|
|
@@ -121,7 +121,8 @@ public class GUI<E> implements CategoryListener {
|
|
|
private JMenuItem editItem = new JMenuItem("Edit Object");
|
|
|
private String catOfObjToBeEdited;
|
|
|
private final JScrollPane statTab = new JScrollPane();
|
|
|
-
|
|
|
+
|
|
|
+ private FlexiblePane flexPane;
|
|
|
private StatPanel2 statSplitPane;
|
|
|
private JScrollPane statScrollPane;
|
|
|
private UpperNodeCanvas unc;
|
|
|
@@ -281,7 +282,7 @@ public class GUI<E> implements CategoryListener {
|
|
|
statScrollPane = new JScrollPane(statSplitPane);
|
|
|
this.canvas = new MyCanvas(model, control);
|
|
|
this.holonCanvas = new HolonCanvas(model, control);
|
|
|
- this.unitGraph = new UnitGraph(model, control);
|
|
|
+ //this.unitGraph = new UnitGraph(model, control);
|
|
|
control.initListener(this);
|
|
|
controller.setCanvas(canvas);
|
|
|
model.setConsole(console);
|
|
|
@@ -289,6 +290,7 @@ public class GUI<E> implements CategoryListener {
|
|
|
initialize();
|
|
|
updateCategories(model.getCategories());
|
|
|
updCon = new UpdateController(model, controller);
|
|
|
+ flexPane = new FlexiblePane();
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -1291,9 +1293,11 @@ public class GUI<E> implements CategoryListener {
|
|
|
|
|
|
scrollPane1.setColumnHeaderView(panel);
|
|
|
panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
|
|
|
+ toolBar.setAlignmentX(Component.LEFT_ALIGNMENT);
|
|
|
toolBar.setFloatable(false);
|
|
|
|
|
|
panel.add(toolBar);
|
|
|
+ comboBox.setMaximumSize(new Dimension(100, 20));
|
|
|
toolBar.add(comboBox);
|
|
|
comboBox.setModel(new DefaultComboBoxModel(comboBoxCat));
|
|
|
// Add Buttonnew DefaultComboBoxModel(comboBoxCat)
|
|
|
@@ -1692,6 +1696,7 @@ public class GUI<E> implements CategoryListener {
|
|
|
statSplitPane.repaintGraphs();
|
|
|
}
|
|
|
});
|
|
|
+ splitPane1.setMinimumSize(new Dimension(0, 25));
|
|
|
splitPane.setRightComponent(splitPane1);
|
|
|
splitPane.setDividerLocation(200);
|
|
|
splitPane1.setDividerLocation(500);
|
|
|
@@ -1702,7 +1707,7 @@ public class GUI<E> implements CategoryListener {
|
|
|
tabbedPane.addTab("View", canvasSP);
|
|
|
tabbedPane.addTab("Statistics", statScrollPane);
|
|
|
tabbedPane.addTab("Holon", holonCanvas);
|
|
|
- tabbedPane.addTab("Flexibility", new FlexiblePane());
|
|
|
+ tabbedPane.addTab("Flexibility", flexPane);
|
|
|
|
|
|
splitPaneCanvasConsole.setRightComponent(console);
|
|
|
splitPane1.setLeftComponent(splitPaneCanvasConsole);
|
