[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool ExtrusionTool.java,1.19,1.20

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

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15539

Modified Files:
	ExtrusionTool.java 
Log Message:
removed bug when extruding surfaces with functional spaces attached

Index: ExtrusionTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrusionTool.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ExtrusionTool.java	2 Oct 2005 14:48:23 -0000	1.19
--- ExtrusionTool.java	3 Oct 2005 18:41:34 -0000	1.20
***************
*** 195,202 ****
    private Surface extendSurface(Surface extendSurf) {
      // HAVE TO BE CHANGED IN FUTURE RELEASE
!     Domain newCSpace = extendSurf.getBackDomain();
!     if (newCSpace == null) {
!       newCSpace = new ConstructionSpace("innerSpace");
!       Project.getInstance().intern((ConstructionSpace) newCSpace);
      }
      Domain outer = extendSurf.getFrontDomain();
--- 195,202 ----
    private Surface extendSurface(Surface extendSurf) {
      // HAVE TO BE CHANGED IN FUTURE RELEASE
!     Domain newSpace = extendSurf.getBackDomain();
!     if (newSpace == null) {
!       newSpace = new ConstructionSpace("innerSpace");
!       Project.getInstance().intern((ConstructionSpace) newSpace);
      }
      Domain outer = extendSurf.getFrontDomain();
***************
*** 207,212 ****
      List edges = extendSurf.getEdges();
      List top = new ArrayList(edges.size());
!     newCSpace.addSurface(extendSurf);
!     extendSurf.setBackDomain(newCSpace);
      Iterator i = edges.iterator();
      Edge current = null;
--- 207,212 ----
      List edges = extendSurf.getEdges();
      List top = new ArrayList(edges.size());
!     newSpace.addSurface(extendSurf);
!     extendSurf.setBackDomain(newSpace);
      Iterator i = edges.iterator();
      Edge current = null;
***************
*** 263,268 ****
          }
          Surface sur = createSurface(newEdges);
!         newCSpace.addSurface(sur);
!         sur.setFrontDomain(newCSpace);
          newEdges = new ArrayList();
          
--- 263,268 ----
          }
          Surface sur = createSurface(newEdges);
!         newSpace.addSurface(sur);
!         sur.setFrontDomain(newSpace);
          newEdges = new ArrayList();
          
***************
*** 281,288 ****
      }
      //moving this line to the top
!     Project.getInstance().update(newCSpace);
      Surface topSurf = createSurface(top);
!     newCSpace.addSurface(topSurf);
!     topSurf.setFrontDomain(newCSpace);
      Notification n = new Notification(Notification.SURFACE_SELECTED, topSurf.getId());
      Notifier.getInstance().sendNotification(n);
--- 281,288 ----
      }
      //moving this line to the top
!     Project.getInstance().update(newSpace);
      Surface topSurf = createSurface(top);
!     newSpace.addSurface(topSurf);
!     topSurf.setFrontDomain(newSpace);
      Notification n = new Notification(Notification.SURFACE_SELECTED, topSurf.getId());
      Notifier.getInstance().sendNotification(n);
***************
*** 293,297 ****
      }
      Notifier.getInstance().sendNotification(n);
!     n = new Notification(Notification.CONSTRUCTION_SPACE_MODIFIED, newCSpace.getId());
      Notifier.getInstance().sendNotification(n);
  
--- 293,301 ----
      }
      Notifier.getInstance().sendNotification(n);
!     if (newSpace instanceof ConstructionSpace) {
!       n = new Notification(Notification.CONSTRUCTION_SPACE_MODIFIED, newSpace.getId());
!     } else if (newSpace instanceof FunctionalSpace) {
!       n = new Notification(Notification.FUNCTIONAL_SPACE_MODIFIED, newSpace.getId());
!     }
      Notifier.getInstance().sendNotification(n);