[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Space.java, 1.61, 1.62

[Michael L. <he...@us...>]

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

Modified Files:
	Space.java 
Log Message:
Space instantiation implemented

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** Space.java	15 Sep 2006 12:06:38 -0000	1.61
--- Space.java	17 Sep 2006 19:04:59 -0000	1.62
***************
*** 60,63 ****
--- 60,72 ----
     */
    private boolean container;
+   
+   /**
+    * If proto points to another space, this space
+    * is an instance of the other space and is not
+    * a container.
+    * 
+    * FIXME Should be handled by a class hierarchy.
+    */
+   private Space proto;
  
    /** The empty space in this space (also called void) */
***************
*** 222,225 ****
--- 231,250 ----
      this.transform = transform;
    }
+   
+   /**
+    * Set proto
+    * @param space Space
+    */
+   public void setProto(Space space) {
+     this.proto = space;
+   }
+   
+   /**
+    * Get proto
+    * @return proto
+    */
+   public Space getProto() {
+     return proto;
+   }
  
    /**
***************
*** 452,456 ****
        return vertices.values();
      } else {
!       return EMPTY;
      }
    }
--- 477,485 ----
        return vertices.values();
      } else {
!       if (proto != null) {
!         return proto.getVertices();
!       } else {
!         return EMPTY;
!       }
      }
    }
***************
*** 638,642 ****
        return edges.values();
      } else {
!       return EMPTY;
      }
    }
--- 667,675 ----
        return edges.values();
      } else {
!       if (proto != null) {
!         return proto.getEdges();
!       } else {
!         return EMPTY;
!       }
      }
    }
***************
*** 752,756 ****
        return surfaces.values();
      } else {
!       return EMPTY;
      }
    }
--- 785,793 ----
        return surfaces.values();
      } else {
!       if (proto != null) {
!         return proto.getSurfaces();
!       } else {
!         return EMPTY;
!       }
      }
    }
***************
*** 1031,1035 ****
        return elements.values();
      } else {
!       return EMPTY;
      }
    }
--- 1068,1076 ----
        return elements.values();
      } else {
!       if (proto != null) {
!         return proto.getElements();
!       } else {
!         return EMPTY;
!       }
      }
    }