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

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

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

Modified Files:
	NetFacadeModellor.java 
Log Message:
added a width attribute to the edges of the b-net for a facade. This makes it possible to define seperate widths for each post of the facade.

Index: NetFacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/NetFacadeModellor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** NetFacadeModellor.java	18 Dec 2006 18:20:19 -0000	1.6
--- NetFacadeModellor.java	21 Dec 2006 14:23:49 -0000	1.7
***************
*** 7,10 ****
--- 7,11 ----
  package net.sourceforge.bprocessor.facade.modellor;
  
+ import java.util.Collection;
  import java.util.HashMap;
  import java.util.HashSet;
***************
*** 226,230 ****
      space.clear();
      frame = null;
!     space.add(net); 
      if (single) {
        createSingleFacade(net);
--- 227,232 ----
      space.clear();
      frame = null;
!     space.add(net);
!     prepareNet(net);
      if (single) {
        createSingleFacade(net);
***************
*** 235,238 ****
--- 237,256 ----
    
    /**
+    * Adds extra parameters to the b-net
+    * @param n the net
+    */
+   private void prepareNet(Net n) {
+     Collection edges = n.getEdges();
+     Iterator it = edges.iterator();
+     while (it.hasNext()) {
+       Edge e = (Edge)it.next();
+       Map env = e.getParameters().environment();
+       if (env.get("width") == null) {
+         e.getParameters().put("width", frameWidth);
+       }
+     }
+   }
+   
+   /**
     * Creates a facade from a net.
     * @param net the net
***************
*** 253,257 ****
          while (fEdges.hasNext()) {
            Edge e = (Edge)fEdges.next();
!           offsetMap.put(e, Double.valueOf(-frameWidth));
          }
          Surface h = new Surface(Edge.placeOffset(fcopy.getEdges(), fcopy, offsetMap));        
--- 271,277 ----
          while (fEdges.hasNext()) {
            Edge e = (Edge)fEdges.next();
!           Map env = e.getParameters().environment();
!           double width = ((Double)env.get("width")).doubleValue();
!           offsetMap.put(e, Double.valueOf(-width));
          }
          Surface h = new Surface(Edge.placeOffset(fcopy.getEdges(), fcopy, offsetMap));        
***************
*** 299,306 ****
            while (fieldEdges.hasNext()) {
              Edge e = (Edge)fieldEdges.next();
              if (outline.contains(e)) {
!               offsetMap.put(e, Double.valueOf(-frameWidth));
              } else {
!               offsetMap.put(e, Double.valueOf(-frameWidth / 2));
              }
            }
--- 319,328 ----
            while (fieldEdges.hasNext()) {
              Edge e = (Edge)fieldEdges.next();
+             Map env = e.getParameters().environment();
+             double width = ((Double)env.get("width")).doubleValue();
              if (outline.contains(e)) {
!               offsetMap.put(e, Double.valueOf(-width));
              } else {
!               offsetMap.put(e, Double.valueOf(-width / 2));
              }
            }