|
@@ -266,7 +266,7 @@ public class GUI<E> implements CategoryListener {
|
|
|
private AbstractCpsObject temp = null;
|
|
|
private final JMenuItem mntmUndo = new JMenuItem("Undo");
|
|
|
private final JMenuItem mntmRedo = new JMenuItem("Redo");
|
|
|
- private final JMenuItem mntmEditEdges = new JMenuItem("Edit Edges");
|
|
|
+ private final JMenuItem mntmEditEdges = new JMenuItem("Edge Properties");
|
|
|
private final JMenuItem mntmFindReplace = new JMenuItem("Find/ Replace");
|
|
|
private final JMenuItem mntmEditShowedInformation = new JMenuItem("Edit showed Information");
|
|
|
private final JMenuItem mntmResetCategory = new JMenuItem("Reset Categories");
|
|
@@ -406,6 +406,7 @@ public class GUI<E> implements CategoryListener {
|
|
|
for (AbstractCpsObject cps : uNC.upperNode.getNodes()) {
|
|
|
controller.addSelectedObject(cps);
|
|
|
}
|
|
|
+ controller.getObjectsInDepth();
|
|
|
uNC.repaint();
|
|
|
// or Canvas?
|
|
|
} else if (((JScrollPane) tabTemp.getSelectedComponent()).getViewport()
|
|
@@ -413,6 +414,7 @@ public class GUI<E> implements CategoryListener {
|
|
|
for (AbstractCpsObject cps : model.getObjectsOnCanvas()) {
|
|
|
controller.addSelectedObject(cps);
|
|
|
}
|
|
|
+ controller.getObjectsInDepth();
|
|
|
canvas.repaint();
|
|
|
}
|
|
|
controller.getObjectsInDepth();
|
|
@@ -443,6 +445,7 @@ public class GUI<E> implements CategoryListener {
|
|
|
controller.removeTrackingObj(cps);
|
|
|
if (uNC.upperNode.getNodes().contains(cps)) {
|
|
|
controller.delObjUpperNode(cps, uNC.upperNode);
|
|
|
+ unc.setToolTip(false);
|
|
|
// Remove UpperNodeTab if UpperNode deleted
|
|
|
if (cps instanceof CpsUpperNode) {
|
|
|
boolean splitView = false;
|
|
@@ -481,6 +484,7 @@ public class GUI<E> implements CategoryListener {
|
|
|
if (j < model.getSelectedCpsObjects().size() - 1)
|
|
|
save = true;
|
|
|
controller.delCanvasObject(cps, save);
|
|
|
+ canvas.setToolTip(false);
|
|
|
// Remove UpperNodeTab if UpperNode deleted
|
|
|
if (cps instanceof CpsUpperNode) {
|
|
|
boolean splitView = false;
|
|
@@ -688,8 +692,7 @@ public class GUI<E> implements CategoryListener {
|
|
|
});
|
|
|
|
|
|
mnNewMenuEdit.add(mntmEditShowedInformation);
|
|
|
-
|
|
|
- menuBar.add(mnNewMenuOptions);
|
|
|
+ mnNewMenuEdit.add(mntmEditEdges);
|
|
|
mntmEditEdges.addActionListener(new ActionListener() {
|
|
|
public void actionPerformed(ActionEvent e) {
|
|
|
EditEdgesPopUp edgePopUp = new EditEdgesPopUp();
|
|
@@ -699,7 +702,7 @@ public class GUI<E> implements CategoryListener {
|
|
|
}
|
|
|
});
|
|
|
|
|
|
- mnNewMenuOptions.add(mntmEditEdges);
|
|
|
+ menuBar.add(mnNewMenuOptions);
|
|
|
|
|
|
mnNewMenuOptions.add(mntmResetCategory);
|
|
|
mntmResetCategory.addActionListener(new ActionListener() {
|
|
@@ -1415,6 +1418,8 @@ public class GUI<E> implements CategoryListener {
|
|
|
|
|
|
controller.addObjUpperNode(h, unc.upperNode);
|
|
|
unc.invalidate();
|
|
|
+ unc.setXY((int) canvas.getMousePosition().getX(),
|
|
|
+ (int) canvas.getMousePosition().getY());
|
|
|
unc.repaint();
|
|
|
}
|
|
|
} else {
|
|
@@ -1436,6 +1441,8 @@ public class GUI<E> implements CategoryListener {
|
|
|
|
|
|
controller.addObjectCanvas(h);
|
|
|
canvas.invalidate();
|
|
|
+ canvas.setXY((int) canvas.getMousePosition().getX(),
|
|
|
+ (int) canvas.getMousePosition().getY());
|
|
|
canvas.repaint();
|
|
|
}
|
|
|
controller.calculateStateForCurrentTimeStep();
|