Changeset 17984

Timestamp:

2008-11-29T21:56:11+13:00 (15 years ago)

Author:

oranfry

Message:

reverted to the old way of finding the running jar (as the new way did not work for the mac installer) but improved the url decoding function to properly decode UTF-8 encoded characters

Location:

release-kits/shared/ant-installer

Files:

• lib/ant-installer.jar (modified) ( previous)
• src/org/tp23/antinstaller/selfextract/SelfExtractor.java (modified) (3 diffs)

release-kits/shared/ant-installer/src/org/tp23/antinstaller/selfextract/SelfExtractor.java

@@ -25 +25 @@
 import java.io.IOException;
 import java.net.URL;
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.jar.JarEntry;
@@ -73 +74 @@
         //String fileForm = jarUrl.getFile();
 
-
-/*
-        File file = new File( fileForm );
-        if ( !file.exists() ) {
-            throw new RuntimeException( "Failed expanding Jar.\n File: '" + file.getAbsolutePath() + "'\nString: '" + stringForm + "'" );
-        }
-        return file;
-*/
-
         File file = null;
         int endIdx = stringForm.indexOf("!/");
-        if( endIdx == -1 ) {
-            throw new RuntimeException("Failed expanding Jar.");
-        }
-        String unescaped = null;
-        String fileNamePart = stringForm.substring("jar:file:".length(), endIdx);
-        file = new File(fileNamePart);
-        file = new File( file.getName() );
-
-/*
-        if ( !file.exists()) {
-            // try to unescape encase the URL Handler has escaped the " " to %20
-            unescaped = unescape(fileNamePart);
-            file = new File(unescaped);
-        }
-*/
-        return file;
-
+        if(endIdx != -1){
+            String unescaped = null;
+            String fileNamePart = stringForm.substring("jar:file:".length(), endIdx);
+            file = new File(fileNamePart);
+            if ( ! file.exists()) {
+                // try to unescape encase the URL Handler has escaped the " " to %20
+                unescaped = unescape(fileNamePart);
+                file = new File(unescaped);
+            }
+            return file;
+        }
+        throw new RuntimeException("Failed expanding Jar.");
     }
 
@@ -465 +452 @@
      */
     private static String unescape(final String s) {
-        StringBuffer sb = new StringBuffer(s.length());
-
-        for (int i = 0; i < s.length(); i++) {
-            char c = s.charAt(i);
-            switch (c) {
-                case '%': {
-                    try {
-                        sb.append( (char) Integer.parseInt(s.substring(i + 1, i + 3), 16));
-                        i += 2;
-                        break;
-                    }
-                    catch (NumberFormatException nfe) {
-                        throw new IllegalArgumentException();
-                    }
-                    catch (StringIndexOutOfBoundsException siob) {
-                        String end = s.substring(i);
-                        sb.append(end);
-                        if (end.length() == 2) i++;
-                    }
-                    break;
-                }
-                default: {
-                    sb.append(c);
-                    break;
-                }
-            }
-        }
-        return sb.toString();
+
+        URLDecoder ud = new URLDecoder();
+
+        String decoded = null;
+
+        try {
+            decoded = ud.decode( s, "UTF-8" );
+        } catch ( java.io.UnsupportedEncodingException uee ) {
+            System.err.println( "unsupported encoding" );
+            return s;
+        }
+        return decoded;
     }