[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Space.java,1.16,1.17 Modellor.java,1.2,1.3

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

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

Modified Files:
	Space.java Modellor.java 
Log Message:
Elements and interior added to Space

Index: Modellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Modellor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Modellor.java	30 Jan 2006 10:04:50 -0000	1.2
--- Modellor.java	6 Feb 2006 07:41:23 -0000	1.3
***************
*** 13,20 ****
   * established at the creation of the Modellor.
   */
! public interface Modellor {
    /**
     * Generate a list of surfaces.
     */
!   public void generate();
  }
--- 13,21 ----
   * established at the creation of the Modellor.
   */
! public abstract class Modellor extends Entity implements Observer {
    /**
     * Generate a list of surfaces.
+    * @param entity Changed entity
     */
!   public abstract void update(Object entity);
  }

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Space.java	1 Feb 2006 09:00:23 -0000	1.16
--- Space.java	6 Feb 2006 07:41:23 -0000	1.17
***************
*** 8,11 ****
--- 8,13 ----
  
  import java.util.HashSet;
+ import java.util.LinkedList;
+ import java.util.List;
  import java.util.Set;
  
***************
*** 28,31 ****
--- 30,37 ----
    /** The envelope (a set of surfaces) */
    private Set envelope;
+   /** The elements (a list of spaces) */
+   private List elements;
+   /** The interior mesh */
+   private Mesh interior;
    
    
***************
*** 124,127 ****
--- 130,150 ----
  
    /**
+    * Get the interior mesh
+    * @return The interior mesh
+    */
+   public Mesh getInterior() {
+     return interior;
+   }
+   
+   /**
+    * Set the interior mesh
+    * @param mesh The mesh
+    */
+   public void setInterior(Mesh mesh) {
+     interior = mesh;
+   }
+   
+   
+   /**
     * Get the surfaces
     * @return The surfaces
***************
*** 175,178 ****
--- 198,221 ----
  
    /**
+    * Add a space as element
+    * @param element The space to add as element
+    */
+   public void add(Space element) {
+     if (elements == null) {
+       elements = new LinkedList();
+     }
+     elements.add(element);
+   }
+   
+   /**
+    * Remove a space as  element
+    * @param element The space to remove as element
+    */
+   public void remove(Space element) {
+     elements.remove(element);
+   }
+   
+   
+   /**
     * String representation of the object
     * @return The string