|
@@ -2,7 +2,9 @@ package ui.controller;
|
|
|
|
|
|
import Interfaces.CategoryListener;
|
|
import Interfaces.CategoryListener;
|
|
import Interfaces.ObjectListener;
|
|
import Interfaces.ObjectListener;
|
|
|
|
+import classes.CpsEdge;
|
|
import classes.CpsObject;
|
|
import classes.CpsObject;
|
|
|
|
+import javafx.util.Pair;
|
|
import ui.model.Model;
|
|
import ui.model.Model;
|
|
|
|
|
|
public class CanvasController {
|
|
public class CanvasController {
|
|
@@ -45,8 +47,14 @@ public class CanvasController {
|
|
* @param CpsObject
|
|
* @param CpsObject
|
|
*/
|
|
*/
|
|
public void deleteObjectOnCanvas(CpsObject obj) {
|
|
public void deleteObjectOnCanvas(CpsObject obj) {
|
|
|
|
+ Pair<CpsObject, CpsEdge> tempPair = null;
|
|
for (CpsObject cps : MODEL.getObjectsOnCanvas()) {
|
|
for (CpsObject cps : MODEL.getObjectsOnCanvas()) {
|
|
- cps.getConnectedTo().remove(obj);
|
|
|
|
|
|
+ for (Pair<CpsObject, CpsEdge> p : cps.getConnections()) {
|
|
|
|
+ if (p.getKey() == obj) {
|
|
|
|
+ tempPair = p;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ cps.getConnectedTo().remove(tempPair);
|
|
}
|
|
}
|
|
MODEL.getObjectsOnCanvas().remove(obj);
|
|
MODEL.getObjectsOnCanvas().remove(obj);
|
|
}
|
|
}
|