bprocessor-commit

[Nikolaj B. <nbr...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13301/src/net/sourceforge/bprocessor/model

Modified Files:
	Classification.java Space.java Project.java 
Log Message:
Temporary fix that was making attribute view for spaces unstable

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** Space.java	24 Oct 2006 20:40:48 -0000	1.87
--- Space.java	27 Oct 2006 10:25:14 -0000	1.88
***************
*** 1348,1352 ****
      if (getOwner() == Project.getInstance().world()) {
        if (isConstructionSpace()) { 
!         
          res.add(new Attribute("Classification", 
              Project.getInstance().getClassification(), getClassification()));
--- 1348,1353 ----
      if (getOwner() == Project.getInstance().world()) {
        if (isConstructionSpace()) { 
!         System.out.println("The classification: " + getClassification());
!         System.out.println("The name: " + getName());
          res.add(new Attribute("Classification", 
              Project.getInstance().getClassification(), getClassification()));

Index: Classification.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Classification.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Classification.java	24 Oct 2006 20:40:48 -0000	1.1
--- Classification.java	27 Oct 2006 10:25:14 -0000	1.2
***************
*** 46,50 ****
     */
    public Classification() {
!     setName("World");
      setId(new Integer(0));
    }
--- 46,50 ----
     */
    public Classification() {
!     setName("Classification");
      setId(new Integer(0));
    }
***************
*** 122,126 ****
      String fullId = id.toString();
      Classification par = parent;
!     while (!par.getName().equalsIgnoreCase("World")) {
        fullId = par.getId() + "." + fullId;
        par = par.getParent();
--- 122,126 ----
      String fullId = id.toString();
      Classification par = parent;
!     while (!par.getName().equalsIgnoreCase("Classification")) {
        fullId = par.getId() + "." + fullId;
        par = par.getParent();

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** Project.java	24 Oct 2006 20:40:48 -0000	1.86
--- Project.java	27 Oct 2006 10:25:14 -0000	1.87
***************
*** 753,762 ****
      ArrayList res = new ArrayList();
      res.add(new Attribute("Name", getName()));
!     res.add(new Attribute("Energyloss", new Double(EnergyCalc.energyLoss()), false));
      res.add(new Attribute("Heated area", new Double(EnergyCalc.heatedArea()), false));
!     if (EnergyCalc.heatedArea() != 0) {
        res.add(new Attribute("loss per m2", 
            new Double(EnergyCalc.energyLoss() / EnergyCalc.heatedArea()), false));
!     }
      res.add(new Attribute("Script", script));
      return res;
--- 753,762 ----
      ArrayList res = new ArrayList();
      res.add(new Attribute("Name", getName()));
!     //res.add(new Attribute("Energyloss", new Double(EnergyCalc.energyLoss()), false));
      res.add(new Attribute("Heated area", new Double(EnergyCalc.heatedArea()), false));
!     /*if (EnergyCalc.heatedArea() != 0) {
        res.add(new Attribute("loss per m2", 
            new Double(EnergyCalc.energyLoss() / EnergyCalc.heatedArea()), false));
!     }*/
      res.add(new Attribute("Script", script));
      return res;