[Bprocessor-commit] facade/src/net/sourceforge/bprocessor/facade/modellor NetFacadeModellor.java, 1.26, 1.27 FacadeModellor.java, 1.31, 1.32

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

Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16302/src/net/sourceforge/bprocessor/facade/modellor

Modified Files:
	NetFacadeModellor.java FacadeModellor.java 
Log Message:
changing use of new integer objects to use of the static valueOf method

Index: NetFacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/NetFacadeModellor.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** NetFacadeModellor.java	10 Apr 2007 20:59:05 -0000	1.26
--- NetFacadeModellor.java	15 Apr 2007 10:40:17 -0000	1.27
***************
*** 49,56 ****
    
    /** The depth of window and door frames */
!   private static final double FRAME_DEPTH = 0.05;  
!   
!   /** The depth of window and door frames */
!   private static final double GLASS_FRAME = 0.02;  
    
    /** serial id */
--- 49,53 ----
    
    /** The depth of window and door frames */
!   private static final double FRAME_DEPTH = 0.05;   
    
    /** serial id */
***************
*** 286,294 ****
     */
    public void setNet(Space net) {
!     if (this.net != null) {
!       space.remove(this.net);
      }
-     this.net = (Net)net;
-     space.add(net);
    }
  
--- 283,293 ----
     */
    public void setNet(Space net) {
!     if (net instanceof Net) {
!       if (this.net != null) {
!         space.remove(this.net);
!       }
!       this.net = (Net)net;
!       space.add(net);
      }
    }
  
***************
*** 410,422 ****
            frame.removeSurface(cut2);
            frame1.addAll(frame2);         
!           space.addAll(frame1);          
!           frame1.removeAll(Geometry.deleteRedundantSurfaces(frame1));
!           Geometry.allPossibleCollapses(Geometry.collect(frame1));
!           Geometry.mergeAllPossibleSurfaces(frame1);
!           Set<Edge> edges = new HashSet<Edge>();
!           for (Surface s : frame1) {
!             edges.addAll(s.getEdges());
!           }
!           Geometry.extendAllPossibleEdges(edges);
          }
        }
--- 409,414 ----
            frame.removeSurface(cut2);
            frame1.addAll(frame2);         
!           space.addAll(frame1);  
!           Geometry.simplifyGeometry(frame1);
          }
        }

Index: FacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/FacadeModellor.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** FacadeModellor.java	10 Apr 2007 20:59:05 -0000	1.31
--- FacadeModellor.java	15 Apr 2007 10:40:18 -0000	1.32
***************
*** 803,811 ****
      m.put("front", front);
      m.put("frameThickness", new Double(frameWidth));
!     m.put("horPosts", new Integer(horPosts));
      m.put("horPostWidth", new Double(horPostWidth));
!     m.put("vertPosts", new Integer(vertPosts));
      m.put("vertPostWidth", new Double(vertPostWidth));
!     m.put("type", new Integer(type));
      m.put("name", name);
      m.put("Space", space);
--- 803,811 ----
      m.put("front", front);
      m.put("frameThickness", new Double(frameWidth));
!     m.put("horPosts", Integer.valueOf(horPosts));
      m.put("horPostWidth", new Double(horPostWidth));
!     m.put("vertPosts",  Integer.valueOf(vertPosts));
      m.put("vertPostWidth", new Double(vertPostWidth));
!     m.put("type", Integer.valueOf(type));
      m.put("name", name);
      m.put("Space", space);