[izpack-changes] r1586 - izpack-src/branches/branch-3.9/src/lib/com/izforge/izpack/installer

[noreply at berlios.de]

Author: eppelman
Date: 2006-09-12 22:36:53 +0200 (Tue, 12 Sep 2006)
New Revision: 1586

Modified:
   izpack-src/branches/branch-3.9/src/lib/com/izforge/izpack/installer/InstallerFrame.java
Log:
Optimized/Fixed UnixRootShortcutShellscript: 
Here: write only the RootScript content via writer.writeUTF()

Modified: izpack-src/branches/branch-3.9/src/lib/com/izforge/izpack/installer/InstallerFrame.java
===================================================================
--- izpack-src/branches/branch-3.9/src/lib/com/izforge/izpack/installer/InstallerFrame.java	2006-09-10 08:47:41 UTC (rev 1585)
+++ izpack-src/branches/branch-3.9/src/lib/com/izforge/izpack/installer/InstallerFrame.java	2006-09-12 20:36:53 UTC (rev 1586)
@@ -793,27 +793,13 @@
             }
             // write the files which should be deleted by root for another user
             
-            // TODO:
-            outJar.putNextEntry(new ZipEntry(UninstallData.RootFiles));
+            outJar.putNextEntry(new ZipEntry(UninstallData.ROOTSCRIPT));
             ObjectOutputStream rootStream = new ObjectOutputStream(outJar);
             
-            Hashtable rootData = udata.getRootData();
+            String rootScript = udata.getRootScript();           
             
-            Enumeration e = rootData.keys();
+            rootStream.writeUTF(rootScript);
             
-            rootStream.writeInt(rootData.size());
-            
-            while (e.hasMoreElements())
-            {
-                //File file = iter.next();
-                String file = (String) e.nextElement();
-                
-                rootStream.writeObject(file);
-                
-                UnixUser uu = (UnixUser) rootData.get(file);
-                
-                rootStream.writeObject(uu);
-            }
             rootStream.flush();
             outJar.closeEntry();