|
@@ -86,7 +86,6 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
|
|
|
|
|
|
// contains the value of the Capacity for new created Edges
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* Constructor.
|
|
|
*
|
|
@@ -205,16 +204,16 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
|
|
|
for (AbstractCpsObject cps : model.getSelectedCpsObjects()) {
|
|
|
controller.delCanvasObject(cps);
|
|
|
// Remove UpperNodeTab if UpperNode deleted
|
|
|
- if(cps instanceof CpsUpperNode){
|
|
|
+ if (cps instanceof CpsUpperNode) {
|
|
|
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()) {
|
|
|
+ if (((UpperNodeCanvas) ((JScrollPane) tabbedPane.getComponentAt(i)).getViewport()
|
|
|
+ .getComponent(0)).upperNode.getID() == cps.getID()) {
|
|
|
tabbedPane.remove(i);
|
|
|
- i = tabbedPane.getTabCount();
|
|
|
+ i = tabbedPane.getTabCount();
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
model.getSelectedCpsObjects().clear();
|
|
|
tempCps = null;
|
|
@@ -473,13 +472,13 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
|
|
|
dataSelected = null;
|
|
|
edgeHighlight = null;
|
|
|
controller.setSelecteEdge(null);
|
|
|
-
|
|
|
+
|
|
|
// Object Selection
|
|
|
for (AbstractCpsObject cps : model.getObjectsOnCanvas()) {
|
|
|
cx = cps.getPosition().x;
|
|
|
cy = cps.getPosition().y;
|
|
|
if (x - controller.getScale() <= cx && y - controller.getScale() <= cy && x >= cx && y >= cy) {
|
|
|
- tempCps = cps;
|
|
|
+ tempCps = cps;
|
|
|
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);
|
|
@@ -700,14 +699,15 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
|
|
|
cy = cps.getPosition().y;
|
|
|
if (x - controller.getScale() <= cx && y - controller.getScale() <= cy && x >= cx && y >= cy) {
|
|
|
|
|
|
- objectTT.setTipText(cps.getName() + ", " + cps.getID());
|
|
|
objectTT.setLocation(cx, cy + controller.getScale());
|
|
|
+ objectTT.setTipText(cps.getName() + ", " + cps.getID());
|
|
|
+
|
|
|
on = true;
|
|
|
}
|
|
|
}
|
|
|
if (!on) {
|
|
|
- objectTT.setLocation(-200, -200);
|
|
|
objectTT.setTipText("");
|
|
|
+ objectTT.setLocation(-200, -200);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -866,8 +866,6 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
/**
|
|
|
* Set if Information should be shown.
|
|
|
*
|