Author: xor
Date: 2008-11-09 22:52:44 +0000 (Sun, 09 Nov 2008)
New Revision: 23455
Modified:
trunk/plugins/Freetalk/WoT/FTIdentityManagerWoT.java
trunk/plugins/Freetalk/ui/IdentityEditor.java
Log:
Bugfixes.
Modified: trunk/plugins/Freetalk/WoT/FTIdentityManagerWoT.java
===================================================================
--- trunk/plugins/Freetalk/WoT/FTIdentityManagerWoT.java 2008-11-09
22:27:17 UTC (rev 23454)
+++ trunk/plugins/Freetalk/WoT/FTIdentityManagerWoT.java 2008-11-09
22:52:44 UTC (rev 23455)
@@ -73,7 +73,7 @@
synchronized(this) { /* We lock here and not
during the whole function to allow other threads to execute */
Query q = db.query();
q.constrain(FTIdentityWoT.class);
- q.descend("mUID").equals(uid);
+ q.descend("mUID").constrain(uid);
ObjectSet<FTIdentityWoT> result =
q.execute();
FTIdentityWoT id = null;
@@ -113,26 +113,6 @@
SimpleFieldSet p2 = new SimpleFieldSet(true);
p2.putOverwrite("Message","GetOwnIdentities");
mTalker.send(p2, null);
-
- /*
- ObjectSet<OwnIdentity> oids = mWoT.getAllOwnIdentities();
- for(OwnIdentity o : oids) {
- synchronized(this) { // We lock here and not during the
whole function to allow other threads to execute
- Query q = db.query();
- q.constrain(FTOwnIdentityWoT.class);
- q.descend("mUID").equals();
- ObjectSet<FTOwnIdentityWoT> result =
q.execute();
-
- if(result.size() == 0) {
- db.store(new FTOwnIdentityWoT(db, o));
- db.commit();
- } else {
- assert(result.size() == 1);
-
result.next().setLastReceivedFromWoT(time);
- }
- }
- }
- */
}
private synchronized void garbageCollectIdentities() {
@@ -142,7 +122,7 @@
Query q = db.query();
q.constrain(FTIdentityWoT.class);
- q.descend("isNeeded").equals(false);
+ q.descend("isNeeded").constrain(false);
q.descend("lastReceivedFromWoT").constrain(new
Long(lastAcceptTime)).smaller();
ObjectSet<FTIdentityWoT> result = q.execute();
@@ -163,7 +143,7 @@
* manager and therefore this might cause deadlock. */
Query q = db.query();
q.constrain(FTMessage.class);
- q.descend("mAuthor").equals(i);
+ q.descend("mAuthor").constrain(i);
return (q.execute().size() == 0);
}
Modified: trunk/plugins/Freetalk/ui/IdentityEditor.java
===================================================================
--- trunk/plugins/Freetalk/ui/IdentityEditor.java 2008-11-09 22:27:17 UTC
(rev 23454)
+++ trunk/plugins/Freetalk/ui/IdentityEditor.java 2008-11-09 22:52:44 UTC
(rev 23455)
@@ -40,7 +40,6 @@
row.addChild("th", "Name");
row.addChild("th", "Request URI");
row.addChild("th", "Insert URI");
- row.addChild("th", "Publish TrustList ?");
row.addChild("th", "Last update");
row.addChild("th");
@@ -49,8 +48,7 @@
row = identitiesTable.addChild("tr");
row.addChild("td", id.getNickname());
row.addChild("td", new String[]{"title"}, new
String[]{id.getRequestURI().toACIIString()},
id.getRequestURI().toACIIString().substring(0, 35)+"...");
- row.addChild("td", new String[]{"title"}, new
String[]{id.getInsertURI().toACIIString()},
id.getInsertURI().toACIIString().substring(0, 15)+"...");
- /* row.addChild("td",
id.doesPublishTrustList()?"yes":"no"); */
+ row.addChild("td", new String[]{"title"}, new
String[]{id.getInsertURI().toACIIString()},
id.getInsertURI().toACIIString().substring(0, 35)+"...");
HTMLNode lastUpdateCell = row.addChild("td");
/*
if (id.getLastInsert() == null) {
