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

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

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

Modified Files:
	PersistenceManager.java 
Log Message:
Removed part and element

Index: PersistenceManager.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/xml/PersistenceManager.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** PersistenceManager.java	29 Nov 2005 19:05:26 -0000	1.12
--- PersistenceManager.java	11 Dec 2005 17:27:19 -0000	1.13
***************
*** 15,21 ****
  import net.sourceforge.bprocessor.model.xml.impl.ConstructionspaceImpl;
  import net.sourceforge.bprocessor.model.xml.impl.EdgeImpl;
- import net.sourceforge.bprocessor.model.xml.impl.ElementImpl;
  import net.sourceforge.bprocessor.model.xml.impl.FunctionalspaceImpl;
- import net.sourceforge.bprocessor.model.xml.impl.PartImpl;
  import net.sourceforge.bprocessor.model.xml.impl.SurfaceImpl;
  import net.sourceforge.bprocessor.model.xml.impl.VertexImpl;
--- 15,19 ----
***************
*** 95,100 ****
      loadConstructionSpace(bp.getConstructionspace());
      loadFunctionalSpace(bp.getFunctionalspace());
-     loadElement(bp.getElement());
-     loadPart(bp.getPart());
      loadSurface(bp.getSurface());
      loadEdge(bp.getEdge());
--- 93,96 ----
***************
*** 104,109 ****
      loadRefConstructionSpace(bp.getConstructionspace(), attribs);
      loadRefFunctionalSpace(bp.getFunctionalspace(), attribs);
-     loadRefElement(bp.getElement(), attribs);
-     loadRefPart(bp.getPart(), attribs);
      loadRefSurface(bp.getSurface(), attribs);
      loadRefEdge(bp.getEdge(), attribs);
--- 100,103 ----
***************
*** 170,211 ****
  
    /**
-    * Load element
-    * @param l The list
-    */
-   private static void loadElement(List l) {
-     Iterator it = l.iterator();
-     while (it.hasNext()) {
-       net.sourceforge.bprocessor.model.xml.Element e =
-         (net.sourceforge.bprocessor.model.xml.Element)it.next(); 
- 
-       net.sourceforge.bprocessor.model.Element em =
-         new net.sourceforge.bprocessor.model.Element(e.getName());
- 
-       Project.getInstance().intern(em);
- 
-       mapper.put(new Long(e.getId()), em.getId());
-     }
-   }
- 
-   /**
-    * Load part
-    * @param l The list
-    */
-   private static void loadPart(List l) {
-     Iterator it = l.iterator();
-     while (it.hasNext()) {
-       net.sourceforge.bprocessor.model.xml.Part p =
-         (net.sourceforge.bprocessor.model.xml.Part)it.next(); 
- 
-       net.sourceforge.bprocessor.model.Part pm =
-         new net.sourceforge.bprocessor.model.Part(p.getName());
- 
-       Project.getInstance().intern(pm);
- 
-       mapper.put(new Long(p.getId()), pm.getId());
-     }
-   }
- 
-   /**
     * Load surface
     * @param l The list
--- 164,167 ----
***************
*** 313,328 ****
          csm.setSurfaces(sr);
        }
-       List es = cs.getElementref();
-       if (es != null && es.size() > 0) {
-         Set er = new HashSet();
-         Iterator ies = es.iterator();
-         while (ies.hasNext()) {
-           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);
      }
--- 269,272 ----
***************
*** 367,382 ****
          fsm.setSurfaces(sr);
        }
-       List es = fs.getElementref();
-       if (es != null && es.size() > 0) {
-         Set er = new HashSet();
-         Iterator ies = es.iterator();
-         while (ies.hasNext()) {
-           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);
      }
--- 311,314 ----
***************
*** 388,489 ****
     * @param attribs The attributes
     */
-   private static void loadRefElement(List l, Map attribs) {
-     Iterator it = l.iterator();
-     while (it.hasNext()) {
-       net.sourceforge.bprocessor.model.xml.Element e =
-         (net.sourceforge.bprocessor.model.xml.Element)it.next(); 
- 
-       Long id = (Long)mapper.get(new Long(e.getId()));
-       net.sourceforge.bprocessor.model.Element em =
-         Project.getInstance().findElementById(id);
- 
-       List as = e.getAttributeref();
-       if (as != null && as.size() > 0) {
-         Set ar = new HashSet();
-         Iterator ias = as.iterator();
-         while (ias.hasNext()) {
-           Long aid = (Long)mapper.get((Long)ias.next());
-           net.sourceforge.bprocessor.model.Attribute a =
-             (net.sourceforge.bprocessor.model.Attribute)attribs.get(aid);
-           ar.add(a);
-         }
-         em.setAttributes(ar);
-       }
-       List ss = e.getSurfaceref();
-       if (ss != null && ss.size() > 0) {
-         Set sr = new HashSet();
-         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);
-         }
-         em.setSurfaces(sr);
-       }
-       List ps = e.getPartref();
-       if (ps != null && ps.size() > 0) {
-         Set pr = new HashSet();
-         Iterator ips = ps.iterator();
-         while (ips.hasNext()) {
-           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);
-     }
-   }
- 
-   /**
-    * Create the references
-    * @param l The list
-    * @param attribs The attributes
-    */
-   private static void loadRefPart(List l, Map attribs) {
-     Iterator it = l.iterator();
-     while (it.hasNext()) {
-       net.sourceforge.bprocessor.model.xml.Part p =
-         (net.sourceforge.bprocessor.model.xml.Part)it.next(); 
- 
-       Long id = (Long)mapper.get(new Long(p.getId()));
-       net.sourceforge.bprocessor.model.Part pm =
-         Project.getInstance().findPartById(id);
- 
-       List as = p.getAttributeref();
-       if (as != null && as.size() > 0) {
-         Set ar = new HashSet();
-         Iterator ias = as.iterator();
-         while (ias.hasNext()) {
-           Long aid = (Long)mapper.get((Long)ias.next());
-           net.sourceforge.bprocessor.model.Attribute a =
-             (net.sourceforge.bprocessor.model.Attribute)attribs.get(aid);
-           ar.add(a);
-         }
-         pm.setAttributes(ar);
-       }
-       List ss = p.getSurfaceref();
-       if (ss != null && ss.size() > 0) {
-         Set sr = new HashSet();
-         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);
-         }
-         pm.setSurfaces(sr);
-       }
-       Project.getInstance().update(pm);
-     }
-   }
- 
-   /**
-    * Create the references
-    * @param l The list
-    * @param attribs The attributes
-    */
    private static void loadRefSurface(List l, Map attribs) {
      Iterator it = l.iterator();
--- 320,323 ----
***************
*** 613,619 ****
      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());
--- 447,451 ----
***************
*** 623,629 ****
      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());
--- 455,459 ----
***************
*** 720,789 ****
  
    /**
-    * Save the element 
-    * @param bp The BProcessor document
-    * @param es The elements 
-    */
-   private static void saveElement(Bprocessor bp, Set es) {
-     Iterator i = es.iterator();
-     while (i.hasNext()) {
-       net.sourceforge.bprocessor.model.Element e =
-         (net.sourceforge.bprocessor.model.Element)i.next();
-       net.sourceforge.bprocessor.model.xml.Element ex = new ElementImpl();
- 
-       ex.setId(counter++);
-       ex.setName(e.getName());
- 
-       Set data = e.getAttributes();
-       Iterator it = data.iterator();
-       while (it.hasNext()) {
-         net.sourceforge.bprocessor.model.Attribute a =
-           (net.sourceforge.bprocessor.model.Attribute)it.next();
- 
-         Long aid = saveAttribute(bp, a);
- 
-         ex.getAttributeref().add(aid);
-       }
- 
-       Map em = (Map)mapper.get(KEY_ELEMENT);
-       em.put(e.getId(), new Long(ex.getId()));
-     
-       bp.getElement().add(ex);
-     }
-   }
- 
-   /**
-    * Save the part 
-    * @param bp The BProcessor document
-    * @param ps The parts 
-    */
-   private static void savePart(Bprocessor bp, Set ps) {
-     Iterator i = ps.iterator();
-     while (i.hasNext()) {
-       net.sourceforge.bprocessor.model.Part p =
-         (net.sourceforge.bprocessor.model.Part)i.next();
-       net.sourceforge.bprocessor.model.xml.Part px = new PartImpl();
- 
-       px.setId(counter++);
-       px.setName(p.getName());
- 
-       Set data = p.getAttributes();
-       Iterator it = data.iterator();
-       while (it.hasNext()) {
-         net.sourceforge.bprocessor.model.Attribute a =
-           (net.sourceforge.bprocessor.model.Attribute)it.next();
-         
-         Long aid = saveAttribute(bp, a);
-         
-         px.getAttributeref().add(aid);
-       }
- 
-       Map pm = (Map)mapper.get(KEY_PART);
-       pm.put(p.getId(), new Long(px.getId()));
-     
-       bp.getPart().add(px);
-     }
-   }
- 
-   /**
     * Save the surface 
     * @param bp The BProcessor document
--- 550,553 ----
***************
*** 878,894 ****
          csx.getSurfaceref().add(m.get(s.getId()));
        }
-       
-       data = cs.getElements();
-       if (data != null) {
-         it = data.iterator();
-         while (it.hasNext()) {
-           net.sourceforge.bprocessor.model.Element e =
-             (net.sourceforge.bprocessor.model.Element)it.next();
- 
-           Map m = (Map)mapper.get(KEY_ELEMENT);
- 
-           csx.getElementref().add(m.get(e.getId()));
-         }
-       }
      }
    }
--- 642,645 ----
***************
*** 935,949 ****
          fsx.getSurfaceref().add(m.get(s.getId()));
        }
-     
-       data = fs.getElements();
-       it = data.iterator();
-       while (it.hasNext()) {
-         net.sourceforge.bprocessor.model.Element e =
-           (net.sourceforge.bprocessor.model.Element)it.next();
- 
-         Map m = (Map)mapper.get(KEY_ELEMENT);
- 
-         fsx.getElementref().add(m.get(e.getId()));
-       }
      }
    }
--- 686,689 ----
***************
*** 968,1079 ****
      return null;
    }
! 
!   /**
!    * Save the element references
!    * @param bp The BProcessor document
!    * @param es The elements 
!    */
!   private static void saveRefElement(Bprocessor bp, Set es) {
!     Iterator i = es.iterator();
!     while (i.hasNext()) {
!       net.sourceforge.bprocessor.model.Element e =
!         (net.sourceforge.bprocessor.model.Element)i.next();
!       net.sourceforge.bprocessor.model.xml.Element ex = findElement(bp, e);
! 
!       Set data = e.getSurfaces();
!       Iterator it = data.iterator();
!       while (it.hasNext()) {
!         net.sourceforge.bprocessor.model.Surface s =
!           (net.sourceforge.bprocessor.model.Surface)it.next();
! 
!         Map m = (Map)mapper.get(KEY_SURFACE);
! 
!         ex.getSurfaceref().add(m.get(s.getId()));
!       }
!     
!       data = e.getParts();
!       it = data.iterator();
!       while (it.hasNext()) {
!         net.sourceforge.bprocessor.model.Part p =
!           (net.sourceforge.bprocessor.model.Part)it.next();
! 
!         Map m = (Map)mapper.get(KEY_PART);
! 
!         ex.getPartref().add(m.get(p.getId()));
!       }
!     }
!   }
! 
!   /**
!    * Find the element
!    * @param bp The BProcessor document
!    * @param e The element
!    * @return The element
!    */
!   private static net.sourceforge.bprocessor.model.xml.Element
!   findElement(Bprocessor bp, net.sourceforge.bprocessor.model.Element e) {
! 
!     Map m = (Map)mapper.get(KEY_ELEMENT);
!     Long id = (Long)m.get(e.getId());
! 
!     Iterator it = bp.getElement().iterator();
!     while (it.hasNext()) {
!       net.sourceforge.bprocessor.model.xml.Element ex =
!         (net.sourceforge.bprocessor.model.xml.Element)it.next();
!       if (ex.getId() == id.longValue()) {
!         return ex;
!       }
!     }
!     return null;
!   }
! 
!   /**
!    * Save the part references
!    * @param bp The BProcessor document
!    * @param ps The parts
!    */
!   private static void saveRefPart(Bprocessor bp, Set ps) {
!     Iterator i = ps.iterator();
!     while (i.hasNext()) {
!       net.sourceforge.bprocessor.model.Part p =
!         (net.sourceforge.bprocessor.model.Part)i.next();
!       net.sourceforge.bprocessor.model.xml.Part px = findPart(bp, p);
! 
!       Set data = p.getSurfaces();
!       Iterator it = data.iterator();
!       while (it.hasNext()) {
!         net.sourceforge.bprocessor.model.Surface s =
!           (net.sourceforge.bprocessor.model.Surface)it.next();
! 
!         Map m = (Map)mapper.get(KEY_SURFACE);
! 
!         px.getSurfaceref().add(m.get(s.getId()));
!       }
!     }
!   }
! 
!   /**
!    * Find the part
!    * @param bp The BProcessor document
!    * @param p The part
!    * @return The part
!    */
!   private static net.sourceforge.bprocessor.model.xml.Part
!   findPart(Bprocessor bp, net.sourceforge.bprocessor.model.Part p) {
! 
!     Map m = (Map)mapper.get(KEY_PART);
!     Long id = (Long)m.get(p.getId());
! 
!     Iterator it = bp.getPart().iterator();
!     while (it.hasNext()) {
!       net.sourceforge.bprocessor.model.xml.Part px =
!         (net.sourceforge.bprocessor.model.xml.Part)it.next();
!       if (px.getId() == id.longValue()) {
!         return px;
!       }
!     }
!     return null;
!   }
! 
    /**
     * Save the surface references
--- 708,712 ----
      return null;
    }
!  
    /**
     * Save the surface references