id

.gradle/2.14/taskArtifacts/cache.properties

@@ -0,0 +1 @@
+#Tue Jul 05 09:50:14 CEST 2016

src/ui/controller/Control.java

@@ -93,8 +93,8 @@ public class Control {
 	}
 
 	/* Operations for Objects and Elements */
-	public void addElementCanvasObject(String objName, String eleName, int amount, float energy) {
-		objectController.addNewElementIntoCanvasObject(objName, eleName, amount, energy);
+	public void addElementCanvasObject(int ID, String eleName, int amount, float energy) {
+		objectController.addNewElementIntoCanvasObject(ID, eleName, amount, energy);
 	}
 
 	public void addElementCategoryObject(String catName, String objName, String eleName, int amount, float energy) {

src/ui/controller/LoadStoreController.java

@@ -1,10 +1,10 @@
 package ui.controller;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.util.ArrayList;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import classes.Category;
@@ -12,43 +12,60 @@ import classes.CpsObject;
 import classes.HolonElement;
 import classes.HolonObject;
 import ui.model.Model;
+
 public class LoadStoreController {
 	private Model MODEL;
+
 	public LoadStoreController(Model model) {
 		this.MODEL = model;
 	}
+
+	
+	
 	public void writeJSONFile() throws IOException {
-		JSONObject jsonObj = new JSONObject();
-		writeCategory(jsonObj);
-		writeCategoryObjects(jsonObj);
-		writeCategoryElements(jsonObj);
-		FileWriter file = new FileWriter("C:/Users/krabs/Desktop/Tesst.json");
-		file.write(jsonObj.toJSONString());
-		file.flush();
-		file.close();
+
+		JSONObject json = new JSONObject();
+
+		
+		writeCategory(json);
+		writeCategoryObjects(json);
+		writeCategoryElements(json);
+
+		FileWriter writer = new FileWriter("//Users//zheng//Desktop//Tesst.json");
+		writer.flush();
+		writer.close();
 	}
-	public void writeCategory(JSONObject jsonObj) throws IOException {
+
+	public void writeCategory(JSONObject json) throws IOException {
 		JSONArray arr = new JSONArray();
+		
 		for (Category cat : MODEL.getCategories())
 			arr.add(cat.getName());
-		jsonObj.put("Category", arr);
+		json.put("Category", arr);
 	}
-	public void writeCategoryObjects(JSONObject jsonObj) {
-		int i = 1;
+
+	public void writeCategoryObjects(JSONObject json) throws IOException {
+		
 		JSONArray arr = new JSONArray();
+		int i = 1;
+		
 		for (Category cats : MODEL.getCategories())
 			for (CpsObject cps : cats.getObjects()) {
 				arr.add(cps.getStored());
 				arr.add(cps.getObjName());
 				arr.add(cps.getName());
 				arr.add(cps.getImage());
-				jsonObj.put("CategoryObject." + i++, arr);
+				json.put("CategoryObject." + i++, arr);
 				arr = new JSONArray();
 			}
 	}
-	public void writeCategoryElements(JSONObject jsonObj) {
-		int i = 1;
+
+	public void writeCategoryElements(JSONObject json) throws IOException {
+		
+
 		JSONArray arr = new JSONArray();
+		int i = 1;
+		
 		for (Category cats : MODEL.getCategories())
 			for (CpsObject cps : cats.getObjects())
 				if (cps instanceof HolonObject)
@@ -57,10 +74,11 @@ public class LoadStoreController {
 						arr.add(ele.getEleName());
 						arr.add(ele.getAmount());
 						arr.add(ele.getEnergy());
-						jsonObj.put("CategoryElement." + i++, arr);
+						json.put("CategoryElement." + i++, arr);
 						arr = new JSONArray();
 					}
 	}
+
 	public void readFromJSON(File jsonFile) throws IOException {
 		String line;
 		BufferedReader reader = new BufferedReader(new FileReader("textfile"));

src/ui/controller/ObjectController.java

@@ -42,8 +42,8 @@ public class ObjectController {
 	 * @param element
 	 * @param type
 	 */
-	public void addElementIntoCanvasObject(String object, HolonElement element) {
-		addElement(searchHolonObject(object, MODEL.getObjectsOnCanvas()), element);
+	public void addElementIntoCanvasObject(HolonObject object, HolonElement element) {
+		addElement(object, element);
 	}
 
 	/**
@@ -55,8 +55,8 @@ public class ObjectController {
 	 * @param energy
 	 * @param type
 	 */
-	public void addNewElementIntoCanvasObject(String object, String eleName, int amount, float energy) {
-		addElementIntoCanvasObject(object, new HolonElement(eleName, energy, amount));
+	public void addNewElementIntoCanvasObject(int id, String eleName, int amount, float energy) {
+		addElementIntoCanvasObject((HolonObject) searchByID(id), new HolonElement(eleName, energy, amount));
 	}
 
 	/**
@@ -75,6 +75,7 @@ public class ObjectController {
 				break;
 			}
 		}
+		element.setStored(object);
 		addElement(searchHolonObject(object, cat.getObjects()), element);
 	}