Merge pull request 'Sorokin_P.V. HardLabWork02' (#2) from LabWork02 into LabWork01

Reviewed-on: http://student.git.athene.tech/Pavel_Sorokin/PIbd-21_Sorokin_P.V._Liner._Hard/pulls/2

src/DrawingEntities.java

@@ -1,58 +0,0 @@
-import java.util.Random;
-
-public class DrawingEntities <T extends  EntityShip,U extends IAdditionalDrawingObject>{
-    public Object[] _entities;
-    public Object[] _decks;
-    int entitiesCount = 0;
-    int decksCount = 0;
-    String  indx;
-    String indy;
-    public DrawingEntities(int countE,int countD)
-    {
-        _entities=new Object[countE];
-        _decks=new Object[countD];
-    }
-    public int Insert(T ship)
-    {
-        if(entitiesCount<_entities.length){
-            _entities[entitiesCount] = ship;
-            entitiesCount++;
-            return entitiesCount-1;
-        }
-        return -1;
-    }
-    public int Insert(U deck)
-    {
-        if(decksCount<_decks.length){
-            _decks[decksCount] = deck;
-            decksCount++;
-            return decksCount-1;
-        }
-        return -1;
-    }
-    public void SetIndexs(int ind1, int ind2)
-    {
-        indx=Integer.toString(ind1);
-        indy=Integer.toString(ind2);
-    }
-    public DrawingShip CreateShip()
-    {
-        Random rnd = new Random();
-        int indEnt=0;
-        int indDeck=0;
-        if(entitiesCount-1!=0 & decksCount-1!=0)
-        {
-            indDeck=rnd.nextInt(0,decksCount-1);
-            indEnt=rnd.nextInt(0,entitiesCount-1);
-        }
-        T ship=(T)_entities[indEnt];
-        U deck=(U)_decks[indDeck];
-        SetIndexs(indEnt,indDeck);
-        if(ship instanceof EntityLiner)
-        {
-            return new DrawingLiner(ship,deck);
-        }
-        return new DrawingShip(ship,deck);
-    }
-
-}

src/DrawingLiner.java

@@ -7,11 +7,6 @@ public class DrawingLiner extends DrawingShip
         super(speed,weight,bodyColor,130,45);
         Ship = new EntityLiner(speed, weight, bodyColor, dopColor, dopDeck, pool);
     }
-    protected DrawingLiner(EntityShip ship,IAdditionalDrawingObject deck)
-    {
-        super(ship,deck);
-        Ship=ship;
-    }
     @Override
     public void DrawTransport(Graphics gr) {
         Graphics2D g2d = (Graphics2D) gr;

src/DrawingShip.java

@@ -43,11 +43,6 @@ public class DrawingShip extends JPanel {
         _ShipWidth = shipWidth;
         _ShipHeight = shipHeight;
     }
-    protected DrawingShip(EntityShip ship,IAdditionalDrawingObject deck)
-    {
-        Ship=ship;
-        Deck=deck;
-    }
     public void SetPosition(int x, int y, int width, int height) {
         if (width <= _ShipWidth + x || height <= _ShipHeight + y || x < 0 || y < 0) {
             _pictureWidth = null;

src/FormMap.form

@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="FormMap">
+  <grid id="27dc6" binding="MainPanel" layout-manager="GridLayoutManager" row-count="4" column-count="6" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+    <margin top="0" left="0" bottom="0" right="0"/>
+    <constraints>
+      <xy x="20" y="20" width="500" height="400"/>
+    </constraints>
+    <properties/>
+    <border type="none"/>
+    <children>
+      <grid id="4c171" binding="pictureBoxShip" layout-manager="BorderLayout" hgap="0" vgap="0">
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="6" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children/>
+      </grid>
+      <toolbar id="7b4c1" binding="StatusStrip">
+        <constraints>
+          <grid row="3" column="0" row-span="1" col-span="6" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false">
+            <preferred-size width="-1" height="20"/>
+          </grid>
+        </constraints>
+        <properties>
+          <enabled value="false"/>
+        </properties>
+        <border type="none"/>
+        <children/>
+      </toolbar>
+      <component id="d2f33" class="javax.swing.JButton" binding="ButtonCreateModif">
+        <constraints>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Модификация"/>
+        </properties>
+      </component>
+      <component id="15603" class="javax.swing.JButton" binding="ButtonDown">
+        <constraints>
+          <grid row="2" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
+            <minimum-size width="30" height="30"/>
+            <preferred-size width="30" height="30"/>
+            <maximum-size width="30" height="30"/>
+          </grid>
+        </constraints>
+        <properties>
+          <text value=""/>
+        </properties>
+      </component>
+      <component id="3510" class="javax.swing.JButton" binding="ButtonRight">
+        <constraints>
+          <grid row="2" column="5" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
+            <minimum-size width="30" height="30"/>
+            <preferred-size width="30" height="30"/>
+            <maximum-size width="30" height="30"/>
+          </grid>
+        </constraints>
+        <properties>
+          <text value=""/>
+        </properties>
+      </component>
+      <component id="dd08b" class="javax.swing.JButton" binding="ButtonCreate">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Создать"/>
+        </properties>
+      </component>
+      <component id="37083" class="javax.swing.JButton" binding="ButtonUp">
+        <constraints>
+          <grid row="1" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
+            <minimum-size width="30" height="30"/>
+            <preferred-size width="30" height="30"/>
+            <maximum-size width="30" height="30"/>
+          </grid>
+        </constraints>
+        <properties>
+          <text value=""/>
+        </properties>
+      </component>
+      <hspacer id="7977">
+        <constraints>
+          <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+      </hspacer>
+      <component id="4a1" class="javax.swing.JComboBox" binding="ComboBoxSelectorMap">
+        <constraints>
+          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <model>
+            <item value="Простая карта"/>
+            <item value="Карта море"/>
+          </model>
+        </properties>
+      </component>
+      <hspacer id="ed54d">
+        <constraints>
+          <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+      </hspacer>
+      <component id="87b9e" class="javax.swing.JButton" binding="ButtonLeft">
+        <constraints>
+          <grid row="2" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
+            <minimum-size width="30" height="30"/>
+            <preferred-size width="30" height="30"/>
+            <maximum-size width="30" height="30"/>
+          </grid>
+        </constraints>
+        <properties>
+          <text value=""/>
+        </properties>
+      </component>
+    </children>
+  </grid>
+</form>

src/FormMap.java

@@ -0,0 +1,177 @@
+import javax.imageio.ImageIO;
+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.image.BufferedImage;
+import java.security.PublicKey;
+import java.util.Random;
+
+public class FormMap extends JFrame{
+    private JButton ButtonCreateModif;
+    private JButton ButtonLeft;
+    private JButton ButtonDown;
+    private JButton ButtonRight;
+    private JButton ButtonUp;
+    private JButton ButtonCreate;
+    private JComboBox ComboBoxSelectorMap;
+    private AbstractMap _abstractMap;
+    private JPanel pictureBoxShip;
+    private JToolBar StatusStrip;
+    public JPanel MainPanel;
+    private Random random = new Random();
+    protected DrawingShip _ship;
+
+    private BufferedImage bufferImg = null;
+    private JLabel JLabelSpeed = new JLabel();
+    private JLabel JLabelWeight = new JLabel();
+    private JLabel JLabelColor = new JLabel();
+
+    public void Draw() {
+        pictureBoxShip.removeAll();
+        BufferedImage bmp = new BufferedImage(pictureBoxShip.getWidth(), pictureBoxShip.getHeight(),BufferedImage.TYPE_INT_RGB);
+        Graphics gr = bmp.getGraphics();
+        gr.setColor(new Color(238, 238, 238));
+        gr.fillRect(0, 0, pictureBoxShip.getWidth(), pictureBoxShip.getHeight());
+        if (_ship != null) {
+            _ship.DrawTransport(gr);
+            JLabel imageOfLoco = new JLabel();
+            imageOfLoco.setPreferredSize(pictureBoxShip.getSize());
+            imageOfLoco.setMinimumSize(new Dimension(1, 1));
+            imageOfLoco.setIcon(new ImageIcon(bmp));
+            pictureBoxShip.add(imageOfLoco,BorderLayout.CENTER);
+        }
+        validate();
+    }
+    public void SetData(DrawingShip _ship)
+    {
+        pictureBoxShip.removeAll();
+        JLabelSpeed.setText("Cкорость: " + _ship.GetShip().GetSpeed() + " ");
+        JLabelWeight.setText("Вес: " + _ship.GetShip().GetWeight() + " ");
+        JLabelColor.setText(("Цвет: " + _ship.GetShip().GetBodyColor() + " "));
+        JLabel imageWithMapAndObject = new JLabel();
+        imageWithMapAndObject.setPreferredSize(pictureBoxShip.getSize());
+        imageWithMapAndObject.setMinimumSize(new Dimension(1, 1));
+        imageWithMapAndObject.setIcon(new ImageIcon(_abstractMap.CreateMap(pictureBoxShip.getWidth(),pictureBoxShip.getHeight(), new DrawingObjectShip(_ship))));
+        pictureBoxShip.add(imageWithMapAndObject, BorderLayout.CENTER);
+        pictureBoxShip.revalidate();
+    }
+    @Override
+    public void paint(Graphics g) {
+        super.paint(g);
+        Draw();
+    }
+    public FormMap() {
+        _abstractMap = new SimpleMap();
+        Box LabelBox = Box.createHorizontalBox();
+        LabelBox.setMinimumSize(new Dimension(1, 20));
+        LabelBox.add(JLabelSpeed);
+        LabelBox.add(JLabelWeight);
+        LabelBox.add(JLabelColor);
+        StatusStrip.add(LabelBox);
+        try {
+            Image img = ImageIO.read(FormShip.class.getResource("Images/4.png"));
+            ButtonUp.setIcon(new ImageIcon(img));
+            img = ImageIO.read(FormShip.class.getResource("Images/2.png"));
+            ButtonDown.setIcon(new ImageIcon(img));
+            img = ImageIO.read(FormShip.class.getResource("Images/1.png"));
+            ButtonLeft.setIcon(new ImageIcon(img));
+            img = ImageIO.read(FormShip.class.getResource("Images/3.png"));
+            ButtonRight.setIcon(new ImageIcon(img));
+        } catch (Exception ex) {
+            System.out.println(ex);
+        }
+        _ship=new DrawingShip (random.nextInt(100, 300), random.nextInt(1000, 2000), new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256)));
+        ButtonCreate.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                var _ship=new DrawingShip(random.nextInt(100, 300), random.nextInt(1000, 2000), new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256)));
+                _ship.SetPosition(random.nextInt(100, 500), random.nextInt(10, 100), pictureBoxShip.getWidth(), pictureBoxShip.getHeight());
+                SetData(_ship);
+            }
+        });
+        ButtonUp.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                pictureBoxShip.removeAll();
+                JLabel imageWithMapAndObject = new JLabel();
+                imageWithMapAndObject.setPreferredSize(pictureBoxShip.getSize());
+                imageWithMapAndObject.setMinimumSize(new Dimension(1, 1));
+                imageWithMapAndObject.setIcon(new ImageIcon(_abstractMap.MoveObject(Direction.Up)));
+                pictureBoxShip.add(imageWithMapAndObject, BorderLayout.CENTER);
+                pictureBoxShip.revalidate();
+                pictureBoxShip.repaint();
+            }
+        });
+        ButtonDown.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                pictureBoxShip.removeAll();
+                JLabel imageWithMapAndObject = new JLabel();
+                imageWithMapAndObject.setPreferredSize(pictureBoxShip.getSize());
+                imageWithMapAndObject.setMinimumSize(new Dimension(1, 1));
+                imageWithMapAndObject.setIcon(new ImageIcon(_abstractMap.MoveObject(Direction.Down)));
+                pictureBoxShip.add(imageWithMapAndObject, BorderLayout.CENTER);
+                pictureBoxShip.revalidate();
+                pictureBoxShip.repaint();
+            }
+        });
+        ButtonRight.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                pictureBoxShip.removeAll();
+                JLabel imageWithMapAndObject = new JLabel();
+                imageWithMapAndObject.setPreferredSize(pictureBoxShip.getSize());
+                imageWithMapAndObject.setMinimumSize(new Dimension(1, 1));
+                imageWithMapAndObject.setIcon(new ImageIcon(_abstractMap.MoveObject(Direction.Right)));
+                pictureBoxShip.add(imageWithMapAndObject, BorderLayout.CENTER);
+                pictureBoxShip.revalidate();
+                pictureBoxShip.repaint();
+            }
+        });
+        ButtonLeft.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                pictureBoxShip.removeAll();
+                JLabel imageWithMapAndObject = new JLabel();
+                imageWithMapAndObject.setPreferredSize(pictureBoxShip.getSize());
+                imageWithMapAndObject.setMinimumSize(new Dimension(1, 1));
+                imageWithMapAndObject.setIcon(new ImageIcon(_abstractMap.MoveObject(Direction.Left)));
+                pictureBoxShip.add(imageWithMapAndObject, BorderLayout.CENTER);
+                pictureBoxShip.revalidate();
+                pictureBoxShip.repaint();
+
+            }
+        });
+        ButtonCreateModif.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                _ship=new DrawingLiner(random.nextInt(100, 300), random.nextInt(1000, 2000), new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256)),new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256)),random.nextBoolean(),random.nextBoolean());
+                _ship.SetPosition(random.nextInt(100, 500), random.nextInt(10, 100), pictureBoxShip.getWidth(), pictureBoxShip.getHeight());
+                SetData(_ship);
+            }
+        });
+
+        ComboBoxSelectorMap.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                ComboBoxSelectorMap = (JComboBox)e.getSource();
+                String item = (String)ComboBoxSelectorMap.getSelectedItem();
+                switch (item) {
+                    case "Простая карта": {
+                        _abstractMap = new SimpleMap();
+                        break;
+                    }
+                    case "Карта море": {
+                        _abstractMap = new SeaMap();
+                        break;
+                    }
+                }
+            }
+        });
+
+    }
+}
+

src/FormMapWithSetShipsGeneric.form

@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="FormMapWithSetShipsGeneric">
-  <grid id="27dc6" binding="Mainpanel" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-    <margin top="0" left="0" bottom="0" right="0"/>
-    <constraints>
-      <xy x="20" y="20" width="649" height="400"/>
-    </constraints>
-    <properties/>
-    <border type="none"/>
-    <children>
-      <grid id="9bb5a" binding="pictureBoxShip" layout-manager="BorderLayout" hgap="0" vgap="0">
-        <constraints>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
-        <border type="none"/>
-        <children/>
-      </grid>
-      <hspacer id="b305e">
-        <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-        </constraints>
-      </hspacer>
-      <grid id="4fa91" binding="GroupBoxTools" layout-manager="GridLayoutManager" row-count="8" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="0" left="0" bottom="0" right="0"/>
-        <constraints>
-          <grid row="0" column="1" row-span="2" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
-        <border type="none"/>
-        <children>
-          <component id="95ba3" class="javax.swing.JComboBox" binding="ComboBoxSelectorMap">
-            <constraints>
-              <grid row="0" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <model>
-                <item value="Простая карта"/>
-                <item value="Карта море"/>
-              </model>
-            </properties>
-          </component>
-          <component id="cdb80" class="javax.swing.JButton" binding="ButtonAddShip">
-            <constraints>
-              <grid row="1" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Добавить корабль"/>
-            </properties>
-          </component>
-          <component id="e5494" class="javax.swing.JTextField" binding="maskedTextBoxPosition">
-            <constraints>
-              <grid row="2" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-                <preferred-size width="150" height="-1"/>
-              </grid>
-            </constraints>
-            <properties/>
-          </component>
-          <component id="8bb89" class="javax.swing.JButton" binding="ButtonDeleteShip">
-            <constraints>
-              <grid row="3" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Удалить корабль"/>
-            </properties>
-          </component>
-          <component id="aa482" class="javax.swing.JButton" binding="ButtonShowStorage">
-            <constraints>
-              <grid row="4" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Показать хранилище"/>
-            </properties>
-          </component>
-          <component id="9ebdc" class="javax.swing.JButton" binding="ButtonShowMap">
-            <constraints>
-              <grid row="5" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Показать карту"/>
-            </properties>
-          </component>
-          <component id="acbc" class="javax.swing.JButton" binding="ButtonUp">
-            <constraints>
-              <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
-                <minimum-size width="30" height="30"/>
-                <preferred-size width="30" height="30"/>
-                <maximum-size width="30" height="30"/>
-              </grid>
-            </constraints>
-            <properties>
-              <text value=""/>
-            </properties>
-          </component>
-          <component id="a584e" class="javax.swing.JButton" binding="ButtonDown">
-            <constraints>
-              <grid row="7" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
-                <minimum-size width="30" height="30"/>
-                <preferred-size width="30" height="30"/>
-                <maximum-size width="30" height="30"/>
-              </grid>
-            </constraints>
-            <properties>
-              <text value=""/>
-            </properties>
-          </component>
-          <component id="e9fe6" class="javax.swing.JButton" binding="ButtonLeft">
-            <constraints>
-              <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
-                <minimum-size width="30" height="30"/>
-                <preferred-size width="30" height="30"/>
-                <maximum-size width="30" height="30"/>
-              </grid>
-            </constraints>
-            <properties>
-              <text value=""/>
-            </properties>
-          </component>
-          <component id="25a22" class="javax.swing.JButton" binding="ButtonRight">
-            <constraints>
-              <grid row="7" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
-                <minimum-size width="30" height="30"/>
-                <preferred-size width="30" height="30"/>
-                <maximum-size width="30" height="30"/>
-              </grid>
-            </constraints>
-            <properties>
-              <text value=""/>
-            </properties>
-          </component>
-        </children>
-      </grid>
-    </children>
-  </grid>
-</form>

src/FormMapWithSetShipsGeneric.java

@@ -1,223 +0,0 @@
-import javax.imageio.ImageIO;
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.image.BufferedImage;
-
-public class FormMapWithSetShipsGeneric extends JFrame{
-    public JPanel Mainpanel;
-    private JPanel pictureBoxShip;
-    private JPanel GroupBoxTools;
-    private JComboBox ComboBoxSelectorMap;
-    private JButton ButtonAddShip;
-    private JButton ButtonDeleteShip;
-    private JButton ButtonShowStorage;
-    private JButton ButtonShowMap;
-    private JButton ButtonLeft;
-    private JButton ButtonDown;
-    private JButton ButtonUp;
-    private JButton ButtonRight;
-    private JTextField maskedTextBoxPosition;
-    private  MapWithSetShipsGeneric<DrawingObjectShip,AbstractMap> _mapShipsCollectionGeneric;
-    public void UpdateWindow(BufferedImage bmp)
-    {
-        pictureBoxShip.removeAll();
-        JLabel imageWithMapAndObject = new JLabel();
-        imageWithMapAndObject.setPreferredSize(pictureBoxShip.getSize());
-        imageWithMapAndObject.setMinimumSize(new Dimension(1, 1));
-        imageWithMapAndObject.setIcon(new ImageIcon(bmp));
-        pictureBoxShip.add(imageWithMapAndObject, BorderLayout.CENTER);
-        pictureBoxShip.revalidate();
-    }
-    public FormMapWithSetShipsGeneric()
-    {
-        try {
-            Image img = ImageIO.read(FormShip.class.getResource("Images/4.png"));
-            ButtonUp.setIcon(new ImageIcon(img));
-            img = ImageIO.read(FormShip.class.getResource("Images/2.png"));
-            ButtonDown.setIcon(new ImageIcon(img));
-            img = ImageIO.read(FormShip.class.getResource("Images/1.png"));
-            ButtonLeft.setIcon(new ImageIcon(img));
-            img = ImageIO.read(FormShip.class.getResource("Images/3.png"));
-            ButtonRight.setIcon(new ImageIcon(img));
-        } catch (Exception ex) {
-            System.out.println(ex);
-        }
-
-        ComboBoxSelectorMap.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                AbstractMap map = null;
-                ComboBoxSelectorMap = (JComboBox)e.getSource();
-                String item = (String)ComboBoxSelectorMap.getSelectedItem();
-                switch (item) {
-                    case "Простая карта": {
-                        map = new SimpleMap();
-                        break;
-                    }
-                    case "Карта море": {
-                        map = new SeaMap();
-                        break;
-                    }
-                }
-                if(map!=null)
-                {
-                    _mapShipsCollectionGeneric = new MapWithSetShipsGeneric<DrawingObjectShip,AbstractMap>(pictureBoxShip.getWidth(),pictureBoxShip.getHeight(),map);
-                }
-                else
-                {
-                    _mapShipsCollectionGeneric=null;
-                }
-            }
-        });
-        ButtonAddShip.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if(_mapShipsCollectionGeneric==null)
-                {
-                    return;
-                }
-                FormShip form = new FormShip();
-                form.setSize(1000,700);
-                form.setVisible(true);
-                form.setModal(true);
-                DrawingObjectShip ship = new DrawingObjectShip(form.GetSelectedShip());
-                if(_mapShipsCollectionGeneric.Add(ship)!=-1)
-                {
-                    JOptionPane.showMessageDialog(null,"Объект добавлен");
-                    UpdateWindow(_mapShipsCollectionGeneric.ShowSet());
-                }
-                else
-                {
-                    JOptionPane.showMessageDialog(null, "Не удалось добавить объект");
-                }
-            }
-        });
-
-        ButtonDeleteShip.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (maskedTextBoxPosition.getText().isEmpty())
-                {
-                    return;
-                }
-                int result = JOptionPane.showConfirmDialog(null,"Удалить объект?","Удаление",JOptionPane.YES_NO_OPTION,JOptionPane.WARNING_MESSAGE);
-                if(result==JOptionPane.NO_OPTION)
-                {
-                    return;
-                }
-                int pos=Integer.parseInt(maskedTextBoxPosition.getText());
-                if(_mapShipsCollectionGeneric.Delete(pos)!=null)
-                {
-                    JOptionPane.showMessageDialog(null, "Объект удален");
-                    UpdateWindow(_mapShipsCollectionGeneric.ShowSet());
-                }
-                else
-                {
-                    JOptionPane.showMessageDialog(null, "Не удалось удалить объект");
-                }
-            }
-        });
-        ButtonShowStorage.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (_mapShipsCollectionGeneric == null)
-                {
-                    return;
-                }
-                UpdateWindow(_mapShipsCollectionGeneric.ShowSet());
-            }
-        });
-        ButtonShowMap.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (_mapShipsCollectionGeneric == null)
-                {
-                    return;
-                }
-                UpdateWindow(_mapShipsCollectionGeneric.ShowOnMap());
-            }
-        });
-        ButtonUp.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (_mapShipsCollectionGeneric == null)
-                {
-                    return;
-                }
-                pictureBoxShip.removeAll();
-                JLabel imageWithMapAndObject = new JLabel();
-                imageWithMapAndObject.setPreferredSize(pictureBoxShip.getSize());
-                imageWithMapAndObject.setMinimumSize(new Dimension(1, 1));
-                imageWithMapAndObject.setIcon(new ImageIcon(_mapShipsCollectionGeneric.MoveObject(Direction.Up)));
-                pictureBoxShip.add(imageWithMapAndObject, BorderLayout.CENTER);
-                pictureBoxShip.revalidate();
-                pictureBoxShip.repaint();
-            }
-        });
-        ButtonDown.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (_mapShipsCollectionGeneric == null)
-                {
-                    return;
-                }
-                pictureBoxShip.removeAll();
-                JLabel imageWithMapAndObject = new JLabel();
-                imageWithMapAndObject.setPreferredSize(pictureBoxShip.getSize());
-                imageWithMapAndObject.setMinimumSize(new Dimension(1, 1));
-                imageWithMapAndObject.setIcon(new ImageIcon(_mapShipsCollectionGeneric.MoveObject(Direction.Down)));
-                pictureBoxShip.add(imageWithMapAndObject, BorderLayout.CENTER);
-                pictureBoxShip.revalidate();
-                pictureBoxShip.repaint();
-            }
-        });
-        ButtonRight.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (_mapShipsCollectionGeneric == null)
-                {
-                    return;
-                }
-                pictureBoxShip.removeAll();
-                JLabel imageWithMapAndObject = new JLabel();
-                imageWithMapAndObject.setPreferredSize(pictureBoxShip.getSize());
-                imageWithMapAndObject.setMinimumSize(new Dimension(1, 1));
-                imageWithMapAndObject.setIcon(new ImageIcon(_mapShipsCollectionGeneric.MoveObject(Direction.Right)));
-                pictureBoxShip.add(imageWithMapAndObject, BorderLayout.CENTER);
-                pictureBoxShip.revalidate();
-                pictureBoxShip.repaint();
-            }
-        });
-        ButtonLeft.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (_mapShipsCollectionGeneric == null)
-                {
-                    return;
-                }
-                pictureBoxShip.removeAll();
-                JLabel imageWithMapAndObject = new JLabel();
-                imageWithMapAndObject.setPreferredSize(pictureBoxShip.getSize());
-                imageWithMapAndObject.setMinimumSize(new Dimension(1, 1));
-                imageWithMapAndObject.setIcon(new ImageIcon(_mapShipsCollectionGeneric.MoveObject(Direction.Left)));
-                pictureBoxShip.add(imageWithMapAndObject, BorderLayout.CENTER);
-                pictureBoxShip.revalidate();
-                pictureBoxShip.repaint();
-
-            }
-        });
-        maskedTextBoxPosition.addKeyListener(new KeyAdapter() {
-            @Override
-            public void keyTyped(KeyEvent e) {
-                char c = e.getKeyChar();
-                if ( ((c < '0') || (c > '9')) || maskedTextBoxPosition.getText().length() >= 2) {
-                    e.consume();
-                }
-            }
-        });
-    }
-}

src/FormParam.form

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="FormParam">
-  <grid id="27dc6" binding="MainPanel" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-    <margin top="0" left="0" bottom="0" right="0"/>
-    <constraints>
-      <xy x="20" y="20" width="500" height="400"/>
-    </constraints>
-    <properties/>
-    <border type="none"/>
-    <children>
-      <grid id="7700e" binding="pictureBoxShip" layout-manager="BorderLayout" hgap="0" vgap="0">
-        <constraints>
-          <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
-        <border type="none"/>
-        <children/>
-      </grid>
-      <component id="b960b" class="javax.swing.JButton" binding="ButtonCreate">
-        <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text value="Создать"/>
-        </properties>
-      </component>
-      <component id="a44b0" class="javax.swing.JButton" binding="ButtonCreateModif">
-        <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text value="Модификация"/>
-        </properties>
-      </component>
-      <hspacer id="56304">
-        <constraints>
-          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-        </constraints>
-      </hspacer>
-      <component id="31e01" class="javax.swing.JLabel" binding="LabelInfo">
-        <constraints>
-          <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text value=""/>
-        </properties>
-      </component>
-      <toolbar id="7a0ba" binding="StatusStrip">
-        <constraints>
-          <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false">
-            <preferred-size width="-1" height="20"/>
-          </grid>
-        </constraints>
-        <properties>
-          <enabled value="false"/>
-        </properties>
-        <border type="none"/>
-        <children/>
-      </toolbar>
-    </children>
-  </grid>
-</form>

src/FormParam.java

@@ -1,113 +0,0 @@
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.image.BufferedImage;
-import java.util.Random;
-import java.util.Set;
-
-public class FormParam extends JFrame{
-    public JPanel MainPanel;
-    private JPanel pictureBoxShip;
-    private JButton ButtonCreate;
-    private JButton ButtonCreateModif;
-    private JToolBar StatusStrip;
-    private JLabel LabelInfo;
-    private JLabel JLabelSpeed = new JLabel();
-    private JLabel JLabelWeight = new JLabel();
-    private JLabel JLabelColor = new JLabel();
-    private DrawingEntities<EntityShip,IAdditionalDrawingObject> _drawingEntities;
-    private IAdditionalDrawingObject SetData()
-    {
-        Random random=new Random();
-        int r = random.nextInt(3);
-        if(r==0)
-        {
-            return new DrawingTriangleDeck();
-        }
-        if(r==1)
-        {
-            return new DrawingDeck();
-        }
-        else
-        {
-            return new  DrawingOvalDeck();
-        }
-
-    }
-    private void Draw(DrawingShip _ship) {
-        pictureBoxShip.removeAll();
-        Random random = new Random();
-        BufferedImage bmp = new BufferedImage(pictureBoxShip.getWidth(), pictureBoxShip.getHeight(),BufferedImage.TYPE_INT_RGB);
-        Graphics gr = bmp.getGraphics();
-        gr.setColor(new Color(238, 238, 238));
-        gr.fillRect(0, 0, pictureBoxShip.getWidth(), pictureBoxShip.getHeight());
-        if (_ship != null) {
-            _ship.SetPosition(random.nextInt(10, 100), random.nextInt(10, 100),
-                    pictureBoxShip.getWidth(), pictureBoxShip.getHeight());
-            _ship.DrawTransport(gr);
-            JLabelSpeed.setText("Cкорость: " + _ship.GetShip().GetSpeed() + " ");
-            JLabelWeight.setText("Вес: " + _ship.GetShip().GetWeight() + " ");
-            JLabelColor.setText(("Цвет: " + _ship.GetShip().GetBodyColor() + " "));
-            JLabel imageOfLoco = new JLabel();
-            imageOfLoco.setPreferredSize(pictureBoxShip.getSize());
-            imageOfLoco.setMinimumSize(new Dimension(1, 1));
-            imageOfLoco.setIcon(new ImageIcon(bmp));
-            pictureBoxShip.add(imageOfLoco,BorderLayout.CENTER);
-        }
-        validate();
-    }
-    public FormParam()
-    {
-        Box LabelBox = Box.createHorizontalBox();
-        LabelBox.setMinimumSize(new Dimension(1, 20));
-        LabelBox.add(JLabelSpeed);
-        LabelBox.add(JLabelWeight);
-        LabelBox.add(JLabelColor);
-        StatusStrip.add(LabelBox);
-        _drawingEntities=new DrawingEntities<>(10,10);
-        ButtonCreate.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e){
-                Random random = new Random();
-                Color colorFirst = JColorChooser.showDialog(null, "Цвет", null);
-                EntityShip ship=new EntityShip(random.nextInt(100,300), random.nextInt(1000,2000),colorFirst);
-                IAdditionalDrawingObject deck = SetData();
-                int DecksCount=random.nextInt(1,4);
-                deck.SetAddEnum(DecksCount);
-                if((_drawingEntities.Insert(ship)!=-1) & (_drawingEntities.Insert(deck)!=-1))
-                {
-                    JOptionPane.showMessageDialog(null,"Объект добавлен");
-                    Draw(_drawingEntities.CreateShip());
-                    LabelInfo.setText(_drawingEntities.indx+ " " + _drawingEntities.indy);
-                }
-                else
-                {
-                    JOptionPane.showMessageDialog(null, "Не удалось добавить объект");
-                }
-            }
-        });
-        ButtonCreateModif.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                Random random = new Random();
-                Color colorFirst = JColorChooser.showDialog(null, "Цвет", null);
-                Color colorSecond = JColorChooser.showDialog(null, "Цвет", null);
-                EntityLiner _ship=new EntityLiner(random.nextInt(100, 300), random.nextInt(1000, 2000), colorFirst,colorSecond,random.nextBoolean(),random.nextBoolean());
-                IAdditionalDrawingObject deck = SetData();
-                int DecksCount=random.nextInt(1,4);
-                deck.SetAddEnum(DecksCount);
-                if((_drawingEntities.Insert(_ship)!=-1) & (_drawingEntities.Insert(deck)!=-1))
-                {
-                    JOptionPane.showMessageDialog(null,"Объект добавлен");
-                    Draw(_drawingEntities.CreateShip());
-                    LabelInfo.setText(_drawingEntities.indx+ " " + _drawingEntities.indy);
-                }
-                else
-                {
-                    JOptionPane.showMessageDialog(null, "Не удалось добавить объект");
-                }
-            }
-        });
-    }
-}

src/FormShip.form

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="FormShip">
-  <grid id="27dc6" binding="Mainpanel" layout-manager="GridLayoutManager" row-count="4" column-count="9" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="Mainpanel" layout-manager="GridLayoutManager" row-count="4" column-count="7" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
       <xy x="20" y="20" width="500" height="400"/>
@@ -10,7 +10,7 @@
     <children>
       <component id="2ea16" class="javax.swing.JButton" binding="ButtonDown">
         <constraints>
-          <grid row="2" column="7" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
+          <grid row="2" column="5" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
             <minimum-size width="30" height="30"/>
             <preferred-size width="30" height="30"/>
             <maximum-size width="30" height="30"/>
@@ -22,7 +22,7 @@
       </component>
       <component id="4f60a" class="javax.swing.JButton" binding="ButtonLeft">
         <constraints>
-          <grid row="2" column="6" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
+          <grid row="2" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
             <minimum-size width="30" height="30"/>
             <preferred-size width="30" height="30"/>
             <maximum-size width="30" height="30"/>
@@ -34,7 +34,7 @@
       </component>
       <component id="4eb88" class="javax.swing.JButton" binding="ButtonRight">
         <constraints>
-          <grid row="2" column="8" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
+          <grid row="2" column="6" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
             <minimum-size width="30" height="30"/>
             <preferred-size width="30" height="30"/>
             <maximum-size width="30" height="30"/>
@@ -47,7 +47,7 @@
       </component>
       <component id="fb937" class="javax.swing.JButton" binding="ButtonUp">
         <constraints>
-          <grid row="1" column="7" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
+          <grid row="1" column="5" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
             <minimum-size width="30" height="30"/>
             <preferred-size width="30" height="30"/>
             <maximum-size width="30" height="30"/>
@@ -59,7 +59,7 @@
       </component>
       <toolbar id="e747d" binding="StatusStrip">
         <constraints>
-          <grid row="3" column="0" row-span="1" col-span="9" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false">
+          <grid row="3" column="0" row-span="1" col-span="7" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false">
             <minimum-size width="-1" height="20"/>
             <preferred-size width="-1" height="20"/>
             <maximum-size width="-1" height="20"/>
@@ -71,14 +71,19 @@
         <border type="none"/>
         <children/>
       </toolbar>
+      <hspacer id="d6bea">
+        <constraints>
+          <grid row="1" column="1" row-span="1" col-span="4" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+      </hspacer>
       <hspacer id="d86ff">
         <constraints>
-          <grid row="2" column="1" row-span="1" col-span="5" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="1" row-span="1" col-span="3" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
       </hspacer>
       <grid id="6b0b8" binding="pictureBoxShip" layout-manager="FlowLayout" hgap="5" vgap="5" flow-align="1">
         <constraints>
-          <grid row="0" column="0" row-span="1" col-span="9" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="0" column="0" row-span="1" col-span="7" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -100,19 +105,6 @@
           <text value="Модификация"/>
         </properties>
       </component>
-      <hspacer id="9abb1">
-        <constraints>
-          <grid row="1" column="1" row-span="1" col-span="4" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-        </constraints>
-      </hspacer>
-      <component id="8005c" class="javax.swing.JButton" binding="ButtonSelect">
-        <constraints>
-          <grid row="1" column="5" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text value="Выбрать"/>
-        </properties>
-      </component>
     </children>
   </grid>
 </form>

src/FormShip.java

@@ -1,10 +1,13 @@
 import javax.imageio.ImageIO;
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
 import java.awt.image.BufferedImage;
 import java.util.Random;
-public class FormShip extends JDialog{
+public class FormShip extends JFrame{
     public JPanel Mainpanel;
     private Random random = new Random();
     private JButton ButtonCreate;
@@ -16,15 +19,9 @@ public class FormShip extends JDialog{
     protected DrawingShip _ship;
     private JPanel pictureBoxShip;
     private JToolBar StatusStrip;
-    private JButton ButtonSelect;
     private JLabel JLabelSpeed = new JLabel();
     private JLabel JLabelWeight = new JLabel();
     private JLabel JLabelColor = new JLabel();
-    protected DrawingShip SelectedShip;
-    public DrawingShip GetSelectedShip()
-    {
-        return SelectedShip;
-    }
     public void Draw(DrawingShip _ship) {
         pictureBoxShip.removeAll();
         BufferedImage bmp = new BufferedImage(pictureBoxShip.getWidth(), pictureBoxShip.getHeight(),BufferedImage.TYPE_INT_RGB);
@@ -41,15 +38,8 @@ public class FormShip extends JDialog{
         }
         validate();
     }
-    public FormShip()
+
-    {
+    public FormShip() {
-        super(new Frame("Лайнер"));
-        CreateWindow();
-        setModal(true);
-        getContentPane().add(Mainpanel);
-    }
-    public void CreateWindow() {
-        setModal(true);
         Box LabelBox = Box.createHorizontalBox();
         LabelBox.setMinimumSize(new Dimension(1, 20));
         LabelBox.add(JLabelSpeed);
@@ -68,13 +58,10 @@ public class FormShip extends JDialog{
         } catch (Exception ex) {
             System.out.println(ex);
         }
-        SelectedShip=_ship;
         ButtonCreate.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e){
-                Random random = new Random();
+                _ship=new DrawingShip(random.nextInt(100, 300), random.nextInt(1000, 2000), new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256)));
-                Color colorFirst = JColorChooser.showDialog(null, "Цвет", null);
-                _ship=new DrawingShip(random.nextInt(100, 300), random.nextInt(1000, 2000), colorFirst);
                 _ship.SetPosition(random.nextInt(10, 100), random.nextInt(10, 100), pictureBoxShip.getWidth(), pictureBoxShip.getHeight());
                 JLabelSpeed.setText("Cкорость: " + _ship.GetShip().GetSpeed() + " ");
                 JLabelWeight.setText("Вес: " + _ship.GetShip().GetWeight() + " ");
@@ -130,10 +117,7 @@ public class FormShip extends JDialog{
         ButtonCreateModif.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                Random random = new Random();
+                _ship=new DrawingLiner(random.nextInt(100, 300), random.nextInt(1000, 2000), new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256)),new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256)),random.nextBoolean(),random.nextBoolean());
-                Color colorFirst = JColorChooser.showDialog(null, "Цвет", null);
-                Color colorSecond = JColorChooser.showDialog(null, "Цвет", null);
-                _ship=new DrawingLiner(random.nextInt(100, 300), random.nextInt(1000, 2000), colorFirst,colorSecond,random.nextBoolean(),random.nextBoolean());
                 _ship.SetPosition(random.nextInt(10, 100), random.nextInt(10, 100), pictureBoxShip.getWidth(), pictureBoxShip.getHeight());
                 JLabelSpeed.setText("Cкорость: " + _ship.GetShip().GetSpeed() + " ");
                 JLabelWeight.setText("Вес: " + _ship.GetShip().GetWeight() + " ");
@@ -141,13 +125,5 @@ public class FormShip extends JDialog{
                 Draw(_ship);
             }
         });
-
-        ButtonSelect.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                SelectedShip=_ship;
-                dispose();
-            }
-        });
     }
 }

src/Main.java

@@ -3,11 +3,11 @@ import javax.swing.*;
 public class Main {
     public static void main(String[] args) {
         JFrame frame = new JFrame("Лайнер");
-        frame.setContentPane(new FormParam().MainPanel);
+        frame.setContentPane(new FormMap().MainPanel);
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         frame.setLocation(500, 200);
         frame.pack();
-        frame.setSize(800, 500);
+        frame.setSize(500, 500);
         frame.setVisible(true);
     }
 }

src/MapWithSetShipsGeneric.java

@@ -1,130 +0,0 @@
-import java.awt.*;
-import java.awt.image.BufferedImage;
-
-public class MapWithSetShipsGeneric<T extends IDrawingObject, U extends  AbstractMap> {
-    private final int _pictureWidth;
-    private final int _pictureHeight;
-    private final int _placeSizeWidth = 170;
-    private final int _placeSizeHeight = 90;
-    private final SetShipsGeneric<T> _setShips;
-    private final U _map;
-    public MapWithSetShipsGeneric(int picWidth, int picHeight, U map)
-    {
-        int width = picWidth / _placeSizeWidth;
-        int height = picHeight / _placeSizeHeight;
-        _setShips = new SetShipsGeneric<T>(width * height);
-        _pictureWidth = picWidth;
-        _pictureHeight = picHeight;
-        _map = map;
-    }
-    public int Add(T ship)
-    {
-        return _setShips.Insert(ship);
-    }
-    public T Delete(int position)
-    {
-        return _setShips.Remove(position);
-    }
-    public BufferedImage ShowSet()
-    {
-        BufferedImage bmp = new BufferedImage(_pictureWidth,_pictureHeight,BufferedImage.TYPE_INT_RGB);
-        Graphics gr = bmp.getGraphics();
-        DrawBackground(gr);
-        DrawShips(gr);
-        return bmp;
-    }
-    public BufferedImage ShowOnMap()
-    {
-        Shaking();
-        for (int i = 0; i < _setShips.Count(); i++)
-        {
-            var ship = _setShips.Get(i);
-            if (ship != null)
-            {
-                return _map.CreateMap(_pictureWidth, _pictureHeight, ship);
-            }
-        }
-        return new BufferedImage(_pictureWidth, _pictureHeight, BufferedImage.TYPE_INT_RGB);
-    }
-    public BufferedImage MoveObject(Direction direction)
-    {
-        if (_map != null)
-        {
-            return _map.MoveObject(direction);
-        }
-        return new BufferedImage(_pictureWidth, _pictureHeight, BufferedImage.TYPE_INT_RGB);
-    }
-    private void Shaking()
-    {
-        int j = _setShips.Count() - 1;
-        for (int i = 0; i < _setShips.Count(); i++)
-        {
-            if (_setShips.Get(i) == null)
-            {
-                for (; j > i; j--)
-                {
-                    var ship = _setShips.Get(j);
-                    if (ship != null)
-                    {
-                        _setShips.Insert(ship, i);
-                        _setShips.Remove(j);
-                        break;
-                    }
-                }
-                if (j <= i)
-                {
-                    return;
-                }
-            }
-        }
-    }
-    private void DrawBackground(Graphics gr)
-    {
-        Graphics2D g = (Graphics2D) gr;
-        g.setColor(Color.BLUE);
-        g.fillRect( 0, 0, _pictureWidth, _pictureHeight);
-        Color c = new Color(89,51,5);
-        g.setStroke(new BasicStroke(2));
-        g.setColor(c);
-        for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
-        {
-            for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
-            {
-                g.drawLine(i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2 + 40, j * _placeSizeHeight);
-            }
-            g.drawLine(i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
-            g.drawLine(i * _placeSizeWidth - 4, 0, i * _placeSizeWidth - 4, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
-        }
-    }
-    private void DrawShips(Graphics g)
-    {
-        int widthEl = _pictureWidth / _placeSizeWidth;
-        int heightEl = _pictureHeight / _placeSizeHeight;
-        int curWidth = 1;
-        int curHeight = 0;
-        for (int i = 0; i < _setShips.Count(); i++)
-        {
-            if(_setShips.Get(i)==null)
-            {
-                continue;
-            }
-            _setShips.Get(i).SetObject(_pictureWidth - _placeSizeWidth * curWidth - (_pictureWidth / 7),
-                    curHeight * _placeSizeHeight + 10, _pictureWidth, _pictureHeight);
-            _setShips.Get(i).DrawingObject(g);
-
-            if (curWidth < widthEl)
-                curWidth++;
-            else
-            {
-                curWidth = 1;
-                curHeight++;
-            }
-            if (curHeight > heightEl)
-            {
-                return;
-            }
-
-        }
-    }
-}
-

src/SetShipsGeneric.java

@@ -1,65 +0,0 @@
-public class SetShipsGeneric<T extends  Object> {
-    private final Object[] _places;
-    public int Count()
-    {
-        return  _places.length;
-    }
-    public SetShipsGeneric(int count)
-    {
-        _places = new Object[count];
-    }
-    public int Insert(T ship)
-    {
-        return Insert(ship, 0);
-    }
-    public int Insert(T ship, int position)
-    {
-        if (position >= _places.length || position < 0)
-        {
-            return -1;
-        }
-        if (_places[position] == null)
-        {
-            _places[position] = ship;
-            return position;
-        }
-        int emptyIndex = -1;
-        for (int i = position + 1; i < Count(); i++)
-        {
-            if (_places[i] == null)
-            {
-                emptyIndex = i;
-                break;
-            }
-        }
-        if (emptyIndex < 0)
-        {
-            return -1;
-        }
-        for (int i = emptyIndex; i > position; i--)
-        {
-            _places[i] = _places[i - 1];
-        }
-        _places[position] = ship;
-        return position;
-    }
-    public T Remove(int position)
-    {
-        if (position >= _places.length || position < 0)
-        {
-            return null;
-        }
-        T ship = (T) _places[position];
-        _places[position] = null;
-        return ship;
-    }
-    public T Get(int position)
-    {
-        if (position >= _places.length || position < 0)
-        {
-            return null;
-        }
-        return (T)_places[position];
-    }
-}
-