|
@@ -77,7 +77,6 @@ public class GUI implements CategoryListener {
|
|
private final JSplitPane splitPane_2 = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
|
|
private final JSplitPane splitPane_2 = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
|
|
|
|
|
|
private JTable table;
|
|
private JTable table;
|
|
- private JTable table_2 = new JTable();
|
|
|
|
private final Model model;
|
|
private final Model model;
|
|
private final Control controller;
|
|
private final Control controller;
|
|
private AddObjectPopUp addObjectPopUP;
|
|
private AddObjectPopUp addObjectPopUP;
|
|
@@ -168,19 +167,6 @@ public class GUI implements CategoryListener {
|
|
table.setModel(new DefaultTableModel(data, columnNames));
|
|
table.setModel(new DefaultTableModel(data, columnNames));
|
|
table.setCellSelectionEnabled(true);
|
|
table.setCellSelectionEnabled(true);
|
|
table.setColumnSelectionAllowed(true);
|
|
table.setColumnSelectionAllowed(true);
|
|
- JScrollPane scrollPane_3 = new JScrollPane();
|
|
|
|
-
|
|
|
|
- scrollPane_3.setViewportView(table_2);
|
|
|
|
-
|
|
|
|
- table_2.setFillsViewportHeight(true);
|
|
|
|
- table_2.setModel(
|
|
|
|
- new DefaultTableModel(
|
|
|
|
- new Object[][] { { "Solar", "23", "10" }, { "Generator", "24", "1" },
|
|
|
|
- { "Something Else", "25", "3" }, },
|
|
|
|
- new String[] { "Gadget", "Production", "Quantity" }));
|
|
|
|
- table_2.getColumnModel().getColumn(0).setPreferredWidth(103);
|
|
|
|
- table_2.getColumnModel().getColumn(1).setPreferredWidth(107);
|
|
|
|
- table_2.getColumnModel().getColumn(2).setPreferredWidth(125);
|
|
|
|
frmCyberPhysical.getContentPane().setLayout(new BorderLayout(0, 0));
|
|
frmCyberPhysical.getContentPane().setLayout(new BorderLayout(0, 0));
|
|
|
|
|
|
TreeCellRenderer customRenderer = new TreeCellRenderer() {
|
|
TreeCellRenderer customRenderer = new TreeCellRenderer() {
|
|
@@ -385,12 +371,9 @@ public class GUI implements CategoryListener {
|
|
splitPane.setRightComponent(splitPane_1);
|
|
splitPane.setRightComponent(splitPane_1);
|
|
splitPane.setDividerLocation(200);
|
|
splitPane.setDividerLocation(200);
|
|
splitPane_1.setDividerLocation(500);
|
|
splitPane_1.setDividerLocation(500);
|
|
- splitPane_2.setDividerLocation(200);
|
|
|
|
splitPane.setLeftComponent(scrollPane_1);
|
|
splitPane.setLeftComponent(scrollPane_1);
|
|
splitPane_1.setLeftComponent(tabbedPane);
|
|
splitPane_1.setLeftComponent(tabbedPane);
|
|
- splitPane_1.setRightComponent(splitPane_2);
|
|
|
|
- splitPane_2.setLeftComponent(scrollPane);
|
|
|
|
- splitPane_2.setRightComponent(scrollPane_3);
|
|
|
|
|
|
+ splitPane_1.setRightComponent(scrollPane);
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
/*
|