Author: batosai
Date: 2008-09-07 14:31:16 +0000 (Sun, 07 Sep 2008)
New Revision: 22531
Modified:
trunk/plugins/WoT/src/plugins/WoT/Identity.java
trunk/plugins/WoT/src/plugins/WoT/OwnIdentity.java
Log:
Switch to String on OwnIdentities too.
Modified: trunk/plugins/WoT/src/plugins/WoT/Identity.java
===================================================================
--- trunk/plugins/WoT/src/plugins/WoT/Identity.java 2008-09-07 14:28:22 UTC
(rev 22530)
+++ trunk/plugins/WoT/src/plugins/WoT/Identity.java 2008-09-07 14:31:16 UTC
(rev 22531)
@@ -95,7 +95,7 @@
return db.queryByExample(Identity.class);
}
- private static String getIdFromURI (FreenetURI uri) {
+ public static String getIdFromURI (FreenetURI uri) {
int begin = uri.toString().indexOf(',') + 1;
int end = uri.toString().indexOf(',', begin);
return uri.toString().substring(begin, end);
Modified: trunk/plugins/WoT/src/plugins/WoT/OwnIdentity.java
===================================================================
--- trunk/plugins/WoT/src/plugins/WoT/OwnIdentity.java 2008-09-07 14:28:22 UTC
(rev 22530)
+++ trunk/plugins/WoT/src/plugins/WoT/OwnIdentity.java 2008-09-07 14:31:16 UTC
(rev 22531)
@@ -68,7 +68,7 @@
}
@SuppressWarnings("unchecked")
- public static OwnIdentity getById (ObjectContainer db, ByteArrayWrapper
id) throws UnknownIdentityException, DuplicateIdentityException {
+ public static OwnIdentity getById (ObjectContainer db, String id)
throws UnknownIdentityException, DuplicateIdentityException {
Query query = db.query();
query.constrain(OwnIdentity.class);
query.descend("id").constrain(id);
@@ -84,7 +84,7 @@
}
public static OwnIdentity getByURI (ObjectContainer db, FreenetURI uri)
throws UnknownIdentityException, DuplicateIdentityException {
- return getById(db, new ByteArrayWrapper(uri.getRoutingKey()));
+ return getById(db, getIdFromURI(uri));
}
public static int getNbOwnIdentities(ObjectContainer db) {
