Author: batosai
Date: 2008-09-04 17:13:36 +0000 (Thu, 04 Sep 2008)
New Revision: 22424
Modified:
trunk/apps/WoT/src/plugins/WoT/Score.java
trunk/apps/WoT/src/plugins/WoT/Trust.java
trunk/apps/WoT/src/plugins/WoT/WebInterface.java
trunk/apps/WoT/src/plugins/WoT/WoT.java
Log:
Refactor.
Modified: trunk/apps/WoT/src/plugins/WoT/Score.java
===================================================================
--- trunk/apps/WoT/src/plugins/WoT/Score.java 2008-09-04 17:02:41 UTC (rev
22423)
+++ trunk/apps/WoT/src/plugins/WoT/Score.java 2008-09-04 17:13:36 UTC (rev
22424)
@@ -5,6 +5,9 @@
*/
package plugins.WoT;
+import com.db4o.ObjectContainer;
+import com.db4o.ObjectSet;
+
/**
* @author Julien Cornuwel (batosai at freenetproject.org)
*
@@ -26,6 +29,11 @@
this.capacity = capacity;
}
+ public static int getNb(ObjectContainer db) {
+ ObjectSet<Score> scores = db.queryByExample(Score.class);
+ return scores.size();
+ }
+
public String toString() {
return getTarget().getNickName() + " has " + getScore() + "
points in " + getTreeOwner().getNickName() + "'s trust tree (rank : " +
getRank() + ", capacity : " + getCapacity() + ")";
}
Modified: trunk/apps/WoT/src/plugins/WoT/Trust.java
===================================================================
--- trunk/apps/WoT/src/plugins/WoT/Trust.java 2008-09-04 17:02:41 UTC (rev
22423)
+++ trunk/apps/WoT/src/plugins/WoT/Trust.java 2008-09-04 17:13:36 UTC (rev
22424)
@@ -8,6 +8,9 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import com.db4o.ObjectContainer;
+import com.db4o.ObjectSet;
+
/**
* A trust relationship between two identities
*
@@ -45,11 +48,11 @@
this.comment = comment;
}
- /**
- *
- * @param xmlDoc XML document
- * @return XML Element containing details of the trust relation
- */
+ public static int getNb(ObjectContainer db) {
+ ObjectSet<Trust> trusts = db.queryByExample(Trust.class);
+ return trusts.size();
+ }
+
public Element toXML(Document xmlDoc) {
Element elem = xmlDoc.createElement("trust");
elem.setAttribute("uri", trustee.getRequestURI().toString());
Modified: trunk/apps/WoT/src/plugins/WoT/WebInterface.java
===================================================================
--- trunk/apps/WoT/src/plugins/WoT/WebInterface.java 2008-09-04 17:02:41 UTC
(rev 22423)
+++ trunk/apps/WoT/src/plugins/WoT/WebInterface.java 2008-09-04 17:13:36 UTC
(rev 22424)
@@ -53,8 +53,8 @@
list.addChild(new HTMLNode("li", "Own Identities : " +
wot.getNbOwnIdentities()));
list.addChild(new HTMLNode("li", "Known Identities : " +
wot.getNbIdentities()));
- list.addChild(new HTMLNode("li", "Trust relationships : " +
wot.getNbTrusts()));
- list.addChild(new HTMLNode("li", "Scores : " +
wot.getNbScores()));
+ list.addChild(new HTMLNode("li", "Trust relationships : " +
Trust.getNb(db)));
+ list.addChild(new HTMLNode("li", "Scores : " +
Score.getNb(db)));
HTMLNode pageNode = getPageNode();
HTMLNode contentNode = pm.getContentNode(pageNode);
Modified: trunk/apps/WoT/src/plugins/WoT/WoT.java
===================================================================
--- trunk/apps/WoT/src/plugins/WoT/WoT.java 2008-09-04 17:02:41 UTC (rev
22423)
+++ trunk/apps/WoT/src/plugins/WoT/WoT.java 2008-09-04 17:13:36 UTC (rev
22424)
@@ -197,34 +197,17 @@
}
}
}
-
- /**
- * @return The number of OwnIdentities in the WoT
- */
+
public int getNbOwnIdentities() {
ObjectSet<OwnIdentity> ownIdentities =
db.queryByExample(OwnIdentity.class);
return ownIdentities.size();
}
-
- /**
- *
- * @return The number of Identities in the WoT
- */
+
public int getNbIdentities() {
ObjectSet<Identity> identities =
db.queryByExample(Identity.class);
return identities.size() - getNbOwnIdentities();
}
- public int getNbTrusts() {
- ObjectSet<Trust> trusts = db.queryByExample(Trust.class);
- return trusts.size();
- }
-
- public int getNbScores() {
- ObjectSet<Score> scores = db.queryByExample(Score.class);
- return scores.size();
- }
-
public ObjectSet<OwnIdentity> getOwnIdentities() {
return db.queryByExample(OwnIdentity.class);
}
