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

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-serv14743/src/net/sourceforge/bprocessor/model/xml

Modified Files:
	PersistenceManager.java 
Log Message:
Fixed some bugs...

Index: PersistenceManager.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/xml/PersistenceManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PersistenceManager.java	20 Sep 2005 12:41:23 -0000	1.7
--- PersistenceManager.java	30 Sep 2005 10:52:00 -0000	1.8
***************
*** 10,13 ****
--- 10,14 ----
  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;
***************
*** 17,21 ****
  import net.sourceforge.bprocessor.model.SurfaceFacade;
  import net.sourceforge.bprocessor.model.VertexFacade;
- import net.sourceforge.bprocessor.model.DomainFacade;
  
  import net.sourceforge.bprocessor.model.xml.impl.AttributeImpl;
--- 18,21 ----
***************
*** 55,78 ****
    private static Logger log = Logger.getLogger(PersistenceManager.class);
  
-   /** Key: CONSTRUCTION_SPACE */
-   private static final Integer KEY_CONSTRUCTION_SPACE = new Integer(0);
- 
-   /** Key: FUNCTIONAL_SPACE */
-   private static final Integer KEY_FUNCTIONAL_SPACE = new Integer(1);
- 
    /** Key: ELEMENT */
!   private static final Integer KEY_ELEMENT = new Integer(2);
  
    /** Key: PART */
!   private static final Integer KEY_PART = new Integer(3);
  
    /** Key: SURFACE */
!   private static final Integer KEY_SURFACE = new Integer(4);
  
    /** Key: EDGE */
!   private static final Integer KEY_EDGE = new Integer(5);
  
    /** Key: VERTEX */
!   private static final Integer KEY_VERTEX = new Integer(6);
  
    /** Mapper counter */
--- 55,76 ----
    private static Logger log = Logger.getLogger(PersistenceManager.class);
  
    /** Key: ELEMENT */
!   private static final Integer KEY_ELEMENT = new Integer(0);
  
    /** Key: PART */
!   private static final Integer KEY_PART = new Integer(1);
  
    /** Key: SURFACE */
!   private static final Integer KEY_SURFACE = new Integer(2);
  
    /** Key: EDGE */
!   private static final Integer KEY_EDGE = new Integer(3);
  
    /** Key: VERTEX */
!   private static final Integer KEY_VERTEX = new Integer(4);
!   
!   /** Key: DOMAIN */
!   
!   private static final Integer KEY_DOMAIN = new Integer(5);
  
    /** Mapper counter */
***************
*** 97,101 ****
      Bprocessor bp = loadFile(fis);
  
-     counter = 0;
      mapper = new HashMap();
  
--- 95,98 ----
***************
*** 530,538 ****
          sm.setInnerSurfaces(isr);
        }
-       
        Long bid = (Long)(mapper.get(new Long(s.getBackdomainref())));
!       sm.setBackDomain(DomainFacade.getInstance().findById(bid));
        Long fid = (Long)(mapper.get(new Long(s.getFrontdomainref())));
!       sm.setFrontDomain(DomainFacade.getInstance().findById(fid));
        SurfaceFacade.getInstance().update(sm);
      }
--- 527,538 ----
          sm.setInnerSurfaces(isr);
        }
        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);
      }
***************
*** 605,612 ****
      Bprocessor bp = new BprocessorImpl();
  
!     counter = 0;
      mapper = new HashMap();
-     mapper.put(KEY_CONSTRUCTION_SPACE, new HashMap());
-     mapper.put(KEY_FUNCTIONAL_SPACE, new HashMap());
      mapper.put(KEY_ELEMENT, new HashMap());
      mapper.put(KEY_PART, new HashMap());
--- 605,610 ----
      Bprocessor bp = new BprocessorImpl();
  
!     counter = 1;
      mapper = new HashMap();
      mapper.put(KEY_ELEMENT, new HashMap());
      mapper.put(KEY_PART, new HashMap());
***************
*** 614,618 ****
      mapper.put(KEY_EDGE, new HashMap());
      mapper.put(KEY_VERTEX, new HashMap());
! 
      ConstructionSpaceFacade csf = ConstructionSpaceFacade.getInstance();
      EdgeFacade edf = EdgeFacade.getInstance();
--- 612,617 ----
      mapper.put(KEY_EDGE, new HashMap());
      mapper.put(KEY_VERTEX, new HashMap());
!     mapper.put(KEY_DOMAIN, new HashMap());
!     
      ConstructionSpaceFacade csf = ConstructionSpaceFacade.getInstance();
      EdgeFacade edf = EdgeFacade.getInstance();
***************
*** 680,694 ****
  
        Set data = cs.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);
          
!         csx.getAttributeref().add(aid);
        }
! 
!       Map csm = (Map)mapper.get(KEY_CONSTRUCTION_SPACE);
        csm.put(cs.getId(), new Long(csx.getId()));
      
--- 679,694 ----
  
        Set data = cs.getAttributes();
!       if (data != null) {
!         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);
          
!           csx.getAttributeref().add(aid);
!         }
        }
!       Map csm = (Map)mapper.get(KEY_DOMAIN);
        csm.put(cs.getId(), new Long(csx.getId()));
      
***************
*** 722,726 ****
        }
        
!       Map fsm = (Map)mapper.get(KEY_FUNCTIONAL_SPACE);
        fsm.put(fs.getId(), new Long(fsx.getId()));
  
--- 722,726 ----
        }
        
!       Map fsm = (Map)mapper.get(KEY_DOMAIN);
        fsm.put(fs.getId(), new Long(fsx.getId()));
  
***************
*** 810,814 ****
        sx.setName(s.getName());
        sx.setConstructor(s.getConstructor());
! 
        Map sm = (Map)mapper.get(KEY_SURFACE);
        sm.put(s.getId(), new Long(sx.getId()));
--- 810,814 ----
        sx.setName(s.getName());
        sx.setConstructor(s.getConstructor());
!       sx.setIsinner(s.getIsInner());
        Map sm = (Map)mapper.get(KEY_SURFACE);
        sm.put(s.getId(), new Long(sx.getId()));
***************
*** 889,900 ****
        
        data = cs.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);
  
!         csx.getElementref().add(m.get(e.getId()));
        }
      }
--- 889,902 ----
        
        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()));
!         }
        }
      }
***************
*** 908,912 ****
     */
    private static Constructionspace findConstructionSpace(Bprocessor bp, ConstructionSpace cs) {
!     Map m = (Map)mapper.get(KEY_CONSTRUCTION_SPACE);
      Long id = (Long)m.get(cs.getId());
  
--- 910,914 ----
     */
    private static Constructionspace findConstructionSpace(Bprocessor bp, ConstructionSpace cs) {
!     Map m = (Map)mapper.get(KEY_DOMAIN);
      Long id = (Long)m.get(cs.getId());
  
***************
*** 963,967 ****
     */
    private static Functionalspace findFunctionalSpace(Bprocessor bp, FunctionalSpace fs) {
!     Map m = (Map)mapper.get(KEY_FUNCTIONAL_SPACE);
      Long id = (Long)m.get(fs.getId());
  
--- 965,969 ----
     */
    private static Functionalspace findFunctionalSpace(Bprocessor bp, FunctionalSpace fs) {
!     Map m = (Map)mapper.get(KEY_DOMAIN);
      Long id = (Long)m.get(fs.getId());
  
***************
*** 1107,1120 ****
        
        Set isData = s.getInnerSurfaces();
!       it = isData.iterator();
!       while (it.hasNext()) {
!         net.sourceforge.bprocessor.model.Surface is = 
!           (net.sourceforge.bprocessor.model.Surface)it.next();
          
!         Map m = (Map)mapper.get(KEY_SURFACE);
          
-         sx.getInnersurfacesref().add(m.get(is.getId()));
        }
-       
      }
    }
--- 1109,1133 ----
        
        Set isData = s.getInnerSurfaces();
!       if (isData != null) { 
!         it = isData.iterator();
!         while (it.hasNext()) {
!           net.sourceforge.bprocessor.model.Surface is = 
!             (net.sourceforge.bprocessor.model.Surface)it.next();
          
!           Map m = (Map)mapper.get(KEY_SURFACE);
!         
!           sx.getInnersurfacesref().add(m.get(is.getId()));
!         }
!       }
!       {
!         Map m = (Map)mapper.get(KEY_DOMAIN);
!         if (s.getBackDomain() != null) {
!           sx.setBackdomainref(((Long) m.get(s.getBackDomain().getId())).longValue());
!         }
!         if (s.getFrontDomain() != null) {
!           sx.setFrontdomainref(((Long) m.get(s.getFrontDomain().getId())).longValue());
!         }
          
        }
      }
    }