[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Command.java, 1.44, 1.45 Space.java, 1.208, 1.209 Project.java, 1.145, 1.146 Persistence.java, 1.62, 1.63

[Michael L. <he...@us...>]

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

Modified Files:
	Command.java Space.java Project.java Persistence.java 
Log Message:
fixes related to using the facade modellor

Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** Persistence.java	26 Nov 2007 18:22:36 -0000	1.62
--- Persistence.java	2 Dec 2007 12:02:14 -0000	1.63
***************
*** 293,296 ****
--- 293,297 ----
      space.setDescription(xml.getDescription());
      space.setUnion(xml.isUnion());
+     space.setNet(xml.isNet());
      space.setClassification(internalizeClassifaction(xml.getClassification(), type));
      ClassificationType classType = internalizeClassificationType(xml.getClassification(), type);
***************
*** 947,950 ****
--- 948,952 ----
      xml.setDescription(space.getDescription().toString());
      xml.setUnion(space.isUnion());
+     xml.setNet(space.isNet());
      if (space.getClassification() != null) {
        if (space.getClassification().getId().equalsIgnoreCase("-1")) {

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.208
retrieving revision 1.209
diff -C2 -d -r1.208 -r1.209
*** Space.java	13 Nov 2007 12:19:29 -0000	1.208
--- Space.java	2 Dec 2007 12:02:14 -0000	1.209
***************
*** 929,932 ****
--- 929,946 ----
    
    /**
+    * Find element by name
+    * @param name String
+    * @return element
+    */
+   public Space find(String name) {
+     for (Space element : getElements()) {
+       if (element.getName().equals(name)) {
+         return element;
+       }
+     }
+     return null;
+   }
+   
+   /**
     * Get the modellor
     * @return The modellor

Index: Command.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** Command.java	28 Nov 2007 22:37:08 -0000	1.44
--- Command.java	2 Dec 2007 12:02:14 -0000	1.45
***************
*** 141,145 ****
--- 141,147 ----
      public OffsetNormal(Surface surface) {
        this.surface = surface;
+       parameters.put("surface", surface);
        parameters.put("distance", 1.0);
+       parameters.put("direction", "");
        parameters.put("controlled", true);
      }
***************
*** 155,161 ****
      @Override
      public void evaluate() {
        double distance = parameters.getDouble("distance");
        boolean controlled = parameters.getBoolean("controlled");
!       Space owner = surface.getOwner();
        HashMap map = new HashMap();
        Surface copy = (Surface) surface.copy(map);
--- 157,170 ----
      @Override
      public void evaluate() {
+       Space owner = surface.getOwner();
        double distance = parameters.getDouble("distance");
+       Space space = owner.find((String)parameters.get("direction"));
+       if (space != null) {
+         if (surface.getBackDomain() == space) {
+           distance = -distance;
+         }
+       }
        boolean controlled = parameters.getBoolean("controlled");
!       
        HashMap map = new HashMap();
        Surface copy = (Surface) surface.copy(map);
***************
*** 1372,1391 ****
      }
      
-     private Space find(String name) {
-       for (Space element : net.getElements()) {
-         if (element.getName().equals(name)) {
-           return element;
-         }
-       }
-       return null;
-     }
-     
      /** {@inheritDoc} */
      @Override
      public void evaluate() {
!       Space interior = find((String) parameters.get("interior"));
!       Space roof = find((String) parameters.get("top"));
!       Space floor = find((String) parameters.get("bottom"));
!       Space exterior = find((String) parameters.get("side"));
        double distance = parameters.getDouble("offset");
        
--- 1381,1391 ----
      }
      
      /** {@inheritDoc} */
      @Override
      public void evaluate() {
!       Space interior = net.find((String) parameters.get("interior"));
!       Space roof = net.find((String) parameters.get("top"));
!       Space floor = net.find((String) parameters.get("bottom"));
!       Space exterior = net.find((String) parameters.get("side"));
        double distance = parameters.getDouble("offset");
        

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** Project.java	30 Nov 2007 14:46:57 -0000	1.145
--- Project.java	2 Dec 2007 12:02:14 -0000	1.146
***************
*** 924,928 ****
          while (it.hasNext()) {
            Classification current = (Classification) it.next();
!           if (current.getId().endsWith(curid) || current.getId().endsWith(curid.substring(1, curid.length()))) {
              cl = current;
              break;
--- 924,929 ----
          while (it.hasNext()) {
            Classification current = (Classification) it.next();
!           if (current.getId().endsWith(curid) 
!               || current.getId().endsWith(curid.substring(1, curid.length()))) {
              cl = current;
              break;
***************
*** 1001,1005 ****
          while (it.hasNext()) {
            Classification current = (Classification) it.next();
!           if (current.getId().endsWith(curid) || current.getId().endsWith(curid.substring(1, curid.length()))) {
              cl = current;
              break;
--- 1002,1007 ----
          while (it.hasNext()) {
            Classification current = (Classification) it.next();
!           if (current.getId().endsWith(curid) 
!               || current.getId().endsWith(curid.substring(1, curid.length()))) {
              cl = current;
              break;