ProjectStormtrooper/src/CanvasFormStormtrooperCollection.java

@@ -0,0 +1,29 @@
+import javax.swing.*;
+import CollectionGenericObjects.AbstractCompany;
+import Drawnings.DrawingBaseStormtrooper;
+
+import java.awt.*;
+
+public class CanvasFormStormtrooperCollection<T> extends JComponent {
+    public AbstractCompany company = null;
+    public void SetCollectionToCanvas(AbstractCompany company) {
+        this.company = company;
+    }
+    public CanvasFormStormtrooperCollection() {};
+    public void paintComponent(Graphics g) {
+        super.paintComponents(g);
+        if (company == null || company._collection == null) {
+            return;
+        }
+        company.DrawBackgound(g);
+        for (int i = 0; i < company._collection.getCount(); i++) {
+
+            Graphics2D g2d = (Graphics2D) g;
+            T obj = (T) company._collection.Get(i);
+            if (obj instanceof DrawingBaseStormtrooper) {
+                ((DrawingBaseStormtrooper) obj).DrawTransport(g2d);
+            }
+        }
+        super.repaint();
+    }
+}

ProjectStormtrooper/src/CollectionGenericObjects/AbstractCompany.java

@@ -0,0 +1,35 @@
+package CollectionGenericObjects;
+import Drawnings.DrawingBaseStormtrooper;
+
+import java.awt.*;
+
+public abstract class AbstractCompany {
+    protected int _placeSizeWidth = 220;
+    protected  int _placeSizeHeight = 155;
+    protected int _pictureWidth;
+    protected  int _pictureHeight;
+    public ICollectionGenericObjects<DrawingBaseStormtrooper> _collection = null;
+    private int GetMaxCount() {
+        return _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
+
+    }
+    public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawingBaseStormtrooper> collection)
+    {
+        _pictureWidth = picWidth;
+        _pictureHeight = picHeight;
+        _collection = collection;
+        System.out.println(_pictureHeight+" "+_pictureWidth+" "+_placeSizeHeight+" "+_placeSizeWidth);
+        _collection.SetMaxCount(GetMaxCount(), (Class) DrawingBaseStormtrooper.class);
+    }
+    //Перегрузок нет
+    public DrawingBaseStormtrooper GetRandomObject()
+    {
+        return _collection.Get((int)(Math.random()*GetMaxCount() + 0));
+    }
+    public void SetPosition()
+    {
+        SetObjectsPosition();
+    }
+    public abstract void DrawBackgound(Graphics graphics);
+    protected abstract void SetObjectsPosition();
+}

ProjectStormtrooper/src/CollectionGenericObjects/AdditionalCollection.java

@@ -0,0 +1,60 @@
+package CollectionGenericObjects;
+
+import Drawnings.DrawingBaseStormtrooper;
+import Drawnings.DrawingStormtrooper;
+import Drawnings.Engines.IDrawingEngines;
+import Entities.EntityBaseStormtrooper;
+import Entities.EntityStormtrooper;
+import java.lang.reflect.Array;
+import java.util.Random;
+
+public class AdditionalCollection <T extends EntityBaseStormtrooper, U extends IDrawingEngines>{
+    public T[] _collectionEntity;
+    public U[] _collectionEngines;
+    public AdditionalCollection(int size, Class<T> type1, Class<T> type2) {
+        _collectionEntity = (T[]) Array.newInstance(type1, size);
+        _collectionEngines = (U[]) Array.newInstance(type2, size);
+        CountEntities = size;
+        CountEngines = size;
+    }
+    public int CountEntities;
+    public int CountEngines;
+    public int Insert(T entity) {
+        int index = 0;
+        while (index < CountEntities) {
+            if (_collectionEntity[index] == null)
+            {
+                _collectionEntity[index] = entity;
+                return index;
+            }
+            ++index;
+        }
+        return -1;
+    }
+    public int Insert(U decks) {
+        int index = 0;
+        while (index < CountEngines) {
+            if (_collectionEngines[index] == null)
+            {
+                _collectionEngines[index] = decks;
+                return index;
+            }
+            ++index;
+        }
+        return -1;
+    }
+    public DrawingBaseStormtrooper CreateAdditionalCollectionStormtrooper() {
+        Random random = new Random();
+        if (_collectionEntity == null || _collectionEngines == null) return null;
+        T entity = _collectionEntity[random.nextInt(CountEntities)];
+        U engines = _collectionEngines[random.nextInt(CountEngines)];
+        DrawingBaseStormtrooper drawingBaseStormtrooper = null;
+        if (entity instanceof EntityStormtrooper) {
+            drawingBaseStormtrooper = new DrawingStormtrooper((EntityStormtrooper) entity, engines);
+        }
+        else {
+            drawingBaseStormtrooper = new DrawingBaseStormtrooper(entity, engines);
+        }
+        return drawingBaseStormtrooper;
+    }
+}

ProjectStormtrooper/src/CollectionGenericObjects/ICollectionGenericObjects.java

@@ -0,0 +1,12 @@
+
+package CollectionGenericObjects;
+
+public interface ICollectionGenericObjects<T>
+{
+    int getCount();
+    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);
+}

ProjectStormtrooper/src/CollectionGenericObjects/MassiveGenericObjects.java

@@ -0,0 +1,76 @@
+package CollectionGenericObjects;
+
+import java.lang.reflect.Array;
+
+
+public class MassiveGenericObjects<T> implements ICollectionGenericObjects<T>{
+    private T[] _collection;
+    private int Count;
+    public void SetMaxCount(int size, Class<T> type) {
+        if (size > 0) {
+            _collection = (T[]) Array.newInstance(type, size);
+            Count = size;
+        }
+    }
+    @Override
+    public int getCount() {
+        return Count;
+    }
+    @Override
+    public int Insert(T obj) {
+        int index = 0;
+        while (index < getCount())
+        {
+            if (_collection[index] == null)
+            {
+                _collection[index] = obj;
+                return index;
+            }
+            ++index;
+        }
+        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;
+        T obj = (T) _collection[position];
+        _collection[position] = null;
+        return obj;
+    }
+    @Override
+    public T Get(int position) {
+        if (position >= getCount() || position < 0) return null;
+        return (T) _collection[position];
+    }
+}

ProjectStormtrooper/src/CollectionGenericObjects/StormtrooperSharingService.java

@@ -0,0 +1,52 @@
+package CollectionGenericObjects;
+
+import Drawnings.DrawingBaseStormtrooper;
+
+import java.awt.*;
+
+public class StormtrooperSharingService  extends AbstractCompany{
+    public StormtrooperSharingService (int picWidth, int picHeight, ICollectionGenericObjects<DrawingBaseStormtrooper> collection) {
+        super(picWidth, picHeight, collection);
+    }
+    @Override
+    public void DrawBackgound(Graphics g) {
+        int width = _pictureWidth / _placeSizeWidth;
+        int height = _pictureHeight / _placeSizeHeight;
+        g.setColor(Color.BLACK);
+        for (int i = 0; i < width; i++)
+        {
+            for (int j = 0; j < height + 1; ++j)
+            {
+                g.drawLine(i * _placeSizeWidth+15, j * _placeSizeHeight, i * _placeSizeWidth+15 + _placeSizeWidth-55, j * _placeSizeHeight);
+                g.drawLine(i * _placeSizeWidth+15, j * _placeSizeHeight, i * _placeSizeWidth+15, j * _placeSizeHeight -_placeSizeHeight);
+            }
+        }
+    }
+    @Override
+    protected void SetObjectsPosition() {
+        int width = _pictureWidth / _placeSizeWidth;
+        int height = _pictureHeight / _placeSizeHeight;
+
+        int curWidth = width - 4;
+        int curHeight = 0;
+
+        for (int i = 0; i < (_collection.getCount()); i++) {
+            if (_collection.Get(i) != null) {
+                _collection.Get(i).SetPictureSize(_pictureWidth, _pictureHeight);
+                _collection.Get(i).SetPosition(_placeSizeWidth * curWidth + 16, curHeight * _placeSizeHeight + 3);
+            }
+
+            if (curWidth < width-1)
+                curWidth++;
+            else
+            {
+                curWidth = 0;
+                curHeight++;
+            }
+            if (curHeight > height)
+            {
+                return;
+            }
+        }
+    }
+}

ProjectStormtrooper/src/Drawnings/DrawingBaseStormtrooper.java

@@ -1,9 +1,11 @@
 package Drawnings;
+import Drawnings.Engines.IDrawingEngines;
 import  Entities.*;
 import java.awt.*;
 
 public class DrawingBaseStormtrooper {
     public EntityBaseStormtrooper EntityBaseStormtrooper;
+    public IDrawingEngines drawingEngines =null;
     protected Integer _pictureWidth;
     protected Integer _pictureHeight;
     protected Integer _startPosX;
@@ -25,6 +27,10 @@ public class DrawingBaseStormtrooper {
         super();
         EntityBaseStormtrooper = new EntityBaseStormtrooper(speed, weight, bodyColor);
     }
+    public DrawingBaseStormtrooper(EntityBaseStormtrooper entityBaseStormtrooper, IDrawingEngines drawingEngines){
+        this.EntityBaseStormtrooper = entityBaseStormtrooper;
+        this.drawingEngines = drawingEngines;
+    }
 
     public boolean SetPictureSize(int width, int height) {
         // TODO проверка, что объект "влезает" в размеры поля

ProjectStormtrooper/src/Drawnings/DrawingStormtrooper.java

@@ -7,7 +7,7 @@ import Entities.*;
 import  java.awt.*;
 
 public class DrawingStormtrooper extends  DrawingBaseStormtrooper{
-    public IDrawingEngines drawingEngines =null;
+
     public DrawingStormtrooper(int speed, float weight, Color bodyColor, Color additionalColor,boolean rockets, boolean bombs, boolean engines, int typeOfEngines) {
         EntityBaseStormtrooper = new EntityStormtrooper(speed, weight, bodyColor, additionalColor, rockets, bombs, engines);
         if(engines){
@@ -32,6 +32,10 @@ public class DrawingStormtrooper extends  DrawingBaseStormtrooper{
         _pictureWidth = null;
         _pictureHeight = null;
     }
+    public DrawingStormtrooper(EntityStormtrooper entityStormtrooper, IDrawingEngines drawingEngines){
+        this.EntityBaseStormtrooper=entityStormtrooper;
+        this.drawingEngines = drawingEngines;
+    }
 
     @Override
     public void DrawTransport(Graphics g)

ProjectStormtrooper/src/FormAdditionalCollection.java

@@ -0,0 +1,154 @@
+import CollectionGenericObjects.AdditionalCollection;
+import CollectionGenericObjects.AbstractCompany;
+import Drawnings.DrawingBaseStormtrooper;
+import Drawnings.DrawingStormtrooper;
+import Drawnings.Engines.DrawingEngines;
+import Drawnings.Engines.DrawingOvalEngines;
+import Drawnings.Engines.DrawingTriangleEngines;
+import Drawnings.Engines.IDrawingEngines;
+import Entities.EntityBaseStormtrooper;
+import Entities.EntityStormtrooper;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Random;
+
+public class FormAdditionalCollection extends JFrame {
+    public DrawingBaseStormtrooper _drawingBaseStormtrooper = null;
+    private AbstractCompany _company = null;
+    private CanvasStormtrooper _canvasStormtrooper = new CanvasStormtrooper();
+    private AdditionalCollection<EntityBaseStormtrooper, IDrawingEngines> _additionalCollection = null;
+    private Random random = new Random();
+    private JButton buttonGenerate = new JButton("Создать");
+    private JList<String> listEntity = new JList<String>();
+    private JList<String> listEngines = new JList<String>();
+    public FormAdditionalCollection() {
+        setTitle("Random stormtrooper");
+        setMinimumSize(new Dimension(650,310));
+        _additionalCollection = new AdditionalCollection<EntityBaseStormtrooper,IDrawingEngines>(3,(Class)EntityBaseStormtrooper.class,(Class)IDrawingEngines.class);
+        AddEntities();
+        AddEngines();
+
+            buttonGenerate.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+
+                _drawingBaseStormtrooper = _additionalCollection.CreateAdditionalCollectionStormtrooper();
+                _drawingBaseStormtrooper.SetPictureSize(getWidth(), getHeight());
+                _drawingBaseStormtrooper.SetPosition(50,50);
+                _canvasStormtrooper._drawingBaseStormtrooper = _drawingBaseStormtrooper;
+                _canvasStormtrooper.repaint();
+                DrawingBaseStormtrooper copyStormtrooper;
+                if (_drawingBaseStormtrooper instanceof DrawingStormtrooper)
+                    copyStormtrooper =  new DrawingStormtrooper((EntityStormtrooper) _drawingBaseStormtrooper.EntityBaseStormtrooper, _drawingBaseStormtrooper.drawingEngines);
+                else
+                    copyStormtrooper =  new DrawingBaseStormtrooper(_drawingBaseStormtrooper.EntityBaseStormtrooper, _drawingBaseStormtrooper.drawingEngines);
+                _company._collection.Insert(copyStormtrooper);
+                FormStormtrooperCollection.canvasShow();
+
+                String[] data1 = new String[_additionalCollection.CountEntities];
+                for (int i = 0; i < _additionalCollection.CountEntities; i++) {
+                    EntityBaseStormtrooper entity = _additionalCollection._collectionEntity[i];
+                    data1[i] = ToString(entity);
+                }
+                String[] data2 = new String[_additionalCollection.CountEngines];
+                for (int i = 0; i < _additionalCollection.CountEngines; i++) {
+                    IDrawingEngines engines = _additionalCollection._collectionEngines[i];
+                    data2[i] = ToString(engines);
+                }
+                listEntity.setListData(data1);
+                listEngines.setListData(data2);
+            }
+        });
+        buttonGenerate.setBounds(450, 10, 100, 50);
+        add(buttonGenerate);
+        listEntity.setBounds(10,200,300,60);
+        listEngines.setBounds(320,200,300,60);
+        add(listEntity);
+        add(listEngines);
+        add(_canvasStormtrooper);
+        setVisible(true);
+    }
+    private String ToString(EntityBaseStormtrooper entity) {
+        String str = "";
+        if (entity instanceof EntityStormtrooper) str += "EntityWarmlyShip ";
+        else str += "EntityShip ";
+        str += entity.getBodyColor().toString();
+        return str;
+    }
+    private String ToString(IDrawingEngines engines) {
+        if (engines == null || engines.getNumberOfEngines() == null)
+            return "Не имеет двигателей";
+        String str = ""+engines.getNumberOfEngines();
+        str+=" двигателя";
+
+        return str;
+    }
+    public void AddEntities() {
+        for (int i = 0; i < _additionalCollection.CountEntities; i++) {
+            random = new Random();
+            int speed = random.nextInt(100, 300);
+            float weight = random.nextInt(1000, 3000);
+            Color bodycolor = new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256));
+            EntityBaseStormtrooper entityBaseStormtrooper;
+            if (random.nextBoolean()) {
+                entityBaseStormtrooper = new EntityBaseStormtrooper(speed, weight, bodycolor);
+            }
+            else {
+                Color additionalcolor = new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256));
+                boolean rockets = random.nextBoolean();
+                boolean bombs = random.nextBoolean();
+                boolean engines = random.nextBoolean();
+                entityBaseStormtrooper = new EntityStormtrooper(speed, weight, bodycolor, additionalcolor, rockets, bombs,engines);
+            }
+            _additionalCollection.Insert(entityBaseStormtrooper);
+        }
+    }
+    public void AddEngines() {
+        for (int i = 0; i < _additionalCollection.CountEngines; i++) {
+            random = new Random();
+            EntityBaseStormtrooper entity = _additionalCollection._collectionEntity[i];
+            IDrawingEngines drawingEngines = null;
+            int numberOfEngines = ((int) ((Math.random() * 3) + 1) * 2);
+            int typeOfEngines = (int) ((Math.random() * 3) + 1);
+            if (entity instanceof EntityStormtrooper) {
+                if (((EntityStormtrooper) entity).getEngines()) {
+                        switch (typeOfEngines) {
+                            case 1:
+                                drawingEngines = new DrawingEngines();
+                                drawingEngines.setAmountOfEngines((int) ((Math.random() * 3) + 1) * 2);
+                                break;
+                            case 2:
+                                drawingEngines = new DrawingTriangleEngines();
+                                drawingEngines.setAmountOfEngines((int) ((Math.random() * 3) + 1) * 2);
+                                break;
+                            case 3:
+                                drawingEngines = new DrawingOvalEngines();
+                                drawingEngines.setAmountOfEngines((int) ((Math.random() * 3) + 1) * 2);
+                                break;
+                        }
+                }
+            }
+            if(drawingEngines!=null){
+                _additionalCollection.Insert(drawingEngines);
+            }
+        }
+    }
+    void setCompany(AbstractCompany company) {
+        this._company = company;
+        for (int i = 0; i < _additionalCollection.CountEntities; i++){
+            EntityBaseStormtrooper entity = _additionalCollection._collectionEntity[i];
+            DrawingBaseStormtrooper _listStormtrooper;
+            if(entity instanceof  EntityStormtrooper){
+                _listStormtrooper = new DrawingStormtrooper((EntityStormtrooper) entity,_additionalCollection._collectionEngines[i]);
+            }else{
+                _listStormtrooper = new DrawingBaseStormtrooper(entity,_additionalCollection._collectionEngines[i]);
+            }
+            _company._collection.Insert(_listStormtrooper);
+
+
+        }
+    }
+}

ProjectStormtrooper/src/FormStormtrooper.java

@@ -1,11 +1,9 @@
 import javax.swing.*;
 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.awt.event.*;
 import java.util.Random;
 
+
 import Drawnings.DirectionType;
 import Drawnings.DrawingBaseStormtrooper;
 import Drawnings.DrawingStormtrooper;
@@ -20,55 +18,25 @@ public class FormStormtrooper extends JFrame {
     private final CanvasStormtrooper canvasStormtrooper = new CanvasStormtrooper();
     private JComboBox ComboBoxStrategy = new JComboBox(new String []{"К центру", "К краю"});
     private JButton ButtonStrategy = new JButton("Шаг");
-    private  final JButton CreateBaseStormtrooper = new JButton("Создать базовый бомбардировщик");
-    private  final JButton CreateStormtrooper = new JButton("Создать бомбардировщик");
+
     private final JButton UpButton = new JButton();
     private final JButton DownButton = new JButton();
     private final JButton LeftButton = new JButton();
     private final JButton RightButton = new JButton();
+
     public FormStormtrooper(String title, Dimension dimension) {
         this.title = title;
         this.dimension = dimension;
     }
-    private void CreateObject(String typeOfClass){
-        int StartPositionX = (int)(Math.random() * 90 + 10);
-        int StartPositionY = (int)(Math.random() * 90 + 10);
-        int speed = (int)(Math.random() * 300 + 100);
-        float weight = (float) (Math.random() * 3000 + 1000);
-        Color bodyColor = new Color((int)(Math.random() * 255 + 0),(int)(Math.random() * 255 + 0),(int)(Math.random() * 255 + 0));
-        switch (typeOfClass){
-            case "Drawnings.DrawingBaseStormtrooper":
-                canvasStormtrooper._drawingBaseStormtrooper = new DrawingBaseStormtrooper(speed, weight, bodyColor);
-                canvasStormtrooper._drawingBaseStormtrooper.SetPictureSize(Width, Height);
-                canvasStormtrooper._drawingBaseStormtrooper.SetPosition( StartPositionX, StartPositionY);
-                canvasStormtrooper.repaint();
-                break;
-            case "Drawnings.DrawingStormtrooper":
-                Color additionalColor = new Color((int)(Math.random() * 255 + 0),(int)(Math.random() * 255 + 0),(int)(Math.random() * 255 + 0));
-                boolean rockets = new Random().nextBoolean();
-                boolean bombs = new Random().nextBoolean();
-                boolean engines = new Random().nextBoolean();
-                int typeOfEngine = ((int)((Math.random()*3)+1));
-                canvasStormtrooper._drawingBaseStormtrooper = new DrawingStormtrooper(speed, weight, bodyColor, additionalColor,rockets, bombs, engines, typeOfEngine);
-                canvasStormtrooper._drawingBaseStormtrooper.SetPictureSize(Width, Height);
-                canvasStormtrooper._drawingBaseStormtrooper.SetPosition( StartPositionX, StartPositionY);
-                canvasStormtrooper.repaint();
-                break;
-            default:
-                return;
-        }
-        _strategy=null;
-        ComboBoxStrategy.setEnabled(true);
-    }
-    public void Init() {
+
+    public void Init(DrawingBaseStormtrooper stormtrooper) {
         setTitle(title);
         setMinimumSize(dimension);
-        setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        Width = getWidth()-10;
+        canvasStormtrooper._drawingBaseStormtrooper = stormtrooper;
+        canvasStormtrooper._drawingBaseStormtrooper.SetPosition((int) (Math.random() * 300 + 100), (int) (Math.random() * 300 + 100));
+        Width = getWidth() - 10;
         Height = getHeight() - 34;
-        _strategy=null;
-        CreateStormtrooper.setName("createStormtrooperButton");
-        CreateBaseStormtrooper.setName("createBaseStormtrooperButton");
+        _strategy = null;
         Icon iconUp = new ImageIcon("Resources\\arrowUp.jpg");
         UpButton.setIcon(iconUp);
         UpButton.setName("UP");
@@ -81,16 +49,14 @@ public class FormStormtrooper extends JFrame {
         RightButton.setName("RIGHT");
         Icon iconRight = new ImageIcon("Resources\\arrowRight.jpg");
         RightButton.setIcon(iconRight);
-        ButtonStrategy.addActionListener(new ActionListener() {
 
+        ButtonStrategy.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
                 if (canvasStormtrooper._drawingBaseStormtrooper == null) return;
-                if (ComboBoxStrategy.isEnabled())
-                {
+                if (ComboBoxStrategy.isEnabled()) {
                     int index = ComboBoxStrategy.getSelectedIndex();
-                    switch(index)
-                    {
+                    switch (index) {
                         case 1:
                             _strategy = new MoveToBorder();
                             break;
@@ -100,40 +66,24 @@ public class FormStormtrooper extends JFrame {
                         default:
                             _strategy = null;
                             break;
-                    };
-                    if (_strategy == null)
-                    {
+                    }
+                    ;
+                    if (_strategy == null) {
                         return;
                     }
                     _strategy.SetData(new MoveableStormtrooper(canvasStormtrooper._drawingBaseStormtrooper), Width, Height);
                 }
-                if (_strategy == null)
-                {
+                if (_strategy == null) {
                     return;
                 }
                 ComboBoxStrategy.setEnabled(false);
                 _strategy.MakeStep();
-                if (_strategy.GetStatus() == StrategyStatus.Finish)
-                {
+                if (_strategy.GetStatus() == StrategyStatus.Finish) {
                     ComboBoxStrategy.setEnabled(true);
                     _strategy = null;
                 }
             }
         });
-        CreateBaseStormtrooper.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                CreateObject("Drawnings.DrawingBaseStormtrooper");
-            }
-        });
-        CreateStormtrooper.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                CreateObject("Drawnings.DrawingStormtrooper");
-            }
-        });
-
-
         ActionListener actionListener = new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent event) {
@@ -154,19 +104,15 @@ public class FormStormtrooper extends JFrame {
         DownButton.addActionListener(actionListener);
         LeftButton.addActionListener(actionListener);
         RightButton.addActionListener(actionListener);
-        setSize(dimension.width,dimension.height);
+        setSize(dimension.width, dimension.height);
         setLayout(null);
-        canvasStormtrooper.setBounds(0,0, getWidth(), getHeight());
-        CreateBaseStormtrooper.setBounds(10, getHeight() - 90, 130, 40);
-        CreateStormtrooper.setBounds(160,getHeight()-90,130,40);
+        canvasStormtrooper.setBounds(0, 0, getWidth() - 180, getHeight());
         UpButton.setBounds(getWidth() - 180, getHeight() - 210, 70, 70);
         DownButton.setBounds(getWidth() - 180, getHeight() - 140, 70, 70);
         RightButton.setBounds(getWidth() - 110, getHeight() - 140, 70, 70);
         LeftButton.setBounds(getWidth() - 250, getHeight() - 140, 70, 70);
         ComboBoxStrategy.setBounds(getWidth() - 170, 10, 140, 35);
         ButtonStrategy.setBounds(getWidth() - 130, 55, 100, 25);
-        add(CreateBaseStormtrooper);
-        add(CreateStormtrooper);
         add(ComboBoxStrategy);
         add(ButtonStrategy);
         add(UpButton);
@@ -177,12 +123,11 @@ public class FormStormtrooper extends JFrame {
         setVisible(true);
         addComponentListener(new ComponentAdapter() {
             public void componentResized(ComponentEvent e) {
-                Width = getWidth() -10;
+                Width = getWidth() - 10;
                 Height = getHeight() - 34;
-                if (canvasStormtrooper._drawingBaseStormtrooper != null)canvasStormtrooper._drawingBaseStormtrooper.SetPictureSize(Width, Height);
-                canvasStormtrooper.setBounds(0,0, getWidth(), getHeight());
-                CreateBaseStormtrooper.setBounds(10, getHeight() - 90, 130, 40);
-                CreateStormtrooper.setBounds(160,getHeight()-90,130,40);
+                if (canvasStormtrooper._drawingBaseStormtrooper != null)
+                    canvasStormtrooper._drawingBaseStormtrooper.SetPictureSize(Width, Height);
+                canvasStormtrooper.setBounds(0, 0, getWidth(), getHeight());
                 UpButton.setBounds(getWidth() - 180, getHeight() - 210, 70, 70);
                 DownButton.setBounds(getWidth() - 180, getHeight() - 140, 70, 70);
                 RightButton.setBounds(getWidth() - 110, getHeight() - 140, 70, 70);
@@ -192,4 +137,7 @@ public class FormStormtrooper extends JFrame {
             }
         });
     }
+
+
 }
+

ProjectStormtrooper/src/FormStormtrooperCollection.java

@@ -0,0 +1,221 @@
+import CollectionGenericObjects.AbstractCompany;
+import CollectionGenericObjects.MassiveGenericObjects;
+import CollectionGenericObjects.StormtrooperSharingService;
+import Drawnings.DrawingBaseStormtrooper;
+import Drawnings.DrawingStormtrooper;
+import javax.swing.*;
+import javax.swing.text.MaskFormatter;
+import java.awt.*;
+import java.awt.event.*;
+import java.text.ParseException;
+import java.util.Random;
+
+import static java.lang.Integer.parseInt;
+
+public class FormStormtrooperCollection extends JFrame{
+    private String title;
+    private Dimension dimension;
+    public static CanvasFormStormtrooperCollection<DrawingBaseStormtrooper> _canvasStormtrooper = new CanvasFormStormtrooperCollection<DrawingBaseStormtrooper>();
+    private static AbstractCompany _company = null;
+    private JButton CreateButton = new JButton("Создать бомбардировщик");;
+    private JButton CreateShipButton = new JButton("Создать базовый бомбардировщик");
+    private JButton RemoveButton = new JButton("Удалить");
+    private JButton GoToCheckButton = new JButton("Check");
+    private JButton RandomButton = new JButton("RandomShip");
+    private JButton RefreshButton = new JButton("Refresh");
+    private JComboBox ComboBoxCollections = new JComboBox(new String[]{"", "Хранилище"});
+    private JFormattedTextField MaskedTextField;
+    public FormStormtrooperCollection(String title, Dimension dimension) {
+        this.title = title;
+        this.dimension = dimension;
+    }
+    public static void canvasShow() {
+        _company.SetPosition();
+        _canvasStormtrooper.SetCollectionToCanvas(_company);
+        _canvasStormtrooper.repaint();
+    }
+    private void CreateObject(String typeOfClass){
+        if (_company == null) return;
+        int speed = (int)(Math.random() * 300 + 100);
+        float weight = (float)(Math.random() * 3000 + 1000);
+        Color bodyColor = getColor();
+        DrawingBaseStormtrooper drawingBaseStormtrooper;
+        switch (typeOfClass) {
+            case "DrawingBaseStormtrooper":
+                drawingBaseStormtrooper = new DrawingBaseStormtrooper(speed, weight, bodyColor);
+                break;
+            case "DrawingStormtrooper":
+                Color additionalColor = getColor();
+                boolean rockets = new Random().nextBoolean();
+                boolean bombs = new Random().nextBoolean();
+                boolean engines = new Random().nextBoolean();
+                int typeOfEngine = ((int)((Math.random()*3)+1));
+                drawingBaseStormtrooper = new DrawingStormtrooper(speed, weight, bodyColor, additionalColor, rockets, bombs,engines,typeOfEngine);
+                break;
+            default: return;
+        }
+        if (_company._collection.Insert(drawingBaseStormtrooper, 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, "Цвет", initializator);
+        return color;
+    }
+    public void Init() {
+        setTitle(title);
+        setMinimumSize(dimension);
+        setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+        MaskFormatter mask = null;
+        try {
+            mask = new MaskFormatter("##");
+            mask.setPlaceholder("00");
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+
+        MaskedTextField = new JFormattedTextField(mask);
+
+        ComboBoxCollections.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                switch (ComboBoxCollections.getSelectedItem().toString()) {
+                    case "Хранилище":
+                        _company = new StormtrooperSharingService(getWidth()-200, getHeight()-110, new MassiveGenericObjects<DrawingBaseStormtrooper>());
+                        break;
+                }
+            }
+        });
+
+        CreateShipButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                CreateObject("DrawingBaseStormtrooper");
+            }
+        });
+        CreateButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                CreateObject("DrawingStormtrooper");
+            }
+        });
+
+        RemoveButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (_company == null || MaskedTextField.getText() == null) {
+                    return;
+                }
+                int pos = parseInt(MaskedTextField.getText());
+                int resultConfirmDialog = JOptionPane.showConfirmDialog(null, "Удалить", "Удаление", JOptionPane.YES_NO_OPTION);
+                if (resultConfirmDialog == JOptionPane.NO_OPTION) return;
+                if (_company._collection.Remove(pos) != null) {
+                    System.out.println(pos);
+                    JOptionPane.showMessageDialog(null, "Объект удален");
+                    canvasShow();
+                }
+                else {
+                    JOptionPane.showMessageDialog(null, "Не удалось удалить объект");
+                }
+            }
+        });
+
+        GoToCheckButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (_company == null)
+                {
+                    return;
+                }
+                DrawingBaseStormtrooper stormtrooper = null;
+                int counter = 100;
+                while (stormtrooper == null)
+                {
+                    stormtrooper = _company.GetRandomObject();
+                    counter--;
+                    if (counter <= 0)
+                    {
+                        break;
+                    }
+                }
+                if (stormtrooper == null)
+                {
+                    return;
+                }
+                FormStormtrooper form = new FormStormtrooper("Бомбардировщик", new Dimension(1000,750));
+                form.addWindowListener(new WindowAdapter() {
+                    @Override
+                    public void windowClosing(WindowEvent e) {
+                        canvasShow();
+                        super.windowClosing(e);
+
+                    }
+                });
+                form.Init(stormtrooper);
+            }
+        });
+
+        RefreshButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (_company == null)
+                {
+                    return;
+                }
+                canvasShow();
+            }
+        });
+        RandomButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if(_company==null){
+                    return;
+                }
+                FormAdditionalCollection form = new FormAdditionalCollection();
+                form.setCompany(_company);
+            }
+        });
+        _canvasStormtrooper.setBounds(0, 0, getWidth()-200, getHeight());
+        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(_canvasStormtrooper);
+        add(ComboBoxCollections);
+        add(CreateShipButton);
+        add(CreateButton);
+        add(MaskedTextField);
+        add(RemoveButton);
+        add(GoToCheckButton);
+        add(RandomButton);
+        add(RefreshButton);
+        setVisible(true);
+
+        addComponentListener(new ComponentAdapter() {
+            public void componentResized(ComponentEvent e) {
+                _canvasStormtrooper.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);
+            }
+        });
+    }
+}

ProjectStormtrooper/src/Main.java

@@ -2,7 +2,7 @@ import java.awt.*;
 
 public class Main {
     public static void main(String[] args) {
-        FormStormtrooper form = new FormStormtrooper("Бoмбардировщик", new Dimension(800,800));
+        FormStormtrooperCollection  form = new FormStormtrooperCollection("Бoмбардировщик", new Dimension(1100,750));
         form.Init();
     }
 }