|
@@ -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");
|
|
@@ -415,6 +415,7 @@ public class GUI<E> implements CategoryListener {
|
|
|
}
|
|
|
canvas.repaint();
|
|
|
}
|
|
|
+ controller.getObjectsInDepth();
|
|
|
|
|
|
}
|
|
|
};
|
|
@@ -669,6 +670,7 @@ public class GUI<E> implements CategoryListener {
|
|
|
SearchPopUp dialog = new SearchPopUp(controller, canvas);
|
|
|
dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
|
|
|
dialog.setVisible(true);
|
|
|
+ controller.getObjectsInDepth();
|
|
|
} catch (Exception ex) {
|
|
|
ex.printStackTrace();
|
|
|
}
|
|
@@ -689,8 +691,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();
|
|
@@ -700,7 +701,7 @@ public class GUI<E> implements CategoryListener {
|
|
|
}
|
|
|
});
|
|
|
|
|
|
- mnNewMenuOptions.add(mntmEditEdges);
|
|
|
+ menuBar.add(mnNewMenuOptions);
|
|
|
|
|
|
mnNewMenuOptions.add(mntmResetCategory);
|
|
|
mntmResetCategory.addActionListener(new ActionListener() {
|
|
@@ -1416,6 +1417,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 {
|
|
@@ -1437,6 +1440,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();
|