Changeset 23242 for main/trunk/release-kits/shared/core/uninstaller/Uninstaller.java

Timestamp:

2010-10-28T10:14:17+13:00 (13 years ago)

Author:

sjm84

Message:

A few minor updates to the uninstaller

File:

• main/trunk/release-kits/shared/core/uninstaller/Uninstaller.java (modified) (2 diffs)

main/trunk/release-kits/shared/core/uninstaller/Uninstaller.java

@@ -443 +443 @@
         for ( int i=0; i < files.length; i++) {
             if( files[i].getAbsolutePath().endsWith(".uninstall") ) {
-                String[] paths = getRelevantPathsFromUninstallFile(files[i]);
+                String[] paths = getPathsFromUninstallFile(files[i]);
                 
                 for(int j=0; j < paths.length; j++) {
@@ -481 +481 @@
         return (String[]) paths.toArray(new String[0]);
     }
+    
+    public String[] getPathsFromUninstallFile ( File uninstallFile ) {
+        
+        ArrayList paths = new ArrayList();
+        try {
+            BufferedReader in = new BufferedReader(new FileReader(uninstallFile));
+            
+            String line;
+            while ( (line = in.readLine()) != null ) {
+                if (line.length() > 0 && !paths.contains(line)) {
+                    paths.add(line);
+                }
+            }
+            
+            in.close();
+        }
+        catch( Exception ex ) {
+            ex.printStackTrace();
+            return null;
+        }
+        return (String[]) paths.toArray(new String[0]);
+    }
 
     public void recursiveDelete( File f, File[] exceptions ) throws CancelledException {