|
@@ -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());
|