[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model SpaceAnalysis.java, 1.15, 1.16 Surface.java, 1.229, 1.230 SurfaceAnalysis.java, 1.19, 1.20 Item.java, 1.11, 1.12 Project.java, 1.208, 1.209

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

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory vz-cvs-4.sog:/tmp/cvs-serv5891/src/net/sourceforge/bprocessor/model

Modified Files:
	SpaceAnalysis.java Surface.java SurfaceAnalysis.java Item.java 
	Project.java 
Log Message:
Fixed bug with section planes

Index: SpaceAnalysis.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/SpaceAnalysis.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** SpaceAnalysis.java	25 Jun 2009 22:17:30 -0000	1.15
--- SpaceAnalysis.java	30 Dec 2011 12:53:24 -0000	1.16
***************
*** 153,157 ****
        mark.add(surface);
        Space assigned = getSide(surface, side);
!       if (assigned.isVoid()) {
          for (Edge current : surface.getEdges()) {
            List<Surface> surfaces = edgemap.get(current);
--- 153,157 ----
        mark.add(surface);
        Space assigned = getSide(surface, side);
!       if (assigned != null) {
          for (Edge current : surface.getEdges()) {
            List<Surface> surfaces = edgemap.get(current);
***************
*** 166,170 ****
              subsume(new Element(selected, other));
              Space container = getSide(selected, other);
!             if (!container.isVoid()) {
                setSide(surface, side, container);
              }
--- 166,170 ----
              subsume(new Element(selected, other));
              Space container = getSide(selected, other);
!             if (container != null) {
                setSide(surface, side, container);
              }

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.229
retrieving revision 1.230
diff -C2 -d -r1.229 -r1.230
*** Surface.java	6 Mar 2011 23:13:27 -0000	1.229
--- Surface.java	30 Dec 2011 12:53:24 -0000	1.230
***************
*** 219,226 ****
        Space front = surface.getFrontDomain();
        Space back = surface.getBackDomain();
!       if (!front.isVoid()) {
          incident.add(front);
        }
!       if (!(back.isVoid() || (front == back))) {
          incident.add(back);
        }
--- 219,226 ----
        Space front = surface.getFrontDomain();
        Space back = surface.getBackDomain();
!       if (front != null) {
          incident.add(front);
        }
!       if (!((back == null) || (front == back))) {
          incident.add(back);
        }

Index: Item.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Item.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Item.java	6 Mar 2011 23:13:27 -0000	1.11
--- Item.java	30 Dec 2011 12:53:24 -0000	1.12
***************
*** 194,205 ****
    
    /**
-    * Returns true if this space is the empty space.
-    * @return true if this space is the empty space
-    */
-   public boolean isVoid() {
-     return false;
-   }
-   
-   /**
     * Sets material
     * @param material The new material
--- 194,197 ----
***************
*** 224,229 ****
      if (material != null) {
        return material;
-     } else if (isVoid()) {
-       return Defaults.getVoidMaterial();
      } else if (isFunctionalSpace()) {
        return Defaults.getFunctionalMaterial();
--- 216,219 ----
***************
*** 693,699 ****
        return Project.getInstance().getName();
      } else {
-       if (this.isVoid()) {
-         return "empty";
-       }
        String lvl = getKindName();
        if (lvl == null) {
--- 683,686 ----

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.208
retrieving revision 1.209
diff -C2 -d -r1.208 -r1.209
*** Project.java	29 Jun 2011 13:56:08 -0000	1.208
--- Project.java	30 Dec 2011 12:53:24 -0000	1.209
***************
*** 1362,1366 ****
      List<Space> constructs = new LinkedList();
      for (Space current : spaces) {
!       if (!current.isVoid() && current.isConstructionSpace()) {
          constructs.add(current);
        }
--- 1362,1366 ----
      List<Space> constructs = new LinkedList();
      for (Space current : spaces) {
!       if (current.isConstructionSpace()) {
          constructs.add(current);
        }
***************
*** 1581,1585 ****
      List<Space> constructs = new LinkedList();
      for (Space current : spaces) {
!       if (!current.isVoid() && current.isConstructionSpace()) {
          constructs.add(current);
        }
--- 1581,1585 ----
      List<Space> constructs = new LinkedList();
      for (Space current : spaces) {
!       if (current.isConstructionSpace()) {
          constructs.add(current);
        }

Index: SurfaceAnalysis.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/SurfaceAnalysis.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** SurfaceAnalysis.java	25 Jun 2009 22:17:30 -0000	1.19
--- SurfaceAnalysis.java	30 Dec 2011 12:53:24 -0000	1.20
***************
*** 325,333 ****
  
      private boolean isVoid(Item space) {
!       if (space != null) {
!         return space.isVoid();
!       } else {
!         return true;
!       }
      }
  
--- 325,329 ----
  
      private boolean isVoid(Item space) {
!       return (space == null);
      }