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