|
@@ -266,7 +266,7 @@ public class GUI implements CategoryListener {
|
|
|
private final JLabel lblSelectedElement = new JLabel("Selected Element: ");
|
|
|
// for doubleclick
|
|
|
private boolean click = false;
|
|
|
- private JFrame frmCyberPhysical;
|
|
|
+ private JFrame holegJFrame;
|
|
|
private JTabbedPane tabTemp; // tabbedPaneOriginal or tabbedPaneSplit
|
|
|
private JSplitPane tempSplit;
|
|
|
private boolean initSplit = true;
|
|
@@ -336,13 +336,13 @@ public class GUI implements CategoryListener {
|
|
|
*/
|
|
|
@SuppressWarnings({ "serial", "unchecked" })
|
|
|
private void initialize() {
|
|
|
- frmCyberPhysical = new JFrame();
|
|
|
- frmCyberPhysical.setTitle("HOLEG Simulator");
|
|
|
+ holegJFrame = new JFrame();
|
|
|
+ holegJFrame.setTitle("HOLEG Simulator");
|
|
|
// try to restore old position/dimensions
|
|
|
ArrayList<Integer> savedWindowDim = controller
|
|
|
.loadSavedWindowDimensionsIfExistent();
|
|
|
if (savedWindowDim.size() == 4) {
|
|
|
- frmCyberPhysical.setBounds(savedWindowDim.get(0),
|
|
|
+ holegJFrame.setBounds(savedWindowDim.get(0),
|
|
|
savedWindowDim.get(1), savedWindowDim.get(2),
|
|
|
savedWindowDim.get(3));
|
|
|
}
|
|
@@ -351,15 +351,15 @@ public class GUI implements CategoryListener {
|
|
|
// moved,
|
|
|
// but if it is not, we need to move it to somewhere else
|
|
|
if (savedWindowDim.size() != 4 || !isUpperPanelInsideBounds()) {
|
|
|
- frmCyberPhysical.setBounds(100, 100, 1000, 800);
|
|
|
- frmCyberPhysical.setExtendedState(JFrame.MAXIMIZED_BOTH);
|
|
|
+ holegJFrame.setBounds(100, 100, 1000, 800);
|
|
|
+ holegJFrame.setExtendedState(JFrame.MAXIMIZED_BOTH);
|
|
|
}
|
|
|
- frmCyberPhysical.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
|
|
|
+ holegJFrame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
|
|
|
|
|
|
- frmCyberPhysical.addWindowListener(new java.awt.event.WindowAdapter() {
|
|
|
+ holegJFrame.addWindowListener(new java.awt.event.WindowAdapter() {
|
|
|
@Override
|
|
|
public void windowClosing(java.awt.event.WindowEvent windowEvent) {
|
|
|
- if (JOptionPane.showConfirmDialog(frmCyberPhysical,
|
|
|
+ if (JOptionPane.showConfirmDialog(holegJFrame,
|
|
|
Languages.getLanguage()[88],
|
|
|
"HOLEG",
|
|
|
JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
|
|
@@ -372,10 +372,10 @@ public class GUI implements CategoryListener {
|
|
|
// it can be opened in the same position the next time
|
|
|
try {
|
|
|
controller.savePosAndSizeOfWindow(
|
|
|
- frmCyberPhysical.getX(),
|
|
|
- frmCyberPhysical.getY(),
|
|
|
- frmCyberPhysical.getWidth(),
|
|
|
- frmCyberPhysical.getHeight());
|
|
|
+ holegJFrame.getX(),
|
|
|
+ holegJFrame.getY(),
|
|
|
+ holegJFrame.getWidth(),
|
|
|
+ holegJFrame.getHeight());
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
@@ -384,7 +384,7 @@ public class GUI implements CategoryListener {
|
|
|
}
|
|
|
});
|
|
|
|
|
|
- contentPane = (JPanel) frmCyberPhysical.getContentPane();
|
|
|
+ contentPane = (JPanel) holegJFrame.getContentPane();
|
|
|
|
|
|
int condition = JComponent.WHEN_IN_FOCUSED_WINDOW;
|
|
|
InputMap inputMap = contentPane.getInputMap(condition);
|
|
@@ -572,7 +572,7 @@ public class GUI implements CategoryListener {
|
|
|
@Override
|
|
|
public void actionPerformed(ActionEvent e) {
|
|
|
SearchPopUp dialog = new SearchPopUp(controller, canvas,
|
|
|
- frmCyberPhysical);
|
|
|
+ holegJFrame);
|
|
|
dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
|
|
|
dialog.setVisible(true);
|
|
|
}
|
|
@@ -644,7 +644,7 @@ public class GUI implements CategoryListener {
|
|
|
| UnsupportedFlavorException | IOException e1) {
|
|
|
JLabel message = new JLabel(
|
|
|
"The Clipboard information cannot be pasted into Application.");
|
|
|
- JOptionPane.showMessageDialog(frmCyberPhysical, message,
|
|
|
+ JOptionPane.showMessageDialog(holegJFrame, message,
|
|
|
"", JOptionPane.ERROR_MESSAGE);
|
|
|
}
|
|
|
|
|
@@ -681,9 +681,9 @@ public class GUI implements CategoryListener {
|
|
|
};
|
|
|
actionMap.put(cntrlXDown, controlX);
|
|
|
|
|
|
- frmCyberPhysical.setJMenuBar(menuBar);
|
|
|
+ holegJFrame.setJMenuBar(menuBar);
|
|
|
|
|
|
- frmCyberPhysical.setIconImage(Util.loadImage(
|
|
|
+ holegJFrame.setIconImage(Util.loadImage(
|
|
|
"/Images/Holeg.png", 30, 30));
|
|
|
|
|
|
menuBar.add(mnNewMenu);
|
|
@@ -724,7 +724,7 @@ public class GUI implements CategoryListener {
|
|
|
mntmFindReplace.addActionListener(actionEvent -> {
|
|
|
try {
|
|
|
SearchPopUp dialog = new SearchPopUp(controller, canvas,
|
|
|
- frmCyberPhysical);
|
|
|
+ holegJFrame);
|
|
|
dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
|
|
|
dialog.setVisible(true);
|
|
|
controller.getObjectsInDepth();
|
|
@@ -739,7 +739,7 @@ public class GUI implements CategoryListener {
|
|
|
try {
|
|
|
DisplayedInformationPopUp dialog = new DisplayedInformationPopUp(
|
|
|
canvas, contentPane, controller,
|
|
|
- frmCyberPhysical);
|
|
|
+ holegJFrame);
|
|
|
dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
|
|
|
dialog.setVisible(true);
|
|
|
} catch (Exception ex) {
|
|
@@ -751,7 +751,7 @@ public class GUI implements CategoryListener {
|
|
|
mnNewMenuEdit.add(mntmEditShowedInformation);
|
|
|
mnNewMenuEdit.add(mntmEditEdges);
|
|
|
mntmEditEdges.addActionListener(actionEvent -> {
|
|
|
- EditEdgesPopUp edgePopUp = new EditEdgesPopUp(frmCyberPhysical);
|
|
|
+ EditEdgesPopUp edgePopUp = new EditEdgesPopUp(holegJFrame);
|
|
|
edgePopUp.setCanvas(canvas);
|
|
|
edgePopUp.setController(controller);
|
|
|
edgePopUp.setVisible(true);
|
|
@@ -848,7 +848,7 @@ public class GUI implements CategoryListener {
|
|
|
mntmCanvasSize.addActionListener(actionEvent -> {
|
|
|
CanvasResizePopUp popUp = new CanvasResizePopUp(model, controller,
|
|
|
canvas, tabbedPaneOriginal, tabbedPaneSplit,
|
|
|
- frmCyberPhysical);
|
|
|
+ holegJFrame);
|
|
|
popUp.setVisible(true);
|
|
|
});
|
|
|
|
|
@@ -949,7 +949,7 @@ public class GUI implements CategoryListener {
|
|
|
if (scrollPane.getViewport().getComponent(0) instanceof MyCanvas) {
|
|
|
BackgroundPopUp backgroundDialog = new BackgroundPopUp(
|
|
|
model, controller, canvas, null,
|
|
|
- frmCyberPhysical);
|
|
|
+ holegJFrame);
|
|
|
backgroundDialog
|
|
|
.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
|
|
|
backgroundDialog.setVisible(true);
|
|
@@ -958,7 +958,7 @@ public class GUI implements CategoryListener {
|
|
|
.getViewport().getComponent(0));
|
|
|
BackgroundPopUp backgroundDialog = new BackgroundPopUp(
|
|
|
model, controller, null, uNodeCanvas.upperNode,
|
|
|
- frmCyberPhysical);
|
|
|
+ holegJFrame);
|
|
|
backgroundDialog
|
|
|
.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
|
|
|
backgroundDialog.setVisible(true);
|
|
@@ -1193,7 +1193,7 @@ public class GUI implements CategoryListener {
|
|
|
if (tempCpsObject != null
|
|
|
&& tempCpsObject.getClass() == HolonObject.class
|
|
|
&& tempCpsObject.getId() != 0) {
|
|
|
- addElementPopUp = new AddElementPopUp(frmCyberPhysical, model);//TODO: I didn't even check
|
|
|
+ addElementPopUp = new AddElementPopUp(holegJFrame, model);//TODO: I didn't even check
|
|
|
addElementPopUp.setActualCps(updCon.getActualCps());
|
|
|
addElementPopUp.setVisible(true);
|
|
|
HolonElement ele = addElementPopUp.getElement();
|
|
@@ -1682,7 +1682,7 @@ public class GUI implements CategoryListener {
|
|
|
* RIGHT CONTAINER DONE
|
|
|
*****************************/
|
|
|
|
|
|
- frmCyberPhysical.getContentPane().setLayout(new BorderLayout(0, 0));
|
|
|
+ holegJFrame.getContentPane().setLayout(new BorderLayout(0, 0));
|
|
|
/****************
|
|
|
* Tree Stuff
|
|
|
****************/
|
|
@@ -1902,7 +1902,7 @@ public class GUI implements CategoryListener {
|
|
|
}
|
|
|
} catch (Exception eex) {
|
|
|
}
|
|
|
- frmCyberPhysical.setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
|
|
|
+ holegJFrame.setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
|
|
|
}
|
|
|
});
|
|
|
|
|
@@ -1973,7 +1973,7 @@ public class GUI implements CategoryListener {
|
|
|
Cursor cursor = Toolkit.getDefaultToolkit()
|
|
|
.createCustomCursor(img,
|
|
|
new Point(0, 0), "Image");
|
|
|
- frmCyberPhysical.setCursor(cursor);
|
|
|
+ holegJFrame.setCursor(cursor);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -1986,7 +1986,7 @@ public class GUI implements CategoryListener {
|
|
|
// Remove the selected Object object
|
|
|
//AddObjectPopUp(boolean edit, AbstractCpsObject obj, String cat, JFrame parentFrame)
|
|
|
addObjectPopUP = new AddObjectPopUp(true, tempCps,
|
|
|
- catOfObjToBeEdited, frmCyberPhysical);
|
|
|
+ catOfObjToBeEdited, holegJFrame);
|
|
|
addObjectPopUP.setCategory(catOfObjToBeEdited);
|
|
|
addObjectPopUP.setController(controller);
|
|
|
addObjectPopUP.setVisible(true);
|
|
@@ -2001,24 +2001,24 @@ public class GUI implements CategoryListener {
|
|
|
panel.add(toolBar);
|
|
|
btnAddPopUp.add(mItemNew);
|
|
|
mItemNew.addActionListener(actionEvent -> {
|
|
|
- new NewPopUp(controller, frmCyberPhysical);
|
|
|
+ new NewPopUp(controller, holegJFrame);
|
|
|
});
|
|
|
btnAddPopUp.addSeparator();
|
|
|
btnAddPopUp.add(mItemCategory);
|
|
|
mItemCategory.addActionListener(actionEvent -> {
|
|
|
- new NewPopUp(controller,Option.Category, frmCyberPhysical);
|
|
|
+ new NewPopUp(controller,Option.Category, holegJFrame);
|
|
|
});
|
|
|
btnAddPopUp.add(mItemObject);
|
|
|
mItemObject.addActionListener(actionEvent -> {
|
|
|
- new NewPopUp(controller,Option.Object, frmCyberPhysical);
|
|
|
+ new NewPopUp(controller,Option.Object, holegJFrame);
|
|
|
});
|
|
|
btnAddPopUp.add(mItemSwitch);
|
|
|
mItemSwitch.addActionListener(actionEvent -> {
|
|
|
- new NewPopUp(controller,Option.Switch, frmCyberPhysical);
|
|
|
+ new NewPopUp(controller,Option.Switch, holegJFrame);
|
|
|
});
|
|
|
btnAddPopUp.add(mItemBattery);
|
|
|
mItemBattery.addActionListener(actionEvent -> {
|
|
|
- new NewPopUp(controller,Option.Battery, frmCyberPhysical);
|
|
|
+ new NewPopUp(controller,Option.Battery, holegJFrame);
|
|
|
});
|
|
|
btnAdd.addActionListener(actionEvent -> btnAddPopUp.show(btnAdd, -1, +20));
|
|
|
btnAdd.setToolTipText("Add a new Category or Item to the library.");
|
|
@@ -2071,7 +2071,7 @@ public class GUI implements CategoryListener {
|
|
|
mntmAboutUs.addMouseListener(new MouseAdapter() {
|
|
|
@Override
|
|
|
public void mousePressed(MouseEvent e) {
|
|
|
- aboutUsPopUp = new AboutUsPopUp(frmCyberPhysical);
|
|
|
+ aboutUsPopUp = new AboutUsPopUp(holegJFrame);
|
|
|
aboutUsPopUp.setVisible(true);
|
|
|
}
|
|
|
});
|
|
@@ -2168,7 +2168,7 @@ public class GUI implements CategoryListener {
|
|
|
switch (depthOfNode) {
|
|
|
case 1:
|
|
|
int dialogResult = JOptionPane.showConfirmDialog(
|
|
|
- frmCyberPhysical, eraseCategory + nodeName
|
|
|
+ holegJFrame, eraseCategory + nodeName
|
|
|
+ "?", warningText,
|
|
|
JOptionPane.YES_NO_OPTION);
|
|
|
if (dialogResult == JOptionPane.YES_OPTION) {
|
|
@@ -2183,27 +2183,27 @@ public class GUI implements CategoryListener {
|
|
|
break;
|
|
|
|
|
|
default:
|
|
|
- JOptionPane.showMessageDialog(frmCyberPhysical,
|
|
|
+ JOptionPane.showMessageDialog(holegJFrame,
|
|
|
selectObjBeforeErase);
|
|
|
}
|
|
|
} catch (Exception e2) {
|
|
|
}
|
|
|
|
|
|
} else {
|
|
|
- JOptionPane.showMessageDialog(frmCyberPhysical,
|
|
|
+ JOptionPane.showMessageDialog(holegJFrame,
|
|
|
selectObjBeforeErase);
|
|
|
}
|
|
|
tree.repaint();
|
|
|
});
|
|
|
toolBar.add(btnDel);
|
|
|
|
|
|
- frmCyberPhysical.getContentPane().add(splitPane);
|
|
|
+ holegJFrame.getContentPane().add(splitPane);
|
|
|
|
|
|
mntmNew.addActionListener(actionEvent -> {
|
|
|
if (model.getObjectsOnCanvas().size() != 0) {
|
|
|
int newWarning = JOptionPane.YES_NO_OPTION;
|
|
|
int dialogForNewWarning = JOptionPane.showConfirmDialog(
|
|
|
- frmCyberPhysical, saveBeforeNew, warningText,
|
|
|
+ holegJFrame, saveBeforeNew, warningText,
|
|
|
newWarning);
|
|
|
if (dialogForNewWarning == JOptionPane.YES_OPTION) {
|
|
|
mntmSave.doClick();
|
|
@@ -2235,7 +2235,7 @@ public class GUI implements CategoryListener {
|
|
|
"Holon Save File(*.holon)", "holon");
|
|
|
fileChooser.setFileFilter(holonFilter);
|
|
|
|
|
|
- if (fileChooser.showOpenDialog(frmCyberPhysical) == JFileChooser.APPROVE_OPTION) {
|
|
|
+ if (fileChooser.showOpenDialog(holegJFrame) == JFileChooser.APPROVE_OPTION) {
|
|
|
File file = fileChooser.getSelectedFile();
|
|
|
|
|
|
try {
|
|
@@ -2250,7 +2250,7 @@ public class GUI implements CategoryListener {
|
|
|
e.printStackTrace();
|
|
|
JLabel message = new JLabel(
|
|
|
"The savefile is corrupt and cannot be opened.");
|
|
|
- JOptionPane.showMessageDialog(frmCyberPhysical,
|
|
|
+ JOptionPane.showMessageDialog(holegJFrame,
|
|
|
message, "", JOptionPane.ERROR_MESSAGE);
|
|
|
}
|
|
|
}
|
|
@@ -2269,7 +2269,7 @@ public class GUI implements CategoryListener {
|
|
|
"Holon Save File(*.holon)", "holon");
|
|
|
fileChooser.setFileFilter(holonFilter);
|
|
|
|
|
|
- if (fileChooser.showSaveDialog(frmCyberPhysical) == JFileChooser.APPROVE_OPTION) {
|
|
|
+ if (fileChooser.showSaveDialog(holegJFrame) == JFileChooser.APPROVE_OPTION) {
|
|
|
File selectedFile = fileChooser.getSelectedFile();
|
|
|
String fileName = selectedFile.getName();
|
|
|
String fullPath = fileChooser.getSelectedFile().getPath();
|
|
@@ -2288,7 +2288,7 @@ public class GUI implements CategoryListener {
|
|
|
+ "\" instead of \".holon\"?");
|
|
|
|
|
|
int response = JOptionPane.showOptionDialog(
|
|
|
- frmCyberPhysical, message, "",
|
|
|
+ holegJFrame, message, "",
|
|
|
JOptionPane.DEFAULT_OPTION,
|
|
|
JOptionPane.QUESTION_MESSAGE, null, options,
|
|
|
options[1]);
|
|
@@ -2442,7 +2442,7 @@ public class GUI implements CategoryListener {
|
|
|
hideScrollGraph();
|
|
|
tableHolonElementScrollPane.setBorder(null);
|
|
|
|
|
|
- frmCyberPhysical.getContentPane().add(timePanel, BorderLayout.SOUTH);
|
|
|
+ holegJFrame.getContentPane().add(timePanel, BorderLayout.SOUTH);
|
|
|
|
|
|
|
|
|
|
|
@@ -2460,7 +2460,7 @@ public class GUI implements CategoryListener {
|
|
|
|
|
|
if (nrOfOldSaves > 0) {
|
|
|
int dialogButton = JOptionPane.YES_NO_OPTION;
|
|
|
- int dialogResult = JOptionPane.showConfirmDialog(frmCyberPhysical,
|
|
|
+ int dialogResult = JOptionPane.showConfirmDialog(holegJFrame,
|
|
|
"Old autosave file was found, should it be loaded?",
|
|
|
warningText, dialogButton);
|
|
|
if (dialogResult == JOptionPane.YES_OPTION) {
|
|
@@ -2468,7 +2468,7 @@ public class GUI implements CategoryListener {
|
|
|
model.setAutoSaveNr(nrOfOldSaves - 1);
|
|
|
mntmRedo.doClick();
|
|
|
} else {
|
|
|
- JOptionPane.showMessageDialog(frmCyberPhysical,
|
|
|
+ JOptionPane.showMessageDialog(holegJFrame,
|
|
|
"Autosave could not be loaded.");
|
|
|
setUpAutoSave(dest);
|
|
|
}
|
|
@@ -2498,17 +2498,24 @@ public class GUI implements CategoryListener {
|
|
|
//Algo
|
|
|
JMenuItem openMenu = new JMenuItem("Open Algorithm Panel", new ImageIcon(Util.loadImage("/Button_Images/iconAlgo.png").getScaledInstance(20, 20, java.awt.Image.SCALE_SMOOTH)));
|
|
|
openMenu.addActionListener(actionEvent -> {
|
|
|
- new AlgoWindow(frmCyberPhysical, controller);
|
|
|
+ new AlgoWindow(holegJFrame, controller);
|
|
|
});
|
|
|
- openMenu.setAccelerator(KeyStroke.getKeyStroke('N', Toolkit.getDefaultToolkit ().getMenuShortcutKeyMask()));
|
|
|
+ openMenu.setAccelerator(KeyStroke.getKeyStroke('N', Toolkit.getDefaultToolkit ().getMenuShortcutKeyMaskEx()));
|
|
|
menuWindow.add(openMenu);
|
|
|
//Outliner
|
|
|
JMenuItem openOutliner = new JMenuItem("Open Outliner", new ImageIcon(Util.loadImage("/Button_Images/iconOutliner.png").getScaledInstance(20, 20, java.awt.Image.SCALE_SMOOTH)));
|
|
|
openOutliner.addActionListener(actionEvent -> {
|
|
|
- outlinerList.add(new Outliner(frmCyberPhysical, model, controller));
|
|
|
+ outlinerList.add(new Outliner(holegJFrame, model, controller));
|
|
|
});
|
|
|
- openOutliner.setAccelerator(KeyStroke.getKeyStroke('O', Toolkit.getDefaultToolkit ().getMenuShortcutKeyMask()));
|
|
|
+ openOutliner.setAccelerator(KeyStroke.getKeyStroke('O', Toolkit.getDefaultToolkit ().getMenuShortcutKeyMaskEx()));
|
|
|
menuWindow.add(openOutliner);
|
|
|
+ //FlexWindow
|
|
|
+ JMenuItem openFlexMenuItem = new JMenuItem("Open Flexibility Panel", new ImageIcon(Util.loadImage("/Button_Images/iconAlgo.png").getScaledInstance(20, 20, java.awt.Image.SCALE_SMOOTH)));
|
|
|
+ openFlexMenuItem.addActionListener(actionEvent -> {
|
|
|
+ new FlexWindow(holegJFrame, model);
|
|
|
+ });
|
|
|
+ openFlexMenuItem.setAccelerator(KeyStroke.getKeyStroke('F', Toolkit.getDefaultToolkit ().getMenuShortcutKeyMaskEx()));
|
|
|
+ menuWindow.add(openFlexMenuItem);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -2538,9 +2545,9 @@ public class GUI implements CategoryListener {
|
|
|
}
|
|
|
|
|
|
private boolean isUpperPanelInsideBounds() {
|
|
|
- int x = frmCyberPhysical.getX();
|
|
|
- int y = frmCyberPhysical.getY();
|
|
|
- int width = frmCyberPhysical.getWidth();
|
|
|
+ int x = holegJFrame.getX();
|
|
|
+ int y = holegJFrame.getY();
|
|
|
+ int width = holegJFrame.getWidth();
|
|
|
|
|
|
// get all connected screen devices
|
|
|
GraphicsDevice[] screenDevices = GraphicsEnvironment
|
|
@@ -2587,14 +2594,14 @@ public class GUI implements CategoryListener {
|
|
|
private void addObjectAction(String objType,
|
|
|
DefaultMutableTreeNode selectedNode) {
|
|
|
if (selectedNode == null) {
|
|
|
- JOptionPane.showMessageDialog(frmCyberPhysical,
|
|
|
+ JOptionPane.showMessageDialog(holegJFrame,
|
|
|
"Please select a Category first before adding " + objType
|
|
|
+ ".");
|
|
|
}
|
|
|
// if selected node is a directory for Categories
|
|
|
else {
|
|
|
if (selectedNode.getLevel() == 1) {
|
|
|
- String objname = JOptionPane.showInputDialog(frmCyberPhysical,
|
|
|
+ String objname = JOptionPane.showInputDialog(holegJFrame,
|
|
|
"Please enter a Name for the " + objType);
|
|
|
Category cat = controller.searchCategory(selectedNode
|
|
|
.getUserObject().toString());
|
|
@@ -2616,7 +2623,7 @@ public class GUI implements CategoryListener {
|
|
|
}
|
|
|
} else {
|
|
|
JOptionPane
|
|
|
- .showMessageDialog(frmCyberPhysical,
|
|
|
+ .showMessageDialog(holegJFrame,
|
|
|
"Objects can not be added to Objects. Please select a Category.");
|
|
|
}
|
|
|
}
|
|
@@ -2668,7 +2675,7 @@ public class GUI implements CategoryListener {
|
|
|
* @return the Frame
|
|
|
*/
|
|
|
JFrame getFrmCyberPhysical() {
|
|
|
- return frmCyberPhysical;
|
|
|
+ return holegJFrame;
|
|
|
}
|
|
|
|
|
|
private void refreshLanguages() {
|