[Bprocessor-commit] /model/src/net/sourceforge/bprocessor/model Surface.java, 1.160, 1.161

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13384/src/net/sourceforge/bprocessor/model

Modified Files:
	Surface.java 
Log Message:
some generics and a method added a method for setting the opposite space of a known one on a surface

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.160
retrieving revision 1.161
diff -C2 -d -r1.160 -r1.161
*** Surface.java	15 May 2007 12:26:35 -0000	1.160
--- Surface.java	20 May 2007 10:21:20 -0000	1.161
***************
*** 152,156 ****
     * @param edges The edges
     */
!   public Surface(List edges) {
      setEdges(edges);
    }
--- 152,156 ----
     * @param edges The edges
     */
!   public Surface(List<Edge> edges) {
      setEdges(edges);
    }
***************
*** 221,225 ****
     * @param edges The edges
     */
!   public void setEdges(List edges) {
      this.edges = edges;
    }
--- 221,225 ----
     * @param edges The edges
     */
!   public void setEdges(List<Edge> edges) {
      this.edges = edges;
    }
***************
*** 558,562 ****
     * @return Extruded top
     */
!   public Surface extrusionall(double delta, Collection sides, Set tops) {
      Surface top = extrusion(delta, sides);
      tops.add(top);
--- 558,562 ----
     * @return Extruded top
     */
!   public Surface extrusionall(double delta, Collection<Surface> sides, Set<Surface> tops) {
      Surface top = extrusion(delta, sides);
      tops.add(top);
***************
*** 564,568 ****
      while (iter.hasNext()) {
        Surface hole = (Surface) iter.next();
!       Surface holetop = hole.extrusionall(delta, sides, tops);
        top.addHole(holetop);
      }
--- 564,573 ----
      while (iter.hasNext()) {
        Surface hole = (Surface) iter.next();
!       Surface holetop;
!       if (hole.normal().equalEps(this.normal())) {
!         holetop = hole.extrusionall(delta, sides, tops);
!       } else {
!         holetop = hole.extrusionall(-delta, sides, tops);
!       }
        top.addHole(holetop);
      }
***************
*** 2025,2027 ****
--- 2030,2050 ----
      return true;
    }
+ 
+   /**
+    * Set the opposite domain of s1 to s2, if s1 is not present nothing will happen
+    * @param s1 The space that s2 will become nabour to
+    * @param s2 The space to assign to the oppisite site of the surface
+    * @return true when succes otherwise false
+    */
+   public boolean setOppositeSpace(Space s1, Space s2) {
+     if (getFrontDomain() == s1 && getBackDomain() != s1) {
+       setBackDomain(s2);
+     } else if (getBackDomain() == s1 && getFrontDomain() != s1) {
+       setFrontDomain(s2);
+     } else {
+       log.warn("The space " + s1 + " werent assigned to " + this + " no assign were made");
+       return false;
+     }
+     return true;
+   }
  }