node highlighting bug fix und selection via dragging optimisiert

src/ui/view/MyCanvas.java

@@ -15,9 +15,7 @@ import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
 import java.awt.geom.Line2D;
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -33,10 +31,8 @@ import classes.CpsObject;
 import classes.HolonElement;
 import classes.HolonObject;
 import classes.HolonSwitch;
-import classes.HolonTransformer;
 import ui.controller.Control;
 import ui.model.Model;
-import ui.model.idCounter;
 
 public class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 	/**
@@ -263,8 +259,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 			
 
 			// node image
-			if (cps.getID() == model.getSelectedObjectID() && controller.searchByID(model.getSelectedObjectID()) != null
-					&& controller.searchByID(model.getSelectedObjectID()) instanceof CpsNode) {
+			if (cps instanceof CpsNode && (model.getSelectedCpsObjects().contains(cps) || TempSelected.contains(cps))) {
 				img = new ImageIcon(this.getClass().getResource("/Images/node_selected.png")).getImage();
 			} else {
 				if (cps instanceof HolonSwitch) {
@@ -515,8 +510,8 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 					y1 = y;
 					y2 = sy;
 				}
-				if (x1 <= cps.getPosition().x && y1 <= cps.getPosition().y && x2 >= cps.getPosition().x
-						&& y2 >= cps.getPosition().y) {
+				if (x1 <= cps.getPosition().x+model.getScaleDiv2() && y1 <= cps.getPosition().y+model.getScaleDiv2() && x2 >= cps.getPosition().x+model.getScaleDiv2()
+						&& y2 >= cps.getPosition().y+model.getScaleDiv2()) {
 					TempSelected.add(cps);
 
 				}