Лабораторная работа №3

ProjectMonorail/.idea/workspace.xml

@@ -5,16 +5,15 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="39e7c520-e505-4e53-a269-c949d7c9f5d1" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Scripts/Wheels/IDrawingWheels.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/ProjectMonorail/Scripts/Wheels/DrawingWheels.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/ProjectMonorail/Scripts/Wheels/DrawingWheels.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Scripts/CollectionGenericObjects/AdditionalCollection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Scripts/CollectionGenericObjects/AdditionalCollection.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Scripts/CollectionGenericObjects/DepotSharingService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Scripts/CollectionGenericObjects/DepotSharingService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Scripts/Drawing/DrawingModernMonorail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Scripts/Drawing/DrawingModernMonorail.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Scripts/Drawing/DrawingMonorail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Scripts/Drawing/DrawingMonorail.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Scripts/Forms/FormAdditionalCollection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Scripts/Forms/FormAdditionalCollection.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Scripts/Forms/FormMonorailCollection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Scripts/Forms/FormMonorailCollection.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Scripts/Wheels/DrawingWheels.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Scripts/Wheels/DrawingWheels.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/CountWheels.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/DirectionType.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/DrawingField.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/DrawingModernMonorail.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/DrawingWheels.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/EntityModernMonorail.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/FormModernMonorail.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Program.java" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -25,7 +24,6 @@
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="Class" />
-        <option value="Interface" />
       </list>
     </option>
   </component>
@@ -46,9 +44,8 @@
     "Application.Program.executor": "Run",
     "RunOnceActivity.OpenProjectViewOnStart": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
-    "git-widget-placeholder": "LabWorking__3",
-    "kotlin-language-version-configured": "true",
-    "last_opened_file_path": "D:/Учеба/PIbd-11_Tarasov_V.D._Hard/ProjectMonorail"
+    "git-widget-placeholder": "LabWorking__2",
+    "kotlin-language-version-configured": "true"
   }
 }]]></component>
   <component name="RunManager">
@@ -60,6 +57,14 @@
       </method>
     </configuration>
   </component>
+  <component name="SharedIndexes">
+    <attachedChunks>
+      <set>
+        <option value="jdk-21.0.2-openjdk-21.0.2-4caba194b151-4f524021" />
+        <option value="jdk-22-openjdk-22-3183f394aec4-bad0321e" />
+      </set>
+    </attachedChunks>
+  </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">

ProjectMonorail/src/Scripts/CollectionGenericObjects/AdditionalCollection.java

@@ -4,7 +4,6 @@ import Scripts.Drawing.DrawingModernMonorail;
 import Scripts.Drawing.DrawingMonorail;
 import Scripts.Entities.EntityModernMonorail;
 import Scripts.Entities.EntityMonorail;
-import Scripts.Wheels.DrawingWheels;
 import Scripts.Wheels.IDrawingWheels;
 
 import java.lang.reflect.Array;
@@ -45,7 +44,7 @@ public class AdditionalCollection <T extends EntityMonorail, U extends IDrawingW
         }
         return -1;
     }
-    public DrawingMonorail CreateAdditionalCollectionStormtrooper() {
+    public DrawingMonorail CreateAdditionalCollectionMonorail() {
         Random random = new Random();
         if (_collectionEntity == null || _collectionWheels == null) return null;
         T entity = _collectionEntity[random.nextInt(CountEntities)];

ProjectMonorail/src/Scripts/Forms/FormAdditionalCollection.java

@@ -24,7 +24,7 @@ public class FormAdditionalCollection extends JFrame {
     private JButton buttonGenerate = new JButton("Создать");
     private JButton buttonGoToCollection = new JButton("В коллекцию");
     private JList<String> listEntity = new JList<String>();
-    private JList<String> listEngines = new JList<String>();
+    private JList<String> listWheels = new JList<String>();
     public FormAdditionalCollection() {
         setTitle("Случайные монорельсы");
         setMinimumSize(new Dimension(970,310));
@@ -45,7 +45,7 @@ public class FormAdditionalCollection extends JFrame {
         buttonGenerate.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                _drawingMonorail = _additionalCollection.CreateAdditionalCollectionStormtrooper();
+                _drawingMonorail = _additionalCollection.CreateAdditionalCollectionMonorail();
                 _drawingMonorail.SetPictureSize(getWidth(), getHeight());
                 _drawingMonorail.SetPosition(360,30);
                 _canvasMonorail._drawingMonorail = _drawingMonorail;
@@ -60,11 +60,11 @@ public class FormAdditionalCollection extends JFrame {
         buttonGoToCollection.setBounds(830,200,120,60);
         buttonGenerate.setBounds(830, 130, 120, 60);
         listEntity.setBounds(10,200,400,60);
-        listEngines.setBounds(420,200,400,60);
+        listWheels.setBounds(420,200,400,60);
         add(buttonGenerate);
         add(buttonGoToCollection);
         add(listEntity);
-        add(listEngines);
+        add(listWheels);
         add(_canvasMonorail);
         setVisible(true);
     }
@@ -128,6 +128,6 @@ public class FormAdditionalCollection extends JFrame {
             data2[i] = ToString(wheels);
         }
         listEntity.setListData(data1);
-        listEngines.setListData(data2);
+        listWheels.setListData(data2);
     }
 }