|
@@ -98,7 +98,7 @@ public class GUI<E> implements CategoryListener {
|
|
|
|
|
|
private JFrame frmCyberPhysical;
|
|
private JFrame frmCyberPhysical;
|
|
|
|
|
|
- private final AlgorithmMenu simMenu;
|
|
|
|
|
|
+ private final AlgorithmMenu algorithmMenu;
|
|
|
|
|
|
private JTabbedPane tabTemp; // tabbedPane or tabbedPane2
|
|
private JTabbedPane tabTemp; // tabbedPane or tabbedPane2
|
|
private final JMenuBar menuBar = new JMenuBar();
|
|
private final JMenuBar menuBar = new JMenuBar();
|
|
@@ -299,7 +299,7 @@ public class GUI<E> implements CategoryListener {
|
|
control.initListener(this);
|
|
control.initListener(this);
|
|
controller.setCanvas(canvas);
|
|
controller.setCanvas(canvas);
|
|
model.setConsole(console);
|
|
model.setConsole(console);
|
|
- simMenu = new AlgorithmMenu(model, control);
|
|
|
|
|
|
+ algorithmMenu = new AlgorithmMenu(model, control);
|
|
initialize();
|
|
initialize();
|
|
updateCategories(model.getCategories());
|
|
updateCategories(model.getCategories());
|
|
updCon = new UpdateController(model, controller);
|
|
updCon = new UpdateController(model, controller);
|
|
@@ -416,7 +416,7 @@ public class GUI<E> implements CategoryListener {
|
|
public void actionPerformed(ActionEvent e) {
|
|
public void actionPerformed(ActionEvent e) {
|
|
if (tabbedPane.getMousePosition() != null) {
|
|
if (tabbedPane.getMousePosition() != null) {
|
|
tabTemp = tabbedPane;
|
|
tabTemp = tabbedPane;
|
|
- } else {
|
|
|
|
|
|
+ } else if (tabbedPane2.getMousePosition() != null) {
|
|
tabTemp = tabbedPane2;
|
|
tabTemp = tabbedPane2;
|
|
}
|
|
}
|
|
// Uppernode Canvas?
|
|
// Uppernode Canvas?
|
|
@@ -655,7 +655,7 @@ public class GUI<E> implements CategoryListener {
|
|
mntmEditShowedInformation.addActionListener(new ActionListener() {
|
|
mntmEditShowedInformation.addActionListener(new ActionListener() {
|
|
public void actionPerformed(ActionEvent e) {
|
|
public void actionPerformed(ActionEvent e) {
|
|
try {
|
|
try {
|
|
- ShowedInformationPopUp dialog = new ShowedInformationPopUp(canvas, contentPane);
|
|
|
|
|
|
+ ShowedInformationPopUp dialog = new ShowedInformationPopUp(canvas, contentPane, controller);
|
|
dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
|
|
dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
|
|
dialog.setVisible(true);
|
|
dialog.setVisible(true);
|
|
} catch (Exception ex) {
|
|
} catch (Exception ex) {
|
|
@@ -832,7 +832,7 @@ public class GUI<E> implements CategoryListener {
|
|
|
|
|
|
splitPane_1.setLeftComponent(lblHolonBodySize);
|
|
splitPane_1.setLeftComponent(lblHolonBodySize);
|
|
|
|
|
|
- mnAlgorithm.add(simMenu);
|
|
|
|
|
|
+ menuBar.add(algorithmMenu);
|
|
|
|
|
|
menuBar.add(mnAlgorithm);
|
|
menuBar.add(mnAlgorithm);
|
|
|
|
|
|
@@ -1919,7 +1919,7 @@ public class GUI<E> implements CategoryListener {
|
|
splitGraphHolonEl.setBottomComponent(scrollElements);
|
|
splitGraphHolonEl.setBottomComponent(scrollElements);
|
|
canvasSP.setViewportView(canvas);
|
|
canvasSP.setViewportView(canvas);
|
|
// holonSP.setViewportView(holonCanvas);
|
|
// holonSP.setViewportView(holonCanvas);
|
|
- simMenu.setBackground(new Color(240, 240, 240));
|
|
|
|
|
|
+ algorithmMenu.setBackground(new Color(240, 240, 240));
|
|
|
|
|
|
tabbedPane.setBorder(null);
|
|
tabbedPane.setBorder(null);
|
|
scrollProperties.setBorder(null);
|
|
scrollProperties.setBorder(null);
|
|
@@ -2151,7 +2151,7 @@ public class GUI<E> implements CategoryListener {
|
|
eraseCategory = tempArray[29];
|
|
eraseCategory = tempArray[29];
|
|
selectObjBeforeErase = tempArray[30];
|
|
selectObjBeforeErase = tempArray[30];
|
|
// SimMenu
|
|
// SimMenu
|
|
- simMenu.algoFolderButton.setText(Languages.getLanguage()[85]);
|
|
|
|
|
|
+ algorithmMenu.algoFolderButton.setText(Languages.getLanguage()[85]);
|
|
// TimePanel
|
|
// TimePanel
|
|
timePanel.playBtn.setToolTipText(Languages.getLanguage()[89]);
|
|
timePanel.playBtn.setToolTipText(Languages.getLanguage()[89]);
|
|
timePanel.timeResetBtn.setToolTipText(Languages.getLanguage()[90]);
|
|
timePanel.timeResetBtn.setToolTipText(Languages.getLanguage()[90]);
|