3 files changed, 52 insertions, 6 deletions

diff --git a/src/main/java/org/gnunet/statistics/Statistics.java b/src/main/java/org/gnunet/statistics/Statistics.java
index d8b8f3e..d642962 100644
--- a/src/main/java/org/gnunet/statistics/Statistics.java
+++ b/src/main/java/org/gnunet/statistics/Statistics.java
@@ -131,6 +131,11 @@ public class  Statistics {
         }
     }
 
+    /**
+     * Create a connection to the statistics service.
+     *
+     * @param cfg configuration to use
+     */
     public Statistics(Configuration cfg) {
         client = new Client("statistics", cfg);
         client.installReceiver(new StatisticsMessageReceiver());
@@ -139,9 +144,7 @@ public class  Statistics {
     }
 
     /**
-     * Retrieve values from statistics.
-     * Only one instance of this getRequestIdentifier may be active simultaneously.
-     * Upon cancellation
+     * Retrieve a statistics value of a subsystem.
      *
      * @param timeout      time after we give up and call receiver.onTimeout
      * @param subsystem    the subsystem of interest
@@ -164,6 +167,19 @@ public class  Statistics {
     }
 
     /**
+     * Retrieve all statistics value of a subsystem.
+     *
+     * @param timeout      time after we give up and call receiver.onTimeout
+     * @param subsystem    the subsystem of interest
+     * @param receiver     callback
+     * @return handle to onCancel the getRequestIdentifier
+     */
+    public Cancelable get(RelativeTime timeout, final String subsystem,
+                          final StatisticsReceiver receiver) {
+        return get(timeout, subsystem, "", receiver);
+    }
+
+    /**
      * Sets a statistics value asynchronously.
      *
      * @param name    name of the entry
@@ -226,9 +242,10 @@ public class  Statistics {
     }
 
     /**
-     * Destroy handle to the statistics service. Always finishes writing pending values.
+     * Destroy handle to the statistics service.
      *
-     * @param syncFirst Wait until the statistics service has received all our updates.
+     * @param syncFirst If true, wait until the statistics service has received all our updates.
+     *                  If false, pending updates may be lost.
      */
     public void destroy(boolean syncFirst) {
         if (destroyRequested)
diff --git a/src/main/java/org/gnunet/statistics/StatisticsReceiver.java b/src/main/java/org/gnunet/statistics/StatisticsReceiver.java
index 0c25acc..d30a93e 100644
--- a/src/main/java/org/gnunet/statistics/StatisticsReceiver.java
+++ b/src/main/java/org/gnunet/statistics/StatisticsReceiver.java
@@ -21,9 +21,28 @@
 package org.gnunet.statistics;
 
 
-
+/**
+ * Handler for statistics results.
+ */
 public interface StatisticsReceiver {
+    /**
+     * Called when having received a statistics value from the service.
+     *
+     * @param subsystem subsystem of the value
+     * @param name name of the value
+     * @param value the value
+     */
     public void onReceive(String subsystem, String name, long value);
+
+    /**
+     * Called when a statistics request times out.  Never called
+     * for watchers.
+     */
     public void onTimeout();
+
+    /**
+     * Called when all values for the request have been received.
+     * Never called for watchers.
+     */
     public void onDone();
 }
diff --git a/src/main/java/org/gnunet/statistics/StatisticsWatcher.java b/src/main/java/org/gnunet/statistics/StatisticsWatcher.java
index 11328b7..5fdd6bc 100644
--- a/src/main/java/org/gnunet/statistics/StatisticsWatcher.java
+++ b/src/main/java/org/gnunet/statistics/StatisticsWatcher.java
@@ -1,5 +1,15 @@
 package org.gnunet.statistics;
 
+/**
+ * Listener for statistics changes.
+ */
 public interface StatisticsWatcher {
+    /**
+     * Called when receiving a change notification for a statistics value.
+     *
+     * @param subsystem subsystem of the value that changed
+     * @param name name of the value that changed
+     * @param value new value
+     */
     public void onReceive(String subsystem, String name, long value);
 }