Upload changes

2024-05-20 15:56:30 +04:00 · 2024-05-20 15:56:30 +04:00 · 5df6a9ad57
commit 5df6a9ad57
parent 6d230a8bb7
3 changed files with 33 additions and 39 deletions
--- a/ProjectMonorail/.idea/workspace.xml
+++ b/ProjectMonorail/.idea/workspace.xml
@ -6,10 +6,8 @@
  <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/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/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/Scripts/Wheels/DrawingWheels.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Scripts/Wheels/DrawingWheels.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -36,16 +34,16 @@
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showLibraryContents" value="true" />
  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "Application.Program.executor": "Run",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "git-widget-placeholder": "LabWorking__5",
-    "kotlin-language-version-configured": "true",
-    "last_opened_file_path": "C:/Учеба/AgarioGame"
+  <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>
+}</component>
  <component name="RunManager">
    <configuration name="Program" type="Application" factoryName="Application">
      <option name="MAIN_CLASS_NAME" value="Scripts.Program" />
--- a/ProjectMonorail/src/Scripts/Entities/EntityModernMonorail.java
+++ b/ProjectMonorail/src/Scripts/Entities/EntityModernMonorail.java
@ -12,7 +12,7 @@ public class EntityModernMonorail extends EntityMonorail {
    public  boolean getMonorailTrack() {return _monorailTrack;}
    public  boolean getCabin() {return _cabin;}

-    public void setAdditionalColor(Color value) {_additionalColor = _additionalColor;}
+    public void setAdditionalColor(Color value) {_additionalColor = value;}
    public void setMonorailTrack(Boolean value) { _monorailTrack = value;}
    public void setCabin(Boolean value) { _cabin = value;}

--- a/ProjectMonorail/src/Scripts/Forms/FormMonorailConfig.java
+++ b/ProjectMonorail/src/Scripts/Forms/FormMonorailConfig.java
@ -35,9 +35,9 @@ public class FormMonorailConfig extends JFrame {
    private JLabel labelBodyColor = new JLabel("Основной цвет", SwingConstants.CENTER);
    private JLabel labelAdditionalColor = new JLabel("Дополнительный цвет", SwingConstants.CENTER);
    private JLabel labelWheels = new JLabel("Тип двигателей",SwingConstants.CENTER);
-    private JLabel labelDefaultEngines = new JLabel("Классические",SwingConstants.CENTER);
-    private JLabel labelOvalEngines = new JLabel("Овальные", SwingConstants.CENTER);
-    private JLabel labelTriangleEngines = new JLabel("Треугольные", SwingConstants.CENTER);
+    private JLabel labelDefaultWheels = new JLabel("Классические",SwingConstants.CENTER);
+    private JLabel labelOvalOrnament = new JLabel("Овальные", SwingConstants.CENTER);
+    private JLabel labelTriangleOrnament = new JLabel("Треугольные", SwingConstants.CENTER);

    private JSpinner spinnerSpeed = new JSpinner();
    private JSpinner spinnerWeight = new JSpinner();
@ -121,9 +121,9 @@ public class FormMonorailConfig extends JFrame {
        labelModernMonorail.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
        labelBodyColor.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
        labelAdditionalColor.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
-        labelDefaultEngines.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
-        labelOvalEngines.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
-        labelTriangleEngines.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
+        labelDefaultWheels.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
+        labelOvalOrnament.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
+        labelTriangleOrnament.setBorder(BorderFactory.createLineBorder(Color.BLACK, 2));
        MouseAdapter labelObjectsMouseDown = new MouseAdapter() {
            @Override
            public void mousePressed(MouseEvent e) {
@ -146,17 +146,17 @@ public class FormMonorailConfig extends JFrame {
        labelModernMonorail.addMouseListener(labelObjectsMouseDown);
        labelModernMonorail.setTransferHandler(labelObjectsTransferHandler);

-        MouseAdapter labelEnginesMouseDown = new MouseAdapter() {
+        MouseAdapter labelWheelsMouseDown = new MouseAdapter() {
            @Override
            public void mousePressed(MouseEvent e) {
                ((JLabel) e.getComponent()).getTransferHandler().exportAsDrag(((JLabel) e.getComponent()), e, TransferHandler.COPY);
            }
        };

-        labelDefaultEngines.addMouseListener(labelEnginesMouseDown);
-        labelOvalEngines.addMouseListener(labelEnginesMouseDown);
-        labelTriangleEngines.addMouseListener(labelEnginesMouseDown);
-        labelDefaultEngines.setTransferHandler(new TransferHandler() {
+        labelDefaultWheels.addMouseListener(labelWheelsMouseDown);
+        labelOvalOrnament.addMouseListener(labelWheelsMouseDown);
+        labelTriangleOrnament.addMouseListener(labelWheelsMouseDown);
+        labelDefaultWheels.setTransferHandler(new TransferHandler() {
            @Override
            public int getSourceActions(JComponent c) {return TransferHandler.COPY;}

@ -165,7 +165,7 @@ public class FormMonorailConfig extends JFrame {
                return new WheelsTransferable(new DrawingWheels());
            }
        });
-        labelOvalEngines.setTransferHandler(new TransferHandler() {
+        labelOvalOrnament.setTransferHandler(new TransferHandler() {
            @Override
            public int getSourceActions(JComponent c) {return TransferHandler.COPY;}

@ -174,7 +174,7 @@ public class FormMonorailConfig extends JFrame {
                return new WheelsTransferable(new DrawOrnamentOval());
            }
        });
-        labelTriangleEngines.setTransferHandler(new TransferHandler() {
+        labelTriangleOrnament.setTransferHandler(new TransferHandler() {
            @Override
            public int getSourceActions(JComponent c) {return TransferHandler.COPY;}

@ -300,12 +300,8 @@ public class FormMonorailConfig extends JFrame {
            @Override
            public void actionPerformed(ActionEvent e) {
                if (_drawingMonorail == null) return;
-                DrawingMonorail copyDrawingMonorail;
-                if (_drawingMonorail instanceof DrawingModernMonorail)
-                    copyDrawingMonorail =  new DrawingModernMonorail((EntityModernMonorail) _drawingMonorail.getMonorail(), _drawingMonorail.getWheels());
-                else
-                    copyDrawingMonorail =  new DrawingMonorail(_drawingMonorail.getMonorail(), _drawingMonorail.getWheels());
-                company._collection.Insert(copyDrawingMonorail);
+
+                company._collection.Insert(_drawingMonorail);
                FormMonorailCollection.canvasShow();
                dispose();
            }
@ -330,9 +326,9 @@ public class FormMonorailConfig extends JFrame {
        labelBodyColor.setBounds(500,5,100, 40);
        labelAdditionalColor.setBounds(605,5,170,40);
        labelWheels.setBounds(225,190,150,15);
-        labelDefaultEngines.setBounds(140, 210, 100, 40);
-        labelOvalEngines.setBounds(250, 210, 100,40);
-        labelTriangleEngines.setBounds(360,210,100,40);
+        labelDefaultWheels.setBounds(140, 210, 100, 40);
+        labelOvalOrnament.setBounds(250, 210, 100,40);
+        labelTriangleOrnament.setBounds(360,210,100,40);
        labelColor.setBounds(200,10,50,15);
        panelColorRed.setBounds(200, 30, 40, 40);
        panelColorGreen.setBounds(250, 30, 40,40);
@ -354,10 +350,10 @@ public class FormMonorailConfig extends JFrame {
        add(labelColor);
        add(labelBodyColor);
        add(labelAdditionalColor);
-        add(labelDefaultEngines);
-        add(labelDefaultEngines);
-        add(labelOvalEngines);
-        add(labelTriangleEngines);
+        add(labelDefaultWheels);
+        add(labelDefaultWheels);
+        add(labelOvalOrnament);
+        add(labelTriangleOrnament);
        add(spinnerSpeed);
        add(spinnerWeight);
        add(spinnerNumberOfWheels);