[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/treeview GenericTreeView.java, 1.151, 1.152 SpaceTreeView.java, 1.36, 1.37

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20330/src/net/sourceforge/bprocessor/gui/treeview

Modified Files:
	GenericTreeView.java SpaceTreeView.java 
Log Message:


Index: GenericTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v
retrieving revision 1.151
retrieving revision 1.152
diff -C2 -d -r1.151 -r1.152
*** GenericTreeView.java	13 Jul 2010 12:33:55 -0000	1.151
--- GenericTreeView.java	31 Aug 2010 13:48:06 -0000	1.152
***************
*** 58,67 ****
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
- import net.sourceforge.bprocessor.model.bridge.DataItem;
- import net.sourceforge.bprocessor.model.bridge.Mote;
- import net.sourceforge.bprocessor.model.bridge.Sensor;
  import net.sourceforge.bprocessor.model.modellor.Modellor;
! import net.sourceforge.bprocessor.model.sense.SensorItem;
! import net.sourceforge.bprocessor.model.sense.SensorStorage;
  import net.sourceforge.bprocessor.gui.GUI;
  import net.sourceforge.bprocessor.gui.attrview.AttributeView;
--- 58,70 ----
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
  import net.sourceforge.bprocessor.model.modellor.Modellor;
! import net.sourceforge.bprocessor.model.sense.brunata.TargetManager;
! import net.sourceforge.bprocessor.model.sense.core.Target;
! import net.sourceforge.bprocessor.model.sense.monitor.DataSet;
! import net.sourceforge.bprocessor.model.sense.monitor.DataItem;
! import net.sourceforge.bprocessor.model.sense.monitor.MonitorManager;
! import net.sourceforge.bprocessor.model.sense.monitor.SensorHistory;
! import net.sourceforge.bprocessor.model.sense.monitor.SensorMonitor;
! import net.sourceforge.bprocessor.model.sense.monitor.TargetMonitor;
  import net.sourceforge.bprocessor.gui.GUI;
  import net.sourceforge.bprocessor.gui.attrview.AttributeView;
***************
*** 659,662 ****
--- 662,705 ----
    }
    
+   
+   private class TargetMonitorNode extends EntityNode {
+     public TargetMonitorNode(TargetMonitor monitor) {
+       super(monitor);
+       for (SensorMonitor current : monitor.getMonitors()) {
+         add(new SensorMonitorNode(current));
+       }
+     }
+   }
+   
+   private class SensorMonitorNode extends EntityNode {
+     public SensorMonitorNode(SensorMonitor monitor) {
+       super(monitor);
+       add(new SensorHistoryNode(monitor.getSensorHistory()));
+     }
+   }
+   
+   private class SensorHistoryNode extends EntityNode {
+     public SensorHistoryNode(SensorHistory sensorHistory) {
+       super(sensorHistory);
+       add(new DataSetNode(sensorHistory.getData()));
+     }
+   }
+   
+   private class DataSetNode extends EntityNode {
+     public DataSetNode(DataSet graph) {
+       super(graph);
+       for (DataItem current : graph.getItems()) {
+         add(new DataItemNode(current));
+       }
+     }
+   }
+   
+   private class DataItemNode extends EntityNode {
+     public DataItemNode(DataItem item) {
+       super(item);
+     }
+   }
+   
+   
    /**
     * 
***************
*** 682,688 ****
          add(new ConstructorNode(cs));
        }
!       if (space.getStorage() != null) {
!         SensorStorage storage = (SensorStorage) space.getStorage();
!         add(new SensorStorageContainer("Data", storage.getItems()));
        }
      }
--- 725,733 ----
          add(new ConstructorNode(cs));
        }
!       Object obj = space.getParameters().get("target");
!       if (obj instanceof String) {
!         Target target = TargetManager.instance().getTarget((String) obj);
!         TargetMonitor monitor = MonitorManager.instance().get(target);
!         add(new TargetMonitorNode(monitor));
        }
      }
***************
*** 702,707 ****
        }
      }
-     
-     
    }
    
--- 747,750 ----
***************
*** 1303,1386 ****
    
    /**
-    * 
-    */
-   public class SensorContainer extends CompositeNode {
- 
-     /**
-      * @param sensor Sensor
-      */
-     public SensorContainer(Sensor sensor) {
-       super(sensor, sensor.motes(), false);
-     }
-     
-     
-     /** {@inheritDoc} */
-     public EntityNode nodeFor(Object entity) {
-       return new MoteNode((Mote) entity);
-     }
-     
-     /**
-      * Update the node with the given object
-      * @param o The object
-      */
-     public void update(Object o) {
-       userObject = o;
-       super.update(((Sensor)o).motes());
-     }
-     
-   }
-   
-   /**
-    * 
-    */
-   public class MoteNode extends EntityNode {
-     /**
-      * @param label Mote
-      */
-     public MoteNode(Mote label) {
-       super(label);
-       add(new DataContainer("Data", label.items()));
-     }
-     
-     /**
-      * {@inheritDoc}
-      */
-     public void update(Object o) {
-       super.update(o);
-       Mote mote = (Mote) o;
-       updateChild(0, mote.items());
-     }
-   }
-   
-   
-   /**
-    * 
-    */
-   public class SensorStorageContainer extends CompositeNode {
-     /**
-      * 
-      * @param name String
-      * @param content data items
-      */
-     public SensorStorageContainer(String name, Collection<SensorItem> content) {
-       super(name, content, false);
-     }
-   }
-   
-   /**
-    * 
-    */
-   public class DataContainer extends CompositeNode {
-     /**
-      * 
-      * @param name String
-      * @param content data items
-      */
-     public DataContainer(String name, Collection<DataItem> content) {
-       super(name, content, false);
-     }
-   }
-   
-   /**
     * Component Container
     */
--- 1346,1349 ----

Index: SpaceTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/SpaceTreeView.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** SpaceTreeView.java	21 May 2010 07:28:54 -0000	1.36
--- SpaceTreeView.java	31 Aug 2010 13:48:06 -0000	1.37
***************
*** 37,43 ****
        root.add(new ScriptContainer("Scripts", p.world().getScripts(), false));
        root.add(new ComponentContainer("Catalog", p.getCatalogObjects()));
-       if (Project.SENSE) {
-         root.add(new SensorContainer(p.sensor()));
-       }
        model.nodeStructureChanged(root);
      } catch (Exception error) {
--- 37,40 ----
***************
*** 57,63 ****
        ((GenericNode)root.getChildAt(2)).update(p.world().getScripts());
        ((GenericNode)root.getChildAt(3)).update(p.getCatalogObjects());
!       if (Project.SENSE) {
!         ((GenericNode)root.getChildAt(4)).update(p.sensor());
!       }
      } catch (ArrayIndexOutOfBoundsException e) {
        log.error("There were a inconsistent number of nodes attached to " +
--- 54,58 ----
        ((GenericNode)root.getChildAt(2)).update(p.world().getScripts());
        ((GenericNode)root.getChildAt(3)).update(p.getCatalogObjects());
!       
      } catch (ArrayIndexOutOfBoundsException e) {
        log.error("There were a inconsistent number of nodes attached to " +