Author: batosai
Date: 2008-08-11 14:40:05 +0000 (Mon, 11 Aug 2008)
New Revision: 21749
Modified:
trunk/apps/WoT/src/plugins/WoT/WoTplugin.java
Log:
Refactor.
Modified: trunk/apps/WoT/src/plugins/WoT/WoTplugin.java
===================================================================
--- trunk/apps/WoT/src/plugins/WoT/WoTplugin.java 2008-08-11 14:39:46 UTC
(rev 21748)
+++ trunk/apps/WoT/src/plugins/WoT/WoTplugin.java 2008-08-11 14:40:05 UTC
(rev 21749)
@@ -6,14 +6,21 @@
package plugins.WoT;
+import java.io.FileNotFoundException;
+import java.io.IOException;
import java.net.MalformedURLException;
import java.util.Date;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+
import com.db4o.Db4o;
import com.db4o.ObjectContainer;
import com.db4o.ObjectSet;
import freenet.client.HighLevelSimpleClient;
+import freenet.client.InsertException;
import freenet.clients.http.PageMaker;
import freenet.config.Config;
import freenet.config.SubConfig;
@@ -315,7 +322,12 @@
return
makeCreateIdentityPage(request.getPartAsString("nickName",1024));
}
else if(page.equals("/createIdentity2")) {
- return createIdentity(request);
+ try {
+ createIdentity(request);
+ } catch (Exception e) {
+ return e.getLocalizedMessage();
+ }
+ return makeOwnIdentitiesPage();
}
else if(page.equals("/addIdentity")) {
return addIdentity(request);
@@ -380,31 +392,36 @@
return makeKnownIdentitiesPage();
}
- private String createIdentity(HTTPRequest request) {
- try {
- OwnIdentity identity = new OwnIdentity( new
FreenetURI(request.getPartAsString("insertURI",1024)).setKeyType("USK"),
-
new
FreenetURI(request.getPartAsString("requestURI",1024)).setKeyType("USK"),
-
null,
-
new Date());
- identity.setProp("nickName",
request.getPartAsString("nickName", 1024), db);
- identity.setProp("publishTrustList", "true", db);
-
- Score score = new Score(identity, identity, 100, 0,
100); // We need to initialize the trust tree
-
- //TODO Make the new identity trust the seed identity
- db.store(identity);
- db.store(score);
- db.commit();
-
- inserter.insert(identity);
- }
- catch(Exception e) {
- // TODO Make a good looking error messages system
- return e.getLocalizedMessage();
- }
- return makeOwnIdentitiesPage();
+ private void createIdentity(HTTPRequest request) throws
TransformerConfigurationException, FileNotFoundException,
MalformedURLException, ParserConfigurationException, TransformerException,
IOException, InsertException {
+ createIdentity( new
FreenetURI(request.getPartAsString("insertURI",1024)).setKeyType("USK"),
+ new
FreenetURI(request.getPartAsString("requestURI",1024)).setKeyType("USK"),
+
request.getPartAsString("nickName", 1024),
+
(request.getPartAsString("publishTrustList", 1024).equals("")) ? "false" :
"true");
}
+
+ private void createIdentity(String nickName, String publishTrustList)
throws TransformerConfigurationException, FileNotFoundException,
ParserConfigurationException, TransformerException, IOException,
InsertException {
+ FreenetURI[] keypair = client.generateKeyPair("WoT");
+ createIdentity( keypair[0], keypair[1], nickName,
publishTrustList);
+ }
+
+ private void createIdentity(FreenetURI insertURI, FreenetURI
requestURI, String nickName, String publishTrustList) throws
TransformerConfigurationException, FileNotFoundException,
ParserConfigurationException, TransformerException, IOException,
InsertException {
+
+ OwnIdentity identity = new OwnIdentity( insertURI, requestURI,
null, new Date());
+ identity.setProp("nickName", nickName, db);
+ identity.setProp("publishTrustList", publishTrustList, db);
+ db.store(identity);
+
+ Score score = new Score(identity, identity, 100, 0, 100); // We
need to initialize the trust tree
+ db.store(score);
+
+ //TODO Make the new identity trust the seed identity
+
+ db.commit();
+
+ inserter.insert(identity);
+ }
+
@Override
public String handleHTTPPut(HTTPRequest request) throws
PluginHTTPException {
return null;
