Browse Source

new Class and change to new queue

Teh-Hai Julian Zheng 8 years ago
parent
commit
2e19f63a81

+ 10 - 18
src/ui/controller/CanvasController.java

@@ -2,7 +2,8 @@ package ui.controller;
 
 import java.awt.Point;
 import java.util.ArrayList;
-import sun.misc.Queue;
+import java.util.LinkedList;
+
 import classes.CpsEdge;
 import classes.CpsNode;
 import classes.CpsUpperNode;
@@ -281,21 +282,17 @@ public class CanvasController {
 	 */
 	public void bfsNodeCleaner(CpsUpperNode node) {
 
-		Queue<AbstractCpsObject> queue = new Queue<>();
+		LinkedList<AbstractCpsObject> queue = new LinkedList<>();
 		AbstractCpsObject u = node;
 
-		queue.enqueue(u);
+		queue.add(u);
 		while (!queue.isEmpty()) {
-			try {
-				u = queue.dequeue();
-			} catch (InterruptedException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
+			u = queue.poll();
+
 			deleteConnections(u);
 			if (u instanceof CpsUpperNode)
 				for (AbstractCpsObject adjacent : ((CpsUpperNode) u).getNodes()) {
-					queue.enqueue(adjacent);
+					queue.add(adjacent);
 				}
 		}
 
@@ -308,19 +305,14 @@ public class CanvasController {
 	 */
 	private void deleteConnections(AbstractCpsObject obj) {
 
-		Queue<CpsEdge> queue = new Queue<>();
+		LinkedList<CpsEdge> queue = new LinkedList<>();
 		CpsEdge e = null;
 
 		for (CpsEdge edge : obj.getConnections()) {
-			queue.enqueue(edge);
+			queue.add(edge);
 		}
 		while (!queue.isEmpty()) {
-			try {
-				e = queue.dequeue();
-			} catch (InterruptedException e1) {
-				// TODO Auto-generated catch block
-				e1.printStackTrace();
-			}
+			e = queue.poll();
 			e.getA().getConnections().remove(e);
 			e.getB().getConnections().remove(e);
 		}

+ 11 - 0
src/ui/controller/ClipboardController.java

@@ -0,0 +1,11 @@
+package ui.controller;
+
+import ui.model.Model;
+
+public class ClipboardController {
+	
+	private Model model;
+	
+	
+
+}

+ 1 - 1
src/ui/controller/LoadController.java

@@ -327,7 +327,7 @@ public class LoadController {
 			break;
 		}
 
-		if (object.get("connection").getAsBoolean()) {
+		if (object.get("connection").getAsBoolean() && !type.equals(EDGETYPE.CONNECTION)) {
 			temp.getA().getConnections().add(temp);
 			temp.getB().getConnections().add(temp);
 		}

+ 6 - 11
src/ui/controller/StoreController.java

@@ -23,7 +23,6 @@ import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.IdCounter;
 import classes.Position;
-import sun.misc.Queue;
 import ui.model.Model;
 
 /**
@@ -170,21 +169,17 @@ public class StoreController {
 	 */
 	private void storeCanvas(JsonObject file) {
 		// TODO Auto-generated method stub
-		Queue<AbstractCpsObject> queue = new Queue<>();
+		LinkedList<AbstractCpsObject> queue = new LinkedList<>();
 		AbstractCpsObject u = null;
 		// put all objects into queue since there is not starting object
 		for (AbstractCpsObject cps : model.getObjectsOnCanvas()) {
-			queue.enqueue(cps);
+			queue.add(cps);
 		}
 		// while quene not empty
 		while (!queue.isEmpty()) {
-			try {
-				// u = current node
-				u = queue.dequeue();
-			} catch (InterruptedException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
+
+			// u = current node
+			u = queue.poll();
 			// add currentnode into jsontree
 			String key = "CVSOBJECT" + getNumerator(NUMTYPE.OBJECT);
 			file.add(key, gson.toJsonTree(u, AbstractCpsObject.class));
@@ -200,7 +195,7 @@ public class StoreController {
 			// if uppernode put all nodes inside the uppernode into queue
 			if (u instanceof CpsUpperNode) {
 				for (AbstractCpsObject adjacent : ((CpsUpperNode) u).getNodes()) {
-					queue.enqueue(adjacent);
+					queue.add(adjacent);
 				}
 				// dont forget to add the nodeedges and oldedges
 				edgeToJson(EDGETYPE.NODE, file, u.getID(), ((CpsUpperNode) u).getNodeEdges());