[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Space.java, 1.199, 1.200

[rimestad <rim...@us...>]

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

Modified Files:
	Space.java 
Log Message:
some null pointer trouble

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.199
retrieving revision 1.200
diff -C2 -d -r1.199 -r1.200
*** Space.java	5 Nov 2007 12:02:29 -0000	1.199
--- Space.java	5 Nov 2007 18:10:29 -0000	1.200
***************
*** 1287,1291 ****
      } else {
        if (isConstructionSpace()) {     
!         if (getOwner().getClassification() != null) {
            res.add(new Attribute("Classification", 
                getOwner().getClassification(), getClassification(), true));
--- 1287,1291 ----
      } else {
        if (isConstructionSpace()) {     
!         if (getOwner() != null && getOwner().getClassification() != null) {
            res.add(new Attribute("Classification", 
                getOwner().getClassification(), getClassification(), true));
***************
*** 1318,1322 ****
        res.add(new Attribute("Room", getRoom(), true));
      }
!     res.add(new Attribute("ID", getId().toString(), false));
      res.add(new Attribute("Owner", getOwner(), false));
      if (isConstructionSpace() || isFunctionalSpace()) {
--- 1318,1322 ----
        res.add(new Attribute("Room", getRoom(), true));
      }
!     res.add(new Attribute("ID", getId() != null ? getId().toString() : "", false));
      res.add(new Attribute("Owner", getOwner(), false));
      if (isConstructionSpace() || isFunctionalSpace()) {
***************
*** 1448,1452 ****
        result.addAll(s.collect());
      }
!     if (isUnion()) {
        result.add(getConstructors().iterator().next().center());
      } else {
--- 1448,1452 ----
        result.addAll(s.collect());
      }
!     if (isUnion() && !getConstructors().isEmpty()) {
        result.add(getConstructors().iterator().next().center());
      } else {