- use java naming conventions (no underscores in non-capitalized identifiers) consistently

1 files changed, 25 insertions, 25 deletions

diff --git a/src/main/java/org/gnunet/statistics/Statistics.java b/src/main/java/org/gnunet/statistics/Statistics.java
index 416db0c..d06b627 100644
--- a/src/main/java/org/gnunet/statistics/Statistics.java
+++ b/src/main/java/org/gnunet/statistics/Statistics.java
@@ -50,28 +50,28 @@ public class  Statistics {
      */
     private final Client client;
 
-    SequentialRequestContainer<SetRequest> set_requests;
-    SequentialRequestContainer<GetRequest> get_requests;
-    MatchingRequestContainer<Long,WatchRequest> watch_requests;
+    SequentialRequestContainer<SetRequest> setRequests;
+    SequentialRequestContainer<GetRequest> getRequests;
+    MatchingRequestContainer<Long,WatchRequest> watchRequests;
 
-    private boolean destroy_requested;
+    private boolean destroyRequested;
 
     private long wid = 0;
 
     public class StatisticsMessageReceiver extends RunaboutMessageReceiver {
         public void visit(GetResponseMessage m) {
-            GetRequest r = get_requests.getRequest();
+            GetRequest r = getRequests.getRequest();
             if (r != null)
                     r.receiver.onReceive(m.subsystemName, m.statisticName, m.value);
         }
 
         public void visit(GetResponseEndMessage m) {
-            GetRequest r = get_requests.getRequest();
+            GetRequest r = getRequests.getRequest();
             if (r != null)
                 r.receiver.onDone();
             //noinspection ConstantConditions
-            if (get_requests != null)
-                get_requests.next();
+            if (getRequests != null)
+                getRequests.next();
         }
 
         public void visit(TestMessage m) {
@@ -80,7 +80,7 @@ public class  Statistics {
         }
 
         public void visit(WatchResponseMessage wrm) {
-            WatchRequest r = watch_requests.getRequest((long) wrm.wid);
+            WatchRequest r = watchRequests.getRequest((long) wrm.wid);
             if (r != null) {
                 r.watcher.onReceive(r.subsystem, r.name, wrm.value);
             }
@@ -88,11 +88,11 @@ public class  Statistics {
 
         @Override
         public void handleError() {
-            if (!destroy_requested) {
+            if (!destroyRequested) {
                 client.reconnect();
-                get_requests.restart();
-                set_requests.restart();
-                watch_requests.restart();
+                getRequests.restart();
+                setRequests.restart();
+                watchRequests.restart();
             }
         }
     }
@@ -100,9 +100,9 @@ public class  Statistics {
     public Statistics(Configuration cfg) {
         client = new Client("statistics", cfg);
         client.installReceiver(new StatisticsMessageReceiver());
-        get_requests = new SequentialRequestContainer<GetRequest>(client);
-        set_requests = new SequentialRequestContainer<SetRequest>(client);
-        watch_requests = new MatchingRequestContainer<Long, WatchRequest>(client);
+        getRequests = new SequentialRequestContainer<GetRequest>(client);
+        setRequests = new SequentialRequestContainer<SetRequest>(client);
+        watchRequests = new MatchingRequestContainer<Long, WatchRequest>(client);
     }
 
     /**
@@ -118,9 +118,9 @@ public class  Statistics {
      */
     public Cancelable get(RelativeTime timeout, final String subsystem, final String name,
                           final StatisticsReceiver receiver) {
-        if (destroy_requested)
+        if (destroyRequested)
             throw new AssertionError("already destroyed");
-        return get_requests.addRequest(new GetRequest(subsystem, name, receiver));
+        return getRequests.addRequest(new GetRequest(subsystem, name, receiver));
     }
 
     /**
@@ -132,9 +132,9 @@ public class  Statistics {
      * @return a handle to cancel the request
      */
     public Cancelable set(final String subsystem, final String name, final long value, boolean persist) {
-        if (destroy_requested)
+        if (destroyRequested)
             throw new AssertionError("already destroyed");
-        return set_requests.addRequest(new SetRequest(subsystem, name, value, false, persist));
+        return setRequests.addRequest(new SetRequest(subsystem, name, value, false, persist));
     }
 
     /**
@@ -146,9 +146,9 @@ public class  Statistics {
      * @return a handle to cancel the request
      */
     public Cancelable update(final String subsystem, final String name, final long delta, boolean persist) {
-        if (destroy_requested)
+        if (destroyRequested)
             throw new AssertionError("already destroyed");
-        return set_requests.addRequest(new SetRequest(subsystem, name, delta, true, persist));
+        return setRequests.addRequest(new SetRequest(subsystem, name, delta, true, persist));
     }
 
     /**
@@ -160,17 +160,17 @@ public class  Statistics {
      * @return a handle to cancel the request
      */
     public Cancelable watch(final String subsystem, final String name, StatisticsWatcher watcher) {
-        if (destroy_requested)
+        if (destroyRequested)
             throw new AssertionError("already destroyed");
         WatchRequest r = new WatchRequest(subsystem, name, watcher);
-        return watch_requests.addRequest(wid++, r);
+        return watchRequests.addRequest(wid++, r);
     }
 
     /**
      * Destroy handle to the statistics service. Always finishes writing pending values.
      */
     public void destroy() {
-        destroy_requested = true;
+        destroyRequested = true;
         client.send(new TestMessage());
         // wait until the service responds
         // TODO: or timeout