[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Surface.java,1.52,1.53 ConstructionSpace.java,1.2,1.3 Space.java,1.7,1.8 FunctionalSpace.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-serv3125/src/net/sourceforge/bprocessor/model

Modified Files:
	Surface.java ConstructionSpace.java Space.java 
	FunctionalSpace.java 
Log Message:
Surface is now related to Space instead of Domain

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** Surface.java	8 Dec 2005 23:21:48 -0000	1.52
--- Surface.java	11 Dec 2005 17:50:30 -0000	1.53
***************
*** 49,56 ****
    
    /** The domain in front of the surface */
!   private Domain frontDomain;
    
    /** The domain behind the surface */
!   private Domain backDomain;
    
    /** Surface is clockwise */
--- 49,56 ----
    
    /** The domain in front of the surface */
!   private Space frontDomain;
    
    /** The domain behind the surface */
!   private Space backDomain;
    
    /** Surface is clockwise */
***************
*** 517,522 ****
      Vertex other = inner.normal();
      double dot = normal.dot(other);
!     Domain front = getFrontDomain();
!     Domain back = getBackDomain();
      if (dot > 0) {
        if (inner.getFrontDomain() == null) {
--- 517,522 ----
      Vertex other = inner.normal();
      double dot = normal.dot(other);
!     Space front = getFrontDomain();
!     Space back = getBackDomain();
      if (dot > 0) {
        if (inner.getFrontDomain() == null) {
***************
*** 674,678 ****
     *   class="net.sourceforge.bprocessor.model.Domain"
     */
!   public Domain getBackDomain() {
      return backDomain;
    }
--- 674,678 ----
     *   class="net.sourceforge.bprocessor.model.Domain"
     */
!   public Space getBackDomain() {
      return backDomain;
    }
***************
*** 682,686 ****
     * @param back the domain
     */
!   public void setBackDomain(Domain back) {
      if (backDomain != back) {
        if (backDomain != null) {
--- 682,686 ----
     * @param back the domain
     */
!   public void setBackDomain(Space back) {
      if (backDomain != back) {
        if (backDomain != null) {
***************
*** 702,706 ****
     *   class="net.sourceforge.bprocessor.model.Domain"
     */
!   public Domain getFrontDomain() {
      return frontDomain;
    }
--- 702,706 ----
     *   class="net.sourceforge.bprocessor.model.Domain"
     */
!   public Space getFrontDomain() {
      return frontDomain;
    }
***************
*** 709,713 ****
     * @param front the frontdomain
     */
!   public void setFrontDomain(Domain front) {
      if (frontDomain != front) {
        if (frontDomain != null) {
--- 709,713 ----
     * @param front the frontdomain
     */
!   public void setFrontDomain(Space front) {
      if (frontDomain != front) {
        if (frontDomain != null) {

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Space.java	11 Dec 2005 17:27:19 -0000	1.7
--- Space.java	11 Dec 2005 17:50:30 -0000	1.8
***************
*** 7,12 ****
  package net.sourceforge.bprocessor.model;
  
- import java.util.HashSet;
- import java.util.Set;
  
  import org.apache.log4j.Logger;
--- 7,10 ----
***************
*** 26,32 ****
    /** The space id */
    private Long spaceId;
! 
!   /** The elements */
!   private Set elements;
    
    /** The modellor */
--- 24,28 ----
    /** The space id */
    private Long spaceId;
!   
    
    /** The modellor */
***************
*** 65,93 ****
      this.spaceId = id;
    }
! 
    /**
!    * Get the elements
!    * @return The elements
!    * @hibernate.set
!    *   lazy="false"
!    * @hibernate.key
!    *   column="SPACE_ID"
!    * @hibernate.one-to-many
!    *   class="net.sourceforge.bprocessor.model.Element"
     */
!   public Set getElements() {
!     if (elements == null) {
!       return new HashSet();
!     } else {
!       return elements;
!     }
    }
! 
    /**
!    * Set the elements
!    * @param elements The elements
     */
!   public void setElements(Set elements) {
!     this.elements = elements;
    }
    
--- 61,80 ----
      this.spaceId = id;
    }
!   
!   
    /**
!    * Test for construction-space
!    * @return True if constructionspace
     */
!   public boolean isConstructionSpace() {
!     return false;
    }
!   
    /**
!    * Test for functional-space
!    * @return True if functional-space
     */
!   public boolean isFunctionalSpace() {
!     return false;
    }
    
***************
*** 113,118 ****
     */
    public String toString() {
!     return "Space[" + super.toString() + ",elements=" + 
!       elements == null ? "0" : elements.size() + "]";
    }
  }
--- 100,104 ----
     */
    public String toString() {
!     return "Space[" + super.toString() + "]";
    }
  }

Index: ConstructionSpace.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ConstructionSpace.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ConstructionSpace.java	28 Jul 2005 06:48:54 -0000	1.2
--- ConstructionSpace.java	11 Dec 2005 17:50:30 -0000	1.3
***************
*** 37,41 ****
      super();
      setName(name);
-     setElements(null);
    }
  
--- 37,40 ----
***************
*** 60,63 ****
--- 59,70 ----
  
    /**
+    * Test for construction-space
+    * @return True if constructionspace
+    */
+   public boolean isConstructionSpace() {
+     return true;
+   }
+   
+   /**
     * Return the hash code of the object
     * @return The hash

Index: FunctionalSpace.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/FunctionalSpace.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FunctionalSpace.java	28 Jul 2005 06:48:54 -0000	1.2
--- FunctionalSpace.java	11 Dec 2005 17:50:30 -0000	1.3
***************
*** 37,41 ****
      super();
      setName(name);
-     setElements(null);
    }
  
--- 37,40 ----
***************
*** 58,61 ****
--- 57,68 ----
      this.functionalSpaceId = id;
    }
+   
+   /**
+    * Test for functional-space
+    * @return True if functional-space
+    */
+   public boolean isFunctionalSpace() {
+     return true;
+   }
  
    /**