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

SourceForge Headquarters 225 Broadway Suite 1600 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-serv2573/src/net/sourceforge/bprocessor/model/xml

Modified Files:
	PersistenceManager.java 
Log Message:
All access to database now through the Project instance

Index: PersistenceManager.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/xml/PersistenceManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PersistenceManager.java	30 Sep 2005 11:35:06 -0000	1.9
--- PersistenceManager.java	2 Oct 2005 14:36:30 -0000	1.10
***************
*** 7,21 ****
  package net.sourceforge.bprocessor.model.xml;

- import net.sourceforge.bprocessor.model.AttributeFacade;
  import net.sourceforge.bprocessor.model.ConstructionSpace;
- import net.sourceforge.bprocessor.model.ConstructionSpaceFacade;
- import net.sourceforge.bprocessor.model.DomainFacade;
- import net.sourceforge.bprocessor.model.EdgeFacade;
- import net.sourceforge.bprocessor.model.ElementFacade;
  import net.sourceforge.bprocessor.model.FunctionalSpace;
! import net.sourceforge.bprocessor.model.FunctionalSpaceFacade;
! import net.sourceforge.bprocessor.model.PartFacade;
! import net.sourceforge.bprocessor.model.SurfaceFacade;
! import net.sourceforge.bprocessor.model.VertexFacade;

  import net.sourceforge.bprocessor.model.xml.impl.AttributeImpl;
--- 7,13 ----
  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.xml.impl.AttributeImpl;
***************
*** 135,139 ****
          new net.sourceforge.bprocessor.model.Attribute(a.getName(), a.getType(), a.getValue());

!       AttributeFacade.getInstance().create(am);

        mapper.put(new Long(a.getId()), am.getId());
--- 127,131 ----
          new net.sourceforge.bprocessor.model.Attribute(a.getName(), a.getType(), a.getValue());

!       Project.getInstance().intern(am);

        mapper.put(new Long(a.getId()), am.getId());
***************
*** 154,158 ****
        ConstructionSpace csm = new ConstructionSpace(cs.getName());

!       ConstructionSpaceFacade.getInstance().create(csm);

        mapper.put(new Long(cs.getId()), csm.getId());
--- 146,150 ----
        ConstructionSpace csm = new ConstructionSpace(cs.getName());

!       Project.getInstance().intern(csm);

        mapper.put(new Long(cs.getId()), csm.getId());
***************
*** 171,175 ****
        FunctionalSpace fsm = new FunctionalSpace(fs.getName());

!       FunctionalSpaceFacade.getInstance().create(fsm);

        mapper.put(new Long(fs.getId()), fsm.getId());
--- 163,167 ----
        FunctionalSpace fsm = new FunctionalSpace(fs.getName());

!       Project.getInstance().intern(fsm);

        mapper.put(new Long(fs.getId()), fsm.getId());
***************
*** 190,194 ****
          new net.sourceforge.bprocessor.model.Element(e.getName());

!       ElementFacade.getInstance().create(em);

        mapper.put(new Long(e.getId()), em.getId());
--- 182,186 ----
          new net.sourceforge.bprocessor.model.Element(e.getName());

!       Project.getInstance().intern(em);

        mapper.put(new Long(e.getId()), em.getId());
***************
*** 209,213 ****
          new net.sourceforge.bprocessor.model.Part(p.getName());

!       PartFacade.getInstance().create(pm);

        mapper.put(new Long(p.getId()), pm.getId());
--- 201,205 ----
          new net.sourceforge.bprocessor.model.Part(p.getName());

!       Project.getInstance().intern(pm);

        mapper.put(new Long(p.getId()), pm.getId());
***************
*** 232,236 ****
        sm.setIsInner(s.isIsinner());

!       SurfaceFacade.getInstance().create(sm);

        mapper.put(new Long(s.getId()), sm.getId());
--- 224,228 ----
        sm.setIsInner(s.isIsinner());

!       Project.getInstance().intern(sm);

        mapper.put(new Long(s.getId()), sm.getId());
***************
*** 251,255 ****
          new net.sourceforge.bprocessor.model.Edge(e.getName());

!       EdgeFacade.getInstance().create(em);

        mapper.put(new Long(e.getId()), em.getId());
--- 243,247 ----
          new net.sourceforge.bprocessor.model.Edge(e.getName());

!       Project.getInstance().intern(em);

        mapper.put(new Long(e.getId()), em.getId());
***************
*** 275,279 ****
        vm.setW(v.getW());

!       VertexFacade.getInstance().create(vm);

        mapper.put(new Long(v.getId()), vm.getId());
--- 267,271 ----
        vm.setW(v.getW());

!       Project.getInstance().intern(vm);

        mapper.put(new Long(v.getId()), vm.getId());
***************
*** 293,297 ****
        Long id = (Long)mapper.get(new Long(cs.getId()));
        ConstructionSpace csm =
!         ConstructionSpaceFacade.getInstance().findById(id);

        List as = cs.getAttributeref();
--- 285,289 ----
        Long id = (Long)mapper.get(new Long(cs.getId()));
        ConstructionSpace csm =
!         Project.getInstance().findConstructionSpaceById(id);

        List as = cs.getAttributeref();
***************
*** 314,318 ****
            Long sid = (Long)mapper.get((Long)iss.next());
            net.sourceforge.bprocessor.model.Surface s =
!             SurfaceFacade.getInstance().findById(sid);
            sr.add(s);
          }
--- 306,310 ----
            Long sid = (Long)mapper.get((Long)iss.next());
            net.sourceforge.bprocessor.model.Surface s =
!             Project.getInstance().findSurfaceById(sid);
            sr.add(s);
          }
***************
*** 326,335 ****
            Long eid = (Long)mapper.get((Long)ies.next());
            net.sourceforge.bprocessor.model.Element e =
!             ElementFacade.getInstance().findById(eid);
            er.add(e);
          }
          csm.setElements(er);
        }
!       ConstructionSpaceFacade.getInstance().update(csm);
      }
    }
--- 318,327 ----
            Long eid = (Long)mapper.get((Long)ies.next());
            net.sourceforge.bprocessor.model.Element e =
!             Project.getInstance().findElementById(eid);
            er.add(e);
          }
          csm.setElements(er);
        }
!       Project.getInstance().update(csm);
      }
    }
***************
*** 347,351 ****
        Long id = (Long)mapper.get(new Long(fs.getId()));
        FunctionalSpace fsm =
!         FunctionalSpaceFacade.getInstance().findById(id);

        List as = fs.getAttributeref();
--- 339,343 ----
        Long id = (Long)mapper.get(new Long(fs.getId()));
        FunctionalSpace fsm =
!         Project.getInstance().findFunctionalSpaceById(id);

        List as = fs.getAttributeref();
***************
*** 368,372 ****
            Long sid = (Long)mapper.get((Long)iss.next());
            net.sourceforge.bprocessor.model.Surface s =
!             SurfaceFacade.getInstance().findById(sid);
            sr.add(s);
          }
--- 360,364 ----
            Long sid = (Long)mapper.get((Long)iss.next());
            net.sourceforge.bprocessor.model.Surface s =
!             Project.getInstance().findSurfaceById(sid);
            sr.add(s);
          }
***************
*** 380,389 ****
            Long eid = (Long)mapper.get((Long)ies.next());
            net.sourceforge.bprocessor.model.Element e =
!             ElementFacade.getInstance().findById(eid);
            er.add(e);
          }
          fsm.setElements(er);
        }
!       FunctionalSpaceFacade.getInstance().update(fsm);
      }
    }
--- 372,381 ----
            Long eid = (Long)mapper.get((Long)ies.next());
            net.sourceforge.bprocessor.model.Element e =
!             Project.getInstance().findElementById(eid);
            er.add(e);
          }
          fsm.setElements(er);
        }
!       Project.getInstance().update(fsm);
      }
    }
***************
*** 402,406 ****
        Long id = (Long)mapper.get(new Long(e.getId()));
        net.sourceforge.bprocessor.model.Element em =
!         ElementFacade.getInstance().findById(id);

        List as = e.getAttributeref();
--- 394,398 ----
        Long id = (Long)mapper.get(new Long(e.getId()));
        net.sourceforge.bprocessor.model.Element em =
!         Project.getInstance().findElementById(id);

        List as = e.getAttributeref();
***************
*** 423,427 ****
            Long sid = (Long)mapper.get((Long)iss.next());
            net.sourceforge.bprocessor.model.Surface s =
!             SurfaceFacade.getInstance().findById(sid);
            sr.add(s);
          }
--- 415,419 ----
            Long sid = (Long)mapper.get((Long)iss.next());
            net.sourceforge.bprocessor.model.Surface s =
!             Project.getInstance().findSurfaceById(sid);
            sr.add(s);
          }
***************
*** 435,444 ****
            Long pid = (Long)mapper.get((Long)ips.next());
            net.sourceforge.bprocessor.model.Part p =
!             PartFacade.getInstance().findById(pid);
            pr.add(p);
          }
          em.setParts(pr);
        }
!       ElementFacade.getInstance().update(em);
      }
    }
--- 427,436 ----
            Long pid = (Long)mapper.get((Long)ips.next());
            net.sourceforge.bprocessor.model.Part p =
!             Project.getInstance().findPartById(pid);
            pr.add(p);
          }
          em.setParts(pr);
        }
!       Project.getInstance().update(em);
      }
    }
***************
*** 457,461 ****
        Long id = (Long)mapper.get(new Long(p.getId()));
        net.sourceforge.bprocessor.model.Part pm =
!         PartFacade.getInstance().findById(id);

        List as = p.getAttributeref();
--- 449,453 ----
        Long id = (Long)mapper.get(new Long(p.getId()));
        net.sourceforge.bprocessor.model.Part pm =
!         Project.getInstance().findPartById(id);

        List as = p.getAttributeref();
***************
*** 478,487 ****
            Long sid = (Long)mapper.get((Long)iss.next());
            net.sourceforge.bprocessor.model.Surface s =
!             SurfaceFacade.getInstance().findById(sid);
            sr.add(s);
          }
          pm.setSurfaces(sr);
        }
!       PartFacade.getInstance().update(pm);
      }
    }
--- 470,479 ----
            Long sid = (Long)mapper.get((Long)iss.next());
            net.sourceforge.bprocessor.model.Surface s =
!             Project.getInstance().findSurfaceById(sid);
            sr.add(s);
          }
          pm.setSurfaces(sr);
        }
!       Project.getInstance().update(pm);
      }
    }
***************
*** 500,504 ****
        Long id = (Long)mapper.get(new Long(s.getId()));
        net.sourceforge.bprocessor.model.Surface sm =
!         SurfaceFacade.getInstance().findById(id);

        List es = s.getEdgeref();
--- 492,496 ----
        Long id = (Long)mapper.get(new Long(s.getId()));
        net.sourceforge.bprocessor.model.Surface sm =
!         Project.getInstance().findSurfaceById(id);

        List es = s.getEdgeref();
***************
*** 509,513 ****
            Long eid = (Long)mapper.get((Long)ies.next());
            net.sourceforge.bprocessor.model.Edge e =
!             EdgeFacade.getInstance().findById(eid);
            er.add(e);
          }
--- 501,505 ----
            Long eid = (Long)mapper.get((Long)ies.next());
            net.sourceforge.bprocessor.model.Edge e =
!             Project.getInstance().findEdgeById(eid);
            er.add(e);
          }
***************
*** 522,526 ****
            Long isid = (Long)mapper.get((Long)iiss.next());
            net.sourceforge.bprocessor.model.Surface is =
!             SurfaceFacade.getInstance().findById(isid);
            isr.add(is);
          }
--- 514,518 ----
            Long isid = (Long)mapper.get((Long)iiss.next());
            net.sourceforge.bprocessor.model.Surface is =
!             Project.getInstance().findSurfaceById(isid);
            isr.add(is);
          }
***************
*** 529,539 ****
        Long bid = (Long)(mapper.get(new Long(s.getBackdomainref())));
        if (bid != null) {
!         sm.setBackDomain(DomainFacade.getInstance().findById(bid));
        }
        Long fid = (Long)(mapper.get(new Long(s.getFrontdomainref())));
        if (fid != null) {
!         sm.setFrontDomain(DomainFacade.getInstance().findById(fid));
        }
!       SurfaceFacade.getInstance().update(sm);
      }
    }
--- 521,531 ----
        Long bid = (Long)(mapper.get(new Long(s.getBackdomainref())));
        if (bid != null) {
!         sm.setBackDomain(Project.getInstance().findDomainById(bid));
        }
        Long fid = (Long)(mapper.get(new Long(s.getFrontdomainref())));
        if (fid != null) {
!         sm.setFrontDomain(Project.getInstance().findDomainById(fid));
        }
!       Project.getInstance().update(sm);
      }
    }
***************
*** 552,567 ****
        Long id = (Long)mapper.get(new Long(e.getId()));
        net.sourceforge.bprocessor.model.Edge em =
!         EdgeFacade.getInstance().findById(id);

        Long vid = (Long)mapper.get(new Long(e.getVertexfromref()));
        net.sourceforge.bprocessor.model.Vertex v =
!         VertexFacade.getInstance().findById(vid);
        em.setFrom(v);

        vid = (Long)mapper.get(new Long(e.getVertextoref()));
!       v = VertexFacade.getInstance().findById(vid);
        em.setTo(v);

!       EdgeFacade.getInstance().update(em);
      }
    }
--- 544,559 ----
        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);

!       Project.getInstance().update(em);
      }
    }
***************
*** 580,584 ****
        Long id = (Long)mapper.get(new Long(v.getId()));
        net.sourceforge.bprocessor.model.Vertex vm =
!         VertexFacade.getInstance().findById(id);
      }
    }
--- 572,576 ----
        Long id = (Long)mapper.get(new Long(v.getId()));
        net.sourceforge.bprocessor.model.Vertex vm =
!         Project.getInstance().findVertexById(id);
      }
    }
***************
*** 614,642 ****
      mapper.put(KEY_DOMAIN, new HashMap());

!     ConstructionSpaceFacade csf = ConstructionSpaceFacade.getInstance();
!     EdgeFacade edf = EdgeFacade.getInstance();
!     ElementFacade ef = ElementFacade.getInstance();
!     FunctionalSpaceFacade fsf = FunctionalSpaceFacade.getInstance();
!     PartFacade pf = PartFacade.getInstance();
!     SurfaceFacade sf = SurfaceFacade.getInstance();
!     VertexFacade vf = VertexFacade.getInstance();

      // Save all objects
!     saveConstructionSpace(bp, csf.findAll());
!     saveEdge(bp, edf.findAll());
!     saveElement(bp, ef.findAll());
!     saveFunctionalSpace(bp, fsf.findAll());
!     savePart(bp, pf.findAll());
!     saveSurface(bp, sf.findAll());
!     saveVertex(bp, vf.findAll());

      // Save all references
!     saveRefConstructionSpace(bp, csf.findAll());
!     saveRefEdge(bp, edf.findAll());
!     saveRefElement(bp, ef.findAll());
!     saveRefFunctionalSpace(bp, fsf.findAll());
!     saveRefPart(bp, pf.findAll());
!     saveRefSurface(bp, sf.findAll());
!     saveRefVertex(bp, vf.findAll());

      saveFile(bp, fos);
--- 606,629 ----
      mapper.put(KEY_DOMAIN, new HashMap());

!     Project project = Project.getInstance();

      // Save all objects
!     saveConstructionSpace(bp, project.getConstructionSpaces());
!     saveEdge(bp, project.getEdges());
!     saveElement(bp, project.getElements());
!     saveFunctionalSpace(bp, project.getFunctionalSpaces());
!     savePart(bp, project.getParts());
!     saveSurface(bp, project.getSurfaces());
!     saveVertex(bp, project.getVertices());

      // Save all references
!     
!     saveRefConstructionSpace(bp, project.getConstructionSpaces());
!     saveRefEdge(bp, project.getEdges());
!     saveRefElement(bp, project.getElements());
!     saveRefFunctionalSpace(bp, project.getFunctionalSpaces());
!     saveRefPart(bp, project.getParts());
!     saveRefSurface(bp, project.getSurfaces());
!     saveRefVertex(bp, project.getVertices());

      saveFile(bp, fos);