[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/sense/brunata BrunataHistory.java, 1.1, 1.2 TargetManager.java, 1.1, 1.2

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

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/sense/brunata
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv26351/src/net/sourceforge/bprocessor/model/sense/brunata

Modified Files:
	BrunataHistory.java TargetManager.java 
Log Message:


Index: TargetManager.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/sense/brunata/TargetManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TargetManager.java	31 Aug 2010 13:48:02 -0000	1.1
--- TargetManager.java	26 Nov 2010 14:20:31 -0000	1.2
***************
*** 4,12 ****
  import java.util.Map;
  
  import net.sourceforge.bprocessor.model.sense.core.History;
  import net.sourceforge.bprocessor.model.sense.core.Sensor;
  import net.sourceforge.bprocessor.model.sense.core.Target;
  
! public class TargetManager {
    private static TargetManager instance;
    
--- 4,16 ----
  import java.util.Map;
  
+ import net.sourceforge.bprocessor.model.sense.core.Consumer;
  import net.sourceforge.bprocessor.model.sense.core.History;
+ import net.sourceforge.bprocessor.model.sense.core.Measurement;
  import net.sourceforge.bprocessor.model.sense.core.Sensor;
  import net.sourceforge.bprocessor.model.sense.core.Target;
+ import net.sourceforge.bprocessor.model.sense.ti.Adapter;
+ import net.sourceforge.bprocessor.model.sense.ti.CoreMeasurement;
  
! public class TargetManager extends Consumer {
    private static TargetManager instance;
    
***************
*** 20,28 ****
    
    private Map<String, Target> targets;
!   private BrunataHistory history;
    
    public TargetManager() {
      targets = new HashMap<String, Target>();
!     history = new BrunataHistory();
    }
    
--- 24,46 ----
    
    private Map<String, Target> targets;
!   private BrunataHistory brunata;
!   private Adapter adapter;
!   
!   
    
    public TargetManager() {
      targets = new HashMap<String, Target>();
!     brunata = new BrunataHistory();
!     adapter = new Adapter();
!     adapter.add(this);
!   }
!   
!   public void fill() {
!     try {
!       adapter.fill();
!     } catch (Exception e) {
!       // TODO Auto-generated catch block
!       e.printStackTrace();
!     }
    }
    
***************
*** 36,39 ****
--- 54,59 ----
        target.getSensors().add(humidity);
        targets.put(id, target);
+       
+       
      }
      return target;
***************
*** 41,45 ****
    
    public History getHistory() {
!     return history;
    }
  }
--- 61,78 ----
    
    public History getHistory() {
!     return brunata;
!   }
!   
!   public void consume(Object value) {
!     if (value instanceof CoreMeasurement) {
!       CoreMeasurement core = (CoreMeasurement) value;
!       System.out.println(core);
!       String id = String.valueOf(core.id);
!       Target target = getTarget(id);
!       Measurement temperature = new Measurement(core.time, String.valueOf(core.temperature));
!       target.newTemperature(temperature);
!       Measurement humidity = new Measurement(core.time, String.valueOf(core.humidity));
!       target.newHumidity(humidity);
!     }
    }
  }

Index: BrunataHistory.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/sense/brunata/BrunataHistory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BrunataHistory.java	31 Aug 2010 13:48:02 -0000	1.1
--- BrunataHistory.java	26 Nov 2010 14:20:31 -0000	1.2
***************
*** 14,19 ****
  import net.sourceforge.bprocessor.model.sense.brunata.xml.Document;
  import net.sourceforge.bprocessor.model.sense.brunata.xml.DocumentParser;
- import net.sourceforge.bprocessor.model.sense.brunata.xml.Element;
- import net.sourceforge.bprocessor.model.sense.brunata.xml.Atom;
  import net.sourceforge.bprocessor.model.sense.brunata.xml.Persistence;
  import net.sourceforge.bprocessor.model.sense.brunata.xml.Persistence.Serie;
--- 14,17 ----
***************
*** 34,37 ****
--- 32,40 ----
      map.put("3138", "2501864");
      map.put("3127", "2501865");
+     
+     map.put("3890735184", "2501861");
+     map.put("3890735106", "2501858");
+     map.put("3890735107", "2501865");
+     
    }