[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Space.java, 1.54, 1.55

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

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

Modified Files:
	Space.java 
Log Message:
Classifictaion is now different on the different levels

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** Space.java	31 Aug 2006 13:01:39 -0000	1.54
--- Space.java	5 Sep 2006 07:27:47 -0000	1.55
***************
*** 109,112 ****
--- 109,120 ----
    {"None", "Exteriør", "Stue", "Badeværelse", "Opvarmet rum", "Uopvarmet rum"};
    
+   /** The construcstionspace classification options */
+   private String[] elementConstructionOptions = 
+   {"None", "Karm", "Sprosse", "Post", "Vindue 2lag termo", "Vindue 3lag termo"};
+   
+   /** The functionalspace classification options */
+   private String[] elementFunctionalOptions = 
+   {"None"};
+   
    /** The modellor */
    private Modellor modellor;
***************
*** 1085,1093 ****
      res.add(new Attribute("ID", getId().toString(), false));
      res.add(new Attribute("Owner", getOwner(), false));
!     if (isConstructionSpace()) {
!       res.add(new Attribute("Classification", constructionOptions, getClassification()));
      } else {
!       res.add(new Attribute("Classification", functionalOptions, getClassification()));
      }
      if (isConstructionSpace()) {
        if (isTransparent()) {
--- 1093,1115 ----
      res.add(new Attribute("ID", getId().toString(), false));
      res.add(new Attribute("Owner", getOwner(), false));
!     if (getOwner() == Project.getInstance().world()) {
!       if (isConstructionSpace()) {       
!         res.add(new Attribute("Classification", constructionOptions, getClassification()));
!       } else {
!         res.add(new Attribute("Classification", functionalOptions, getClassification()));
!       }
!     }
!     
!     if (getOwner().getOwner() == Project.getInstance().world()) {
!       if (isConstructionSpace()) {     
!         res.add(new Attribute("Classification", elementConstructionOptions, getClassification()));
!       } else {
!         res.add(new Attribute("Classification", elementFunctionalOptions, getClassification()));
!       }
      } else {
!       System.out.println("This space is on part level - implementation pending");
      }
+       
+     
      if (isConstructionSpace()) {
        if (isTransparent()) {