From f146a0ff06f68e05df4d35eb59dcfcddfba7f343 Mon Sep 17 00:00:00 2001 From: antoc0der <1@DESKTOP-K1L8ND3> Date: Mon, 18 Dec 2023 20:01:51 +0300 Subject: [PATCH] baby don't hurt me --- src/DrawningObjects/ExtentionDrawningAirplane.java | 12 ++++++------ src/FormAirplaneCollection.java | 2 -- src/Generics/AirplaneGenericCollection.java | 2 +- src/Generics/AirplaneGenericStorage.java | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/DrawningObjects/ExtentionDrawningAirplane.java b/src/DrawningObjects/ExtentionDrawningAirplane.java index bde9da2..151e713 100644 --- a/src/DrawningObjects/ExtentionDrawningAirplane.java +++ b/src/DrawningObjects/ExtentionDrawningAirplane.java @@ -50,8 +50,8 @@ public class ExtentionDrawningAirplane { getColor(strs[2]), width, height); - toRet.ChangeIlluminatorNumb(Integer.parseInt(strs[5])); - toRet.ChangeIDraw(Integer.parseInt(strs[6])); + toRet.ChangeIlluminatorNumb(Integer.parseInt(strs[3])); + toRet.ChangeIDraw(Integer.parseInt(strs[4])); return toRet; } if(strs.length == 8){ @@ -60,12 +60,12 @@ public class ExtentionDrawningAirplane { Integer.parseInt(strs[1]), getColor(strs[2]), getColor(strs[3]), - Boolean.parseBoolean(strs[7]), - Boolean.parseBoolean(strs[8]), + Boolean.parseBoolean(strs[4]), + Boolean.parseBoolean(strs[5]), width, height); - toRet.ChangeIlluminatorNumb(Integer.parseInt(strs[5])); - toRet.ChangeIDraw(Integer.parseInt(strs[6])); + toRet.ChangeIlluminatorNumb(Integer.parseInt(strs[6])); + toRet.ChangeIDraw(Integer.parseInt(strs[7])); return toRet; } return null; diff --git a/src/FormAirplaneCollection.java b/src/FormAirplaneCollection.java index 5a9bbaa..c6a5de3 100644 --- a/src/FormAirplaneCollection.java +++ b/src/FormAirplaneCollection.java @@ -135,10 +135,8 @@ public class FormAirplaneCollection { JFileChooser fc = new JFileChooser("C:\\Users\\1\\Desktop\\свое"); fc.addChoosableFileFilter(new TxtSaveFilter()); int retrieval = fc.showSaveDialog(null); - if (retrieval == JFileChooser.APPROVE_OPTION) { File file = new File(fc.getSelectedFile() + "." + "txt"); - try { if(listBoxStorages.getSelectedIndex() == -1) { return; diff --git a/src/Generics/AirplaneGenericCollection.java b/src/Generics/AirplaneGenericCollection.java index 95b0620..2be90f0 100644 --- a/src/Generics/AirplaneGenericCollection.java +++ b/src/Generics/AirplaneGenericCollection.java @@ -29,7 +29,7 @@ public class AirplaneGenericCollection<T extends DrawningAirplane, U extends IMo } f.createNewFile(); StringBuilder data = new StringBuilder(); - data.append("MonorailCollection\n"); + data.append("AirplaneCollection\n"); data.append(String.format("%s\n", name)); StringBuilder records = new StringBuilder(); for(DrawningAirplane elem : GetAirplanes()) diff --git a/src/Generics/AirplaneGenericStorage.java b/src/Generics/AirplaneGenericStorage.java index 1ec2e24..afdaded 100644 --- a/src/Generics/AirplaneGenericStorage.java +++ b/src/Generics/AirplaneGenericStorage.java @@ -48,7 +48,7 @@ public class AirplaneGenericStorage { var strs = bufferTextFromFile.toString().split("\n"); if(strs == null || strs.length == 0) return false; - if (!strs[0].startsWith("MonorailStorage")) + if (!strs[0].startsWith("AirplaneStorage")) return false; _airplaneStorages.clear(); for(String data : strs){