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

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

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

Modified Files:
	PersistenceManager.java 
Log Message:
Changed Surface.isInner to Surface.exterior pointing to the exterior

Index: PersistenceManager.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/xml/PersistenceManager.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** PersistenceManager.java	19 Dec 2005 07:50:06 -0000	1.15
--- PersistenceManager.java	20 Dec 2005 13:54:53 -0000	1.16
***************
*** 179,183 ****
        sm.setConstructor(s.isConstructor());
        
!       sm.setIsInner(s.isIsinner());
  
        Project.getInstance().intern(sm);
--- 179,183 ----
        sm.setConstructor(s.isConstructor());
        
!       //sm.setIsInner(s.isIsinner());
  
        Project.getInstance().intern(sm);
***************
*** 353,357 ****
            isr.add(is);
          }
!         sm.setInnerSurfaces(isr);
        }
        Long bid = (Long)(mapper.get(new Long(s.getBackdomainref())));
--- 353,357 ----
            isr.add(is);
          }
!         sm.setHoles(isr);
        }
        Long bid = (Long)(mapper.get(new Long(s.getBackdomainref())));
***************
*** 363,366 ****
--- 363,370 ----
          sm.setFrontDomain((Space) Project.getInstance().findDomainById(fid));
        }
+       Long eid = (Long)(mapper.get(new Long(s.getExteriorref())));
+       if (eid != null) {
+         sm.setExterior(Project.getInstance().findSurfaceById(eid));
+       }
        Project.getInstance().update(sm);
      }
***************
*** 564,568 ****
        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()));
--- 568,572 ----
        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()));
***************
*** 731,735 ****
        }
        
!       Set isData = s.getInnerSurfaces();
        if (isData != null) { 
          it = isData.iterator();
--- 735,739 ----
        }
        
!       Set isData = s.getHoles();
        if (isData != null) { 
          it = isData.iterator();
***************
*** 753,756 ****
--- 757,766 ----
          
        }
+       {
+         Map m = (Map)mapper.get(KEY_SURFACE);
+         if (s.getExterior() != null) {
+           sx.setExteriorref(((Long) m.get(s.getExterior().getId())).longValue());
+         }
+       }
      }
    }