[Bprocessor-commit] /model/src/net/sourceforge/bprocessor/model Persistence.java, 1.58, 1.59

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11577/src/net/sourceforge/bprocessor/model

Modified Files:
	Persistence.java 
Log Message:
some fixes to lib readin

Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** Persistence.java	13 Nov 2007 08:47:09 -0000	1.58
--- Persistence.java	19 Nov 2007 08:43:43 -0000	1.59
***************
*** 1623,1627 ****
      Collection<Object> xmls = new LinkedList<Object>();
      Collection<LibraryObj> library = new LinkedList<LibraryObj>();
!     File libdir = new File("Library");
      if (libdir.isDirectory()) {
        File[] libs = libdir.listFiles();
--- 1623,1630 ----
      Collection<Object> xmls = new LinkedList<Object>();
      Collection<LibraryObj> library = new LinkedList<LibraryObj>();
!     File libdir = new File("Library/");
!     if (!libdir.exists()) {
!       libdir.createNewFile();
!     }
      if (libdir.isDirectory()) {
        File[] libs = libdir.listFiles();
***************
*** 1633,1636 ****
--- 1636,1647 ----
        }
      }
+     {
+       Iterator iter = xmls.iterator();
+       while (iter.hasNext()) {
+         EntityType external = (EntityType) iter.next();
+         Object object = map.get(new Long(external.getId()));
+         internalizeReferences(object, external, map);
+       }
+     }
      return library;
    }
***************
*** 1668,1672 ****
     */
    public static void saveLibrary() throws Exception {
!     FileOutputStream fos = new FileOutputStream(new File("library\\lib.bpl"));
      
      Library lib = externalizeLibrary(Project.getLibraryObjects());
--- 1679,1684 ----
     */
    public static void saveLibrary() throws Exception {
!     File fout = new File("library/lib.bpl");
!     FileOutputStream fos = new FileOutputStream(fout);
      
      Library lib = externalizeLibrary(Project.getLibraryObjects());
***************
*** 1684,1687 ****
--- 1696,1709 ----
        libobjs.add(externalizeLibObj(libo, map));
      }
+     {
+       Set entries = map.entrySet();
+       Iterator iter = entries.iterator();
+       while (iter.hasNext()) {
+         Entry current = (Entry) iter.next();
+         Object object = current.getKey();
+         EntityType external = (EntityType) current.getValue();
+         externalizeReferences(object, external, map);
+       }
+     }
      return lib;
    }