|
@@ -71,7 +71,9 @@ public class CanvasController {
|
|
e = p;
|
|
e = p;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- cps.getConnectedTo().remove(e);
|
|
|
|
|
|
+ if (!MODEL.getClipboradObjects().contains(cps)) {
|
|
|
|
+ cps.getConnectedTo().remove(e);
|
|
|
|
+ }
|
|
MODEL.getEdgesOnCanvas().remove(e);
|
|
MODEL.getEdgesOnCanvas().remove(e);
|
|
}
|
|
}
|
|
mpC.decIdx(obj.getID(), MODEL.getCvsObjIdx());
|
|
mpC.decIdx(obj.getID(), MODEL.getCvsObjIdx());
|
|
@@ -101,6 +103,7 @@ public class CanvasController {
|
|
/**
|
|
/**
|
|
* Copy all Selected Objects
|
|
* Copy all Selected Objects
|
|
*/
|
|
*/
|
|
|
|
+ @SuppressWarnings("unchecked")
|
|
public void copyObjects() {
|
|
public void copyObjects() {
|
|
MODEL.setClipboradObjects((ArrayList<CpsObject>) MODEL.getSelectedCpsObjects().clone());
|
|
MODEL.setClipboradObjects((ArrayList<CpsObject>) MODEL.getSelectedCpsObjects().clone());
|
|
}
|
|
}
|
|
@@ -186,11 +189,14 @@ public class CanvasController {
|
|
/**
|
|
/**
|
|
* Cut all Selected Objects
|
|
* Cut all Selected Objects
|
|
*/
|
|
*/
|
|
|
|
+ @SuppressWarnings("unchecked")
|
|
public void cutObjects() {
|
|
public void cutObjects() {
|
|
MODEL.setClipboradObjects((ArrayList<CpsObject>) MODEL.getSelectedCpsObjects().clone());
|
|
MODEL.setClipboradObjects((ArrayList<CpsObject>) MODEL.getSelectedCpsObjects().clone());
|
|
- for (CpsObject cps : MODEL.getSelectedCpsObjects()) {
|
|
|
|
|
|
+
|
|
|
|
+ for (CpsObject cps : MODEL.getClipboradObjects()) {
|
|
deleteObjectOnCanvas(cps);
|
|
deleteObjectOnCanvas(cps);
|
|
}
|
|
}
|
|
|
|
+
|
|
MODEL.getSelectedCpsObjects().clear();
|
|
MODEL.getSelectedCpsObjects().clear();
|
|
}
|
|
}
|
|
}
|
|
}
|