[izpack-changes] r1572 - izpack-src/trunk/src/lib/com/izforge/izpack/installer

[noreply at berlios.de]

Author: eppelman
Date: 2006-09-06 22:36:17 +0200 (Wed, 06 Sep 2006)
New Revision: 1572

Modified:
   izpack-src/trunk/src/lib/com/izforge/izpack/installer/InstallerFrame.java
Log:
-implemented  the X-KDE subsitute user - shortcut attribute (see Unix_shortcutSpec.xml).
-write Desktop shortcuts to all known local and ypbinded users "desktop" folders.
-write common shortcuts  to the new freedesktop.org common "/usr/share/applications" 
and "/usr/share/pixmaps" folders to display these in the commons [start].menu
Here: updated the uninstaller

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/installer/InstallerFrame.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/installer/InstallerFrame.java	2006-09-06 20:35:36 UTC (rev 1571)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/installer/InstallerFrame.java	2006-09-06 20:36:17 UTC (rev 1572)
@@ -54,7 +54,9 @@
 import java.lang.reflect.Constructor;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Enumeration;
 import java.util.HashSet;
+import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -101,6 +103,7 @@
 import com.izforge.izpack.util.IoHelper;
 import com.izforge.izpack.util.OsConstraint;
 import com.izforge.izpack.util.VariableSubstitutor;
+import com.izforge.izpack.util.os.unix.UnixUser;
 
 /**
  * The IzPack installer frame.
@@ -788,6 +791,31 @@
                     }
                 }
             }
+            // write the files which should be deleted by root for another user
+            
+            // TODO:
+            outJar.putNextEntry(new ZipEntry(UninstallData.RootFiles));
+            ObjectOutputStream rootStream = new ObjectOutputStream(outJar);
+            
+            Hashtable rootData = udata.getRootData();
+            
+            Enumeration e = rootData.keys();
+            
+            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();
 
             // Cleanup
             outJar.flush();