[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Edge.java, 1.50, 1.51 Vertex.java, 1.42, 1.43 Surface.java, 1.103, 1.104 Space.java, 1.48, 1.49 Project.java, 1.69, 1.70

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

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

Modified Files:
	Edge.java Vertex.java Surface.java Space.java Project.java 
Log Message:
Mad some changed to the naming scheme

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** Surface.java	21 Aug 2006 14:18:50 -0000	1.103
--- Surface.java	23 Aug 2006 13:43:19 -0000	1.104
***************
*** 80,88 ****
     */
    public String getName() {
!     String name = super.getName();
      if (id == null) {
!       name = name + "S";
      } else {
!       name = name + "S" + id;
      }
      return name;
--- 80,88 ----
     */
    public String getName() {
!     String name;
      if (id == null) {
!       name = "None";
      } else {
!       name = "S" + id;
      }
      return name;
***************
*** 1344,1349 ****
        } else if (a.getName().equals("Space")) {
          continue;
-       } else {
-         log.error("Wrong attribute for the object " + a);
        }
      }
--- 1344,1347 ----
***************
*** 1358,1361 ****
--- 1356,1360 ----
      ArrayList res = new ArrayList();
      res.add(new Attribute("Name", getName(), false));
+     res.add(new Attribute("Owner", getOwner(), false));
      if (getFrontDomain() != null) {
        res.add(new Attribute("Space1", getFrontDomain(), true));

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** Space.java	21 Aug 2006 20:32:17 -0000	1.48
--- Space.java	23 Aug 2006 13:43:19 -0000	1.49
***************
*** 138,146 ****
--- 138,152 ----
      if (container) {
        vertices = new HashMap();
+       nextVertexId = 1;
        edges = new HashMap();
+       nextEdgeId = 1;
        surfaces = new HashMap();
+       nextSurfaceId = 1;
        elements = new HashMap();
+       nextElementId = 1;
        materials = new HashMap();
+       nextMaterialId = 1;
        constructors = new HashMap();
+       nextConstructorId = 1;
        empty = new Space("Void", FUNCTIONAL, false);
        this.add(empty);
***************
*** 262,274 ****
      if (container) {
        vertices.clear();
!       nextVertexId = 0;
        edges.clear();
!       nextEdgeId = 0;
        surfaces.clear();
!       nextSurfaceId = 0;
        elements.clear();
!       nextElementId = 0;
        constructors.clear();
!       nextConstructorId = 0;
        empty = new Space("Void", FUNCTIONAL, false);
        this.add(empty);
--- 268,280 ----
      if (container) {
        vertices.clear();
!       nextVertexId = 1;
        edges.clear();
!       nextEdgeId = 1;
        surfaces.clear();
!       nextSurfaceId = 1;
        elements.clear();
!       nextElementId = 1;
        constructors.clear();
!       nextConstructorId = 1;
        empty = new Space("Void", FUNCTIONAL, false);
        this.add(empty);
***************
*** 1058,1063 ****
        } else  if (a.getName().equals("Description")) {
          setDescription(((String)a.getValue().toString()));
-       } else {
-         log.error("Wrong attribute for the object " + a);
        }
      }
--- 1064,1067 ----
***************
*** 1072,1075 ****
--- 1076,1080 ----
      res.add(new Attribute("Name", getName()));
      res.add(new Attribute("ID", getId().toString(), false));
+     res.add(new Attribute("Owner", getOwner(), false));
      if (isConstructionSpace()) {
        res.add(new Attribute("Classification", constructionOptions, getClassification()));

Index: Vertex.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Vertex.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** Vertex.java	11 Aug 2006 13:36:20 -0000	1.42
--- Vertex.java	23 Aug 2006 13:43:19 -0000	1.43
***************
*** 79,87 ****
     */
    public String getName() {
!     String name = super.getName();
!     if (id != null) {
!       name = name + "V" + id;
      } else {
!       name = name + "V";
      }
      return name;
--- 79,87 ----
     */
    public String getName() {
!     String name;
!     if (id == null) {
!       name = "None";
      } else {
!       name = "V" + id;
      }
      return name;
***************
*** 383,388 ****
        } else if (a.getName().equals("Z")) {
          setZ(((Double)a.getValue()).doubleValue());
-       } else {
-         log.error("Wrong attribute for the object " + a);
        }
      } 
--- 383,386 ----
***************
*** 395,400 ****
    public List getAttributes() {
      ArrayList res = new ArrayList();
-     
      res.add(new Attribute("Name", getName(), false));
      res.add(new Attribute("X", new Double(getX())));
      res.add(new Attribute("Y", new Double(getY())));
--- 393,398 ----
    public List getAttributes() {
      ArrayList res = new ArrayList();
      res.add(new Attribute("Name", getName(), false));
+     res.add(new Attribute("Owner", getOwner(), false));
      res.add(new Attribute("X", new Double(getX())));
      res.add(new Attribute("Y", new Double(getY())));

Index: Edge.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Edge.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** Edge.java	22 Aug 2006 14:15:10 -0000	1.50
--- Edge.java	23 Aug 2006 13:43:19 -0000	1.51
***************
*** 151,160 ****
     */
    public String getName() {
!     String name = super.getName();
!     
      if (id == null) {
!       name = name + "E";
      } else {
!       name = name + "E" + id;
      }
      return name;
--- 151,159 ----
     */
    public String getName() {
!     String name;
      if (id == null) {
!       name = "None";
      } else {
!       name = "E" + id;
      }
      return name;
***************
*** 474,479 ****
        } else  if (a.getName().equals("Length")) {
          setLength(((Double)a.getValue()).doubleValue());
-       } else {
-         log.error("Wrong attribute for the object " + a);
        }
      } 
--- 473,476 ----
***************
*** 487,490 ****
--- 484,488 ----
      ArrayList res = new ArrayList();
      res.add(new Attribute("Name", getName(), false));
+     res.add(new Attribute("Owner", getOwner(), false));
      res.add(new Attribute("Length", new Double(getLength())));
      return res;

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** Project.java	10 Aug 2006 13:13:26 -0000	1.69
--- Project.java	23 Aug 2006 13:43:19 -0000	1.70
***************
*** 229,233 ****
          world.delete((Edge)next);
        } else if (next instanceof Surface) {
!         world.delete((Surface)next);
        } else if (next instanceof Vertex) {
          world.delete((Vertex)next);
--- 229,233 ----
          world.delete((Edge)next);
        } else if (next instanceof Surface) {
!         delete((Surface)next);
        } else if (next instanceof Vertex) {
          world.delete((Vertex)next);
***************
*** 472,476 ****
     */
    public void delete(Surface surface) {
!     world.delete(surface);
      changed(this);
    }
--- 472,476 ----
     */
    public void delete(Surface surface) {
!     surface.delete();
      changed(this);
    }