[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/treeview GenericTreeView.java, 1.143, 1.144 SpaceTreeView.java, 1.33, 1.34

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

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31700/src/net/sourceforge/bprocessor/gui/treeview

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

Index: GenericTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v
retrieving revision 1.143
retrieving revision 1.144
diff -C2 -d -r1.143 -r1.144
*** GenericTreeView.java	13 Oct 2008 10:54:11 -0000	1.143
--- GenericTreeView.java	4 Feb 2009 15:09:44 -0000	1.144
***************
*** 58,61 ****
--- 58,63 ----
  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;
***************
*** 1264,1267 ****
--- 1266,1320 ----
      }
      
+     
+     /** {@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 DataContainer extends CompositeNode {
+     /**
+      * 
+      * @param name String
+      * @param content data items
+      */
+     public DataContainer(String name, Collection<DataItem> content) {
+       super(name, content, false);
+     }
    }
    

Index: SpaceTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/SpaceTreeView.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** SpaceTreeView.java	22 Sep 2008 15:58:17 -0000	1.33
--- SpaceTreeView.java	4 Feb 2009 15:09:44 -0000	1.34
***************
*** 53,56 ****
--- 53,57 ----
        ((GenericNode)root.getChildAt(1)).update(p.getConstructors());
        ((GenericNode)root.getChildAt(2)).update(p.getCatalogObjects());
+       ((GenericNode)root.getChildAt(3)).update(p.sensor());
      } catch (ArrayIndexOutOfBoundsException e) {
        log.error("There were a inconsistent number of nodes attached to " +