|
@@ -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) {
|
|
|
-
|
|
|
- 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) {
|
|
|
-
|
|
|
- e1.printStackTrace();
|
|
|
- }
|
|
|
+ e = queue.poll();
|
|
|
e.getA().getConnections().remove(e);
|
|
|
e.getB().getConnections().remove(e);
|
|
|
}
|