Изменил(а) на 'WarmlyShip/src/CollectionGenericObjects/ICollectionGenericObjects.java'

WarmlyShip/src/CollectionAdditionalObjects/AdditionalCollections.java

@@ -6,7 +6,10 @@ import DrawingShip.DrawingWarmlyShip;
 import Entities.EntityShip;
 import Entities.EntityWarmlyShip;
 
+import java.awt.*;
 import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Random;
 
 public class AdditionalCollections <T extends EntityShip, U extends IDifferentDecks>{

WarmlyShip/src/CollectionGenericObjects/AbstractCompany.java

@@ -18,7 +18,7 @@ public abstract class AbstractCompany {
         _pictureWidth = picWidth;
         _pictureHeight = picHeight;
         _collection = collection;
-        _collection.SetMaxCount(GetMaxCount());
+        _collection.SetMaxCount(GetMaxCount(), (Class) DrawingShip.class);
     }
     //перегрузка операторов в джаве не возможна
     public DrawingShip GetRandomObject()

WarmlyShip/src/CollectionGenericObjects/CollectionType.java

@@ -1,7 +0,0 @@
-package CollectionGenericObjects;
-
-public enum CollectionType {
-    None,
-    Massive,
-    List
-}

WarmlyShip/src/CollectionGenericObjects/ICollectionGenericObjects.java

@@ -3,12 +3,10 @@ package CollectionGenericObjects;
 public interface ICollectionGenericObjects<T>
 {
     int getCount();
-    void SetMaxCount(int count);
+    void SetMaxCount(int count, Class<T> type);
     int Insert(T obj);
+    int Insert(T obj, int position);
     T Remove(int position);
     T Get(int position);
-    CollectionType GetCollectionType();
-    Iterable<T> GetItems();
-    void ClearCollection();
 }
 

WarmlyShip/src/CollectionGenericObjects/ListGenericObjects.java

@@ -1,77 +0,0 @@
-package CollectionGenericObjects;
-
-import java.util.*;
-
-public class ListGenericObjects<T> implements ICollectionGenericObjects<T> {
-    private List<T> _collection;
-    private CollectionType collectionType = CollectionType.List;
-    private int _maxCount;
-    public int getCount() {
-        return _collection.size();
-    }
-    @Override
-    public void SetMaxCount(int size) {
-        if (size > 0) {
-            _maxCount = size;
-        }
-    }
-    public ListGenericObjects() {
-        _collection = new ArrayList<T>();
-    }
-    @Override
-    public CollectionType GetCollectionType() {
-        return collectionType;
-    }
-    @Override
-    public T Get(int position)
-    {
-        if (position >= getCount() || position < 0) return null;
-        return _collection.get(position);
-    }
-    @Override
-    public int Insert(T obj)
-    {
-        if (getCount() == _maxCount) return -1;
-        _collection.add(obj);
-        return getCount();
-    }
-    @Override
-    public T Remove(int position)
-    {
-        if (position >= getCount() || position < 0) return null;
-        T obj = _collection.get(position);
-        _collection.remove(position);
-        return obj;
-    }
-    @Override
-    public Iterable<T> GetItems() {
-        return new Iterable<T>() {
-            @Override
-            public Iterator<T> iterator() {
-                return new Iterator<T>() {
-                    private int currentIndex = 0;
-                    //нужен ли count
-                    private int count = 0;
-                    @Override
-                    public boolean hasNext() {
-                        return currentIndex < getCount();
-                    }
-                    @Override
-                    public T next() {
-                        if (hasNext()) {
-                            count++;
-                            return _collection.get(currentIndex++);
-                        }
-                        throw new NoSuchElementException();
-                    }
-                };
-            }
-        };
-    }
-    @Override
-    public void ClearCollection() {
-        for (T ship : _collection) {
-            ship = null;
-        }
-    }
-}

WarmlyShip/src/CollectionGenericObjects/MassiveGenericObjects.java

@@ -1,21 +1,16 @@
 package CollectionGenericObjects;
 
-import DrawingShip.DrawingShip;
-
 import java.lang.reflect.Array;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 public class MassiveGenericObjects<T> implements ICollectionGenericObjects<T>{
-    private T[] _collection = null;
+    private T[] _collection;
     private int Count;
-    private CollectionType collectionType = CollectionType.Massive;
-    @Override
-    public void SetMaxCount(int size) {
+    public void SetMaxCount(int size, Class<T> type) {
         if (size > 0) {
-            if (_collection == null) {
-                _collection = (T[]) Array.newInstance((Class) DrawingShip.class, size);
-                Count = size;
-            }
+            _collection = (T[]) Array.newInstance(type, size);
+            Count = size;
         }
     }
     @Override
@@ -23,10 +18,6 @@ public class MassiveGenericObjects<T> implements ICollectionGenericObjects<T>{
         return Count;
     }
     @Override
-    public CollectionType GetCollectionType() {
-        return collectionType;
-    }
-    @Override
     public int Insert(T obj) {
         int index = 0;
         while (index < getCount())
@@ -41,6 +32,36 @@ public class MassiveGenericObjects<T> implements ICollectionGenericObjects<T>{
         return -1;
     }
     @Override
+    public int Insert(T obj, int position) {
+        if (position >= getCount() || position < 0)
+            return -1;
+        if (_collection[position] == null) {
+            _collection[position] = obj;
+            return position;
+        }
+        int index = position + 1;
+        while (index < getCount())
+        {
+            if (_collection[index] == null)
+            {
+                _collection[index] = obj;
+                return index;
+            }
+            ++index;
+        }
+        index = position - 1;
+        while (index >= 0)
+        {
+            if (_collection[index] == null)
+            {
+                _collection[index] = obj;
+                return index;
+            }
+            --index;
+        }
+        return -1;
+    }
+    @Override
     public T Remove(int position) {
         if (position >= getCount() || position < 0)
             return null;
@@ -53,35 +74,4 @@ public class MassiveGenericObjects<T> implements ICollectionGenericObjects<T>{
         if (position >= getCount() || position < 0) return null;
         return (T) _collection[position];
     }
-    @Override
-    public Iterable<T> GetItems() {
-        return new Iterable<T>() {
-            @Override
-            public Iterator<T> iterator() {
-                return new Iterator<T>() {
-                    private int currentIndex = 0;
-                    //нужен ли count
-                    private int count = 0;
-                    @Override
-                    public boolean hasNext() {
-                        return currentIndex < getCount();
-                    }
-                    @Override
-                    public T next() {
-                        if (hasNext()) {
-                            count++;
-                            return _collection[currentIndex++];
-                        }
-                        throw new NoSuchElementException();
-                    }
-                };
-            }
-        };
-    }
-    @Override
-    public void ClearCollection() {
-        for (T ship : _collection) {
-            ship = null;
-        }
-    }
 }

WarmlyShip/src/CollectionGenericObjects/StorageCollection.java

@@ -1,194 +0,0 @@
-package CollectionGenericObjects;
-
-import DrawingShip.DrawingShip;
-import DrawingShip.ExtentionDrawningShip;
-
-import java.io.*;
-import java.util.*;
-
-public class StorageCollection<T extends DrawingShip> {
-    private Map<String, ICollectionGenericObjects<T>> _storages;
-    public StorageCollection()
-    {
-        _storages = new HashMap<String, ICollectionGenericObjects<T>>();
-    }
-    public Set<String> Keys() {
-        Set<String> keys = _storages.keySet();
-        return keys;
-    }
-    public void AddCollection(String name, CollectionType collectionType)
-    {
-        if (_storages.containsKey(name)) return;
-        if (collectionType == CollectionType.None) return;
-        else if (collectionType == CollectionType.Massive)
-            _storages.put(name, new MassiveGenericObjects<T>());
-        else if (collectionType == CollectionType.List)
-            _storages.put(name, new ListGenericObjects<T>());
-    }
-    public void DelCollection(String name)
-    {
-        if (_storages.containsKey(name))
-            _storages.remove(name);
-    }
-    // в джаве отсутствуют индикаторы
-    public ICollectionGenericObjects<T> getCollectionObject(String name) {
-        if (_storages.containsKey(name))
-            return _storages.get(name);
-        return null;
-    }
-    //дополнительное задание номер 1
-    public T Get(String name, int position){
-        if(_storages.containsKey(name))
-            return _storages.get(name).Remove(position);
-        return null;
-    }
-    private String _collectionKey = "CollectionsStorage";
-    private String _collectionName = "StorageCollection";
-    private String _separatorForKeyValueS = "|";
-    private String _separatorForKeyValue = "\\|";
-    private String _separatorItemsS = ";";
-    private String _separatorItems = "\\;";
-    public boolean SaveData(String filename) {
-        if (_storages.isEmpty()) return false;
-        File file = new File(filename);
-        if (file.exists()) file.delete();
-        try {
-            file.createNewFile();
-            FileWriter writer = new FileWriter(file);
-            writer.write(_collectionKey);
-            writer.write("\n");
-            for (Map.Entry<String, ICollectionGenericObjects<T>> value : _storages.entrySet()) {
-                StringBuilder sb = new StringBuilder();
-                sb.append(value.getKey());
-                sb.append(_separatorForKeyValueS);
-                sb.append(value.getValue().GetCollectionType());
-                sb.append(_separatorForKeyValueS);
-                sb.append(value.getValue().getCount());
-                sb.append(_separatorForKeyValueS);
-                for (T ship : value.getValue().GetItems()) {
-                    String data = ExtentionDrawningShip.GetDataForSave((DrawingShip) ship);
-                    if (data.isEmpty()) continue;
-                    sb.append(data);
-                    sb.append(_separatorItemsS);
-                }
-                sb.append("\n");
-                writer.write(String.valueOf(sb));
-            }
-            writer.close();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        return true;
-    }
-    public boolean SaveOneCollection(String filename, String name) {
-        if (_storages.isEmpty()) return false;
-        File file = new File(filename);
-        if (file.exists()) file.delete();
-        try {
-            file.createNewFile();
-            FileWriter writer = new FileWriter(file);
-            writer.write(_collectionName);
-            writer.write("\n");
-            ICollectionGenericObjects<T> value = _storages.get(name);
-            StringBuilder sb = new StringBuilder();
-            sb.append(name);
-            sb.append(_separatorForKeyValueS);
-            sb.append(value.GetCollectionType());
-            sb.append(_separatorForKeyValueS);
-            sb.append(value.getCount());
-            sb.append(_separatorForKeyValueS);
-            for (T ship : value.GetItems()) {
-                String data = ExtentionDrawningShip.GetDataForSave((DrawingShip) ship);
-                if (data.isEmpty()) continue;
-                sb.append(data);
-                sb.append(_separatorItemsS);
-            }
-            writer.append(sb);
-            writer.close();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        return true;
-    }
-    public boolean LoadData(String filename) {
-        File file = new File(filename);
-        if (!file.exists()) return false;
-        try (BufferedReader fs = new BufferedReader(new FileReader(filename))) {
-            String s = fs.readLine();
-            if (s == null || s.isEmpty() || !s.startsWith(_collectionKey))
-                return false;
-            _storages.clear();
-            s = "";
-            while ((s = fs.readLine()) != null) {
-                String[] record = s.split(_separatorForKeyValue);
-                if (record.length != 4) {
-                    continue;
-                }
-                ICollectionGenericObjects<T> collection = CreateCollection(record[1]);
-                if (collection == null)
-                {
-                    return false;
-                }
-                collection.SetMaxCount(Integer.parseInt(record[2]));
-                String[] set = record[3].split(_separatorItems);
-                for (String elem : set) {
-                    DrawingShip ship = ExtentionDrawningShip.CreateDrawingShip(elem);
-                    if (collection.Insert((T) ship) == -1)
-                    {
-                        return false;
-                    }
-                }
-                _storages.put(record[0], collection);
-            }
-            return true;
-        }
-        catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-    public boolean LoadOneCollection(String filename) {
-        File file = new File(filename);
-        if (!file.exists()) return false;
-        try (BufferedReader fs = new BufferedReader(new FileReader(filename))) {
-            String s = fs.readLine();
-            if (s == null || s.isEmpty() || !s.startsWith(_collectionName))
-                return false;
-            if (_storages.containsKey(s)) {
-                _storages.get(s).ClearCollection();
-            }
-            s = fs.readLine();
-            String[] record = s.split(_separatorForKeyValue);
-            if (record.length != 4) {
-                return false;
-            }
-            ICollectionGenericObjects<T> collection = CreateCollection(record[1]);
-            if (collection == null)
-            {
-                return false;
-            }
-            collection.SetMaxCount(Integer.parseInt(record[2]));
-            String[] set = record[3].split(_separatorItems);
-            for (String elem : set) {
-                DrawingShip ship = ExtentionDrawningShip.CreateDrawingShip(elem);
-                if (collection.Insert((T) ship) == -1)
-                {
-                    return false;
-                }
-            }
-            _storages.put(record[0], collection);
-            return true;
-        }
-        catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-    public ICollectionGenericObjects<T> CreateCollection(String s) {
-        switch (s) {
-            case "Massive":
-                return new MassiveGenericObjects<T>();
-            case "List":
-                return new ListGenericObjects<T>();
-        }
-        return null;
-    }
-}

WarmlyShip/src/DrawingShip/CanvasFormShipCollection.java

@@ -1,12 +1,16 @@
 package DrawingShip;
 
 import CollectionGenericObjects.AbstractCompany;
+import CollectionGenericObjects.ICollectionGenericObjects;
+import CollectionGenericObjects.MassiveGenericObjects;
 
 import javax.swing.*;
 import java.awt.*;
 
 public class CanvasFormShipCollection<T> extends JComponent
 {
+    //неиспользуемые методы
+    public ICollectionGenericObjects<T> collection = new MassiveGenericObjects<T>();
     public AbstractCompany company = null;
     public void SetCollectionToCanvas(AbstractCompany company) {
         this.company =  company;

WarmlyShip/src/DrawingShip/DrawingShip.java

@@ -28,9 +28,28 @@ public class DrawingShip extends JPanel {
         _StartPosX = null;
         _StartPosY = null;
     }
+    protected void SetAmountandTypeDecks() {
+        int numberOfDecks = (int)(Math.random() * 4 + 0);
+        switch ((int)(Math.random() * 3 + 1)) {
+            case 1:
+                drawingDecks = new DrawingDecksType1();
+                break;
+            case 2:
+                drawingDecks = new DrawingDecksType2();
+                break;
+            case 3:
+                drawingDecks = new DrawingDecksType3();
+                break;
+            default:
+                numberOfDecks = 0;
+                break;
+        }
+        drawingDecks.setNumberOfDecks(numberOfDecks);
+    }
     public DrawingShip(int speed, double weight, Color bodycolor)  {
         super();
         EntityShip = new EntityShip(speed, weight, bodycolor);
+        SetAmountandTypeDecks();
     }
     protected DrawingShip(int drawingShipWidth, int drawingShipHeight) {
         super();
@@ -134,16 +153,4 @@ public class DrawingShip extends JPanel {
         g.fillPolygon(poly);
         drawingShipHeight = y + 50 - _StartPosY;
     }
-    public String[] GetStringRepresentationDecks() {
-        if (drawingDecks instanceof DrawingDecksType1) {
-            return new String[]{String.valueOf(drawingDecks.getNumberOfDecks().getNumdecks()), "DrawingDecksType1"};
-        }
-        else if (drawingDecks instanceof DrawingDecksType2) {
-            return new String[]{String.valueOf(drawingDecks.getNumberOfDecks().getNumdecks()), "DrawingDecksType2"};
-        }
-        else if (drawingDecks instanceof DrawingDecksType3) {
-            return new String[]{String.valueOf(drawingDecks.getNumberOfDecks().getNumdecks()), "DrawingDecksType3"};
-        }
-        return null;
-    }
 }

WarmlyShip/src/DrawingShip/DrawingWarmlyShip.java

@@ -1,5 +1,6 @@
 package DrawingShip;
 import DiffetentsDrawingDecks.IDifferentDecks;
+import Entities.EntityShip;
 import Entities.EntityWarmlyShip;
 
 import java.awt.*;
@@ -7,6 +8,7 @@ import java.awt.*;
 public class DrawingWarmlyShip extends DrawingShip {
     public DrawingWarmlyShip(int speed, double weight, Color bodycolor, Color additionalcolor, boolean sheeppipes, boolean fueltank) {
         EntityShip = new EntityWarmlyShip(speed, weight, bodycolor, additionalcolor, sheeppipes, fueltank);
+        SetAmountandTypeDecks();
     }
     //добавил
     public DrawingWarmlyShip(EntityWarmlyShip entity, IDifferentDecks decks) {

WarmlyShip/src/DrawingShip/ExtentionDrawningShip.java

@@ -1,74 +0,0 @@
-package DrawingShip;
-
-import DiffetentsDrawingDecks.DrawingDecksType1;
-import DiffetentsDrawingDecks.DrawingDecksType2;
-import DiffetentsDrawingDecks.DrawingDecksType3;
-import DiffetentsDrawingDecks.IDifferentDecks;
-import Entities.EntityShip;
-import Entities.EntityWarmlyShip;
-
-import java.util.ArrayList;
-import java.util.Collections;
-
-public class ExtentionDrawningShip {
-    private static String _separatorForObjectS = ":";
-    private static String _separatorForObject = "\\:";
-    public static DrawingShip CreateDrawingShip(String info) {
-        String[] strs = info.split(_separatorForObject);
-        EntityShip ship;
-        IDifferentDecks decks = null;
-        if (strs.length == 8)
-        {
-           String s = strs[8];
-           switch (s) {
-               case "DrawingDecksType1":
-                   decks = new DrawingDecksType1();
-               case "DrawingDecksType2":
-                   decks = new DrawingDecksType2();
-               case "DrawingDecksType3":
-                   decks = new DrawingDecksType3();
-           }
-           if (decks != null) decks.setNumberOfDecks(Integer.parseInt(strs[7]));
-        }
-        else if (strs.length == 6) {
-            String s = strs[5];
-            switch (s) {
-                case "DrawingDecksType1":
-                    decks = new DrawingDecksType1();
-                case "DrawingDecksType2":
-                    decks = new DrawingDecksType2();
-                case "DrawingDecksType3":
-                    decks = new DrawingDecksType3();
-            }
-            if (decks != null) decks.setNumberOfDecks(Integer.parseInt(strs[4]));
-        }
-        ship = EntityWarmlyShip.CreateEntityWarmlyShip(strs);
-        if (ship != null)
-        {
-            return new DrawingWarmlyShip((EntityWarmlyShip)ship, decks);
-        }
-        ship = EntityShip.CreateEntityShip(strs);
-        if (ship != null)
-        {
-            return new DrawingShip(ship, decks);
-        }
-        return null;
-    }
-    public static String GetDataForSave(DrawingShip drawningShip)
-    {
-        if (drawningShip == null) return "";
-        String[] array1 = drawningShip.EntityShip.GetStringRepresentation();
-        String[] array2 = drawningShip.GetStringRepresentationDecks();
-        if (array1 == null)
-        {
-            return "";
-        }
-        ArrayList<String> list = new ArrayList<>();
-        Collections.addAll(list, array1);
-        if (array2 == null) {
-            Collections.addAll(list, "0", " ");
-        }
-        else Collections.addAll(list, array2);
-        return String.join(_separatorForObjectS, list);
-    }
-}

WarmlyShip/src/Entities/EntityShip.java

@@ -1,18 +1,12 @@
 package Entities;
 
 import java.awt.*;
-import java.util.Objects;
 
 public class EntityShip {
-    private Integer Speed;
-    public void setSpeed(int speed) {Speed = speed;}
-    public Integer getSpeed() {return Speed;}
-    private Double Weight;
-    public void setWeight(double weight) {Weight = weight;}
-    public Double getWeight() {return Weight;}
+    private int Speed;
+    private double Weight;
     private Color BodyColor;
     public Color getBodyColor() {return BodyColor;}
-    public void setBodyColor(Color color) {BodyColor = color;}
     public double Step;
     public EntityShip(int speed, double weight, Color bodycolor)
     {
@@ -21,22 +15,4 @@ public class EntityShip {
         BodyColor = bodycolor;
         Step = Speed * 100 / Weight;
     }
-    public String[] GetStringRepresentation()
-    {
-        return new String[]{"EntityShip", Speed.toString(), Weight.toString(), colorToHexString(BodyColor)};
-    }
-    public static EntityShip CreateEntityShip(String[] strs)
-    {
-        if (strs.length != 6 || !Objects.equals(strs[0], "EntityShip"))
-        {
-            return null;
-        }
-        return new EntityShip(Integer.parseInt(strs[1]), Double.parseDouble(strs[2]), hexStringToColor(strs[3]));
-    }
-    public static String colorToHexString(Color color) {
-        return String.format("#%02x%02x%02x", color.getRed(), color.getGreen(), color.getBlue());
-    }
-    public static Color hexStringToColor(String hexString) {
-        return Color.decode(hexString);
-    }
 }

WarmlyShip/src/Entities/EntityWarmlyShip.java

@@ -1,17 +1,12 @@
 package Entities;
 
 import java.awt.*;
-import java.util.Objects;
-
 public class EntityWarmlyShip extends EntityShip{
     public Color AdditionalColor;
     public  Color getAdditionalColor() {return AdditionalColor;}
-    public void setAdditionalColor(Color color) {AdditionalColor = color;}
     public  boolean ShipPipes;
-    public void setShipPipes(boolean pipes) {ShipPipes = pipes;}
     public  boolean FuelTank;
     public  boolean getFuelTank() {return FuelTank;}
-    public void setFuelTank(boolean tank) {FuelTank = tank;}
     public EntityWarmlyShip(int speed, double weight, Color bodyColor, Color additionalcolor, boolean sheeppipes, boolean fueltank)
     {
         super(speed, weight, bodyColor);
@@ -19,20 +14,4 @@ public class EntityWarmlyShip extends EntityShip{
         ShipPipes = sheeppipes;
         FuelTank = fueltank;
     }
-    @Override
-    public String[] GetStringRepresentation()
-    {
-        return new String[]{"EntityWarmlyShip", getSpeed().toString(), getWeight().toString(),
-                colorToHexString(getBodyColor()), colorToHexString(getAdditionalColor()),
-                String.valueOf(ShipPipes), String.valueOf(FuelTank)};
-    }
-    public static EntityWarmlyShip CreateEntityWarmlyShip(String[] strs)
-    {
-        if (strs.length != 9 || !Objects.equals(strs[0], "EntityWarmlyShip"))
-        {
-            return null;
-        }
-        return new EntityWarmlyShip(Integer.parseInt(strs[1]), Double.parseDouble(strs[2]), hexStringToColor(strs[3]),
-                hexStringToColor(strs[4]), Boolean.parseBoolean(strs[5]), Boolean.parseBoolean(strs[6]));
-    }
 }

WarmlyShip/src/FormAdditionalCollection.java

@@ -35,6 +35,7 @@ public class FormAdditionalCollection extends JFrame {
         buttonGenerate.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
+
                 drawingShip = additionalCollection.CreateAdditionalCollectionShip();
                 drawingShip.SetPictureSize(getWidth(), getHeight());
                 drawingShip.SetPosition(50,50);

WarmlyShip/src/FormShipCollection.java

@@ -1,4 +1,6 @@
-import CollectionGenericObjects.*;
+import CollectionGenericObjects.AbstractCompany;
+import CollectionGenericObjects.MassiveGenericObjects;
+import CollectionGenericObjects.ShipPortService;
 import DrawingShip.CanvasFormShipCollection;
 import DrawingShip.DrawingShip;
 import DrawingShip.DrawingWarmlyShip;
@@ -8,9 +10,10 @@ import javax.swing.text.MaskFormatter;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
 import java.text.ParseException;
 import java.util.Random;
-import java.util.Stack;
 
 import static java.lang.Integer.parseInt;
 
@@ -19,29 +22,14 @@ public class FormShipCollection extends JFrame{
     private Dimension dimension;
     public static CanvasFormShipCollection<DrawingShip> _canvasWarmlyShip = new CanvasFormShipCollection<DrawingShip>();
     private static AbstractCompany _company = null;
-    private Stack<DrawingShip> _collectionRemoveObjects = new Stack<DrawingShip>();
-    private StorageCollection<DrawingShip> _storageCollection = new StorageCollection<DrawingShip>();
-    private JTextField textBoxCollection = new JTextField();
-    private JRadioButton radioButtonMassive = new JRadioButton("Massive");
-    private JRadioButton radioButtonList = new JRadioButton("List");
-    private JButton buttonAddCollection = new JButton("Add");
-    private JList listBoxCollection = new JList();
-    private JButton buttonRemoveCollection = new JButton("Remove");
-    private JButton buttonCreateCompany = new JButton("Create company");
+    private JButton CreateButton = new JButton("Create warmlyship");;
     private JButton CreateShipButton = new JButton("Create ship");
     private JButton RemoveButton = new JButton("Remove");
     private JButton GoToCheckButton = new JButton("Check");
     private JButton RandomButton = new JButton("RandomShip");
-    private JButton RemoveObjectsButton = new JButton("Show remove");
     private JButton RefreshButton = new JButton("Refresh");
     private JComboBox ComboBoxCollections = new JComboBox(new String[]{"", "Хранилище"});
     private JFormattedTextField MaskedTextField;
-    private JMenuBar menuBar = new JMenuBar();
-    private JMenu fileMenu = new JMenu("File");
-    private JMenuItem loadItem = new JMenuItem("Load");
-    private JMenuItem saveItem = new JMenuItem("Save");
-    private JMenuItem loadCollection = new JMenuItem("Load coll");
-    private JMenuItem saveCollection = new JMenuItem("Save coll");
     public FormShipCollection(String title, Dimension dimension) {
         this.title = title;
         this.dimension = dimension;
@@ -51,6 +39,37 @@ public class FormShipCollection extends JFrame{
         _canvasWarmlyShip.SetCollectionToCanvas(_company);
         _canvasWarmlyShip.repaint();
     }
+    private void CreateObject(String typeOfClass) {
+        if (_company == null) return;
+        int speed = (int)(Math.random() * 300 + 100);
+        double weight = (double)(Math.random() * 3000 + 1000);
+        Color bodyColor = getColor();
+        DrawingShip drawingShip;
+        switch (typeOfClass) {
+            case "DrawingShip":
+                drawingShip = new DrawingShip(speed, weight, bodyColor);
+                break;
+            case "DrawingWarmlyShip":
+                Color additionalColor = getColor();
+                boolean sheepPipes = new Random().nextBoolean();
+                boolean fuelTank = new Random().nextBoolean();;
+                drawingShip = new DrawingWarmlyShip(speed, weight, bodyColor, additionalColor, sheepPipes, fuelTank);
+                break;
+            default: return;
+        }
+        if (_company._collection.Insert(drawingShip, 0) != -1) {
+            JOptionPane.showMessageDialog(null, "Объект добавлен");
+            canvasShow();
+        }
+        else {
+            JOptionPane.showMessageDialog(null, "Объект не удалось добавить");
+        }
+    }
+    public Color getColor() {
+        Color initializator = new Color((int)(Math.random() * 255 + 0),(int)(Math.random() * 255 + 0),(int)(Math.random() * 255 + 0));
+        Color color = JColorChooser.showDialog(this, "Select a color", initializator);
+        return color;
+    }
     public void Init() {
         setTitle(title);
         setMinimumSize(dimension);
@@ -66,21 +85,34 @@ public class FormShipCollection extends JFrame{
 
         MaskedTextField = new JFormattedTextField(mask);
 
+        ComboBoxCollections.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                switch (ComboBoxCollections.getSelectedItem().toString()) {
+                    case "Хранилище":
+                        _company = new ShipPortService(getWidth()-200, getHeight()-70, new MassiveGenericObjects<DrawingShip>());
+                        break;
+                }
+            }
+        });
+
         CreateShipButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                if (_company == null) return;
-                FormShipConfig form = new FormShipConfig("", new Dimension(700, 300));
-                form.setCompany(_company);
-                form.Init();
+                CreateObject("DrawingShip");
+            }
+        });
+        CreateButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                CreateObject("DrawingWarmlyShip");
             }
         });
 
         RemoveButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                if (_company == null || MaskedTextField.getText() == null ||
-                        listBoxCollection.getSelectedValue().toString() == null) {
+                if (_company == null || MaskedTextField.getText() == null) {
                     return;
                 }
                 int pos = parseInt(MaskedTextField.getText());
@@ -88,11 +120,8 @@ public class FormShipCollection extends JFrame{
                         "Удалить", "Удаление",
                         JOptionPane.YES_NO_OPTION);
                 if (resultConfirmDialog == JOptionPane.NO_OPTION) return;
-                DrawingShip obj = _storageCollection.Get(
-                        listBoxCollection.getSelectedValue().toString(), pos);
-                if (obj != null) {
+                if (_company._collection.Remove(pos) != null) {
                     JOptionPane.showMessageDialog(null, "Объект удален");
-                    _collectionRemoveObjects.push(obj);
                     canvasShow();
                 }
                 else {
@@ -151,231 +180,41 @@ public class FormShipCollection extends JFrame{
             }
         });
 
-        buttonAddCollection.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (textBoxCollection.getText().isEmpty() || (!radioButtonMassive.isSelected()
-                    && !radioButtonList.isSelected())) {
-                    JOptionPane.showMessageDialog(null, "Не все данные заполнены");
-                    return;
-                }
-                CollectionType collectionType = CollectionType.None;
-                if (radioButtonMassive.isSelected())
-                {
-                    collectionType = CollectionType.Massive;
-                }
-                else if (radioButtonList.isSelected())
-                {
-                    collectionType = CollectionType.List;
-                }
-                _storageCollection.AddCollection(textBoxCollection.getText(), collectionType);
-                RerfreshListBoxItems();
-            }
-        });
-
-        buttonRemoveCollection.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (listBoxCollection.getSelectedIndex() < 0 || listBoxCollection.getSelectedValue() == null) {
-                    JOptionPane.showMessageDialog(null, "Коллекция не выбрана");
-                    return;
-                }
-                int resultConfirmDialog = JOptionPane.showConfirmDialog(null,
-                        "Удалить", "Удаление",
-                        JOptionPane.YES_NO_OPTION);
-                if (resultConfirmDialog == JOptionPane.NO_OPTION) return;
-                _storageCollection.DelCollection(listBoxCollection.getSelectedValue().toString());
-                RerfreshListBoxItems();
-            }
-        });
-
-        buttonCreateCompany.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (listBoxCollection.getSelectedIndex() < 0 || listBoxCollection.getSelectedValue() == null) {
-                    JOptionPane.showMessageDialog(null, "Коллекция не выбрана");
-                    return;
-                }
-                ICollectionGenericObjects<DrawingShip> collection =
-                        _storageCollection.getCollectionObject(listBoxCollection.getSelectedValue().toString());
-                if (collection == null) {
-                    JOptionPane.showMessageDialog(null, "Коллекция не проинициализирована");
-                    return;
-                }
-                switch (ComboBoxCollections.getSelectedItem().toString()) {
-                    case "Хранилище":
-                        _company = new ShipPortService(getWidth()-200, getHeight()-70,
-                                collection);
-                        break;
-                }
-                RerfreshListBoxItems();
-            }
-        });
-
-        RemoveObjectsButton.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (_collectionRemoveObjects.empty())
-                {
-                    return;
-                }
-                DrawingShip ship = null;
-                ship = _collectionRemoveObjects.pop();
-                if (ship == null)
-                {
-                    return;
-                }
-                FormWarmlyShip form = new FormWarmlyShip("Теплоход", new Dimension(900,565));
-                form.Init(ship);
-            }
-        });
-
-        saveItem.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                SaveFile();
-            }
-        });
-
-
-        loadItem.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                LoadFile();
-            }
-        });
-
-        saveCollection.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                System.out.println("Save coll");
-                SaveCollection();
-            }
-        });
-
-        loadCollection.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                System.out.println("Load coll");
-                LoadCollection();
-            }
-        });
-
-        JLabel labelCollectionName = new JLabel("Название коллекции");
-        ButtonGroup radiobuttonsGroup = new ButtonGroup();
-        radiobuttonsGroup.add(radioButtonMassive);
-        radiobuttonsGroup.add(radioButtonList);
-
-        fileMenu.add(loadItem);
-        fileMenu.add(saveItem);
-        fileMenu.add(loadCollection);
-        fileMenu.add(saveCollection);
-        fileMenu.addSeparator();
-        menuBar.add(fileMenu);
-        setJMenuBar(menuBar);
-
         _canvasWarmlyShip.setBounds(0, 0, getWidth()-200, getHeight());
-        labelCollectionName.setBounds(getWidth()-190, 10, 150, 20);
-        textBoxCollection.setBounds(getWidth()-190, 32, 150, 25);
-        radioButtonMassive.setBounds(getWidth()-190, 60, 75, 20);
-        radioButtonList.setBounds(getWidth()-105, 60, 50, 20);
-        buttonAddCollection.setBounds(getWidth()-190, 85, 150, 20);
-        listBoxCollection.setBounds(getWidth()-190, 115, 150, 70);
-        buttonRemoveCollection.setBounds(getWidth()-190, 195, 150, 20);
-        ComboBoxCollections.setBounds(getWidth()-190, 235, 150, 20);
-        buttonCreateCompany.setBounds(getWidth()-190, 260, 150, 20);
-        CreateShipButton.setBounds(getWidth()-190, 295, 150, 30);
-        MaskedTextField.setBounds(getWidth()-190,365,150,30);
-        RemoveButton.setBounds(getWidth()-190, 400, 150, 30);
-        GoToCheckButton.setBounds(getWidth()-190, 435, 150, 30);
-        RandomButton.setBounds(getWidth()-190, 470, 150, 30);
-        RemoveObjectsButton.setBounds(getWidth()-190, 505, 150, 30);
-        RefreshButton.setBounds(getWidth()-190, getHeight()-100, 150, 30);
+        ComboBoxCollections.setBounds(getWidth()-190, 10, 150, 20);
+        CreateShipButton.setBounds(getWidth()-190, 60, 150, 30);
+        CreateButton.setBounds(getWidth()-190, 100, 150, 30);
+        MaskedTextField.setBounds(getWidth()-190,200,150,30);
+        RemoveButton.setBounds(getWidth()-190, 240, 150, 30);
+        GoToCheckButton.setBounds(getWidth()-190, 280, 150, 30);
+        RandomButton.setBounds(getWidth()-190, 320, 150, 30);
+        RefreshButton.setBounds(getWidth()-190, getHeight()-90, 150, 30);
 
         setSize(dimension.width,dimension.height);
         setLayout(null);
         add(_canvasWarmlyShip);
-        add(labelCollectionName);
-        add(textBoxCollection);
-        add(radioButtonMassive);
-        add(radioButtonList);
-        add(buttonAddCollection);
-        add(listBoxCollection);
-        add(buttonRemoveCollection);
         add(ComboBoxCollections);
-        add(buttonCreateCompany);
         add(CreateShipButton);
+        add(CreateButton);
         add(MaskedTextField);
         add(RemoveButton);
         add(GoToCheckButton);
         add(RandomButton);
-        add(RemoveObjectsButton);
         add(RefreshButton);
         setVisible(true);
-    }
-    private String SaveWindow() {
-        FileDialog fileDialog = new FileDialog(this, "Save File", FileDialog.SAVE);
-        fileDialog.setVisible(true);
-        String directory = fileDialog.getDirectory();
-        String file = fileDialog.getFile();
-        if (directory == null || file == null) return null;
-        return directory + file;
-    }
-    private void SaveFile() {
-        String filename = SaveWindow();
-        if (_storageCollection.SaveData(filename)) {
-            JOptionPane.showMessageDialog(null, "Сохранено");
-        }
-        else JOptionPane.showMessageDialog(null, "Ошибка сохранения");
-    }
-    private void SaveCollection() {
-        String filename = SaveWindow();
-        if (filename == null) {
-            JOptionPane.showMessageDialog(null, "Файл не выбран");
-            return;
-        }
-        if (listBoxCollection.getSelectedIndex() < 0 || listBoxCollection.getSelectedValue() == null) {
-            JOptionPane.showMessageDialog(null, "Коллекция не выбрана");
-        }
-        if (_storageCollection.SaveOneCollection(filename, listBoxCollection.getSelectedValue().toString())) {
-            JOptionPane.showMessageDialog(null, "Коллекция сохранена");
-        }
-        else JOptionPane.showMessageDialog(null, "Ошибка сохранения");
-    }
-    private String LoadWindow() {
-        FileDialog fileDialog = new FileDialog(this, "Save File", FileDialog.LOAD);
-        fileDialog.setVisible(true);
-        String directory = fileDialog.getDirectory();
-        String file = fileDialog.getFile();
-        if (directory == null || file == null) return null;
-        return directory + file;
-    }
-    private void LoadFile() {
-        String filename = LoadWindow();
-        if (_storageCollection.LoadData(filename)) {
-            JOptionPane.showMessageDialog(null, "Загрузка прошла успешно");
-            RerfreshListBoxItems();
-        }
-        else JOptionPane.showMessageDialog(null, "Не загрузилось");
 
-    }
-    private void LoadCollection() {
-        String filename = LoadWindow();
-        if (_storageCollection.LoadOneCollection(filename)) {
-            JOptionPane.showMessageDialog(null, "Коллекция загружена");
-            RerfreshListBoxItems();
-        }
-        else JOptionPane.showMessageDialog(null, "Не загрузилось");
-    }
-    private void RerfreshListBoxItems()
-    {
-        DefaultListModel<String> list = new DefaultListModel<String>();
-        for (String name : _storageCollection.Keys()) {
-            if (name != "")
-            {
-                list.addElement(name);
+        addComponentListener(new ComponentAdapter() {
+            public void componentResized(ComponentEvent e) {
+                _canvasWarmlyShip.setBounds(0, 0, getWidth()-200, getHeight()-70);
+                ComboBoxCollections.setBounds(getWidth()-190, 10, 150, 20);
+                CreateShipButton.setBounds(getWidth()-190, 60, 150, 30);
+                CreateButton.setBounds(getWidth()-190, 100, 150, 30);
+                MaskedTextField.setBounds(getWidth()-190,200,150,30);
+                RemoveButton.setBounds(getWidth()-190, 240, 150, 30);
+                GoToCheckButton.setBounds(getWidth()-190, 280, 150, 30);
+                RandomButton.setBounds(getWidth()-190, 320, 150, 30);
+                RefreshButton.setBounds(getWidth()-190, getHeight()-90, 150, 30);
             }
-        }
-        listBoxCollection.setModel(list);
+        });
     }
 }

WarmlyShip/src/FormShipConfig.java

@@ -1,450 +0,0 @@
-import CollectionGenericObjects.AbstractCompany;
-import DiffetentsDrawingDecks.DrawingDecksType1;
-import DiffetentsDrawingDecks.DrawingDecksType2;
-import DiffetentsDrawingDecks.DrawingDecksType3;
-import DiffetentsDrawingDecks.IDifferentDecks;
-import DrawingShip.DrawingShip;
-import DrawingShip.DrawingWarmlyShip;
-import Entities.EntityWarmlyShip;
-
-import javax.swing.*;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import java.awt.*;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.StringSelection;
-import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.UnsupportedFlavorException;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.io.IOException;
-
-public class FormShipConfig extends JFrame {
-    private String title;
-    private Dimension dimension;
-    private DrawingShip _ship;
-    private AbstractCompany company = null;
-    private JLabel labelSpeed = new JLabel("Speed");
-    private JLabel labelWeight = new JLabel("Weight");
-    private JLabel labelShip = new JLabel("Ship", SwingConstants.CENTER);
-    private JLabel labelWarmlyShip = new JLabel("WarmlyShip", SwingConstants.CENTER);
-    private JLabel labelColor = new JLabel("Color");
-    private JLabel labelBodyColor = new JLabel("BodyColor", SwingConstants.CENTER);
-    private JLabel labelSolidDeck = new JLabel("Solid Deck",SwingConstants.CENTER);
-    private JLabel labelBeamsDeck = new JLabel("Beams Deck", SwingConstants.CENTER);
-    private JLabel labelWindowDeck = new JLabel("Window Deck", SwingConstants.CENTER);
-    private JLabel labelAdditionalColor = new JLabel("Additi Color", SwingConstants.CENTER);
-    private JLabel labelNumberOfDecks = new JLabel("Numb Of decks");
-    private JSpinner spinnerSpeed = new JSpinner();
-    private JSpinner spinnerWeight = new JSpinner();
-    private JSpinner spinnerNumberOfDecks = new JSpinner();
-    private JCheckBox checkBoxPipes = new JCheckBox("Have a Ship Pipes");
-    private JCheckBox checkBoxFuelTank = new JCheckBox("Have a Fuel Tank");
-    private JComponent panelObject = new JPanel();
-    private JPanel panelColorRed = new JPanel();
-    private JPanel panelColorGreen = new JPanel();
-    private JPanel panelColorBlue = new JPanel();
-    private JPanel panelColorYellow = new JPanel();
-    private JPanel panelColorBlack = new JPanel();
-    private JPanel panelColorWhite = new JPanel();
-    private JPanel panelColorGray = new JPanel();
-    private JPanel panelColorCyan = new JPanel();
-    private JButton buttonAdd = new JButton("Add");
-    private JButton buttonCansel = new JButton("Cancel");
-
-    public FormShipConfig(String title, Dimension dimension) {
-        this.title = title;
-        this.dimension = dimension;
-    }
-    public void Init() {
-        SpinnerModel numSpeed = new SpinnerNumberModel(100, 100, 1000, 1);
-        SpinnerModel numWeight = new SpinnerNumberModel(100, 100, 1000, 1);
-        spinnerSpeed.setModel(numSpeed);
-        spinnerWeight.setModel(numWeight);
-        SpinnerModel numDecks = new SpinnerNumberModel(0, 0, 3, 1);
-        spinnerNumberOfDecks.setModel(numDecks);
-        panelObject = new Canvas();
-        panelObject.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
-
-        spinnerSpeed.addChangeListener(new ChangeListener() {
-            @Override
-            public void stateChanged(ChangeEvent e) {
-                if (_ship == null) return;
-                _ship.EntityShip.setSpeed((int)spinnerSpeed.getValue());
-            }
-        });
-        spinnerWeight.addChangeListener(new ChangeListener() {
-            @Override
-            public void stateChanged(ChangeEvent e) {
-                if (_ship == null) return;
-                _ship.EntityShip.setWeight((int)spinnerWeight.getValue());
-            }
-        });
-        checkBoxPipes.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (_ship == null) return;
-                if (_ship.EntityShip instanceof EntityWarmlyShip warmlyShip) {
-                    warmlyShip.setShipPipes(checkBoxPipes.isSelected());
-                    panelObject.repaint();
-                }
-            }
-        });
-        checkBoxFuelTank.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (_ship == null) return;
-                if (_ship.EntityShip instanceof EntityWarmlyShip warmlyShip) {
-                    warmlyShip.setFuelTank(checkBoxFuelTank.isSelected());
-                    panelObject.repaint();
-                }
-            }
-        });
-
-        labelShip.setBackground(Color.WHITE);
-        labelShip.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
-        labelWarmlyShip.setBackground(Color.WHITE);
-        labelWarmlyShip.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
-        labelBodyColor.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
-        labelAdditionalColor.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
-        labelSolidDeck.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
-        labelBeamsDeck.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
-        labelWindowDeck.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
-
-        MouseAdapter labelObjectsMouseDown = new MouseAdapter() {
-            @Override
-            public void mousePressed(MouseEvent e) {
-                ((JLabel) e.getComponent()).getTransferHandler().exportAsDrag(((JLabel) e.getComponent()), e, TransferHandler.COPY);
-            }
-        };
-
-        TransferHandler labelObjectsTransferHandler = new TransferHandler() {
-            @Override
-            public int getSourceActions(JComponent c) {
-                return TransferHandler.COPY;
-            }
-
-            @Override
-            protected Transferable createTransferable(JComponent c) {
-                return new StringSelection(((JLabel) c).getText());
-            }
-        };
-
-        labelShip.addMouseListener(labelObjectsMouseDown);
-        labelShip.setTransferHandler(labelObjectsTransferHandler);
-        labelWarmlyShip.addMouseListener(labelObjectsMouseDown);
-        labelWarmlyShip.setTransferHandler(labelObjectsTransferHandler);
-
-        MouseAdapter labelDecksMouseDown = new MouseAdapter() {
-            @Override
-            public void mousePressed(MouseEvent e) {
-                ((JLabel) e.getComponent()).getTransferHandler().exportAsDrag(((JLabel) e.getComponent()), e, TransferHandler.COPY);
-            }
-        };
-
-        labelSolidDeck.addMouseListener(labelDecksMouseDown);
-        labelBeamsDeck.addMouseListener(labelDecksMouseDown);
-        labelWindowDeck.addMouseListener(labelDecksMouseDown);
-        labelSolidDeck.setTransferHandler(new TransferHandler() {
-            @Override
-            public int getSourceActions(JComponent c) {return TransferHandler.COPY;}
-
-            @Override
-            protected Transferable createTransferable(JComponent c) {
-                return new DecksTransferable(new DrawingDecksType1());
-            }
-        });
-        labelBeamsDeck.setTransferHandler(new TransferHandler() {
-            @Override
-            public int getSourceActions(JComponent c) {return TransferHandler.COPY;}
-
-            @Override
-            protected Transferable createTransferable(JComponent c) {
-                return new DecksTransferable(new DrawingDecksType2());
-            }
-        });
-        labelWindowDeck.setTransferHandler(new TransferHandler() {
-            @Override
-            public int getSourceActions(JComponent c) {return TransferHandler.COPY;}
-
-            @Override
-            protected Transferable createTransferable(JComponent c) {
-                return new DecksTransferable(new DrawingDecksType3());
-            }
-        });
-
-        panelObject.setTransferHandler(new TransferHandler() {
-            @Override
-            public boolean canImport(TransferHandler.TransferSupport support) {
-                return support.isDataFlavorSupported(DataFlavor.stringFlavor)
-                        || support.isDataFlavorSupported(DecksTransferable.decksDataFlavor);
-            }
-            @Override
-            public boolean importData(TransferHandler.TransferSupport support) {
-                if (canImport(support)) {
-                    try {
-                        String data = (String) support.getTransferable().getTransferData(DataFlavor.stringFlavor);
-                        switch (data) {
-                            case "Ship":
-                                _ship = new DrawingShip((int) spinnerSpeed.getValue(), (int) spinnerWeight.getValue(),
-                                        Color.WHITE);
-                                break;
-                            case "WarmlyShip":
-                                _ship = new DrawingWarmlyShip((int) spinnerSpeed.getValue(), (int) spinnerWeight.getValue(),
-                                        Color.WHITE, Color.BLACK, checkBoxPipes.isSelected(), checkBoxFuelTank.isSelected());
-                                break;
-                        }
-                        if (_ship != null) {
-                            _ship.SetPictureSize(155,155);
-                            _ship.SetPosition(5,10);
-                        }
-                        else return false;
-                    }
-                    catch (UnsupportedFlavorException | IOException e) {}
-                    try {
-                        IDifferentDecks decks =
-                                (IDifferentDecks) support.getTransferable().getTransferData(DecksTransferable.decksDataFlavor);
-                        _ship.drawingDecks = decks;
-                        _ship.drawingDecks.setNumberOfDecks((int) spinnerNumberOfDecks.getValue());
-
-                    }catch (UnsupportedFlavorException | IOException e) {}
-                    panelObject.repaint();
-                    return true;
-                }
-                return false;
-            }
-        });
-
-        JPanel[] colorPanels = {
-                panelColorRed,
-                panelColorGreen,
-                panelColorBlue,
-                panelColorYellow,
-                panelColorWhite,
-                panelColorBlack,
-                panelColorGray,
-                panelColorCyan,
-        };
-
-        panelColorRed.setBackground(Color.RED);
-        panelColorGreen.setBackground(Color.GREEN);
-        panelColorBlue.setBackground(Color.BLUE);
-        panelColorYellow.setBackground(Color.YELLOW);
-        panelColorWhite.setBackground(Color.WHITE);
-        panelColorBlack.setBackground(Color.BLACK);
-        panelColorGray.setBackground(Color.GRAY);
-        panelColorCyan.setBackground(Color.CYAN);
-
-        MouseAdapter colorMouseDown = new MouseAdapter() {
-            @Override
-            public void mousePressed(MouseEvent e) {
-                ((JPanel) e.getComponent()).getTransferHandler().exportAsDrag(((JPanel) e.getComponent()), e, TransferHandler.COPY);
-            }
-        };
-
-        for (var panelColor : colorPanels) {
-            panelColor.addMouseListener(colorMouseDown);
-            panelColor.setTransferHandler(new ColorTransferHandler());
-        }
-
-        labelBodyColor.setTransferHandler(new TransferHandler() {
-            @Override
-            public boolean canImport(TransferHandler.TransferSupport support) {
-                return support.isDataFlavorSupported(ColorTransferable.colorDataFlavor);
-            }
-            @Override
-            public boolean importData(TransferSupport support) {
-                try {
-                    Color color = (Color) support.getTransferable().getTransferData(ColorTransferable.colorDataFlavor);
-                    if (_ship == null) return false;
-                    _ship.EntityShip.setBodyColor(color);
-                    return true;
-                } catch (UnsupportedFlavorException | IOException e) {
-                    e.printStackTrace();
-                }
-                return false;
-            }
-        });
-
-        labelAdditionalColor.setTransferHandler(new TransferHandler() {
-            @Override
-            public boolean canImport(TransferHandler.TransferSupport support) {
-                if (!(_ship instanceof DrawingWarmlyShip)) return false;
-                return support.isDataFlavorSupported(ColorTransferable.colorDataFlavor);
-            }
-            @Override
-            public boolean importData(TransferSupport support) {
-                try {
-                    Color color = (Color) support.getTransferable().getTransferData(ColorTransferable.colorDataFlavor);
-                    if (_ship == null) return false;
-                    if (_ship.EntityShip instanceof EntityWarmlyShip warmlyShip) {
-                        warmlyShip.setAdditionalColor(color);
-                        labelColor.setBackground(color);
-                        return true;
-                    }
-                    return false;
-                } catch (UnsupportedFlavorException | IOException e) {
-                    e.printStackTrace();
-                }
-                return false;
-            }
-        });
-
-        buttonAdd.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (_ship == null) return;
-                DrawingShip copyShip;
-                if (_ship instanceof DrawingWarmlyShip)
-                    copyShip =  new DrawingWarmlyShip((EntityWarmlyShip) _ship.EntityShip, _ship.drawingDecks);
-                else
-                    copyShip =  new DrawingShip(_ship.EntityShip, _ship.drawingDecks);
-                company._collection.Insert(copyShip);
-                FormShipCollection.canvasShow();
-                dispose();
-            }
-        });
-
-        buttonCansel.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                dispose();
-            }
-        });
-
-        labelSpeed.setBounds(10, 17, 50, 15);
-        labelWeight.setBounds(10,43, 50, 15);
-        labelNumberOfDecks.setBounds(10, 68, 50, 15);
-        labelShip.setBounds(10,150,70,30);
-        labelWarmlyShip.setBounds(10,190,70,30);
-        labelColor.setBounds(170,10,30,15);
-        labelBodyColor.setBounds(500,5,75, 40);
-        labelAdditionalColor.setBounds(580,5,75,40);
-        labelSolidDeck.setBounds(120, 210, 100, 40);
-        labelBeamsDeck.setBounds(230, 210, 100,40);
-        labelWindowDeck.setBounds(340,210,100,40);
-        spinnerSpeed.setBounds(60,15, 60,20);
-        spinnerWeight.setBounds(60,40, 60,20);
-        spinnerNumberOfDecks.setBounds(60, 65,60,20);
-        checkBoxPipes.setBounds(8,85,150,20);
-        checkBoxFuelTank.setBounds(8,105,150,20);
-        panelObject.setBounds(500,50,160,150);
-        panelColorRed.setBounds(170, 30, 40, 40);
-        panelColorGreen.setBounds(220, 30, 40,40);
-        panelColorBlue.setBounds(270,30,40,40);
-        panelColorYellow.setBounds(320,30,40,40);
-        panelColorWhite.setBounds(170, 80,40,40);
-        panelColorBlack.setBounds(220,80,40,40);
-        panelColorGray.setBounds(270,80,40,40);
-        panelColorCyan.setBounds(320,80,40,40);
-        buttonAdd.setBounds(500, 210, 70, 40);
-        buttonCansel.setBounds(585, 210, 70, 40);
-
-        setSize(dimension.width, dimension.height);
-        setLayout(null);
-        add(labelSpeed);
-        add(labelWeight);
-        add(labelNumberOfDecks);
-        add(labelShip);
-        add(labelWarmlyShip);
-        add(labelColor);
-        add(labelBodyColor);
-        add(labelAdditionalColor);
-        add(labelSolidDeck);
-        add(labelSolidDeck);
-        add(labelBeamsDeck);
-        add(labelWindowDeck);
-        add(spinnerSpeed);
-        add(spinnerWeight);
-        add(spinnerNumberOfDecks);
-        add(checkBoxPipes);
-        add(checkBoxFuelTank);
-        add(panelObject);
-        add(panelColorRed);
-        add(panelColorGreen);
-        add(panelColorBlue);
-        add(panelColorYellow);
-        add(panelColorWhite);
-        add(panelColorBlack);
-        add(panelColorGray);
-        add(panelColorCyan);
-        add(buttonAdd);
-        add(buttonCansel);
-        setVisible(true);
-    }
-    public void setCompany(AbstractCompany company) {
-        this.company = company;
-    }
-    private class Canvas extends JComponent {
-        public Canvas() {
-        }
-        public void paintComponent(Graphics g) {
-            if (_ship == null) {
-                return;
-            }
-            super.paintComponents(g);
-            Graphics2D g2d = (Graphics2D) g;
-            _ship.DrawTransport(g2d);
-            super.repaint();
-        }
-    }
-    private class ColorTransferable implements Transferable {
-        private Color color;
-        private static final DataFlavor colorDataFlavor = new DataFlavor(Color.class, "Color");
-        public ColorTransferable(Color color) {
-            this.color = color;
-        }
-        @Override
-        public DataFlavor[] getTransferDataFlavors() {
-            return new DataFlavor[]{colorDataFlavor};
-        }
-        @Override
-        public boolean isDataFlavorSupported(DataFlavor flavor) {
-            return colorDataFlavor.equals(flavor);
-        }
-        @Override
-        public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException {
-            if (isDataFlavorSupported(flavor)) {
-                return color;
-            } else {
-                throw new UnsupportedFlavorException(flavor);
-            }
-        }
-    }
-    private class ColorTransferHandler extends TransferHandler {
-        @Override
-        public int getSourceActions(JComponent c) {
-            return TransferHandler.COPY;
-        }
-        @Override
-        protected Transferable createTransferable(JComponent c) {
-            return new ColorTransferable(c.getBackground());
-        }
-    }
-    private class DecksTransferable implements Transferable {
-        private IDifferentDecks decks;
-        private static final DataFlavor decksDataFlavor = new DataFlavor(IDifferentDecks.class, "Decks");
-        public DecksTransferable(IDifferentDecks decks) {
-            this.decks = decks;
-        }
-        @Override
-        public DataFlavor[] getTransferDataFlavors() {
-            return new DataFlavor[]{decksDataFlavor};
-        }
-        @Override
-        public boolean isDataFlavorSupported(DataFlavor flavor) {
-            return flavor.equals(decksDataFlavor);
-        }
-        @Override
-        public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException {
-            if (isDataFlavorSupported(flavor)) {
-                return decks;
-            } else {
-                throw new UnsupportedFlavorException(flavor);
-            }
-        }
-    }
-
-}

WarmlyShip/src/FormWarmlyShip.java

@@ -1,3 +1,4 @@
+import DrawingShip.CanvasFormShipCollection;
 import DrawingShip.CanvasWarmlyShip;
 import DrawingShip.DirectionType;
 import DrawingShip.DrawingShip;
@@ -29,6 +30,7 @@ public class FormWarmlyShip extends JFrame {
     public void Init(DrawingShip ship) {
         setTitle(title);
         setMinimumSize(dimension);
+        setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
         Width = getWidth() - 10;
         Height = getHeight() - 34;