[Bprocessor-commit] facade/src/net/sourceforge/bprocessor/facade/modellor NetFacadeModellor.java, 1.19, 1.20

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

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

Modified Files:
	NetFacadeModellor.java 
Log Message:
checkstyle errors...sorry

Index: NetFacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/NetFacadeModellor.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** NetFacadeModellor.java	13 Mar 2007 09:31:44 -0000	1.19
--- NetFacadeModellor.java	13 Mar 2007 09:49:11 -0000	1.20
***************
*** 75,81 ****
    private boolean single = true;
    
-   /** Window spaces for the double facade */
-   private Set<Space> windows = new HashSet<Space>();
-   
    /** The logger */
    private static Logger log = Logger.getLogger(NetFacadeModellor.class);
--- 75,78 ----
***************
*** 150,154 ****
        frontCandidate = (Surface)it.next();
      }    
!     while(it.hasNext()) {
        Surface surface = (Surface)it.next();
        Classification frontClass = surface.getFrontDomain().getClassification();
--- 147,151 ----
        frontCandidate = (Surface)it.next();
      }    
!     while (it.hasNext()) {
        Surface surface = (Surface)it.next();
        Classification frontClass = surface.getFrontDomain().getClassification();
***************
*** 207,211 ****
      frame = null;
      front = null;
-     windows = null;
    }
  
--- 204,207 ----
***************
*** 762,801 ****
      return getGeneralName();
    }
!   
!   public static void genFrameTest() {
!     Space test = new Space("test", 
!         Space.CONSTRUCTION,
!         Space.SPACE_LEVEL, 
!         true);
!     Project.getInstance().world().add(test);
!     {
!       Surface cut = cutType1();
!       cut.setBackDomain(test);
!       cut.setFrontDomain(test);
!       Set<Surface> testFrame = generateFrame(cut, 1, 1);
!       for (Surface s: testFrame) {
!         Project.getInstance().world().add(s);
!         Iterator edgs = s.getEdges().iterator();
!         while (edgs.hasNext()) {
!           Project.getInstance().world().add((Edge)edgs.next());
!         }
!       }
!     }
!     {
!       Surface cut = cutType2();
!       cut.setBackDomain(test);
!       cut.setFrontDomain(test);
!       Set<Surface> testFrame = generateFrame(cut, 1, 1);
!       for (Surface s: testFrame) {
!         Project.getInstance().world().add(s);
!         Iterator edgs = s.getEdges().iterator();
!         while (edgs.hasNext()) {
!           Project.getInstance().world().add((Edge)edgs.next());
!         }
!       }
!     }
!     
!   }
!   
    private static Set<Surface> generateFrame(Surface cut, double height, double width) {
      Set topPost = genFramePost(cut, width);
--- 758,769 ----
      return getGeneralName();
    }
!  
!   /** 
!    * Generates a frame based an a surface descibing a cut of the frame
!    * @param cut the cut surface
!    * @param height height of the frame
!    * @param width with of the frame
!    * @return the set of surfaces in the frame
!    */
    private static Set<Surface> generateFrame(Surface cut, double height, double width) {
      Set topPost = genFramePost(cut, width);
***************
*** 861,865 ****
      List<Edge> el = new LinkedList<Edge>();
      Vertex prevV = first;
!     for (Vertex v: vl) {
        el.add(new Edge(prevV, v));
        prevV = v;
--- 829,833 ----
      List<Edge> el = new LinkedList<Edge>();
      Vertex prevV = first;
!     for (Vertex v : vl) {
        el.add(new Edge(prevV, v));
        prevV = v;
***************
*** 878,882 ****
      List<Edge> el = new LinkedList<Edge>();
      Vertex prevV = first;
!     for (Vertex v: vl) {
        el.add(new Edge(prevV, v));
        prevV = v;
--- 846,850 ----
      List<Edge> el = new LinkedList<Edge>();
      Vertex prevV = first;
!     for (Vertex v : vl) {
        el.add(new Edge(prevV, v));
        prevV = v;
***************
*** 898,902 ****
      copy.setFrontDomain(cut.getFrontDomain());
      Plane topPlane = new Plane(1, 0, 1, new Vertex(0, 0, length / 2));
!     Plane bottomPlane = new Plane(-1, 0, 1, new Vertex(0 , 0, - length / 2));
      
      Set surfaces = new HashSet();
--- 866,870 ----
      copy.setFrontDomain(cut.getFrontDomain());
      Plane topPlane = new Plane(1, 0, 1, new Vertex(0, 0, length / 2));
!     Plane bottomPlane = new Plane(-1, 0, 1, new Vertex(0 , 0, -length / 2));
      
      Set surfaces = new HashSet();
***************
*** 905,909 ****
      copy.extrusionAllOnto(bottomPlane, surfaces, surfaces);
      Set<Vertex> verts = Geometry.collect(surfaces);
!     for (Vertex v: verts) {
        v.move(0, 0, length / 2);
      }
--- 873,877 ----
      copy.extrusionAllOnto(bottomPlane, surfaces, surfaces);
      Set<Vertex> verts = Geometry.collect(surfaces);
!     for (Vertex v : verts) {
        v.move(0, 0, length / 2);
      }