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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	PersistenceManager.java 
Log Message:
Some refactoring

Index: PersistenceManager.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/xml/PersistenceManager.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** PersistenceManager.java	16 Jan 2006 10:07:32 -0000	1.19
--- PersistenceManager.java	17 Jan 2006 14:05:08 -0000	1.20
***************
*** 142,146 ****
        Project.getInstance().intern(csm);

!       mapper.put(new Long(cs.getId()), csm.getId());
      }
    }
--- 142,146 ----
        Project.getInstance().intern(csm);

!       mapper.put(new Long(cs.getId()), csm);
      }
    }
***************
*** 160,164 ****
        Project.getInstance().intern(fsm);

!       mapper.put(new Long(fs.getId()), fsm.getId());
      }
    }
--- 160,164 ----
        Project.getInstance().intern(fsm);

!       mapper.put(new Long(fs.getId()), fsm);
      }
    }
***************
*** 183,187 ****
        Project.getInstance().intern(sm);

!       mapper.put(new Long(s.getId()), sm.getId());
      }
    }
--- 183,187 ----
        Project.getInstance().intern(sm);

!       mapper.put(new Long(s.getId()), sm);
      }
    }
***************
*** 204,208 ****
        Project.getInstance().intern(em);

!       mapper.put(new Long(e.getId()), em.getId());
      }
    }
--- 204,208 ----
        Project.getInstance().intern(em);

!       mapper.put(new Long(e.getId()), em);
      }
    }
***************
*** 227,231 ****
        Project.getInstance().intern(vm);

!       mapper.put(new Long(v.getId()), vm.getId());
      }
    }
--- 227,231 ----
        Project.getInstance().intern(vm);

!       mapper.put(new Long(v.getId()), vm);
      }
    }
***************
*** 241,247 ****
        Constructionspace cs = (Constructionspace)it.next(); 

!       Long id = (Long)mapper.get(new Long(cs.getId()));
!       Space csm =
!         Project.getInstance().findSpaceById(id);

        List as = cs.getAttributeref();
--- 241,245 ----
        Constructionspace cs = (Constructionspace)it.next(); 

!       Space csm = (Space) mapper.get(new Long(cs.getId()));

        List as = cs.getAttributeref();
***************
*** 262,268 ****
          Iterator iss = ss.iterator();
          while (iss.hasNext()) {
!           Long sid = (Long)mapper.get((Long)iss.next());
!           net.sourceforge.bprocessor.model.Surface s =
!             Project.getInstance().findSurfaceById(sid);
            sr.add(s);
          }
--- 260,265 ----
          Iterator iss = ss.iterator();
          while (iss.hasNext()) {
!           net.sourceforge.bprocessor.model.Surface s = 
!             (net.sourceforge.bprocessor.model.Surface) mapper.get((Long)iss.next());
            sr.add(s);
          }
***************
*** 282,288 ****
        Functionalspace fs = (Functionalspace)it.next(); 

!       Long id = (Long)mapper.get(new Long(fs.getId()));
!       Space fsm =
!         Project.getInstance().findSpaceById(id);

        List as = fs.getAttributeref();
--- 279,283 ----
        Functionalspace fs = (Functionalspace)it.next(); 

!       Space fsm = (Space) mapper.get(new Long(fs.getId()));

        List as = fs.getAttributeref();
***************
*** 303,309 ****
          Iterator iss = ss.iterator();
          while (iss.hasNext()) {
!           Long sid = (Long)mapper.get((Long)iss.next());
!           net.sourceforge.bprocessor.model.Surface s =
!             Project.getInstance().findSurfaceById(sid);
            sr.add(s);
          }
--- 298,303 ----
          Iterator iss = ss.iterator();
          while (iss.hasNext()) {
!           net.sourceforge.bprocessor.model.Surface s = 
!             (net.sourceforge.bprocessor.model.Surface) mapper.get((Long)iss.next());
            sr.add(s);
          }
***************
*** 324,330 ****
          (net.sourceforge.bprocessor.model.xml.Surface)it.next(); 

!       Long id = (Long)mapper.get(new Long(s.getId()));
!       net.sourceforge.bprocessor.model.Surface sm =
!         Project.getInstance().findSurfaceById(id);

        List es = s.getEdgeref();
--- 318,323 ----
          (net.sourceforge.bprocessor.model.xml.Surface)it.next(); 

!       net.sourceforge.bprocessor.model.Surface sm = 
!         (net.sourceforge.bprocessor.model.Surface) mapper.get(new Long(s.getId()));

        List es = s.getEdgeref();
***************
*** 333,339 ****
          Iterator ies = es.iterator();
          while (ies.hasNext()) {
-           Long eid = (Long)mapper.get((Long)ies.next());
            net.sourceforge.bprocessor.model.Edge e =
!             Project.getInstance().findEdgeById(eid);
            er.add(e);
          }
--- 326,331 ----
          Iterator ies = es.iterator();
          while (ies.hasNext()) {
            net.sourceforge.bprocessor.model.Edge e =
!             (net.sourceforge.bprocessor.model.Edge) mapper.get((Long)ies.next());
            er.add(e);
          }
***************
*** 346,367 ****
          Iterator iiss = iss.iterator();
          while (iiss.hasNext()) {
!           Long isid = (Long)mapper.get((Long)iiss.next());
!           net.sourceforge.bprocessor.model.Surface is =
!             Project.getInstance().findSurfaceById(isid);
            isr.add(is);
          }
          sm.setHoles(isr);
        }
!       Long bid = (Long)(mapper.get(new Long(s.getBackdomainref())));
!       if (bid != null) {
!         sm.setBackDomain((Space) Project.getInstance().findSpaceById(bid));
        }
!       Long fid = (Long)(mapper.get(new Long(s.getFrontdomainref())));
!       if (fid != null) {
!         sm.setFrontDomain((Space) Project.getInstance().findSpaceById(fid));
        }
!       Long eid = (Long)(mapper.get(new Long(s.getExteriorref())));
!       if (eid != null) {
!         sm.setExterior(Project.getInstance().findSurfaceById(eid));
        }
      }
--- 338,359 ----
          Iterator iiss = iss.iterator();
          while (iiss.hasNext()) {
!           net.sourceforge.bprocessor.model.Surface is = 
!             (net.sourceforge.bprocessor.model.Surface)mapper.get((Long)iiss.next());
            isr.add(is);
          }
          sm.setHoles(isr);
        }
!       Space b = (Space)(mapper.get(new Long(s.getBackdomainref())));
!       if (b != null) {
!         sm.setBackDomain(b);
        }
!       Space f = (Space)(mapper.get(new Long(s.getFrontdomainref())));
!       if (f != null) {
!         sm.setFrontDomain(f);
        }
!       net.sourceforge.bprocessor.model.Surface surface = 
!         (net.sourceforge.bprocessor.model.Surface)(mapper.get(new Long(s.getExteriorref())));
!       if (surface != null) {
!         sm.setExterior(surface);
        }
      }
***************
*** 379,394 ****
          (net.sourceforge.bprocessor.model.xml.Edge)it.next(); 

!       Long id = (Long)mapper.get(new Long(e.getId()));
!       net.sourceforge.bprocessor.model.Edge em =
!         Project.getInstance().findEdgeById(id);
! 
!       Long vid = (Long)mapper.get(new Long(e.getVertexfromref()));
!       net.sourceforge.bprocessor.model.Vertex v =
!         Project.getInstance().findVertexById(vid);
!       em.setFrom(v);

!       vid = (Long)mapper.get(new Long(e.getVertextoref()));
!       v = Project.getInstance().findVertexById(vid);
!       em.setTo(v);
      }
    }
--- 371,384 ----
          (net.sourceforge.bprocessor.model.xml.Edge)it.next(); 

!       net.sourceforge.bprocessor.model.Edge em = 
!         (net.sourceforge.bprocessor.model.Edge) mapper.get(new Long(e.getId()));

!       net.sourceforge.bprocessor.model.Vertex from = 
!         (net.sourceforge.bprocessor.model.Vertex)mapper.get(new Long(e.getVertexfromref()));
!       em.setFrom(from);
!       
!       net.sourceforge.bprocessor.model.Vertex to = 
!         (net.sourceforge.bprocessor.model.Vertex)mapper.get(new Long(e.getVertextoref()));
!       em.setTo(to);
      }
    }
***************
*** 403,411 ****
      while (it.hasNext()) {
        net.sourceforge.bprocessor.model.xml.Vertex v =
!         (net.sourceforge.bprocessor.model.xml.Vertex)it.next(); 
! 
!       Long id = (Long)mapper.get(new Long(v.getId()));
!       net.sourceforge.bprocessor.model.Vertex vm =
!         Project.getInstance().findVertexById(id);
      }
    }
--- 393,400 ----
      while (it.hasNext()) {
        net.sourceforge.bprocessor.model.xml.Vertex v =
!         (net.sourceforge.bprocessor.model.xml.Vertex)it.next();
!       
!       net.sourceforge.bprocessor.model.Vertex vm = 
!         (net.sourceforge.bprocessor.model.Vertex)mapper.get(new Long(v.getId()));
      }
    }