ProjectCatamaran/src/Drawnings/DrawningAbstractCompany.java

@@ -1,7 +1,7 @@
 package Drawnings;
 
-import CollectionGenericObjects.AbstractCompany;
-import CollectionGenericObjects.BoatSharingService;
+import CollectionGenericObjects.*;
+
 import CollectionGenericObjects.MassiveGenericObjects;
 import Forms.FormCatamaran;
 import Forms.FormConstructor;
@@ -103,26 +103,19 @@ public class DrawningAbstractCompany extends JComponent {
         if (boat == null) {
             return;
         }
-        JFrame.setDefaultLookAndFeelDecorated(false);
-        JFrame frame = new JFrame("Катамаран");
         FormCatamaran formCatamaran = new FormCatamaran();
-        frame.setContentPane(formCatamaran.PanelWrapper);
-        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        frame.setLocation(500, 200);
-        formCatamaran.setBoat(boat);
-        frame.pack();
-        frame.setSize(1000, 725);
-        frame.setVisible(true);
+        formCatamaran.setDrawningBoat(boat);
+        formCatamaran.OpenFrame();
+    }
 
     public boolean goToCheckFromRubbishBinAction() {
         if (rubbishBinStack.isEmpty()) {
             return false;
         }
-        DrawningBoat boat = rubbishBinStack.pop();
+        DrawningBoat boat1 = rubbishBinStack.pop();
         FormCatamaran formCatamaran1 = new FormCatamaran();
-        formCatamaran1.setBoat(boat);
-        createAndShowFrame("Катамаран", formCatamaran1.PanelWrapper);
-
+        formCatamaran1.setDrawningBoat(boat1);
+        formCatamaran1.OpenFrame();
         return !rubbishBinStack.isEmpty();
     }