paste finished only position still not done

src/classes/AbstractCpsObject.java

@@ -72,7 +72,7 @@ public abstract class AbstractCpsObject {
 		setName(obj.getObjName());
 		setConnections(new ArrayList<CpsEdge>());
 		setPosition(new Position());
-		setID(IdCounter.nextId());
+		setId(IdCounter.nextId());
 		setImage(obj.getImage());
 	}
 
@@ -119,7 +119,7 @@ public abstract class AbstractCpsObject {
 	 * 
 	 * @return int
 	 */
-	public int getID() {
+	public int getId() {
 		return id;
 	}
 
@@ -129,7 +129,7 @@ public abstract class AbstractCpsObject {
 	 * @param id
 	 *            the iD to set
 	 */
-	public void setID(int id) {
+	public void setId(int id) {
 		this.id = id;
 	}
 

src/classes/CpsNode.java

@@ -22,6 +22,6 @@ public class CpsNode extends AbstractCpsObject {
 		this.setConnections(new ArrayList<CpsEdge>());
 		this.setImage("/Images/node.png");
 		this.setSav("CVS");
-		this.setID(IdCounter.nextId());
+		this.setId(IdCounter.nextId());
 	}
 }

src/classes/CpsUpperNode.java

@@ -15,7 +15,7 @@ public class CpsUpperNode extends AbstractCpsObject {
 		this.setConnections(new ArrayList<CpsEdge>());
 		this.setImage("/Images/upper_node.png");
 		this.setSav("CVS");
-		this.setID(IdCounter.nextId());
+		this.setId(IdCounter.nextId());
 		this.setNodes(new ArrayList<AbstractCpsObject>());
 		this.setNodeEdges(new ArrayList<CpsEdge>());
 		this.setOldEdges(new ArrayList<CpsEdge>());
@@ -116,7 +116,7 @@ public class CpsUpperNode extends AbstractCpsObject {
 	public AbstractCpsObject searchObj(int ID) {
 		AbstractCpsObject result = null;
 		for (AbstractCpsObject obj : getNodes()) {
-			if (obj.getID() == ID) {
+			if (obj.getId() == ID) {
 				result = obj;
 				break;
 			}

src/tests/PraktikumHolonsTestObjectController.java

@@ -111,17 +111,17 @@ public class PraktikumHolonsTestObjectController {
 		}
 		for (AbstractCpsObject cps : model.getObjectsOnCanvas()) {
 			for (int i = 0; i < 27; i++) {
-				controller.addNewElementIntoCanvasObject(cps.getID(), adapter.generate(i), 1, -100);
+				controller.addNewElementIntoCanvasObject(cps.getId(), adapter.generate(i), 1, -100);
 				assertTrue("Element:" + adapter.generate(i) + " was not Created",
-						mp.searchEle((HolonObject) mp.searchByID(cps.getID()), adapter.generate(i)) != null);
+						mp.searchEle((HolonObject) mp.searchByID(cps.getId()), adapter.generate(i)) != null);
 			}
-			assertTrue("Element:B was not Found", mp.searchEle((HolonObject) mp.searchByID(cps.getID()), "B") != null);
-			assertTrue("Element:D was not Found", mp.searchEle((HolonObject) mp.searchByID(cps.getID()), "D") != null);
-			assertTrue("Element:F was not Found", mp.searchEle((HolonObject) mp.searchByID(cps.getID()), "F") != null);
-			assertTrue("Element:G was not Found", mp.searchEle((HolonObject) mp.searchByID(cps.getID()), "G") != null);
-			assertTrue("Element:H was not Found", mp.searchEle((HolonObject) mp.searchByID(cps.getID()), "H") != null);
-			assertTrue("Element:I was not Found", mp.searchEle((HolonObject) mp.searchByID(cps.getID()), "I") != null);
-			assertTrue("Element:B was not Found", mp.searchEle((HolonObject) mp.searchByID(cps.getID()), "B") != null);
+			assertTrue("Element:B was not Found", mp.searchEle((HolonObject) mp.searchByID(cps.getId()), "B") != null);
+			assertTrue("Element:D was not Found", mp.searchEle((HolonObject) mp.searchByID(cps.getId()), "D") != null);
+			assertTrue("Element:F was not Found", mp.searchEle((HolonObject) mp.searchByID(cps.getId()), "F") != null);
+			assertTrue("Element:G was not Found", mp.searchEle((HolonObject) mp.searchByID(cps.getId()), "G") != null);
+			assertTrue("Element:H was not Found", mp.searchEle((HolonObject) mp.searchByID(cps.getId()), "H") != null);
+			assertTrue("Element:I was not Found", mp.searchEle((HolonObject) mp.searchByID(cps.getId()), "I") != null);
+			assertTrue("Element:B was not Found", mp.searchEle((HolonObject) mp.searchByID(cps.getId()), "B") != null);
 		}
 
 		for (AbstractCpsObject cps : model.getObjectsOnCanvas()) {

src/ui/controller/CanvasController.java

@@ -44,7 +44,7 @@ public class CanvasController {
 	 *            CpsObject to be added.
 	 */
 	public void addObject(AbstractCpsObject object) {
-		model.getCvsObjIdx().put(object.getID(), model.getObjectsOnCanvas().size());
+		model.getCvsObjIdx().put(object.getId(), model.getObjectsOnCanvas().size());
 		model.getObjectsOnCanvas().add(object);
 		notifyObjListeners();
 	}
@@ -99,8 +99,8 @@ public class CanvasController {
 			}
 			model.getEdgesOnCanvas().remove(e);
 		}
-		mpC.decIdx(obj.getID(), model.getCvsObjIdx());
-		model.getCvsObjIdx().remove(obj.getID());
+		mpC.decIdx(obj.getId(), model.getCvsObjIdx());
+		model.getCvsObjIdx().remove(obj.getId());
 		model.getObjectsOnCanvas().remove(obj);
 
 	}

src/ui/controller/ClipboardController.java

@@ -59,8 +59,10 @@ public class ClipboardController {
 	private Gson gson;
 	private JsonParser parser;
 	private Clipboard clipboard;
-	private HashMap<Integer, Integer> idMap;
+	private HashMap<Integer, Integer> objIDMap;
+	private HashMap<Integer, Integer> eleIDMap;
 	private String sav;
+	private Point point;
 
 	public ClipboardController(Model model, StoreController store, LoadController load, CanvasController cvs,
 			ObjectController obj, NodeController uppC, MultiPurposeController mp) {
@@ -88,7 +90,7 @@ public class ClipboardController {
 
 		store.initNumeration();
 
-		file.add("SAV", new JsonPrimitive((upperNode == null ? "CVS" : "" + upperNode.getID())));
+		file.add("SAV", new JsonPrimitive((upperNode == null ? "CVS" : "" + upperNode.getId())));
 
 		for (AbstractCpsObject abs : model.getSelectedCpsObjects()) {
 			queue.add(abs);
@@ -100,27 +102,27 @@ public class ClipboardController {
 
 			String key = "CVSOBJECT" + store.getNumerator(NUMTYPE.OBJECT);
 			file.add(key, gson.toJsonTree(u, AbstractCpsObject.class));
-			edgeToJson(EDGETYPE.CONNECTION, file, u.getID(), u.getConnections());
+			edgeToJson(EDGETYPE.CONNECTION, file, u.getId(), u.getConnections());
 
 			if (u instanceof HolonObject)
 				store.elementsToJson(TYPE.CANVAS, file, u);
 
 			if (u instanceof HolonSwitch)
 				if (((HolonSwitch) u).getGraphPoints().size() != 0)
-					store.unitgraphToJson(GRAPHTYPE.SWITCH, file, u.getID(), ((HolonSwitch) u).getGraphPoints());
+					store.unitgraphToJson(GRAPHTYPE.SWITCH, file, u.getId(), ((HolonSwitch) u).getGraphPoints());
 
 			if (u instanceof CpsUpperNode) {
 				for (AbstractCpsObject adjacent : ((CpsUpperNode) u).getNodes()) {
 					queue.add(adjacent);
 				}
-				edgeToJson(EDGETYPE.NODE, file, u.getID(), ((CpsUpperNode) u).getNodeEdges());
-				edgeToJson(EDGETYPE.OLD, file, u.getID(), ((CpsUpperNode) u).getOldEdges());
+				edgeToJson(EDGETYPE.NODE, file, u.getId(), ((CpsUpperNode) u).getNodeEdges());
+				edgeToJson(EDGETYPE.OLD, file, u.getId(), ((CpsUpperNode) u).getOldEdges());
 			}
 		}
 		if (upperNode == null)
 			edgeToJson(EDGETYPE.LAYER, file, 0, model.getEdgesOnCanvas());
 		else
-			edgeToJson(EDGETYPE.LAYER, file, upperNode.getID(), model.getEdgesOnCanvas());
+			edgeToJson(EDGETYPE.LAYER, file, upperNode.getId(), upperNode.getNodeEdges());
 
 		StringSelection selection = new StringSelection(gson.toJson(file));
 		clipboard.setContents(selection, selection);
@@ -131,10 +133,11 @@ public class ClipboardController {
 	 * 
 	 * @param upperNode
 	 */
-	public void paste(CpsUpperNode upperNode, Point point) {
+	public void paste(CpsUpperNode upperNode, Point p) {
 
 		JsonObject json = new JsonObject();
 		Transferable content = clipboard.getContents(null);
+		point = p;
 
 		if (content != null && content.isDataFlavorSupported(DataFlavor.stringFlavor)
 				&& !content.isDataFlavorSupported(DataFlavor.allHtmlFlavor))
@@ -156,20 +159,25 @@ public class ClipboardController {
 
 		HashMap<Integer, AbstractCpsObject> objDispatch = new HashMap<>();
 		HashMap<Integer, HolonElement> eleDispatch = new HashMap<>();
-		idMap = new HashMap<>();
+		objIDMap = new HashMap<>();
+		eleIDMap = new HashMap<>();
 		sav = json.get("SAV").getAsString();
 
-		objDist(keys, json, objDispatch, eleDispatch, upperNode);
-		edgeDist(edges, json, objDispatch, upperNode);
+		forwardObjects(keys, json, objDispatch, eleDispatch, upperNode);
+		forwardEdges(edges, json, objDispatch, upperNode);
 
 	}
 
-	private void edgeDist(List<String> edges, JsonObject json, HashMap<Integer, AbstractCpsObject> objDispatch,
+	public void cut(CpsUpperNode upperNode) {
+		copy(upperNode);
+	}
+
+	private void forwardEdges(List<String> keys, JsonObject json, HashMap<Integer, AbstractCpsObject> objDispatch,
 			CpsUpperNode upperNode) {
 		// TODO Auto-generated method stub
 		List<String> conn = new ArrayList<>();
 
-		for (String edge : edges) {
+		for (String edge : keys) {
 			if (edge.contains("LAYEREDGE"))
 				loadEdge(EDGETYPE.LAYER, json.get(edge), objDispatch, upperNode);
 			if (edge.contains("CONNEDGE"))
@@ -186,7 +194,7 @@ public class ClipboardController {
 
 	}
 
-	private void objDist(List<String> keys, JsonObject json, HashMap<Integer, AbstractCpsObject> objDispatch,
+	private void forwardObjects(List<String> keys, JsonObject json, HashMap<Integer, AbstractCpsObject> objDispatch,
 			HashMap<Integer, HolonElement> eleDispatch, CpsUpperNode upperNode) {
 		// TODO Auto-generated method stub
 
@@ -207,13 +215,15 @@ public class ClipboardController {
 		// TODO Auto-generated method stub
 		AbstractCpsObject temp = gson.fromJson(jsonElement.getAsJsonObject(), AbstractCpsObject.class);
 		load.initObjects(temp);
-		idMapper(temp);
-		if (temp.getSav().equals(sav))
-			updateSav(temp, upperNode);
+		objIDMapper(temp);
+		updatePosition(temp);
 
 		// if its stored before on the canvas just put it there
-		if (temp.getSav().equals("CVS")) {
-			cvsC.addObject(temp);
+		if (temp.getSav().equals(sav)) {
+			if (upperNode == null)
+				cvsC.addObject(temp);
+			else
+				uppC.addObjectInUpperNode(temp, upperNode);
 
 		} else {
 			// else look up the table and put it into the right Uppernode
@@ -221,55 +231,7 @@ public class ClipboardController {
 			uppC.addObjectInUpperNode(temp, temp2);
 		}
 
-		objDispatch.put(temp.getID(), temp);
-	}
-
-	private void loadEdge(EDGETYPE type, JsonElement jsonElement, HashMap<Integer, AbstractCpsObject> objDispatch,
-			CpsUpperNode upperNode) {
-		// TODO Auto-generated method stub
-		JsonObject object = jsonElement.getAsJsonObject();
-		CpsEdge temp = gson.fromJson(object.get("properties"), CpsEdge.class);
-		load.initCpsEdge(temp);
-		// look for A and B inside the Table
-		temp.setA(objDispatch.get(idMap.get(object.get("A").getAsInt())));
-		temp.setB(objDispatch.get(idMap.get(object.get("B").getAsInt())));
-
-		int sav = 0;
-
-		switch (type) {
-		case LAYER:
-			// if in canvas add it into the canvas but delete connection before
-			if (upperNode == null)
-				model.getEdgesOnCanvas().add(temp);
-			else
-				upperNode.getNodeEdges().add(temp);
-			break;
-		case CONNECTION:
-			// if no duplicates in connection store them into the given A and B
-			if (!uppC.lookforDuplicates(temp.getA(), temp.getB(), temp.getA().getConnections()))
-				temp.getA().getConnections().add(temp);
-			if (!uppC.lookforDuplicates(temp.getA(), temp.getB(), temp.getB().getConnections()))
-				temp.getB().getConnections().add(temp);
-			break;
-		case NODE:
-			// put it into given nodeofnode
-			sav = idMap.get(object.get("ID").getAsInt());
-			((CpsUpperNode) objDispatch.get(sav)).getNodeEdges().add(temp);
-			break;
-		case OLD:
-			// same as above
-			sav = idMap.get(object.get("ID").getAsInt());
-			((CpsUpperNode) objDispatch.get(sav)).getOldEdges().add(temp);
-			break;
-		default:
-			break;
-		}
-
-		if (object.get("connection").getAsBoolean() && !type.equals(EDGETYPE.CONNECTION)) {
-			temp.getA().getConnections().add(temp);
-			temp.getB().getConnections().add(temp);
-		}
-
+		objDispatch.put(temp.getId(), temp);
 	}
 
 	private void loadCanvasElements(JsonElement jsonElement, HashMap<Integer, AbstractCpsObject> objDispatch,
@@ -279,9 +241,9 @@ public class ClipboardController {
 
 		HolonElement temp = gson.fromJson(object.get("properties"), HolonElement.class);
 		load.initElements(temp);
-		temp.setId(IdCounterElem.nextId());
+		eleIDMapper(temp);
 		// id which Object it was stored before
-		int stored = idMap.get(object.get("ID").getAsInt());
+		int stored = objIDMap.get(object.get("ID").getAsInt());
 		// lookup that object
 		HolonObject temp2 = (HolonObject) objDispatch.get(stored);
 		// add it
@@ -311,16 +273,18 @@ public class ClipboardController {
 				graphpoint.add(new Point(x, y));
 			} else
 				// else its an ID
-				sav = idMap.get(object.get(k).getAsInt());
+				sav = object.get(k).getAsInt();
 
 		}
 
 		switch (type) {
 		case SWITCH:
+			sav = objIDMap.get(sav);
 			HolonSwitch sw = (HolonSwitch) objDispatch.get(sav);
 			sw.setGraphPoints(graphpoint);
 			break;
 		case ELEMENT:
+			sav = eleIDMap.get(sav);
 			HolonElement ele = eleDispatch.get(sav);
 			ele.setGraphPoints(graphpoint);
 			break;
@@ -330,6 +294,51 @@ public class ClipboardController {
 
 	}
 
+	private void loadEdge(EDGETYPE type, JsonElement jsonElement, HashMap<Integer, AbstractCpsObject> objDispatch,
+			CpsUpperNode upperNode) {
+		// TODO Auto-generated method stub
+		JsonObject object = jsonElement.getAsJsonObject();
+		CpsEdge temp = gson.fromJson(object.get("properties"), CpsEdge.class);
+		load.initCpsEdge(temp);
+		// look for A and B inside the Table
+		temp.setA(objDispatch.get(objIDMap.get(object.get("A").getAsInt())));
+		temp.setB(objDispatch.get(objIDMap.get(object.get("B").getAsInt())));
+
+		int sav = 0;
+
+		switch (type) {
+		case LAYER:
+			// if in canvas add it into the canvas but delete connection before
+			(upperNode == null ? model.getEdgesOnCanvas() : upperNode.getNodeEdges()).add(temp);
+			break;
+		case CONNECTION:
+			// if no duplicates in connection store them into the given A and B
+			if (!uppC.lookforDuplicates(temp.getA(), temp.getB(), temp.getA().getConnections()))
+				temp.getA().getConnections().add(temp);
+			if (!uppC.lookforDuplicates(temp.getA(), temp.getB(), temp.getB().getConnections()))
+				temp.getB().getConnections().add(temp);
+			break;
+		case NODE:
+			// put it into given nodeofnode
+			sav = objIDMap.get(object.get("ID").getAsInt());
+			((CpsUpperNode) objDispatch.get(sav)).getNodeEdges().add(temp);
+			break;
+		case OLD:
+			// same as above
+			sav = objIDMap.get(object.get("ID").getAsInt());
+			((CpsUpperNode) objDispatch.get(sav)).getOldEdges().add(temp);
+			break;
+		default:
+			break;
+		}
+
+		if (object.get("connection").getAsBoolean() && !type.equals(EDGETYPE.CONNECTION)) {
+			temp.getA().getConnections().add(temp);
+			temp.getB().getConnections().add(temp);
+		}
+
+	}
+
 	/**
 	 * 
 	 * @param type
@@ -348,8 +357,8 @@ public class ClipboardController {
 					&& model.getClipboradObjects().contains(edge.getB())) {
 				// add properties and only the ids from a and b
 				temp.add("properties", gson.toJsonTree(edge));
-				temp.add("A", new JsonPrimitive(edge.getA().getID()));
-				temp.add("B", new JsonPrimitive(edge.getB().getID()));
+				temp.add("A", new JsonPrimitive(edge.getA().getId()));
+				temp.add("B", new JsonPrimitive(edge.getB().getId()));
 
 				// Key and occasionally the id of Uppernode
 				switch (type) {
@@ -423,17 +432,24 @@ public class ClipboardController {
 
 	}
 
-	private void idMapper(AbstractCpsObject temp) {
+	private void objIDMapper(AbstractCpsObject temp) {
 		// TODO Auto-generated method stub
-		int id = temp.getID();
-		temp.setID(IdCounter.nextId());
-		idMap.put(id, temp.getID());
+		int id = temp.getId();
+		temp.setId(IdCounter.nextId());
+		objIDMap.put(id, temp.getId());
+	}
+
+	private void eleIDMapper(HolonElement temp) {
+		// TODO Auto-generated method stub
+		int id = temp.getId();
+		temp.setId(IdCounterElem.nextId());
+		eleIDMap.put(id, temp.getId());
+
 	}
 
-	private void updateSav(AbstractCpsObject temp, CpsUpperNode upperNode) {
+	private void updatePosition(AbstractCpsObject temp) {
 		// TODO Auto-generated method stub
-		String newSav = (upperNode == null ? "CVS" : "" + upperNode.getID());
-		temp.setSav(newSav);
+		temp.setPosition(new Position(temp.getPosition().x + point.x, temp.getPosition().y + point.y));
 	}
 
 }

src/ui/controller/Control.java

@@ -868,6 +868,10 @@ public class Control {
 	public void copy(CpsUpperNode upperNode) {
 		clipboardController.copy(upperNode);
 	}
+	
+	public void paste(CpsUpperNode upperNode, Point point) {
+		clipboardController.paste(upperNode, point);
+	}
 
 	public void getObjectsInDepth() {
 		clipboardController.getObjectsInDepth();

src/ui/controller/LoadController.java

@@ -105,8 +105,8 @@ public class LoadController {
 		HashMap<Integer, HolonElement> eleDispatch = new HashMap<>();
 
 		initialize(keys, json);
-		distribute(keys, json, objDispatch, eleDispatch);
-		distEdges(edges, json, objDispatch);
+		forwardObjects(keys, json, objDispatch, eleDispatch);
+		forwardEdges(edges, json, objDispatch);
 
 	}
 
@@ -117,7 +117,7 @@ public class LoadController {
 	 * @param json
 	 * @param objDispatch
 	 */
-	private void distEdges(List<String> edges, JsonObject json, HashMap<Integer, AbstractCpsObject> objDispatch) {
+	private void forwardEdges(List<String> edges, JsonObject json, HashMap<Integer, AbstractCpsObject> objDispatch) {
 		// TODO Auto-generated method stub
 
 		List<String> conn = new ArrayList<>();
@@ -147,7 +147,7 @@ public class LoadController {
 	 * @param objDispatch
 	 * @param eleDispatch
 	 */
-	private void distribute(List<String> keys, JsonObject json, HashMap<Integer, AbstractCpsObject> objDispatch,
+	private void forwardObjects(List<String> keys, JsonObject json, HashMap<Integer, AbstractCpsObject> objDispatch,
 			HashMap<Integer, HolonElement> eleDispatch) {
 		// TODO Auto-generated method stub
 		for (String key : keys) {
@@ -256,7 +256,7 @@ public class LoadController {
 			uppC.addObjectInUpperNode(temp, temp2);
 		}
 
-		objDispatch.put(temp.getID(), temp);
+		objDispatch.put(temp.getId(), temp);
 
 	}
 

src/ui/controller/NodeController.java

@@ -129,7 +129,7 @@ public class NodeController {
 			if(upperNode == null)
 				obj.setSav("CVS");
 			else
-				obj.setSav(""+upperNode.getID());
+				obj.setSav(""+upperNode.getId());
 		}
 
 		(upperNode == null ? model.getObjectsOnCanvas() : upperNode.getNodes()).addAll(node.getNodes());
@@ -443,8 +443,8 @@ public class NodeController {
 	 */
 	private void removeForNodeOfNode(AbstractCpsObject obj, CpsUpperNode upperNode) {
 
-		mpC.decIdx(obj.getID(), (upperNode == null ? model.getCvsObjIdx() : upperNode.getNodesIdx()));
-		(upperNode == null ? model.getCvsObjIdx() : upperNode.getNodesIdx()).remove(obj.getID());
+		mpC.decIdx(obj.getId(), (upperNode == null ? model.getCvsObjIdx() : upperNode.getNodesIdx()));
+		(upperNode == null ? model.getCvsObjIdx() : upperNode.getNodesIdx()).remove(obj.getId());
 		(upperNode == null ? model.getObjectsOnCanvas() : upperNode.getNodes()).remove(obj);
 	}
 
@@ -483,8 +483,8 @@ public class NodeController {
 	 * @param upperNode
 	 */
 	public void addObjectInUpperNode(AbstractCpsObject object, CpsUpperNode upperNode) {
-		object.setSav("" + upperNode.getID());
-		upperNode.getNodesIdx().put(object.getID(), upperNode.getNodes().size());
+		object.setSav("" + upperNode.getId());
+		upperNode.getNodesIdx().put(object.getId(), upperNode.getNodes().size());
 		upperNode.getNodes().add(object);
 	}
 
@@ -508,8 +508,8 @@ public class NodeController {
 			upperNode.getNodeEdges().remove(e);
 		}
 		
-		mpC.decIdx(object.getID(), upperNode.getNodesIdx());
-		upperNode.getNodesIdx().remove(object.getID());
+		mpC.decIdx(object.getId(), upperNode.getNodesIdx());
+		upperNode.getNodesIdx().remove(object.getId());
 		upperNode.getNodes().remove(object);
 	}
 
@@ -559,7 +559,7 @@ public class NodeController {
 	private void refreshSave(ArrayList<AbstractCpsObject> list, CpsUpperNode upperNode) {
 
 		for (AbstractCpsObject abs : list) {
-			abs.setSav("" + upperNode.getID());
+			abs.setSav("" + upperNode.getId());
 		}
 	}
 

src/ui/controller/ObjectController.java

@@ -69,7 +69,7 @@ public class ObjectController {
 	 */
 	public void addElementIntoCanvasObject(HolonObject object, HolonElement element) {
 		element.setSav("CVS");
-		element.setObj(Integer.toString(object.getID()));
+		element.setObj(Integer.toString(object.getId()));
 		addElement(object, element);
 	}
 

src/ui/controller/SimulationManager.java

@@ -139,21 +139,21 @@ public class SimulationManager {
 		for (HolonObject hl : sN.getObjects()) {
 			float energy = hl.getCurrentEnergyAtTimeStep(timeStep);
 			if (energy > 0) {
-				tagTable.put(hl.getID(), energy);
-				hl.addTag(hl.getID());
+				tagTable.put(hl.getId(), energy);
+				hl.addTag(hl.getId());
 				for (CpsEdge edge : hl.getConnections()) {
 					if (edge.getState()) {
-						if (edge.getA().getID() == hl.getID()) {
-							edge.getB().addTag(hl.getID());
+						if (edge.getA().getId() == hl.getId()) {
+							edge.getB().addTag(hl.getId());
 							tmp = edge.getB();
 						}
-						if (edge.getB().getID() == hl.getID()) {
-							edge.getA().addTag(hl.getID());
+						if (edge.getB().getId() == hl.getId()) {
+							edge.getA().addTag(hl.getId());
 							tmp = edge.getA();
 						}
 						edge.setFlow(edge.getFlow() + energy);
 						edge.calculateState(true);
-						edge.addTag(hl.getID());
+						edge.addTag(hl.getId());
 						if (edge.getState() && !producers.contains(tmp)) {
 							if(tmp instanceof HolonSwitch){
 								if(((HolonSwitch)tmp).getState(timeStep)){
@@ -187,7 +187,7 @@ public class SimulationManager {
 				if(legitState(cps)){
 					for(CpsEdge edge: cps.getConnections()){
 						if(edge.getState() && (!(edge.containsTags(edge.getTags(), cps.getTag())))){
-							if(edge.getA().getID() == cps.getID()){
+							if(edge.getA().getId() == cps.getId()){
 								tmp = edge.getB();
 							}else{
 								tmp = edge.getA();
@@ -250,7 +250,7 @@ public class SimulationManager {
 	public void printNodes(ArrayList<AbstractCpsObject> nodes) {
 		System.out.println("new Nodes:");
 		for (AbstractCpsObject node : nodes) {
-			System.out.println(node.getID());
+			System.out.println(node.getId());
 		}
 	}
 
@@ -305,7 +305,7 @@ public class SimulationManager {
 	 */
 	public void resetConnections(AbstractCpsObject cps, ArrayList<Integer> visitedObj,
 			ArrayList<CpsEdge> visitedEdges) {
-		visitedObj.add(cps.getID());
+		visitedObj.add(cps.getId());
 		cps.resetTags();
 		for (CpsEdge e : cps.getConnections()) {
 			if (!(visitedEdges.contains(e))) {
@@ -313,11 +313,11 @@ public class SimulationManager {
 				e.calculateState(simMode);
 				e.setTags(new ArrayList<Integer>());
 				visitedEdges.add(e);
-				if (!(visitedObj.contains(e.getA().getID()))) {
+				if (!(visitedObj.contains(e.getA().getId()))) {
 					resetConnections(e.getA(), visitedObj, visitedEdges);
 					e.getA().resetTags();
 				}
-				if (!(visitedObj.contains(e.getB().getID()))) {
+				if (!(visitedObj.contains(e.getB().getId()))) {
 					resetConnections(e.getB(), visitedObj, visitedEdges);
 					e.getB().resetTags();
 				}
@@ -422,14 +422,14 @@ public class SimulationManager {
 	 * @return Subnet
 	 */
 	public SubNet buildSubNet(AbstractCpsObject cps, ArrayList<Integer> visited, SubNet sN) {
-		visited.add(cps.getID());
+		visited.add(cps.getId());
 		if (cps instanceof HolonObject) {
 			sN.getObjects().add((HolonObject) cps);
 		}
 		if (cps instanceof HolonSwitch) {
 			sN.getSwitches().add((HolonSwitch) cps);
 		}
-		removeFromToHandle(cps.getID());
+		removeFromToHandle(cps.getId());
 		AbstractCpsObject a;
 		AbstractCpsObject b;
 		for (CpsEdge edge : cps.getConnections()) {
@@ -446,17 +446,17 @@ public class SimulationManager {
 						sN.getEdges().add(edge);
 					}
 				}
-				if (!visited.contains(a.getID()) && legitState(cps) && !(a instanceof CpsUpperNode)) {
+				if (!visited.contains(a.getId()) && legitState(cps) && !(a instanceof CpsUpperNode)) {
 					sN = buildSubNet(a, visited, sN);
 				}
-				if (!visited.contains(b.getID()) && legitState(cps) && !(b instanceof CpsUpperNode)) {
+				if (!visited.contains(b.getId()) && legitState(cps) && !(b instanceof CpsUpperNode)) {
 					sN = buildSubNet(b, visited, sN);
 				}
-				if(a instanceof CpsUpperNode && a.getID() != cps.getID()){
+				if(a instanceof CpsUpperNode && a.getId() != cps.getId()){
 					edge.setConnected(2);
 					checkForConnectedStates(b, (CpsUpperNode)a, edge);
 				}
-				if(b instanceof CpsUpperNode && b.getID() != cps.getID()){
+				if(b instanceof CpsUpperNode && b.getId() != cps.getId()){
 					edge.setConnected(2);
 					checkForConnectedStates(a, (CpsUpperNode)b, edge);
 				}
@@ -490,7 +490,7 @@ public class SimulationManager {
 	 */
 	public void removeFromToHandle(int id) {
 		for (int i = 0; i < objectsToHandle.size(); i++) {
-			if (objectsToHandle.get(i).getID() == id) {
+			if (objectsToHandle.get(i).getId() == id) {
 				objectsToHandle.remove(i);
 			}
 		}
@@ -531,7 +531,7 @@ public class SimulationManager {
 			System.out.println("  Objects:");
 			for (int j = 0; j < subNets.get(i).getObjects().size(); j++) {
 				HolonObject hl = subNets.get(i).getObjects().get(j);
-				System.out.println("    " + hl.getName() + " " + hl.getID());
+				System.out.println("    " + hl.getName() + " " + hl.getId());
 			}
 			System.out.println("  Edges:");
 			for (int j = 0; j < subNets.get(i).getEdges().size(); j++) {
@@ -541,7 +541,7 @@ public class SimulationManager {
 			System.out.println("  Switches:");
 			for (int j = 0; j < subNets.get(i).getSwitches().size(); j++) {
 				HolonSwitch sw = subNets.get(i).getSwitches().get(j);
-				System.out.println("    " + sw.getName() + " " + sw.getID() + " State:" + sw.getActiveAt()[timeStep]);
+				System.out.println("    " + sw.getName() + " " + sw.getId() + " State:" + sw.getActiveAt()[timeStep]);
 			}
 		}
 	}
@@ -582,7 +582,7 @@ public class SimulationManager {
 	public void checkForConnectedStates(AbstractCpsObject cps, CpsUpperNode cUNode, CpsEdge theEdge){
 		AbstractCpsObject tmp;
 		for(CpsEdge edge: cps.getConnections()){
-			if(edge.getA().getID() == cps.getID()){
+			if(edge.getA().getId() == cps.getId()){
 				tmp = edge.getB();
 			} else{
 				tmp = edge.getA();

src/ui/controller/StoreController.java

@@ -188,22 +188,22 @@ public class StoreController {
 			String key = "CVSOBJECT" + getNumerator(NUMTYPE.OBJECT);
 			file.add(key, gson.toJsonTree(u, AbstractCpsObject.class));
 			// and its connections too
-			edgeToJson(EDGETYPE.CONNECTION, file, u.getID(), u.getConnections());
+			edgeToJson(EDGETYPE.CONNECTION, file, u.getId(), u.getConnections());
 			// if holonobject elements too
 			if (u instanceof HolonObject)
 				elementsToJson(TYPE.CANVAS, file, u);
 			// if switch graphpoints too
 			if (u instanceof HolonSwitch)
 				if (((HolonSwitch) u).getGraphPoints().size() != 0)
-					unitgraphToJson(GRAPHTYPE.SWITCH, file, u.getID(), ((HolonSwitch) u).getGraphPoints());
+					unitgraphToJson(GRAPHTYPE.SWITCH, file, u.getId(), ((HolonSwitch) u).getGraphPoints());
 			// if uppernode put all nodes inside the uppernode into queue
 			if (u instanceof CpsUpperNode) {
 				for (AbstractCpsObject adjacent : ((CpsUpperNode) u).getNodes()) {
 					queue.add(adjacent);
 				}
 				// dont forget to add the nodeedges and oldedges
-				edgeToJson(EDGETYPE.NODE, file, u.getID(), ((CpsUpperNode) u).getNodeEdges());
-				edgeToJson(EDGETYPE.OLD, file, u.getID(), ((CpsUpperNode) u).getOldEdges());
+				edgeToJson(EDGETYPE.NODE, file, u.getId(), ((CpsUpperNode) u).getNodeEdges());
+				edgeToJson(EDGETYPE.OLD, file, u.getId(), ((CpsUpperNode) u).getOldEdges());
 			}
 		}
 		// lastly add canvasedges into json
@@ -226,7 +226,7 @@ public class StoreController {
 		// forall elements store them into json and include the id of the object
 		for (HolonElement ele : ((HolonObject) obj).getElements()) {
 			temp.add("properties", gson.toJsonTree(ele));
-			temp.add("ID", new JsonPrimitive(obj.getID()));
+			temp.add("ID", new JsonPrimitive(obj.getId()));
 			// switch for deciding the key
 			switch (type) {
 			case CANVAS:
@@ -294,8 +294,8 @@ public class StoreController {
 		for (CpsEdge edge : arr) {
 			// add properties and only the ids from a and b
 			temp.add("properties", gson.toJsonTree(edge));
-			temp.add("A", new JsonPrimitive(edge.getA().getID()));
-			temp.add("B", new JsonPrimitive(edge.getB().getID()));
+			temp.add("A", new JsonPrimitive(edge.getA().getId()));
+			temp.add("B", new JsonPrimitive(edge.getB().getId()));
 
 			// Key and occasionally the id of Uppernode
 			switch (type) {

src/ui/controller/UpdateController.java

@@ -63,7 +63,7 @@ public class UpdateController {
 			for (AbstractCpsObject o : objects) {
 				if (o instanceof HolonObject) {
 					for (HolonElement he : ((HolonObject) o).getElements()) {
-						Object[] temp = { o.getName() + ", " + o.getID(), he.getId(), he.getEleName(), he.getEnergy(),
+						Object[] temp = { o.getName() + ", " + o.getId(), he.getId(), he.getEleName(), he.getEnergy(),
 								he.getAmount(), he.getActive() };
 						table.addRow(temp);
 					}
@@ -233,7 +233,7 @@ public class UpdateController {
 			Object[] tempName = { Languages.getLanguage()[72], obj.getName() };
 			model.getPropertyTable().addRow(tempName);
 			// Id of the CpsObject
-			Object[] tempId = { "ID", obj.getID() };
+			Object[] tempId = { "ID", obj.getId() };
 			model.getPropertyTable().addRow(tempId);
 			// For HolonObjects the Total Energy (production or
 			// consumption) is calculated
@@ -288,23 +288,23 @@ public class UpdateController {
 				for (CpsEdge temp2 : tempArray) {
 					if (first) {
 						first = false;
-						if (obj.getID() != temp2.getA().getID()) {
+						if (obj.getId() != temp2.getA().getId()) {
 							Object[] tempConnection = { obj.getName() + Languages.getLanguage()[76],
-									temp2.getA().getName() + Languages.getLanguage()[77] + temp2.getA().getID() };
+									temp2.getA().getName() + Languages.getLanguage()[77] + temp2.getA().getId() };
 							model.getPropertyTable().addRow(tempConnection);
 						} else {
 							Object[] tempConnection = { obj.getName() + Languages.getLanguage()[76],
-									temp2.getB().getName() + Languages.getLanguage()[77] + temp2.getB().getID() };
+									temp2.getB().getName() + Languages.getLanguage()[77] + temp2.getB().getId() };
 							model.getPropertyTable().addRow(tempConnection);
 						}
 					} else {
-						if (obj.getID() != temp2.getA().getID()) {
+						if (obj.getId() != temp2.getA().getId()) {
 							Object[] tempConnection = { "",
-									temp2.getA().getName() + Languages.getLanguage()[77] + temp2.getA().getID() };
+									temp2.getA().getName() + Languages.getLanguage()[77] + temp2.getA().getId() };
 							model.getPropertyTable().addRow(tempConnection);
 						} else {
 							Object[] tempConnection = { "",
-									temp2.getB().getName() + Languages.getLanguage()[77] + temp2.getB().getID() };
+									temp2.getB().getName() + Languages.getLanguage()[77] + temp2.getB().getId() };
 							model.getPropertyTable().addRow(tempConnection);
 						}
 					}
@@ -346,7 +346,7 @@ public class UpdateController {
 	public AbstractCpsObject getHolonObjSelected(int id) {
 		AbstractCpsObject obj = null;
 		for (AbstractCpsObject o : model.getSelectedCpsObjects()) {
-			if (o.getID() == id) {
+			if (o.getId() == id) {
 				obj = o;
 			}
 		}

src/ui/view/GUI.java

@@ -443,7 +443,7 @@ public class GUI<E> implements CategoryListener {
 							if (cps instanceof CpsUpperNode) {
 								for (int i = 3; i < tabbedPane.getTabCount(); i++) {
 									if (((UpperNodeCanvas) ((JScrollPane) tabbedPane.getComponentAt(i)).getViewport()
-											.getComponent(0)).upperNode.getID() == cps.getID()) {
+											.getComponent(0)).upperNode.getId() == cps.getId()) {
 										tabbedPane.remove(i);
 										i = tabbedPane.getTabCount();
 									}
@@ -466,7 +466,7 @@ public class GUI<E> implements CategoryListener {
 						if (cps instanceof CpsUpperNode) {
 							for (int i = 3; i < tabbedPane.getTabCount(); i++) {
 								if (((UpperNodeCanvas) ((JScrollPane) tabbedPane.getComponentAt(i)).getViewport()
-										.getComponent(0)).upperNode.getID() == cps.getID()) {
+										.getComponent(0)).upperNode.getId() == cps.getId()) {
 									tabbedPane.remove(i);
 									i = tabbedPane.getTabCount();
 								}
@@ -505,8 +505,8 @@ public class GUI<E> implements CategoryListener {
 				if (!model.getSelectedCpsObjects().isEmpty()) {
 					if (((JScrollPane) tabbedPane.getSelectedComponent()).getViewport()
 							.getComponent(0) instanceof UpperNodeCanvas)
-						controller.copy(((UpperNodeCanvas)((JScrollPane) tabbedPane.getSelectedComponent()).getViewport()
-								.getComponent(0)).upperNode);
+						controller.copy(((UpperNodeCanvas) ((JScrollPane) tabbedPane.getSelectedComponent())
+								.getViewport().getComponent(0)).upperNode);
 					else
 						controller.copy(null);
 					if (!model.getClipboradObjects().isEmpty()) {
@@ -524,7 +524,13 @@ public class GUI<E> implements CategoryListener {
 
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				controller.pasteObjects(canvas.getMousePosition());
+				if (((JScrollPane) tabbedPane.getSelectedComponent()).getViewport()
+						.getComponent(0) instanceof UpperNodeCanvas)
+					controller.paste(((UpperNodeCanvas) ((JScrollPane) tabbedPane.getSelectedComponent()).getViewport()
+							.getComponent(0)).upperNode, ((UpperNodeCanvas) ((JScrollPane) tabbedPane.getSelectedComponent()).getViewport()
+									.getComponent(0)).getMousePosition());
+				else
+					controller.paste(null, canvas.getMousePosition());
 				canvas.repaint();
 			}
 		});
@@ -765,13 +771,13 @@ public class GUI<E> implements CategoryListener {
 					AbstractCpsObject tempCpsObject = updCon.getActualCps();
 					System.out.println(tempCpsObject.getName());
 					if (tempCpsObject != null && tempCpsObject.getClass() == HolonObject.class
-							&& tempCpsObject.getID() != 0) {
+							&& tempCpsObject.getId() != 0) {
 						addElementPopUp = new AddElementPopUp();
 						addElementPopUp.setActualCps(updCon.getActualCps());
 						addElementPopUp.setVisible(true);
 						HolonElement ele = addElementPopUp.getElement();
 						if (ele != null) {
-							controller.addElementCanvasObject(tempCpsObject.getID(), ele.getEleName(), ele.getAmount(),
+							controller.addElementCanvasObject(tempCpsObject.getId(), ele.getEleName(), ele.getAmount(),
 									ele.getEnergy());
 						}
 						updCon.refreshTableHolonElement(model.getMultiTable(), model.getSingleTable());
@@ -793,7 +799,7 @@ public class GUI<E> implements CategoryListener {
 					if (updCon.getActualCps().getClass() == HolonObject.class) {
 						HolonObject obj = (HolonObject) updCon.getActualCps();
 						for (HolonElement e : selectedElements) {
-							controller.deleteElementCanvas(obj.getID(), e.getId());
+							controller.deleteElementCanvas(obj.getId(), e.getId());
 							updCon.refreshTableHolonElement(model.getMultiTable(), model.getSingleTable());
 							updCon.refreshTableProperties(model.getPropertyTable());
 							controller.calculateStateForTimeStep(model.getCurIteration());
@@ -1028,7 +1034,7 @@ public class GUI<E> implements CategoryListener {
 							for (int index = 3; index < tabbedPane.getTabCount(); index++) {
 								UpperNodeCanvas unc = ((UpperNodeCanvas) ((JScrollPane) tabbedPane.getComponent(index))
 										.getViewport().getComponent(0));
-								if (unc.upperNode.getID() == updCon.getActualCps().getID()) {
+								if (unc.upperNode.getId() == updCon.getActualCps().getId()) {
 									tabbedPane.setTitleAt(index, unc.upperNode.getName());
 									tabbedPane.updateUI();
 								}
@@ -1335,7 +1341,7 @@ public class GUI<E> implements CategoryListener {
 			public void mouseReleased(MouseEvent e) {
 				holonEleNamesDisplayed = Languages.getLanguage()[25];
 				// If any empty space is clicked
-				if (temp == null || temp.getID() != model.getSelectedObjectID()) {
+				if (temp == null || temp.getId() != model.getSelectedObjectID()) {
 					unitGraph.empty();
 					elementGraph.setText(Languages.getLanguage()[25]);
 				}
@@ -1963,7 +1969,7 @@ public class GUI<E> implements CategoryListener {
 		boolean dupl = false;
 		for (int i = 3; i < tabbedPane.getTabCount() && dupl == false; i++) {
 			if (((UpperNodeCanvas) ((JScrollPane) tabbedPane.getComponentAt(i)).getViewport().getComponent(0)).upperNode
-					.getID() == temp.getID()) {
+					.getId() == temp.getId()) {
 				dupl = true;
 				tabbedPane.setSelectedComponent(tabbedPane.getComponentAt(i));
 			}

src/ui/view/MyCanvas.java

@@ -218,7 +218,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 				JTabbedPane tabbedPane = (JTabbedPane) getParent().getParent().getParent();
 				for (int i = 3; i < tabbedPane.getTabCount(); i++) {
 					if (((UpperNodeCanvas) ((JScrollPane) tabbedPane.getComponentAt(i)).getViewport()
-							.getComponent(0)).upperNode.getID() == ((CpsUpperNode) tempCps).getID()) {
+							.getComponent(0)).upperNode.getId() == ((CpsUpperNode) tempCps).getId()) {
 						tabbedPane.remove(i);
 						break;
 					}
@@ -295,7 +295,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 					controller.addTextToConsole("Tracking: ", Color.BLACK, 12, false, false, false);
 					controller.addTextToConsole("" + o.getName(), Color.BLUE, 12, true, false, false);
 					controller.addTextToConsole(", ID:", Color.BLACK, 12, false, false, false);
-					controller.addTextToConsole("" + o.getID(), Color.RED, 12, true, false, true);
+					controller.addTextToConsole("" + o.getId(), Color.RED, 12, true, false, true);
 				}
 			}
 		});
@@ -310,7 +310,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 						if (controller.getTrackingObj() != null) {
 							for (AbstractCpsObject obj : controller.getTrackingObj()) {
 								if (obj instanceof HolonObject) {
-									if (obj.getID() == o.getID()) {
+									if (obj.getId() == o.getId()) {
 										found = true;
 									}
 								}
@@ -326,7 +326,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 						controller.addTextToConsole("Untracking: ", Color.BLACK, 12, false, false, false);
 						controller.addTextToConsole("" + o.getName(), Color.BLUE, 12, true, false, false);
 						controller.addTextToConsole(", ID:", Color.BLACK, 12, false, false, false);
-						controller.addTextToConsole("" + o.getID(), Color.RED, 12, true, false, true);
+						controller.addTextToConsole("" + o.getId(), Color.RED, 12, true, false, true);
 					}
 				}
 			}
@@ -349,7 +349,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 						JTabbedPane tabbedPane = (JTabbedPane) getParent().getParent().getParent();
 						for (int i = 3; i < tabbedPane.getTabCount(); i++) {
 							if (((UpperNodeCanvas) ((JScrollPane) tabbedPane.getComponentAt(i)).getViewport()
-									.getComponent(0)).upperNode.getID() == cps.getID()) {
+									.getComponent(0)).upperNode.getId() == cps.getId()) {
 								tabbedPane.remove(i);
 								i = tabbedPane.getTabCount();
 							}
@@ -435,7 +435,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 		}
 
 		for (CpsEdge con : model.getEdgesOnCanvas()) {
-			if (con.getA().getID() != model.getSelectedObjectID() && con.getB().getID() != model.getSelectedObjectID()
+			if (con.getA().getId() != model.getSelectedObjectID() && con.getB().getId() != model.getSelectedObjectID()
 					&& con != edgeHighlight) {
 				if (con.getConnected() == 0) {
 					if (con.getState()) {
@@ -490,9 +490,9 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 				} else {
 					g2.setStroke(new BasicStroke(2));
 				}
-				if (con.getA().getID() == model.getSelectedObjectID()
+				if (con.getA().getId() == model.getSelectedObjectID()
 						|| model.getSelectedCpsObjects().contains(con.getA()) || tempSelected.contains(con.getA())
-						|| con.getB().getID() == model.getSelectedObjectID()
+						|| con.getB().getId() == model.getSelectedObjectID()
 						|| model.getSelectedCpsObjects().contains(con.getB())
 						|| tempSelected.contains(con.getB()) && con != edgeHighlight) {
 					g2.drawLine(con.getA().getPosition().x + controller.getScaleDiv2(),
@@ -696,7 +696,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 				controller.addTextToConsole("Selected: ", Color.BLACK, 12, false, false, false);
 				controller.addTextToConsole("" + cps.getName(), Color.BLUE, 12, true, false, false);
 				controller.addTextToConsole(", ID:", Color.BLACK, 12, false, false, false);
-				controller.addTextToConsole("" + cps.getID(), Color.RED, 12, true, false, true);
+				controller.addTextToConsole("" + cps.getId(), Color.RED, 12, true, false, true);
 				dragging = true;
 				if (e.isControlDown() && tempCps != null) {
 					if (model.getSelectedCpsObjects().contains(tempCps)) {
@@ -859,7 +859,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 				tempCps.setPosition(x, y); // Drag Position
 				// TipText Position and name
 				toolTip = true;
-				toolTipText = tempCps.getName() + ", " + tempCps.getID();
+				toolTipText = tempCps.getName() + ", " + tempCps.getId();
 				toolTipPos.x = tempCps.getPosition().x;
 				toolTipPos.y = tempCps.getPosition().y + model.getScale();
 
@@ -928,7 +928,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 				on = true;
 				toolTipPos.x = cps.getPosition().x;
 				toolTipPos.y = cps.getPosition().y + model.getScale();
-				toolTipText = cps.getName() + ", " + cps.getID();
+				toolTipText = cps.getName() + ", " + cps.getId();
 			}
 		}
 		if (on) {

src/ui/view/SplitPane.java

@@ -733,7 +733,7 @@ public class SplitPane extends JSplitPane implements GraphListener {
 		objectHashtable.clear();
 		if (hlList.size() > 0 && hlList != null) {
 			for (AbstractCpsObject abs : hlList) {
-				String name = abs.getName() + " " + abs.getID();
+				String name = abs.getName() + " " + abs.getId();
 				DefaultMutableTreeNode tmp = new DefaultMutableTreeNode(name);
 				Hashtable<String, PropertyDataSet> tmpHash = new Hashtable<String, PropertyDataSet>();
 

src/ui/view/StatPanel2.java

@@ -703,7 +703,7 @@ public class StatPanel2 extends JSplitPane implements GraphListener {
 		objectHashtable.clear();
 		if (hlList.size() > 0 && hlList != null) {
 			for (AbstractCpsObject abs : hlList) {
-				String name = abs.getName() + " " + abs.getID();
+				String name = abs.getName() + " " + abs.getId();
 				DefaultMutableTreeNode tmp = new DefaultMutableTreeNode(name);
 				Hashtable<String, PropertyDataSet> tmpHash = new Hashtable<String, PropertyDataSet>();
 

src/ui/view/StatisticGraphPanel.java

@@ -196,7 +196,7 @@ public class StatisticGraphPanel extends JPanel {
 		}
 		JLabel b;
 		if (set.getCpsObject() != null) {
-			b = new JLabel(set.getCpsObject().getID() + ", " + set.getCpsObject().getName() + ": " + property);
+			b = new JLabel(set.getCpsObject().getId() + ", " + set.getCpsObject().getName() + ": " + property);
 		} else {
 			b = new JLabel(property);
 		}

src/ui/view/UpperNodeCanvas.java

@@ -231,7 +231,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 				JTabbedPane tabbedPane = (JTabbedPane) getParent().getParent().getParent();
 				for (int i = 3; i < tabbedPane.getTabCount(); i++) {
 					if (((UpperNodeCanvas) ((JScrollPane) tabbedPane.getComponentAt(i)).getViewport()
-							.getComponent(0)).upperNode.getID() == ((CpsUpperNode) tempCps).getID()) {
+							.getComponent(0)).upperNode.getId() == ((CpsUpperNode) tempCps).getId()) {
 						tabbedPane.remove(i);
 						break;
 					}
@@ -297,7 +297,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 						if (controller.getTrackingObj() != null) {
 							for (AbstractCpsObject obj : controller.getTrackingObj()) {
 								if (obj instanceof HolonObject) {
-									if (obj.getID() == o.getID()) {
+									if (obj.getId() == o.getId()) {
 										found = true;
 									}
 								}
@@ -310,7 +310,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 						controller.addTextToConsole("Tracking: ", Color.BLACK, 12, false, false, false);
 						controller.addTextToConsole("" + o.getName(), Color.BLUE, 12, true, false, false);
 						controller.addTextToConsole(", ID:", Color.BLACK, 12, false, false, false);
-						controller.addTextToConsole("" + o.getID(), Color.RED, 12, true, false, true);
+						controller.addTextToConsole("" + o.getId(), Color.RED, 12, true, false, true);
 					}
 				}
 			}
@@ -326,7 +326,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 						if (controller.getTrackingObj() != null) {
 							for (AbstractCpsObject obj : controller.getTrackingObj()) {
 								if (obj instanceof HolonObject) {
-									if (obj.getID() == o.getID()) {
+									if (obj.getId() == o.getId()) {
 										found = true;
 									}
 								}
@@ -361,7 +361,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 							JTabbedPane tabbedPane = (JTabbedPane) getParent().getParent().getParent();
 							for (int i = 2; i < tabbedPane.getTabCount(); i++) {
 								if (((UpperNodeCanvas) ((JScrollPane) tabbedPane.getComponentAt(i)).getViewport()
-										.getComponent(0)).upperNode.getID() == cps.getID()) {
+										.getComponent(0)).upperNode.getId() == cps.getId()) {
 									tabbedPane.remove(i);
 									i = tabbedPane.getTabCount();
 								}
@@ -467,7 +467,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 		}
 
 		for (CpsEdge con : upperNode.getNodeEdges()) {
-			if (con.getA().getID() != model.getSelectedObjectID() && con.getB().getID() != model.getSelectedObjectID()
+			if (con.getA().getId() != model.getSelectedObjectID() && con.getB().getId() != model.getSelectedObjectID()
 					&& con != edgeHighlight) {
 				if (con.getConnected() == 0) {
 					if (con.getState()) {
@@ -522,9 +522,9 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 				} else {
 					g2.setStroke(new BasicStroke(2));
 				}
-				if (con.getA().getID() == model.getSelectedObjectID()
+				if (con.getA().getId() == model.getSelectedObjectID()
 						|| model.getSelectedCpsObjects().contains(con.getA()) || tempSelected.contains(con.getA())
-						|| con.getB().getID() == model.getSelectedObjectID()
+						|| con.getB().getId() == model.getSelectedObjectID()
 						|| model.getSelectedCpsObjects().contains(con.getB())
 						|| tempSelected.contains(con.getB()) && con != edgeHighlight) {
 					g2.drawLine(con.getA().getPosition().x + controller.getScaleDiv2(),
@@ -813,7 +813,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 					controller.addTextToConsole("Selected: ", Color.BLACK, 12, false, false, false);
 					controller.addTextToConsole("" + cps.getName(), Color.BLUE, 12, true, false, false);
 					controller.addTextToConsole(", ID:", Color.BLACK, 12, false, false, false);
-					controller.addTextToConsole("" + cps.getID(), Color.RED, 12, true, false, true);
+					controller.addTextToConsole("" + cps.getId(), Color.RED, 12, true, false, true);
 					dragging = true;
 					if (e.isControlDown() && tempCps != null) {
 						if (model.getSelectedCpsObjects().contains(tempCps)) {
@@ -859,8 +859,8 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 					controller.addTextToConsole("Selected: ", Color.BLACK, 12, false, false, false);
 					controller.addTextToConsole("" + cps.getName(), Color.BLUE, 12, true, false, false);
 					controller.addTextToConsole(", ID:", Color.BLACK, 12, false, false, false);
-					controller.addTextToConsole("" + cps.getID(), Color.RED, 12, true, false, true);
-					controller.setSelectedObjectID(tempCps.getID());
+					controller.addTextToConsole("" + cps.getId(), Color.RED, 12, true, false, true);
+					controller.setSelectedObjectID(tempCps.getId());
 					// If drawing an Edge (CTRL down)
 					if (tempCps.getClass() == HolonObject.class) {
 						HolonObject tempObj = ((HolonObject) tempCps);
@@ -1034,7 +1034,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 
 					// TipText Position and name
 					toolTip = true;
-					toolTipText = tempCps.getName() + ", " + tempCps.getID();
+					toolTipText = tempCps.getName() + ", " + tempCps.getId();
 					toolTipPos.x = tempCps.getPosition().x;
 					toolTipPos.y = tempCps.getPosition().y + model.getScale();
 
@@ -1135,7 +1135,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 				on = true;
 				toolTipPos.x = cps.getPosition().x;
 				toolTipPos.y = cps.getPosition().y + model.getScale();
-				toolTipText = cps.getName() + ", " + cps.getID();
+				toolTipText = cps.getName() + ", " + cps.getId();
 
 				on = true;
 			}
@@ -1157,7 +1157,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 				on = true;
 				toolTipPos.x = cx - model.getScaleDiv2();
 				toolTipPos.y = cy + controller.getScale();
-				toolTipText = cps.getName() + ", " + cps.getID();
+				toolTipText = cps.getName() + ", " + cps.getId();
 
 			}
 			count++;