|
@@ -23,6 +23,8 @@ import javax.swing.tree.TreeNode;
|
|
|
|
|
|
import DataSets.GraphDataSet;
|
|
|
import DataSets.PropertyDataSet;
|
|
|
+import classes.AbstractCpsObject;
|
|
|
+import classes.CpsUpperNode;
|
|
|
import classes.HolonObject;
|
|
|
import classes.HolonSwitch;
|
|
|
import classes.TrackedDataSet;
|
|
@@ -72,6 +74,7 @@ public class splitPane extends JSplitPane implements GraphListener {
|
|
|
private DefaultMutableTreeNode objectsNode;
|
|
|
private DefaultMutableTreeNode wholeHolon;
|
|
|
private DefaultMutableTreeNode switchesNode;
|
|
|
+ private DefaultMutableTreeNode gridsNode;
|
|
|
|
|
|
private Hashtable<String, GraphDataSet> objectHashtable;
|
|
|
private Hashtable<String, StatisticGraphPanel> graphHashtable;
|
|
@@ -507,10 +510,14 @@ public class splitPane extends JSplitPane implements GraphListener {
|
|
|
switchesNode = new DefaultMutableTreeNode("Switches");
|
|
|
switchesNode.add(new DefaultMutableTreeNode("empty"));
|
|
|
|
|
|
+ gridsNode = new DefaultMutableTreeNode("Grids");
|
|
|
+ gridsNode.add(new DefaultMutableTreeNode("empty"));
|
|
|
+
|
|
|
treeModel.setRoot(root);
|
|
|
root.add(wholeHolon);
|
|
|
root.add(objectsNode);
|
|
|
root.add(switchesNode);
|
|
|
+ root.add(gridsNode);
|
|
|
objectTree.setModel(treeModel);
|
|
|
|
|
|
treeScrollPane.setViewportView(objectTree);
|
|
@@ -604,43 +611,43 @@ public class splitPane extends JSplitPane implements GraphListener {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public void addTrackedObject(ArrayList<HolonObject> hlList) {
|
|
|
+ public void addTrackedObject(ArrayList<AbstractCpsObject> hlList) {
|
|
|
objectsNode.removeAllChildren();
|
|
|
objectHashtable.clear();
|
|
|
if (hlList.size() > 0 && hlList != null) {
|
|
|
- for (HolonObject hO : hlList) {
|
|
|
- Hashtable<String, PropertyDataSet> tmpHash = new Hashtable<String, PropertyDataSet>();
|
|
|
- String name = hO.getName() + " " + hO.getID();
|
|
|
+ for (AbstractCpsObject abs : hlList) {
|
|
|
+ String name = abs.getName() + " " + abs.getID();
|
|
|
DefaultMutableTreeNode tmp = new DefaultMutableTreeNode(name);
|
|
|
- tmp.add(new DefaultMutableTreeNode("total Production"));
|
|
|
- tmp.add(new DefaultMutableTreeNode("total Consumption"));
|
|
|
- tmp.add(new DefaultMutableTreeNode("number of activated Elements"));
|
|
|
- tmpHash.put("total Production", new PropertyDataSet());
|
|
|
- tmpHash.put("total Consumption", new PropertyDataSet());
|
|
|
- tmpHash.put("number of activated Elements", new PropertyDataSet());
|
|
|
- GraphDataSet gS = new GraphDataSet(hO, tmpHash);
|
|
|
- objectHashtable.put(name, gS);
|
|
|
- objectsNode.add(tmp);
|
|
|
- }
|
|
|
- } else {
|
|
|
- objectsNode.add(new DefaultMutableTreeNode("empty"));
|
|
|
- }
|
|
|
|
|
|
- }
|
|
|
-
|
|
|
- @Override
|
|
|
- public void addTrackedSwitch(ArrayList<HolonSwitch> swList){
|
|
|
- switchesNode.removeAllChildren();
|
|
|
- if(swList.size() > 0 && swList != null){
|
|
|
- for(HolonSwitch sw : swList){
|
|
|
- String name = sw.getName() + " " + sw.getID();
|
|
|
- DefaultMutableTreeNode tmp = new DefaultMutableTreeNode(name);
|
|
|
- tmp.add(new DefaultMutableTreeNode("activated"));
|
|
|
- switchesNode.add(tmp);
|
|
|
+ //HolonObjects
|
|
|
+ if(abs instanceof HolonObject){
|
|
|
+ Hashtable<String, PropertyDataSet> tmpHash = new Hashtable<String, PropertyDataSet>();
|
|
|
+ tmp.add(new DefaultMutableTreeNode("total Production"));
|
|
|
+ tmp.add(new DefaultMutableTreeNode("total Consumption"));
|
|
|
+ tmp.add(new DefaultMutableTreeNode("number of activated Elements"));
|
|
|
+ tmpHash.put("total Production", new PropertyDataSet());
|
|
|
+ tmpHash.put("total Consumption", new PropertyDataSet());
|
|
|
+ tmpHash.put("number of activated Elements", new PropertyDataSet());
|
|
|
+ GraphDataSet gS = new GraphDataSet(abs, tmpHash);
|
|
|
+ objectHashtable.put(name, gS);
|
|
|
+ objectsNode.add(tmp);
|
|
|
+ }
|
|
|
+
|
|
|
+ //HolonSwitches
|
|
|
+ if(abs instanceof HolonSwitch){
|
|
|
+ tmp.add(new DefaultMutableTreeNode("activated"));
|
|
|
+ switchesNode.add(tmp);
|
|
|
+ }
|
|
|
+
|
|
|
+ //NodesOfNodes
|
|
|
+ if(abs instanceof CpsUpperNode){
|
|
|
+ tmp.add(new DefaultMutableTreeNode("total Production"));
|
|
|
+ tmp.add(new DefaultMutableTreeNode("total Consumption"));
|
|
|
+ gridsNode.add(tmp);
|
|
|
+ }
|
|
|
}
|
|
|
- } else {
|
|
|
- switchesNode.add(new DefaultMutableTreeNode("empty"));
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
|
|
|
public void colorChanged(Color color) {
|