[freenet-cvs] r8630 - in trunk/freenet/src/freenet: clients/http node

[bo...@freenetproject.org]

Author: bombe
Date: 2006-05-06 22:51:33 +0000 (Sat, 06 May 2006)
New Revision: 8630

Modified:
   trunk/freenet/src/freenet/clients/http/PageMaker.java
   trunk/freenet/src/freenet/node/Version.java
Log:
decode url to handle url-encoded spaces in path

Modified: trunk/freenet/src/freenet/clients/http/PageMaker.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PageMaker.java       2006-05-06 
22:36:50 UTC (rev 8629)
+++ trunk/freenet/src/freenet/clients/http/PageMaker.java       2006-05-06 
22:51:33 UTC (rev 8630)
@@ -5,6 +5,7 @@
 import java.net.JarURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Enumeration;
@@ -94,7 +95,7 @@
                        URL url = getClass().getResource("staticfiles/themes/");
                        URLConnection urlConnection = url.openConnection();
                        if (url.getProtocol().equals("file")) {
-                               File themesDirectory = new File(url.getPath());
+                               File themesDirectory = new 
File(URLDecoder.decode(url.getPath(), "ISO-8859-1"));
                                File[] themeDirectories = 
themesDirectory.listFiles();
                                for (int themeIndex = 0; themeIndex < 
themeDirectories.length; themeIndex++) {
                                        File themeDirectory = 
themeDirectories[themeIndex];

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-05-06 22:36:50 UTC (rev 
8629)
+++ trunk/freenet/src/freenet/node/Version.java 2006-05-06 22:51:33 UTC (rev 
8630)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 683;
+       private static final int buildNumber = 684;

        /** Oldest build of Fred we will talk to */
        private static final int lastGoodBuild = 591;