Author: saces
Date: 2008-08-03 10:19:56 +0000 (Sun, 03 Aug 2008)
New Revision: 21590

Added:
   trunk/plugins/KeyExplorer/GetResult.java
Modified:
   trunk/plugins/KeyExplorer/KeyExplorer.java
Log:
refactoring, make getter reusable

Added: trunk/plugins/KeyExplorer/GetResult.java
===================================================================
--- trunk/plugins/KeyExplorer/GetResult.java                            (rev 0)
+++ trunk/plugins/KeyExplorer/GetResult.java    2008-08-03 10:19:56 UTC (rev 
21590)
@@ -0,0 +1,25 @@
+/* This code is part of Freenet. It is distributed under the GNU General
+ * Public License, version 2 (or at your option any later version). See
+ * http://www.gnu.org/ for further details of the GPL. */
+package plugins.KeyExplorer;
+
+import freenet.support.api.Bucket;
+
+public class GetResult {
+       private final Bucket data;
+       private final boolean isMetaData;
+
+       GetResult(Bucket data2, boolean isMetaData2) {
+               data = data2;
+               isMetaData = isMetaData2;
+       }
+
+       public boolean isMetaData() {
+               return isMetaData;
+       }
+
+       public Bucket getData() {
+               return data;
+       }
+
+}


Property changes on: trunk/plugins/KeyExplorer/GetResult.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: trunk/plugins/KeyExplorer/KeyExplorer.java
===================================================================
--- trunk/plugins/KeyExplorer/KeyExplorer.java  2008-08-03 10:06:04 UTC (rev 
21589)
+++ trunk/plugins/KeyExplorer/KeyExplorer.java  2008-08-03 10:19:56 UTC (rev 
21590)
@@ -1,3 +1,6 @@
+/* This code is part of Freenet. It is distributed under the GNU General
+ * Public License, version 2 (or at your option any later version). See
+ * http://www.gnu.org/ for further details of the GPL. */
 package plugins.KeyExplorer;

 import java.io.IOException;
@@ -91,9 +94,9 @@

                                SimpleFieldSet sfs = new SimpleFieldSet(true);
                                sfs.putSingle("Identifier", identifier);
-                               sfs.put("IsMetadata", getResult.isMetaData);
+                               sfs.put("IsMetadata", getResult.isMetaData());
                                sfs.putSingle("Status", "DataFound");
-                               replysender.send(sfs, getResult.data);
+                               replysender.send(sfs, getResult.getData());
                                return;

                        } catch (MalformedURLException e) {
@@ -119,16 +122,6 @@
        public void terminate() {
        }

-       private class GetResult {
-               final Bucket data;
-               final boolean isMetaData;
-
-               GetResult(Bucket data2, boolean isMetaData2) {
-                       data = data2;
-                       isMetaData = isMetaData2;
-               }
-       }
-
        private GetResult simpleGet(FreenetURI uri) throws 
MalformedURLException, LowLevelGetException {
                ClientKey ck;
                try {
@@ -177,7 +170,7 @@
                                        furi = tempKey.getURI();
                                } 
                                getresult = simpleGet(furi);
-                               data = BucketTools.toByteArray(getresult.data);
+                               data = 
BucketTools.toByteArray(getresult.getData());
                        }
                } catch (MalformedURLException e) {
                        error = "MalformedURL";
@@ -195,7 +188,7 @@

                if (data != null) {
                        String title = "Key: " + furi.toString();
-                       if (getresult.isMetaData)
+                       if (getresult.isMetaData())
                                title = title + "\u00a0(MetaData)";
                        HTMLNode dataBox2 = m_pm.getInfobox(title);

@@ -241,7 +234,7 @@

                        error = null;

-                       if (getresult.isMetaData) {
+                       if (getresult.isMetaData()) {

                                Metadata md = null;
                                try {


Reply via email to