[freenet-cvs] r21693 - trunk/apps/WoT/src/plugins/WoT

[bato...@freenetproject.org]

Author: batosai
Date: 2008-08-09 19:30:33 +0000 (Sat, 09 Aug 2008)
New Revision: 21693

Modified:
   trunk/apps/WoT/src/plugins/WoT/WoTplugin.java
Log:
More cleanup.

Modified: trunk/apps/WoT/src/plugins/WoT/WoTplugin.java
===================================================================
--- trunk/apps/WoT/src/plugins/WoT/WoTplugin.java       2008-08-09 18:47:15 UTC 
(rev 21692)
+++ trunk/apps/WoT/src/plugins/WoT/WoTplugin.java       2008-08-09 19:30:33 UTC 
(rev 21693)
@@ -38,7 +38,6 @@

 /**
  * @author Julien Cornuwel (batosai at freenetproject.org)
- *
  */
 public class WoTplugin implements FredPlugin, FredPluginHTTP, 
FredPluginThreadless, FredPluginVersioned, ClientCallback {

@@ -52,6 +51,7 @@
        private IdentityParser parser;
        private IdentityInserter inserter;

+
        public void runPlugin(PluginRespirator pr) {

                Logger.error(this, "Start");
@@ -98,7 +98,7 @@
                        return makeHomePage();
                }
        }
-       
+
        private String makeHomePage() {

                HTMLNode list = new HTMLNode("ul");
@@ -261,26 +261,7 @@
                        return addIdentity(request);
                }
                else if (page.equals("/insertIdentity")) {
-                       
-                       FreenetURI uri;
-                       try {
-                               uri = new 
FreenetURI(request.getPartAsString("identity", 1024));
-                       } catch (MalformedURLException e) {
-                               return e.getLocalizedMessage();
-                       }
-                       
-                       ObjectSet<OwnIdentity> ownIdentities = 
db.queryByExample(new OwnIdentity(null, uri, null, null, true));
-                       if (ownIdentities.size() == 0) return "Identity not 
found";
-                       
-                       OwnIdentity identity = ownIdentities.next();
-                       
-                       try {
-                               inserter.insert(identity);
-                       } catch (Exception e) {
-                               return e.getLocalizedMessage();
-                       }
-                       
-                       return makeOwnIdentitiesPage();
+                       return insertIdentity(request);
                }
                else {
                        return makeHomePage();
@@ -326,6 +307,29 @@
                return makeOwnIdentitiesPage();
        }

+       private String insertIdentity(HTTPRequest request) {
+               
+               FreenetURI uri;
+               try {
+                       uri = new 
FreenetURI(request.getPartAsString("identity", 1024));
+               } catch (MalformedURLException e) {
+                       return e.getLocalizedMessage();
+               }
+               
+               ObjectSet<OwnIdentity> ownIdentities = db.queryByExample(new 
OwnIdentity(null, uri, null, null, true));
+               if (ownIdentities.size() == 0) return "Identity not found";
+               
+               OwnIdentity identity = ownIdentities.next();
+               
+               try {
+                       inserter.insert(identity);
+               } catch (Exception e) {
+                       return e.getLocalizedMessage();
+               }
+               
+               return makeOwnIdentitiesPage();
+       }
+
        @Override
        public String handleHTTPPut(HTTPRequest request) throws 
PluginHTTPException {
                return null;