|
|
@@ -6,14 +6,12 @@ import java.awt.Component;
|
|
|
import java.awt.Cursor;
|
|
|
import java.awt.Dimension;
|
|
|
import java.awt.Image;
|
|
|
-import java.awt.MouseInfo;
|
|
|
import java.awt.Point;
|
|
|
import java.awt.Toolkit;
|
|
|
import java.awt.event.ActionEvent;
|
|
|
import java.awt.event.ActionListener;
|
|
|
import java.awt.event.MouseAdapter;
|
|
|
import java.awt.event.MouseEvent;
|
|
|
-import java.awt.event.MouseListener;
|
|
|
import java.beans.PropertyChangeEvent;
|
|
|
import java.beans.PropertyChangeListener;
|
|
|
import java.io.File;
|
|
|
@@ -36,7 +34,6 @@ import javax.swing.JMenuItem;
|
|
|
import javax.swing.JOptionPane;
|
|
|
import javax.swing.JPanel;
|
|
|
import javax.swing.JPopupMenu;
|
|
|
-import javax.swing.JRadioButton;
|
|
|
import javax.swing.JScrollPane;
|
|
|
import javax.swing.JSlider;
|
|
|
import javax.swing.JSplitPane;
|
|
|
@@ -51,12 +48,9 @@ import javax.swing.tree.DefaultMutableTreeNode;
|
|
|
import javax.swing.tree.DefaultTreeModel;
|
|
|
import javax.swing.tree.TreeCellRenderer;
|
|
|
|
|
|
-import com.sun.javafx.geom.Edge;
|
|
|
-
|
|
|
import Interfaces.CategoryListener;
|
|
|
import classes.Category;
|
|
|
import classes.CpsEdge;
|
|
|
-import classes.CpsNode;
|
|
|
import classes.CpsObject;
|
|
|
import classes.HolonElement;
|
|
|
import classes.HolonObject;
|
|
|
@@ -166,7 +160,6 @@ public class GUI<E> implements CategoryListener {
|
|
|
private final JMenu mnAlgorithm = new JMenu("Algorithm");
|
|
|
private final JCheckBoxMenuItem chckbxmntmUseAlgorithm = new JCheckBoxMenuItem("Use Algorithm");
|
|
|
private final JSplitPane splitPane_2 = new JSplitPane();
|
|
|
- private final JLabel label_1 = new JLabel("New label");
|
|
|
private final JLabel lblSelect = new JLabel("Select");
|
|
|
private final JComboBox comboBoxAlgo = new JComboBox();
|
|
|
private int yTHIS;
|
|
|
@@ -256,8 +249,6 @@ public class GUI<E> implements CategoryListener {
|
|
|
tabbedPane.addTab("Modeling", new ImageIcon(new ImageIcon(this.getClass().getResource("/Images/home.png"))
|
|
|
.getImage().getScaledInstance(30, 30, Image.SCALE_SMOOTH)), canvasSP, "Model a CPS");
|
|
|
|
|
|
- tabbedPane.addTab("New tab", null, label_1, null);
|
|
|
-
|
|
|
tabbedPane.addTab("Simulation",
|
|
|
new ImageIcon(new ImageIcon(this.getClass().getResource("/Images/Dummy_House.png")).getImage()
|
|
|
.getScaledInstance(30, 30, Image.SCALE_SMOOTH)),
|
|
|
@@ -509,10 +500,10 @@ public class GUI<E> implements CategoryListener {
|
|
|
CpsObject selected = controller.searchObjInCat(selectedNode.toString(),
|
|
|
selectedNode.getParent().toString());
|
|
|
deleteRows();
|
|
|
- if (selected instanceof HolonObject && selected != null) {
|
|
|
- selected = (HolonObject) selected;
|
|
|
- fillElementTable(((HolonObject) selected).getElements());
|
|
|
- }
|
|
|
+// if (selected instanceof HolonObject && selected != null) {
|
|
|
+// selected = (HolonObject) selected;
|
|
|
+// fillElementTable(((HolonObject) selected).getElements());
|
|
|
+// }
|
|
|
}
|
|
|
for (Category cat : model.getCategories()) {
|
|
|
for (CpsObject cps : cat.getObjects()) {
|
