|
@@ -86,7 +86,11 @@ public class ObjectController {
|
|
|
*/
|
|
|
public void addNewElementIntoCanvasObject(int id, String element, int amount, float energy) {
|
|
|
HolonElement ele = new HolonElement(element, amount, energy);
|
|
|
- addElementIntoCanvasObject((HolonObject) mpC.searchByID(id), ele);
|
|
|
+ if ((HolonObject) mpC.searchByID(id) == null) {
|
|
|
+ addElementIntoCanvasObject((HolonObject) model.getSelectedCpsObjects().get(0), ele);
|
|
|
+ } else {
|
|
|
+ addElementIntoCanvasObject((HolonObject) mpC.searchByID(id), ele);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -172,6 +176,9 @@ public class ObjectController {
|
|
|
*/
|
|
|
public void deleteElementInCanvas(int id, int eleid) {
|
|
|
HolonObject object = (HolonObject) mpC.searchByID(id);
|
|
|
+ if (object == null) {
|
|
|
+ object = (HolonObject) model.getSelectedCpsObjects().get(0);
|
|
|
+ }
|
|
|
HolonElement element = mpC.searchEleById(object, eleid);
|
|
|
// mpC.searchEle(object, ele);
|
|
|
deleteElement(object, element);
|