diff --git a/ProjectElectricLocomotive/FormLocomotiveConfig.form b/ProjectElectricLocomotive/FormLocomotiveConfig.form
index 61f09a6..1afb46a 100644
--- a/ProjectElectricLocomotive/FormLocomotiveConfig.form
+++ b/ProjectElectricLocomotive/FormLocomotiveConfig.form
@@ -13,7 +13,7 @@
-
+
@@ -36,7 +36,7 @@
-
+
@@ -201,7 +201,7 @@
-
+
@@ -209,7 +209,7 @@
-
+
@@ -224,14 +224,6 @@
-
-
-
-
-
-
-
-
@@ -246,6 +238,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ProjectElectricLocomotive/FormLocomotiveConfig.java b/ProjectElectricLocomotive/FormLocomotiveConfig.java
index 996faa6..5235732 100644
--- a/ProjectElectricLocomotive/FormLocomotiveConfig.java
+++ b/ProjectElectricLocomotive/FormLocomotiveConfig.java
@@ -41,9 +41,11 @@ public class FormLocomotiveConfig{
private JPanel violetPanel;
private JPanel panelBodyColor;
private JPanel panelAdditionalColor;
- private JLabel labelWheels;
+ private JLabel labelBlackWheels;
private JLabel labelCountWheels;
private JSpinner numericUpDownWheels;
+ private JLabel labelEmptyWheels;
+ private JLabel labelRainbowWheels;
public Canvas canvas;
public JPanel getPictureBoxObject(){
@@ -154,9 +156,17 @@ public class FormLocomotiveConfig{
labelModifiedObject.addMouseListener(new LabelMouseAdapter());
labelModifiedObject.setBorder(br);
- labelWheels.setTransferHandler(new LabelTransferHandler());
- labelWheels.addMouseListener(new LabelMouseAdapter());
- labelWheels.setBorder(br);
+ labelBlackWheels.setTransferHandler(new LabelTransferHandler());
+ labelBlackWheels.addMouseListener(new LabelMouseAdapter());
+ labelBlackWheels.setBorder(br);
+
+ labelEmptyWheels.setTransferHandler(new LabelTransferHandler());
+ labelEmptyWheels.addMouseListener(new LabelMouseAdapter());
+ labelEmptyWheels.setBorder(br);
+
+ labelRainbowWheels.setTransferHandler((new LabelTransferHandler()));
+ labelRainbowWheels.addMouseListener(new LabelMouseAdapter());
+ labelRainbowWheels.setBorder(br);
redPanel.setTransferHandler(new PanelTransferHandler());
redPanel.addMouseListener(new PanelMouseAdapter());
@@ -271,24 +281,25 @@ public class FormLocomotiveConfig{
break;
}
+ int wheelsCount = (int)numericUpDownWheels.getValue();
+ IDrawingWheels iDrawingWheels;
String dataWheels = (String) support.getTransferable().getTransferData(DataFlavor.stringFlavor);
switch (dataWheels){
- case "Колеса добавить?...":
- Random rnd;
- rnd = new Random();
- IDrawingWheels iDrawingWheels;
- int wheelsChoice = rnd.nextInt(0, 3);
- int wheelsCount = (int)numericUpDownWheels.getValue();
- if (wheelsChoice == 0) {
- iDrawingWheels = new DrawingWheel();
- } else if (wheelsChoice == 1) {
- iDrawingWheels = new DrawingEmptyWheels();
- } else {
- iDrawingWheels = new DrawingWheelsBlueCrom();
- }
-
+ case "Черные колеса":
+ iDrawingWheels = new DrawingWheel();
iDrawingWheels.SetWheelsCount(wheelsCount);
_loco._drawingWheels = iDrawingWheels;
+ break;
+ case "Пустые колеса":
+ iDrawingWheels = new DrawingEmptyWheels();
+ iDrawingWheels.SetWheelsCount(wheelsCount);
+ _loco._drawingWheels = iDrawingWheels;
+ break;
+ case "Радужные колеса":
+ iDrawingWheels = new DrawingWheelsBlueCrom();
+ iDrawingWheels.SetWheelsCount(wheelsCount);
+ _loco._drawingWheels = iDrawingWheels;
+ break;
}
pictureBoxObject.repaint();
return true;