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

[bato...@freenetproject.org]

Author: batosai
Date: 2008-08-05 12:46:17 +0000 (Tue, 05 Aug 2008)
New Revision: 21611

Modified:
   trunk/apps/WoT/src/plugins/WoT/WoT.java
   trunk/apps/WoT/src/plugins/WoT/WoTplugin.java
Log:
Place identity counting code where it belongs.

Modified: trunk/apps/WoT/src/plugins/WoT/WoT.java
===================================================================
--- trunk/apps/WoT/src/plugins/WoT/WoT.java     2008-08-05 11:06:28 UTC (rev 
21610)
+++ trunk/apps/WoT/src/plugins/WoT/WoT.java     2008-08-05 12:46:17 UTC (rev 
21611)
@@ -134,5 +134,15 @@
                        }
                }
        }
+       
+       public int getNbOwnIdentities() {
+               ObjectSet<OwnIdentity> ownIdentities = 
db.queryByExample(OwnIdentity.class);
+               return ownIdentities.size();
+       }
+       
+       public int getNbIdentities() {
+               ObjectSet<Identity> identities = 
db.queryByExample(Identity.class);
+               return identities.size() - getNbOwnIdentities();
+       }
 }


Modified: trunk/apps/WoT/src/plugins/WoT/WoTplugin.java
===================================================================
--- trunk/apps/WoT/src/plugins/WoT/WoTplugin.java       2008-08-05 11:06:28 UTC 
(rev 21610)
+++ trunk/apps/WoT/src/plugins/WoT/WoTplugin.java       2008-08-05 12:46:17 UTC 
(rev 21611)
@@ -41,6 +41,7 @@
        private HighLevelSimpleClient client;
        private FCPServer fcp;
        private ObjectContainer db;
+       private WoT wot;

        public void runPlugin(PluginRespirator pr) {

@@ -48,6 +49,7 @@

                this.pr = pr;
                db = Db4o.openFile("WoT.db4o");
+               wot = new WoT(db);

                Config nc = pr.getNode().config;
                SubConfig fc = nc.get("fproxy");
@@ -125,15 +127,9 @@

                HTMLNode list = new HTMLNode("ul");

-               ObjectSet<OwnIdentity> ownIdentities = 
db.queryByExample(OwnIdentity.class);
-               nbOwnIdentities = ownIdentities.size();
-               list.addChild(new HTMLNode("li", "Own Identities : " + 
nbOwnIdentities));
+               list.addChild(new HTMLNode("li", "Own Identities : " + 
wot.getNbOwnIdentities()));
+               list.addChild(new HTMLNode("li", "Known Identities : " + 
wot.getNbIdentities()));

-               ObjectSet<Identity> identities = 
db.queryByExample(Identity.class);
-               nbIdentities = identities.size();
-               list.addChild(new HTMLNode("li", "Known Identities : " + 
nbIdentities));
-               
-               
                HTMLNode pageNode = getPageNode();
                HTMLNode contentNode = pm.getContentNode(pageNode);
                HTMLNode box = pm.getInfobox("Summary");