[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model CoordinateSystem.java, 1.58, 1.59

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

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

Modified Files:
	CoordinateSystem.java 
Log Message:
Changes to the displayed attributes of CoordinateSystem Ð editable displayed, normal displayed even when only plane

Index: CoordinateSystem.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/CoordinateSystem.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** CoordinateSystem.java	5 Oct 2007 13:30:49 -0000	1.58
--- CoordinateSystem.java	12 Oct 2007 13:14:46 -0000	1.59
***************
*** 571,588 ****
        this.j = j;
      }
!     if (onlyPlane) {
!       setActive(((Boolean)(((Attribute)attributes.get(12)).getValue())).booleanValue());
!       onlyPlane(((Boolean)(((Attribute)attributes.get(13)).getValue())).booleanValue());
!     } else {
!       Vertex n = new Vertex(0, 0, 0);
!       n.setX(((Double)(((Attribute)attributes.get(13)).getValue())).doubleValue());
!       n.setY(((Double)(((Attribute)attributes.get(14)).getValue())).doubleValue());
!       n.setZ(((Double)(((Attribute)attributes.get(15)).getValue())).doubleValue());
!       if (n.length() > 0) {
!         this.n = n;
!       }
!       setActive(((Boolean)(((Attribute)attributes.get(16)).getValue())).booleanValue());
!       onlyPlane(((Boolean)(((Attribute)attributes.get(17)).getValue())).booleanValue()); 
      }
      update();
    }
--- 571,584 ----
        this.j = j;
      }
!     Vertex n = new Vertex(0, 0, 0);
!     n.setX(((Double)(((Attribute)attributes.get(13)).getValue())).doubleValue());
!     n.setY(((Double)(((Attribute)attributes.get(14)).getValue())).doubleValue());
!     n.setZ(((Double)(((Attribute)attributes.get(15)).getValue())).doubleValue());
!     if (n.length() > 0) {
!       this.n = n;
      }
+     setActive(((Boolean)(((Attribute)attributes.get(16)).getValue())).booleanValue());
+     onlyPlane(((Boolean)(((Attribute)attributes.get(17)).getValue())).booleanValue());
+     setEditable(((Boolean)(((Attribute)attributes.get(18)).getValue())).booleanValue());
      update();
    }
***************
*** 603,612 ****
      res.add(new Attribute("y", new Double(getJ().getY())));
      res.add(new Attribute("z", new Double(getJ().getZ())));
!     if (!onlyPlane()) {
!       res.add(new Attribute("K (Normal)", "", false));
!       res.add(new Attribute("x", new Double(getN().getX())));
!       res.add(new Attribute("y", new Double(getN().getY())));
!       res.add(new Attribute("z", new Double(getN().getZ())));
!     }
      if (isActive()) {
        res.add(new Attribute("Active", Boolean.TRUE));
--- 599,607 ----
      res.add(new Attribute("y", new Double(getJ().getY())));
      res.add(new Attribute("z", new Double(getJ().getZ())));
!     res.add(new Attribute("K (Normal)", "", false));
!     res.add(new Attribute("x", new Double(getN().getX())));
!     res.add(new Attribute("y", new Double(getN().getY())));
!     res.add(new Attribute("z", new Double(getN().getZ())));
!     
      if (isActive()) {
        res.add(new Attribute("Active", Boolean.TRUE));
***************
*** 619,622 ****
--- 614,618 ----
        res.add(new Attribute("Only plane", Boolean.FALSE));
      }
+     res.add(new Attribute("Editable", Boolean.valueOf(isEditable())));
      return res;
    }
***************
*** 624,632 ****
    /** {@inheritDoc} */
    public String getGeneralName() {
!     if (onlyPlane()) {
!       return "B-Plane";
!     } else {
!       return "B-System";
!     }
    }
  
--- 620,624 ----
    /** {@inheritDoc} */
    public String getGeneralName() {
!     return "B-System";
    }