diff --git a/ProjectElectricLocomotive/FormLocomotiveConfig.java b/ProjectElectricLocomotive/FormLocomotiveConfig.java index d72ce0e..d160f8e 100644 --- a/ProjectElectricLocomotive/FormLocomotiveConfig.java +++ b/ProjectElectricLocomotive/FormLocomotiveConfig.java @@ -158,7 +158,7 @@ public class FormLocomotiveConfig{ } } - //что бы wheel'ы можно было тоскать + //что бы wheel'ы можно было тaскать private class WheelTransferable implements Transferable { private IDrawingWheels wheelDrawing; private static final DataFlavor wheelDrawingDataFlavor = new DataFlavor(IDrawingWheels.class, "Wheel Drawing"); @@ -236,8 +236,9 @@ public class FormLocomotiveConfig{ labelModifiedObject.addMouseListener(new LabelMouseAdapter()); labelModifiedObject.setBorder(br); -// labelWheels.setTransferHandler(new LabelTransferHandler()); - labelWheels.addMouseListener(new LabelMouseAdapter()); + labelWheels.setTransferHandler(new PanelTransferHandler()); + labelWheels.addMouseListener(new PanelMouseAdapter()); + labelWheels.setBorder(br); redPanel.setTransferHandler(new PanelTransferHandler()); redPanel.addMouseListener(new PanelMouseAdapter()); @@ -316,7 +317,11 @@ public class FormLocomotiveConfig{ } ); - labelWheels.setBorder(br); + + + + + /*labelWheels.setBorder(br); labelWheels.setTransferHandler( new TransferHandler(){ @Override @@ -334,7 +339,7 @@ public class FormLocomotiveConfig{ int wheelsChoice = rnd.nextInt(0, 3); - wheels.SetWheelsCount(/*rnd.nextInt(2, 5)*/ wheelsChoice); + wheels.SetWheelsCount(rnd.nextInt(2, 5)); if (wheelsChoice == 0) { wheels = new DrawingWheel(); @@ -353,7 +358,7 @@ public class FormLocomotiveConfig{ return false; } } - ); + );*/ canvas = new Canvas(); @@ -380,19 +385,6 @@ public class FormLocomotiveConfig{ // pictureBoxObject.getHeight() 300,300 ); - -// rnd = new Random(); -// IDrawingWheels iDrawingWheels; -// int wheelsChoice = rnd.nextInt(0, 3); -// if (wheelsChoice == 0) { -// iDrawingWheels = new DrawingWheel(); -// } else if (wheelsChoice == 1) { -// iDrawingWheels = new DrawingEmptyWheels(); -// } else { -// iDrawingWheels = new DrawingWheelsBlueCrom(); -// } -// iDrawingWheels.SetWheelsCount(rnd.nextInt(2, 5)); - break; case "Сложный": _loco = new DrawingElectricLocomotive(