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

[Nordholt <nor...@us...>]

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

Modified Files:
	Space.java 
Log Message:
fixed some situations that could result in nullpointer exceptions

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** Space.java	5 Sep 2006 11:01:37 -0000	1.57
--- Space.java	7 Sep 2006 11:34:34 -0000	1.58
***************
*** 972,977 ****
      if (element != null) {
        Space superSpace = findElement(element);
!       superSpace.elements.remove(element.getId());
!       element.setId(null);
      }
    }
--- 972,979 ----
      if (element != null) {
        Space superSpace = findElement(element);
!       if (superSpace != null) {
!         superSpace.elements.remove(element.getId());
!         element.setId(null);
!       }
      }
    }
***************
*** 985,997 ****
     */
    private Space findElement(Space element) {
!     if (elements.get(element.getId()) == element) {
!       return this;
!     } else {
!       Iterator it = elements.values().iterator();
!       while (it.hasNext()) {
!         Space space = (Space)it.next();
!         Space result = space.findElement(element);
!         if (result != null) {
!           return result;
          }
        }
--- 987,1001 ----
     */
    private Space findElement(Space element) {
!     if (elements != null) { 
!       if (elements.get(element.getId()) == element) {
!         return this;
!       } else {
!         Iterator it = elements.values().iterator();
!         while (it.hasNext()) {
!           Space space = (Space)it.next();
!           Space result = space.findElement(element);
!           if (result != null) {
!             return result;
!           }
          }
        }