[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model ParameterBlock.java, 1.6, 1.7 Mesh.java, 1.15, 1.16 Persistence.java, 1.35, 1.36 Description.java, 1.1, 1.2 CoordinateSystem.java, 1.48, 1.49

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

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

Modified Files:
	ParameterBlock.java Mesh.java Persistence.java 
	Description.java CoordinateSystem.java 
Log Message:
replaced usage of new Long objects with use of the Long.valueOf method, which should be better practise, and allow for chaching.

Index: CoordinateSystem.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/CoordinateSystem.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** CoordinateSystem.java	27 Mar 2007 17:18:11 -0000	1.48
--- CoordinateSystem.java	11 Apr 2007 12:19:41 -0000	1.49
***************
*** 165,170 ****
     */
    public void add(Relation relation) {
!     relations.add(relation);
!     relation.setId(new Long(relations.size() + 1));
    }
    
--- 165,170 ----
     */
    public void add(Relation relation) {
!     relations.add(relation);  
!     relation.setId(Long.valueOf(relations.size() + 1));
    }
    

Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** Persistence.java	13 Mar 2007 09:56:50 -0000	1.35
--- Persistence.java	11 Apr 2007 12:19:41 -0000	1.36
***************
*** 648,652 ****
        return null;
      } else {
!       return map.get(new Long(id));
      }
    }
--- 648,652 ----
        return null;
      } else {
!       return map.get(Long.valueOf(id));
      }
    }
***************
*** 1216,1220 ****
      while (iter.hasNext()) {
        Object current = iter.next();
!       ids.add(new Long(id(map, current)));
      }
      return ids;
--- 1216,1220 ----
      while (iter.hasNext()) {
        Object current = iter.next();
!       ids.add(Long.valueOf(id(map, current)));
      }
      return ids;
***************
*** 1374,1378 ****
      while (iter.hasNext()) {
        long l = id(map, iter.next());
!       xml.getConnected().add(new Long(l));
      }
      
--- 1374,1378 ----
      while (iter.hasNext()) {
        long l = id(map, iter.next());
!       xml.getConnected().add(Long.valueOf(l));
      }
      

Index: Mesh.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Mesh.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Mesh.java	27 Mar 2007 08:47:11 -0000	1.15
--- Mesh.java	11 Apr 2007 12:19:41 -0000	1.16
***************
*** 72,76 ****
      for (Edge current : edges) {
        if (current.id == null) {
!         current.setId(new Long(count++));
        }
      }
--- 72,76 ----
      for (Edge current : edges) {
        if (current.id == null) {
!         current.setId(Long.valueOf(count++));
        }
      }
***************
*** 78,82 ****
      for (Vertex current : vertices) {
        if (current.id == null) {
!         current.setId(new Long(count++));
        }
      }
--- 78,82 ----
      for (Vertex current : vertices) {
        if (current.id == null) {
!         current.setId(Long.valueOf(count++));
        }
      }

Index: Description.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Description.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Description.java	28 Feb 2006 02:26:25 -0000	1.1
--- Description.java	11 Apr 2007 12:19:41 -0000	1.2
***************
*** 27,31 ****
     */
    public String toString() {
!     return description.toString();
    }
  }
--- 27,31 ----
     */
    public String toString() {
!     return description;
    }
  }

Index: ParameterBlock.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ParameterBlock.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ParameterBlock.java	13 Mar 2007 10:10:23 -0000	1.6
--- ParameterBlock.java	11 Apr 2007 12:19:41 -0000	1.7
***************
*** 81,85 ****
    public void add(Attribute attribute) {
      parameters.add(attribute);
!     attribute.setId(new Long(parameters.size() + 1));
    }
    
--- 81,85 ----
    public void add(Attribute attribute) {
      parameters.add(attribute);
!     attribute.setId(Long.valueOf(parameters.size() + 1));
    }