[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Instance.java, 1.1, 1.2 Persistence.java, 1.64, 1.65

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

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

Modified Files:
	Instance.java Persistence.java 
Log Message:
refactoring of space/instance

Index: Instance.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Instance.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Instance.java	12 Dec 2007 10:53:50 -0000	1.1
--- Instance.java	12 Dec 2007 12:02:21 -0000	1.2
***************
*** 12,15 ****
   */
  public class Instance extends Space {
! 
  }
--- 12,21 ----
   */
  public class Instance extends Space {
!   /**
!    * Constructs instance
!    * @param name name
!    */
!   public Instance(String name) {
!     super(name, Space.CONSTRUCTION, false);
!   }
  }

Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** Persistence.java	7 Dec 2007 13:19:54 -0000	1.64
--- Persistence.java	12 Dec 2007 12:02:21 -0000	1.65
***************
*** 230,240 ****
    }
    
-   private static Space internalizeSpace(Space owner, SpaceType xml, 
-       Map mapper, Collection xmls) {
-     Space s = new Space(xml.getName(), xml.getType(), xml.getVoidref() != 0);
-     return internalizeSpace(owner, s, xml, mapper, xmls);
-   }
-   
-   
    private static Classification internalizeClassifaction(String string, int type) {
      Classification classification = null;
--- 230,233 ----
***************
*** 276,292 ****
     * @return The Space
     */
!   private static Space internalizeSpace(Space owner, Space space, SpaceType xml, 
        Map mapper, Collection xmls) {
!     //String name = xml.getName();
      int type = xml.getType();
      long empty = xml.getVoidref();
!     //boolean container = (empty != 0);
      
      long proto = xml.getProtoref();
      boolean instance = (proto != 0);
      
      //space.setName(name);
      //space.setType(type);
      //space.setContainer(container);
      space.setTransparent(xml.isTransparent());
      space.setId(new Long(xml.getProgid()));
--- 269,293 ----
     * @return The Space
     */
!   private static Space internalizeSpace(Space owner, SpaceType xml, 
        Map mapper, Collection xmls) {
!     
!     
!     String name = xml.getName();
      int type = xml.getType();
      long empty = xml.getVoidref();
!     boolean container = (empty != 0);
      
      long proto = xml.getProtoref();
      boolean instance = (proto != 0);
      
+     // Alternative:
+     //space = new Space()
      //space.setName(name);
      //space.setType(type);
      //space.setContainer(container);
+     
+     Space space = new Space(name, type, container);
+     
+     
      space.setTransparent(xml.isTransparent());
      space.setId(new Long(xml.getProgid()));