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

[jfle...@freenetproject.org]

Author: jflesch
Date: 2006-12-29 22:15:37 +0000 (Fri, 29 Dec 2006)
New Revision: 11530

Modified:
   trunk/apps/Thaw/src/thaw/core/FreenetURIHelper.java
   trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
Log:
Move the decoding process to another part of the code

Modified: trunk/apps/Thaw/src/thaw/core/FreenetURIHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/FreenetURIHelper.java 2006-12-29 21:59:26 UTC 
(rev 11529)
+++ trunk/apps/Thaw/src/thaw/core/FreenetURIHelper.java 2006-12-29 22:15:37 UTC 
(rev 11530)
@@ -55,12 +55,6 @@

                if(!key.endsWith("/")) {
                        filename = cutcut[cutcut.length-1];
-
-                       try {
-                               filename = java.net.URLDecoder.decode(filename, 
"UTF-8");
-                       } catch (final java.io.UnsupportedEncodingException e) {
-                               Logger.warning(new FreenetURIHelper(), 
"UnsupportedEncodingException (UTF-8): "+e.toString());
-                       }
                } else {
                        filename = "index.html";
                }

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java      2006-12-29 21:59:26 UTC 
(rev 11529)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java      2006-12-29 22:15:37 UTC 
(rev 11530)
@@ -137,6 +137,12 @@

                filename = FreenetURIHelper.getFilenameFromKey(key);

+               try {
+                       filename = java.net.URLDecoder.decode(filename, 
"UTF-8");
+               } catch (final java.io.UnsupportedEncodingException e) {
+                       Logger.warning(new FreenetURIHelper(), 
"UnsupportedEncodingException (UTF-8): "+e.toString());
+               }
+
                Logger.debug(this, "Query for getting "+key+" created");

        }