Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons

src/ui/controller/Control.java

@@ -379,7 +379,6 @@ public class Control {
 	public void delCanvasObject(AbstractCpsObject obj, boolean save) {
 		canvasController.deleteObjectOnCanvas(obj);
 		calculateStateForCurrentTimeStep();
-		model.getTrackingObj().remove(obj);
 		if (obj instanceof CpsUpperNode)
 			canvasController.bfsNodeCleaner((CpsUpperNode) obj);
 		if (save)
@@ -787,7 +786,6 @@ public class Control {
 
 	public void delObjUpperNode(AbstractCpsObject object, CpsUpperNode upperNode) {
 		nodeController.deleteObjectInUpperNode(object, upperNode);
-		model.getTrackingObj().remove(object);
 		if (object instanceof CpsUpperNode)
 			canvasController.bfsNodeCleaner((CpsUpperNode) object);
 		try {

src/ui/view/GUI.java

@@ -266,7 +266,7 @@ public class GUI<E> implements CategoryListener {
 	private AbstractCpsObject temp = null;
 	private final JMenuItem mntmUndo = new JMenuItem("Undo");
 	private final JMenuItem mntmRedo = new JMenuItem("Redo");
-	private final JMenuItem mntmEditEdges = new JMenuItem("Edit Edges");
+	private final JMenuItem mntmEditEdges = new JMenuItem("Edge Properties");
 	private final JMenuItem mntmFindReplace = new JMenuItem("Find/ Replace");
 	private final JMenuItem mntmEditShowedInformation = new JMenuItem("Edit showed Information");
 	private final JMenuItem mntmResetCategory = new JMenuItem("Reset Categories");
@@ -415,6 +415,7 @@ public class GUI<E> implements CategoryListener {
 					}
 					canvas.repaint();
 				}
+				controller.getObjectsInDepth();
 
 			}
 		};
@@ -669,6 +670,7 @@ public class GUI<E> implements CategoryListener {
 					SearchPopUp dialog = new SearchPopUp(controller, canvas);
 					dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 					dialog.setVisible(true);
+					controller.getObjectsInDepth();
 				} catch (Exception ex) {
 					ex.printStackTrace();
 				}
@@ -689,8 +691,7 @@ public class GUI<E> implements CategoryListener {
 		});
 
 		mnNewMenuEdit.add(mntmEditShowedInformation);
-
-		menuBar.add(mnNewMenuOptions);
+		mnNewMenuEdit.add(mntmEditEdges);
 		mntmEditEdges.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
 				EditEdgesPopUp edgePopUp = new EditEdgesPopUp();
@@ -700,7 +701,7 @@ public class GUI<E> implements CategoryListener {
 			}
 		});
 
-		mnNewMenuOptions.add(mntmEditEdges);
+		menuBar.add(mnNewMenuOptions);
 
 		mnNewMenuOptions.add(mntmResetCategory);
 		mntmResetCategory.addActionListener(new ActionListener() {
@@ -1416,6 +1417,8 @@ public class GUI<E> implements CategoryListener {
 
 								controller.addObjUpperNode(h, unc.upperNode);
 								unc.invalidate();
+								unc.setXY((int) canvas.getMousePosition().getX(),
+										(int) canvas.getMousePosition().getY());
 								unc.repaint();
 							}
 						} else {
@@ -1437,6 +1440,8 @@ public class GUI<E> implements CategoryListener {
 
 							controller.addObjectCanvas(h);
 							canvas.invalidate();
+							canvas.setXY((int) canvas.getMousePosition().getX(),
+									(int) canvas.getMousePosition().getY());
 							canvas.repaint();
 						}
 						controller.calculateStateForCurrentTimeStep();

src/ui/view/MyCanvas.java

@@ -761,7 +761,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 			}
 		}
 
-		if (edgeHighlight == null && tempCps == null) {
+		if (edgeHighlight == null && tempCps == null ) {
 			sx = e.getX();
 			sy = e.getY();
 			doMark = true;
@@ -1162,11 +1162,21 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 	}
 	
 	/**
-	 * set tooltIp
+	 * set toolTip
 	 * @param bool
 	 */
 	public void setToolTip(boolean bool){
 		this.toolTip = bool;
 	}
 	
+	/**
+	 * Set the Mouse
+	 * @param x
+	 * @param y
+	 */
+	public void setXY(int x, int y){
+		this.x = x;
+		this.y = y;
+	}
+	
 }

src/ui/view/UpperNodeCanvas.java

@@ -1572,13 +1572,25 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 	public void setBackgroundImage(String imagePath, int mode, int width, int height) {
 		upperNode.setBackgroundImage(imagePath, mode, width, height);
 	}
-	
+
 	/**
 	 * set tooltIp
+	 * 
 	 * @param bool
 	 */
-	public void setToolTip(boolean bool){
+	public void setToolTip(boolean bool) {
 		this.toolTip = bool;
 	}
 
+	/**
+	 * Set the Mouse Position on the UpperNodeCanvas;
+	 * 
+	 * @param x
+	 * @param y
+	 */
+	public void setXY(int x, int y) {
+		this.x = x;
+		this.y = y;
+	}
+
 }