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

ProjectMonorail/.idea/workspace.xml

@@ -6,8 +6,14 @@
   <component name="ChangeListManager">
     <list default="true" id="39e7c520-e505-4e53-a269-c949d7c9f5d1" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Scripts/Entities/EntityModernMonorail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Scripts/Entities/EntityModernMonorail.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Scripts/Forms/FormMonorailConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Scripts/Forms/FormMonorailConfig.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" />
@@ -17,7 +23,6 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="Interface" />
         <option value="Class" />
       </list>
     </option>
@@ -34,16 +39,15 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;Application.Program.executor&quot;: &quot;Run&quot;,
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;LabWorking__5&quot;,
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;C:/Учеба/AgarioGame&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "Application.Program.executor": "Run",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "git-widget-placeholder": "LabWorking__2",
+    "kotlin-language-version-configured": "true"
   }
-}</component>
+}]]></component>
   <component name="RunManager">
     <configuration name="Program" type="Application" factoryName="Application">
       <option name="MAIN_CLASS_NAME" value="Scripts.Program" />
@@ -57,6 +61,7 @@
     <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>

ProjectMonorail/src/Scripts/CollectionGenericObjects/AdditionalCollection.java

@@ -44,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);
     }
 }