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

[bato...@freenetproject.org]

Author: batosai
Date: 2008-08-14 21:09:49 +0000 (Thu, 14 Aug 2008)
New Revision: 21871

Modified:
   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/WebInterface.java
===================================================================
--- trunk/apps/WoT/src/plugins/WoT/WebInterface.java    2008-08-14 21:04:55 UTC 
(rev 21870)
+++ trunk/apps/WoT/src/plugins/WoT/WebInterface.java    2008-08-14 21:09:49 UTC 
(rev 21871)
@@ -160,7 +160,7 @@
                else {
                        // Get the identity the user asked for, or the first 
one if he didn't
                        if(owner.equals("")) {
-                               treeOwner = (OwnIdentity) 
db.queryByExample(OwnIdentity.class).next();
+                               treeOwner = wot.getOwnIdentities().next();
                        }
                        else {
                                try {
@@ -174,7 +174,7 @@
                        HTMLNode selectForm = pr.addFormChild(listBoxContent, 
SELF_URI + "/viewTree", "selectForm");
                        HTMLNode selectBox = selectForm.addChild("select", 
"name", "ownerURI");

-                       ObjectSet<OwnIdentity> ownIdentities = 
db.queryByExample(OwnIdentity.class);
+                       ObjectSet<OwnIdentity> ownIdentities = 
wot.getOwnIdentities();
                        while(ownIdentities.hasNext()) {
                                OwnIdentity ownIdentity = ownIdentities.next();
                                if(ownIdentity == treeOwner) {

Modified: trunk/apps/WoT/src/plugins/WoT/WoT.java
===================================================================
--- trunk/apps/WoT/src/plugins/WoT/WoT.java     2008-08-14 21:04:55 UTC (rev 
21870)
+++ trunk/apps/WoT/src/plugins/WoT/WoT.java     2008-08-14 21:09:49 UTC (rev 
21871)
@@ -198,6 +198,10 @@
                return identities.size() - getNbOwnIdentities();
        }

+       public ObjectSet<OwnIdentity> getOwnIdentities() {
+               return db.queryByExample(OwnIdentity.class);
+       }
+       
        public OwnIdentity getOwnIdentityByURI(String uri) throws 
InvalidParameterException, MalformedURLException, UnknownIdentityException {

                Identity identity = getIdentityByURI(uri);