Author: bombe
Date: 2006-05-06 23:04:04 +0000 (Sat, 06 May 2006)
New Revision: 8631

Modified:
   trunk/freenet/src/freenet/clients/http/PageMaker.java
   trunk/freenet/src/freenet/node/Version.java
Log:
remove xhtml ns uri
replace '|' in urls by ':' (for Windows file urls)

Modified: trunk/freenet/src/freenet/clients/http/PageMaker.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PageMaker.java       2006-05-06 
22:51:33 UTC (rev 8630)
+++ trunk/freenet/src/freenet/clients/http/PageMaker.java       2006-05-06 
23:04:04 UTC (rev 8631)
@@ -34,7 +34,7 @@
        public void makeTopHead(StringBuffer buf) {
                buf.append("<!DOCTYPE\n"
                                + "     html PUBLIC \"-//W3C//DTD XHTML 
1.1//EN\">\n"
-                               + "<html xmlns=\"http://www.w3.org/1999/xhtml\"; 
xml:lang=\"en\">\n"
+                               + "<html xml:lang=\"en\">\n"
                                + "<head>\n"
                                + "<meta http-equiv=\"Content-Type\" 
content=\"text/html;\" />\n"
                                +"<link rel=\"stylesheet\" 
href=\"/static/themes/"+this.theme+"/theme.css\" type=\"text/css\" />\n");
@@ -95,7 +95,7 @@
                        URL url = getClass().getResource("staticfiles/themes/");
                        URLConnection urlConnection = url.openConnection();
                        if (url.getProtocol().equals("file")) {
-                               File themesDirectory = new 
File(URLDecoder.decode(url.getPath(), "ISO-8859-1"));
+                               File themesDirectory = new 
File(URLDecoder.decode(url.getPath(), "ISO-8859-1").replaceAll("|", ":"));
                                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:51:33 UTC (rev 
8630)
+++ trunk/freenet/src/freenet/node/Version.java 2006-05-06 23:04:04 UTC (rev 
8631)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

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

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


Reply via email to