[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/xml PersistenceManager.java,1.27,1.28

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

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/xml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11413/src/net/sourceforge/bprocessor/model/xml

Modified Files:
	PersistenceManager.java 
Log Message:
Removed ConstructionSpace and FunctionalSpace

Index: PersistenceManager.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/xml/PersistenceManager.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** PersistenceManager.java	20 Mar 2006 09:09:31 -0000	1.27
--- PersistenceManager.java	23 Mar 2006 10:43:49 -0000	1.28
***************
*** 7,12 ****
  package net.sourceforge.bprocessor.model.xml;
  
- import net.sourceforge.bprocessor.model.ConstructionSpace;
- import net.sourceforge.bprocessor.model.FunctionalSpace;
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Space;
--- 7,10 ----
***************
*** 120,124 ****
        Constructionspace cs = (Constructionspace)it.next(); 
  
!       ConstructionSpace csm = new ConstructionSpace(cs.getName());
        csm.setDescription(cs.getDescription());
  
--- 118,122 ----
        Constructionspace cs = (Constructionspace)it.next(); 
  
!       Space csm = Space.createConstructionSpace(cs.getName());
        csm.setDescription(cs.getDescription());
  
***************
*** 138,142 ****
        Functionalspace fs = (Functionalspace)it.next(); 
  
!       FunctionalSpace fsm = new FunctionalSpace(fs.getName());
        fsm.setDescription(fs.getDescription());
        
--- 136,140 ----
        Functionalspace fs = (Functionalspace)it.next(); 
  
!       Space fsm = Space.createFunctionalSpace(fs.getName());
        fsm.setDescription(fs.getDescription());
        
***************
*** 426,430 ****
      Iterator i = css.iterator();
      while (i.hasNext()) {
!       ConstructionSpace cs = (ConstructionSpace)i.next();
        Constructionspace csx = new ConstructionspaceImpl();
  
--- 424,428 ----
      Iterator i = css.iterator();
      while (i.hasNext()) {
!       Space cs = (Space)i.next();
        Constructionspace csx = new ConstructionspaceImpl();
  
***************
*** 448,452 ****
      Iterator i = fss.iterator();
      while (i.hasNext()) {
!       FunctionalSpace fs = (FunctionalSpace)i.next();
        Functionalspace fsx = new FunctionalspaceImpl();
  
--- 446,450 ----
      Iterator i = fss.iterator();
      while (i.hasNext()) {
!       Space fs = (Space)i.next();
        Functionalspace fsx = new FunctionalspaceImpl();
  
***************
*** 541,545 ****
      Iterator i = css.iterator();
      while (i.hasNext()) {
!       ConstructionSpace cs = (ConstructionSpace)i.next();
        Constructionspace csx = findConstructionSpace(bp, cs);
  
--- 539,543 ----
      Iterator i = css.iterator();
      while (i.hasNext()) {
!       Space cs = (Space)i.next();
        Constructionspace csx = findConstructionSpace(bp, cs);
  
***************
*** 563,567 ****
     * @return The construction space
     */
!   private static Constructionspace findConstructionSpace(Bprocessor bp, ConstructionSpace cs) {
      Map m = (Map)mapper.get(KEY_DOMAIN);
      Long id = (Long)m.get(cs.getId());
--- 561,565 ----
     * @return The construction space
     */
!   private static Constructionspace findConstructionSpace(Bprocessor bp, Space cs) {
      Map m = (Map)mapper.get(KEY_DOMAIN);
      Long id = (Long)m.get(cs.getId());
***************
*** 585,589 ****
      Iterator i = fss.iterator();
      while (i.hasNext()) {
!       FunctionalSpace fs = (FunctionalSpace)i.next();
        Functionalspace fsx = findFunctionalSpace(bp, fs);
  
--- 583,587 ----
      Iterator i = fss.iterator();
      while (i.hasNext()) {
!       Space fs = (Space)i.next();
        Functionalspace fsx = findFunctionalSpace(bp, fs);
  
***************
*** 607,611 ****
     * @return The functional space
     */
!   private static Functionalspace findFunctionalSpace(Bprocessor bp, FunctionalSpace fs) {
      Map m = (Map)mapper.get(KEY_DOMAIN);
      Long id = (Long)m.get(fs.getId());
--- 605,609 ----
     * @return The functional space
     */
!   private static Functionalspace findFunctionalSpace(Bprocessor bp, Space fs) {
      Map m = (Map)mapper.get(KEY_DOMAIN);
      Long id = (Long)m.get(fs.getId());