READY LabWork02 HARD

ProjectElectricLocomotive/DrawingElectricLocomotive.java

@@ -16,9 +16,6 @@ public class DrawingElectricLocomotive extends DrawingLocomotive {
         if (EntityLocomotive instanceof EntityElectricLocomotive electricLocomotive) /////////     WARNING    INSTANCEOF
         {
             Color colorBlack = Color.BLACK;
-            Color windows = Color.BLUE;
-            Color bodyColor = EntityLocomotive.BodyColor;
-            Color additionalBrush = electricLocomotive.AdditionalColor;
 
             if (electricLocomotive.Horns) {
                 //horns

ProjectElectricLocomotive/DrawingLocomotive.java

@@ -56,7 +56,6 @@ public class DrawingLocomotive {
         _pictureHeight = height;
         _locoWidth = locoWidth;
         _locoHeight = locoHeight;
-    //    EntityLocomotive = new EntityLocomotive(speed, weight, bodyColor);
     }
 
     public void SetWheelsCount(int wheelsCount){
@@ -105,6 +104,7 @@ public class DrawingLocomotive {
                 break;
         }
     }
+
     public void DrawTransport(Graphics g)
     {
         {
@@ -112,7 +112,6 @@ public class DrawingLocomotive {
         }
 
         Color colorBlack = Color.BLACK;
-        /*Brush blackBrush = new SolidBrush(Color.Black);*/
         Color windows = Color.BLUE;
         Color bodyColor = EntityLocomotive.BodyColor;
 
@@ -133,7 +132,6 @@ public class DrawingLocomotive {
         g.setColor(colorBlack);
         g.drawPolygon(locoP);
 
-
         //окошки
         Polygon window = new Polygon();
         window.addPoint(_startPosX + 10, _startPosY + 30);
@@ -155,11 +153,6 @@ public class DrawingLocomotive {
         g.fillOval(_startPosX + 50, _startPosY + 45, 9, 9);
         g.fillOval(_startPosX + 65, _startPosY + 45, 9, 9);
 
-        //telega
-        g.setColor(colorBlack);
-        g.fillOval(_startPosX + 95, _startPosY + 45, 9, 9);
-        g.fillOval(_startPosX + 140, _startPosY + 45, 9, 9);
-
         //telejka
         Polygon telega = new Polygon();
 
@@ -175,7 +168,6 @@ public class DrawingLocomotive {
         g.fillPolygon(telega);
         g.setColor(colorBlack);
         g.drawPolygon(telega);
-        //telejka
 
         //телега окна
         g.setColor(colorBlack);

ProjectElectricLocomotive/DrawingObjectLocomotive.java

@@ -2,7 +2,6 @@ package ProjectElectricLocomotive;
 
 public class DrawingObjectLocomotive implements IMoveableObject {
     private DrawingLocomotive _drawningLocomotive = null;
-
     public DrawingObjectLocomotive(DrawingLocomotive drawningLocomotive)
     {
         _drawningLocomotive = drawningLocomotive;

ProjectElectricLocomotive/EntityElectricLocomotive.java

@@ -5,7 +5,6 @@ import java.awt.*;
 public class EntityElectricLocomotive extends  EntityLocomotive {
     public Color AdditionalColor;
     public boolean Horns;
-
     public boolean SeifBatteries;
     public EntityElectricLocomotive(int speed, double weight, Color bodyColor, Color additionalColor, boolean horns, boolean seifBatteries)
     {

ProjectElectricLocomotive/EntityLocomotive.java

@@ -6,13 +6,11 @@ public class EntityLocomotive {
     public int Speed;
     public double Weight;
     public Color BodyColor;
-
     public EntityLocomotive(int speed, double weight, Color bodyColor) {
         Speed = speed;
         Weight = weight;
         BodyColor = bodyColor;
     }
-
     public double Step()
     {
         return (double) Speed * 100 / Weight;

ProjectElectricLocomotive/FormElectricLocomotive.java

@@ -58,7 +58,6 @@ public class FormElectricLocomotive {
 
             _drawingLocomotive.SetWheelsCount(random.nextInt(2, 5));
             _drawingLocomotive.SetPosition(random.nextInt(10, 100), random.nextInt(10, 100));
-            //drawingElectricLocomotive.SetWheelsCount(random.nextInt(2,5));
             Draw();
         });
 

ProjectElectricLocomotive/IDrawingWheels.java

@@ -7,8 +7,6 @@ public interface IDrawingWheels {
 
      WheelsCount GetWheelsCount();
 
-     //    WheelsCount GetWheelsCount();
-
      void DrawWheel(Graphics2D g2d, Color color, int x, int y, int w, int h);
 
      default void DrawWheels(Graphics g, Color color, int startPosX, int startPosY, int drawingWidth, int drawingHeight){
@@ -18,10 +16,21 @@ public interface IDrawingWheels {
           int wheelWidth = 9;
           int wheelHeight = 9;
 
-          if (wheelsCount.count >= wheelsCount.Three.count) {
+          if(wheelsCount.count <= wheelsCount.Two.count){
+               DrawWheel(g2d, color, startPosX + 95, startPosY + 45, 9, 9);
+               DrawWheel(g2d, color, startPosX + 140, startPosY + 45, 9, 9);
+          }
+
+          if (wheelsCount.count == wheelsCount.Three.count) {
+               DrawWheel(g2d, color, startPosX + 95, startPosY + 45, 9, 9);
+               DrawWheel(g2d, color, startPosX + 140, startPosY + 45, 9, 9);
+
                DrawWheel(g2d, color, startPosX + 105, startPosY + 45, wheelWidth, wheelHeight);
           }
-          if (wheelsCount.count >= wheelsCount.Four.count) {
+          if (wheelsCount.count == wheelsCount.Four.count) {
+               DrawWheel(g2d, color, startPosX + 95, startPosY + 45, 9, 9);
+               DrawWheel(g2d, color, startPosX + 140, startPosY + 45, 9, 9);
+
                DrawWheel(g2d, color, startPosX + 105, startPosY + 45, wheelWidth, wheelHeight);
                DrawWheel(g2d, color, startPosX + 130, startPosY + 45, wheelWidth, wheelHeight);
           }

ProjectElectricLocomotive/IMoveableObject.java

@@ -4,7 +4,6 @@ import java.awt.*;
 public interface IMoveableObject {
     ObjectParameters GetObjectPosition();
     int GetStep();
-
     boolean CheckCanMove(DyrectionType direction);
     void MoveObject(DyrectionType direction);
 }

ProjectElectricLocomotive/MoveToRigthCorner.java

@@ -9,7 +9,6 @@ public class MoveToRigthCorner extends AbstractStrategy {
 
         return objParams.RightBorder() >= FieldWidth - GetStep() && objParams.DownBorder() >= FieldHeight - GetStep();
     }
-
     @Override
     protected void MoveToTarget()
     {
@@ -18,6 +17,5 @@ public class MoveToRigthCorner extends AbstractStrategy {
 
         if (objParams.RightBorder() < FieldWidth - GetStep()) MoveRight();
         if (objParams.DownBorder() < FieldHeight - GetStep()) MoveDown();
-
     }
 }

ProjectElectricLocomotive/WheelsCount.java

@@ -1,7 +1,7 @@
 package ProjectElectricLocomotive;
 
 public enum WheelsCount {
-   /* Two(2),*/ Three(3), Four(4);
+    Two(2), Three(3), Four(4);
     public final int count;
     WheelsCount(int count) {
         this.count = count;