[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Space.java, 1.39, 1.40 Attribute.java, 1.11, 1.12

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

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

Modified Files:
	Space.java Attribute.java 
Log Message:
Constructionspaces can now be transparent

Index: Attribute.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Attribute.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Attribute.java	26 Jun 2006 11:36:26 -0000	1.11
--- Attribute.java	17 Jul 2006 08:37:00 -0000	1.12
***************
*** 86,89 ****
--- 86,90 ----
    }
    
+   
    /**
     * Constructor
***************
*** 206,208 ****
--- 207,211 ----
      return "Parameter";
    }
+ 
+ 
  }

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Space.java	4 Jul 2006 11:53:43 -0000	1.39
--- Space.java	17 Jul 2006 08:37:00 -0000	1.40
***************
*** 95,106 ****
    private String classification;
    
    /** The construcstionspace classification options */
    private String[] constructionOptions = 
    {"None", "Terrandæk",  "Tagkonstruktion", "Ydervæg", "Ældre termovindue", 
!    "2-lags lavenergivindue", "3-lags lavenergivindue", "Dør"};
    
    /** The functionalspace classification options */
    private String[] functionalOptions = 
!   {"None", "Exterior", "Livingroom", "Bathroom", "Bedroom"};
    
    /** The modellor */
--- 95,109 ----
    private String classification;
    
+   /** If the constructionspace is transparent */
+   private boolean transparent;
+   
    /** The construcstionspace classification options */
    private String[] constructionOptions = 
    {"None", "Terrandæk",  "Tagkonstruktion", "Ydervæg", "Ældre termovindue", 
!    "2-lags lavenergivindue", "3-lags lavenergivindue", "Dør", "Loft"};
    
    /** The functionalspace classification options */
    private String[] functionalOptions = 
!   {"None", "Exteriør", "Stue", "Badeværelse", "Uopvarmet rum"};
    
    /** The modellor */
***************
*** 126,129 ****
--- 129,133 ----
      setName(name);
      setType(type);
+     setTransparent(false);
      setClassification("None");
      this.container = container;
***************
*** 1041,1044 ****
--- 1045,1050 ----
        } else  if (a.getName().equals("Classification")) {
          setClassification(((String)a.getValue().toString()));
+       } else  if (a.getName().equals("Transparent")) {
+         setTransparent((((Boolean)a.getValue()).booleanValue()));
        } else  if (a.getName().equals("Description")) {
          setDescription(((String)a.getValue().toString()));
***************
*** 1062,1065 ****
--- 1068,1078 ----
        res.add(new Attribute("Classification", functionalOptions, getClassification()));
      }
+     if (isConstructionSpace()) {
+       if (isTransparent()) {
+         res.add(new Attribute("Transparent", Boolean.TRUE));
+       } else {
+         res.add(new Attribute("Transparent", Boolean.FALSE));
+       }
+     }
      res.add(new Attribute("Description", getDescription()));
      return res;
***************
*** 1359,1362 ****
--- 1372,1389 ----
      return surfaceCopy;
    }
+ 
+   /**
+    * @return Returns true if its transparent
+    */
+   public boolean isTransparent() {
+     return transparent;
+   }
+ 
+   /**
+    * @param transparent If its transparent or not
+    */
+   public void setTransparent(boolean transparent) {
+     this.transparent = transparent;
+   }
    
  }