Changeset 17254 for release-kits

Timestamp:

2008-09-11T15:48:56+12:00 (16 years ago)

Author:

oranfry

Message:

updates to uninstaller

Location:

release-kits/shared/uninstaller

Files:

• . (modified) (1 prop)
• Uninstaller.java (modified) (6 diffs)
• Uninstaller.properties (modified) (1 diff)
• gsdl-template (modified) (1 prop)
• gsdl-template/Uninstaller.jar (deleted)

release-kits/shared/uninstaller/Uninstaller.java

@@ -322 +322 @@
         //log.append( "Processing: " + f.getAbsolutePath() + "\n" );
 
-        // Make sure the file or directory exists and isn't write protected
+        // Make sure the file or directory exists
         if (!f.exists()) {
-            log.append( bundle.getString("warning.nonexistent").replaceAll( "\\{file\\}", f.getAbsolutePath() ) + "\n" );
+            log.append( Strings.replaceAll( bundle.getString("warning.nonexistent"), "{file}", f.getAbsolutePath() ) + "\n" );
             return;
         }
@@ -334 +334 @@
                 try {
                     if ( f.equals( exceptions[i] ) || f.getCanonicalPath().equals(exceptions[i].getCanonicalPath()) ) {
-                        log.append( bundle.getString("info.skipping").replaceAll( "\\{file\\}", f.getAbsolutePath() ) + "\n" );
+                        log.append( Strings.replaceAll( bundle.getString("info.skipping"), "{file}", f.getAbsolutePath() ) + "\n" );
                         return;
                     }
@@ -346 +346 @@
         //check existance
         if ( !f.exists() ) {
-            log.append( bundle.getString("error.nonexistent").replaceAll( "\\{file\\}", f.getAbsolutePath() ) + "\n" );
+            log.append( Strings.replaceAll( bundle.getString("error.nonexistent"), "{file}", f.getAbsolutePath() ) + "\n" );
             return;
         }
-
-        //check writability
-        /*if ( !f.canWrite() ) {
-            log.append( bundle.getString("warning.readonly").replaceAll( "\\{file\\}", f.getAbsolutePath() ) + "\n" );
-        }*/
 
         //if it is a directory, recurse
@@ -378 +373 @@
         if ( doDelete ) {
 
-            log.append( bundle.getString("deleting").replaceAll( "\\{file\\}", f.getAbsolutePath() ) + "\n" );
+            log.append( Strings.replaceAll( bundle.getString("deleting"), "{file}", f.getAbsolutePath() ) + "\n" );
             while ( !f.delete() ) {
-                log.append( bundle.getString("warning.couldnt.delete").replaceAll( "\\{file\\}", f.getAbsolutePath() ) + "\n" );
+                log.append( Strings.replaceAll( bundle.getString("warning.couldnt.delete"), "{file}", f.getAbsolutePath() ) + "\n" );
 
                 if ( ignoreReadOnlys ) {
@@ -389 +384 @@
                 int n = JOptionPane.showOptionDialog(
                     frame,
-                    bundle.getString("warning.readonly").replaceAll( "\\{file\\}", f.getAbsolutePath() ),
+                    Strings.replaceAll( bundle.getString("warning.readonly"), "{file}", f.getAbsolutePath() ),
                     bundle.getString("readonly"),
                     JOptionPane.YES_NO_CANCEL_OPTION,
@@ -420 +415 @@
         finishToolbar.setVisible(true);
     }
-    
 
 }
+
+class Strings {
+    static String replaceAll( String s, String nugget, String replacement ) {
+        StringBuffer string = new StringBuffer(s);
+        StringBuffer r = new StringBuffer();
+
+        int io = 0;
+        while ( (io=string.toString().indexOf(nugget)) != -1 ) {
+            r.append( string.toString().substring( 0, io ) );
+            r.append( replacement );
+            string.delete( 0, io + nugget.length() );
+        }
+        r.append( string.toString() );
+        return r.toString();
+    }
+}
+

release-kits/shared/uninstaller/Uninstaller.properties

@@ -22 +22 @@
 cancelled:Uninstall Cancelled
 finished:Uninstall Finished
-deleting:Deleting {file}
+deleting:Deleting {file} from disk
 
-info.skipping:INFO: Skipping File: {file}
+info.skipping:INFO: Skipping {file}
 info.no.startmenu:INFO: No StartMenu path found. Deleting a StartMenu group will not be part of this uninstall.
-warning.readonly:WARNING: File: {file} appears to be read-only
-warning.couldnt.delete:WARNING: File: {file} could not be deleted
-warning.nonexistent:WARNING: File: {file} does not exist
-error.nonexistent:ERROR: File: {file} does not exist
+warning.readonly:WARNING: {file} appears to be read-only
+warning.couldnt.delete:WARNING: {file} could not be deleted
+warning.nonexistent:WARNING: {file} does not exist
+error.nonexistent:ERROR: {file} does not exist
 error.couldnt.find.install.props:ERROR: Could not find the 'installation.properties' or 'etc/installation.properties' file.\nEither this is not a valid Greenstone installation, or the installation has been corrupted.\nUninstallation cannot proceed.