Explorar el Código

unnötiger code entfernt und delete Object nicht anklickbar, wenn kein
object angeklickt

Kevin Trometer hace 8 años
padre
commit
461f2f7302

BIN
bin/Interfaces/CategoryListener.class


BIN
bin/Interfaces/ComparableObject.class


BIN
bin/Interfaces/ObjectListener.class


BIN
bin/classes/Category.class


BIN
bin/classes/CpsObject.class


BIN
bin/classes/HolonElement.class


BIN
bin/classes/HolonObject.class


BIN
bin/classes/HolonSwitch.class


BIN
bin/classes/HolonTransformer.class


BIN
bin/classes/Position.class


BIN
bin/exceptions/newException1.class


BIN
bin/tests/Tests1.class


BIN
bin/tests/praktikumHolonsTestMinimal.class


BIN
bin/ui/controller/CategoryController.class


BIN
bin/ui/controller/Control$command.class


BIN
bin/ui/controller/Control.class


BIN
bin/ui/controller/ObjectControl.class


BIN
bin/ui/model/IdCounter.class


BIN
bin/ui/model/Model.class


BIN
bin/ui/model/tests.class


BIN
bin/ui/view/AddElementPopUp.class


BIN
bin/ui/view/AddObjectPopUp.class


BIN
bin/ui/view/GUI$1.class


BIN
bin/ui/view/GUI$2.class


BIN
bin/ui/view/GUI$3.class


BIN
bin/ui/view/GUI$4.class


BIN
bin/ui/view/GUI$5.class


BIN
bin/ui/view/GUI$6.class


BIN
bin/ui/view/GUI.class


BIN
bin/ui/view/Main$1.class


BIN
bin/ui/view/Main.class


BIN
bin/ui/view/MyCanvas.class


+ 1 - 14
src/ui/view/GUI.java

@@ -221,7 +221,7 @@ public class GUI implements CategoryListener {
 			public void mousePressed(MouseEvent e) {
 				try {
 					actualObjectClicked = tree.getPathForLocation(e.getX(), e.getY()).getLastPathComponent().toString();
-					// System.out.println(name);
+					System.out.println(actualObjectClicked);
 					if (actualObjectClicked.compareTo("Power Plant") == 0 || actualObjectClicked.compareTo("House") == 0
 							|| actualObjectClicked.compareTo("Switch") == 0
 							|| actualObjectClicked.compareTo("Transformer") == 0) {
@@ -234,19 +234,6 @@ public class GUI implements CategoryListener {
 			}
 		});
 
-		/*
-		 * tree.addTreeSelectionListener(new TreeSelectionListener() {
-		 * 
-		 * @Override public void valueChanged(TreeSelectionEvent e) { try {
-		 * String name = tree.getLastSelectedPathComponent().toString();
-		 * System.out.println(name); if (name.compareTo("Power Plant") == 0 ||
-		 * name.compareTo("House") == 0 || name.compareTo("Switch") == 0 ||
-		 * name.compareTo("Transformer") == 0) { dragging = true; Cursor cursor
-		 * = Toolkit.getDefaultToolkit().createCustomCursor(img, new Point(0,
-		 * 0), "red Cursor"); frmCyberPhysical.setCursor(cursor); } } catch
-		 * (Exception e2) {} } });
-		 */
-
 		scrollPane_1.setViewportView(tree);
 
 		scrollPane_1.setColumnHeaderView(panel);

+ 1 - 0
src/ui/view/MyCanvas.java

@@ -41,6 +41,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				model.getObjectsOnCanvas().remove(tempCps);
+				dropDelete = false;
 				repaint();
 			}
 		});