[Thaw-dev] r13059 - in trunk/apps/Thaw/src/thaw: core fcp

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-04-29 20:54:17 +0000 (Sun, 29 Apr 2007)
New Revision: 13059

Modified:
   trunk/apps/Thaw/src/thaw/core/Logger.java
   trunk/apps/Thaw/src/thaw/fcp/FreenetURIHelper.java
Log:
Thaw: Fix cleanURI ... I broke it in thaw

Modified: trunk/apps/Thaw/src/thaw/core/Logger.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Logger.java   2007-04-29 20:49:35 UTC (rev 
13058)
+++ trunk/apps/Thaw/src/thaw/core/Logger.java   2007-04-29 20:54:17 UTC (rev 
13059)
@@ -22,7 +22,7 @@
         * 2 or more is recommanded.
         * 4 or more is unhealthy
         */
-       public final static int LOG_LEVEL = 3;
+       public final static int LOG_LEVEL = 5;

        private static Vector logListeners = null;


Modified: trunk/apps/Thaw/src/thaw/fcp/FreenetURIHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FreenetURIHelper.java  2007-04-29 20:49:35 UTC 
(rev 13058)
+++ trunk/apps/Thaw/src/thaw/fcp/FreenetURIHelper.java  2007-04-29 20:54:17 UTC 
(rev 13059)
@@ -31,8 +31,7 @@
                        return uri;

                uri = uri.trim();
-               uri = uri.replaceFirst("http://.*/","";);
-               uri = uri.replaceFirst("freenet:", "");
+               uri = uri.replaceFirst("^http://[^/]+/+(freenet:)*","");

                try {
                        uri = java.net.URLDecoder.decode(uri, "UTF-8");