[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Space.java, 1.58, 1.59

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

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

Modified Files:
	Space.java 
Log Message:
Fixed a small bug that would result in two classification fields in some cases

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** Space.java	7 Sep 2006 11:34:34 -0000	1.58
--- Space.java	11 Sep 2006 09:24:52 -0000	1.59
***************
*** 1111,1131 ****
          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 {
!       if (isConstructionSpace()) {     
!         res.add(new Attribute("Classification", partConstructionOptions, getClassification()));
        } else {
!         res.add(new Attribute("Classification", partFunctionalOptions, getClassification()));
        }
-     }
        
!     
      if (isConstructionSpace()) {
        if (isTransparent()) {
--- 1111,1131 ----
          res.add(new Attribute("Classification", functionalOptions, getClassification()));
        }
      } else {
!       
!       if (getOwner().getOwner() == Project.getInstance().world()) {
!         if (isConstructionSpace()) {     
!           res.add(new Attribute("Classification", elementConstructionOptions, getClassification()));
!         } else {
!           res.add(new Attribute("Classification", elementFunctionalOptions, getClassification()));
!         }
        } else {
!         if (isConstructionSpace()) {     
!           res.add(new Attribute("Classification", partConstructionOptions, getClassification()));
!         } else {
!           res.add(new Attribute("Classification", partFunctionalOptions, getClassification()));
!         }
        }
        
!     }
      if (isConstructionSpace()) {
        if (isTransparent()) {