X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fobserver%2FObservable.java;h=820db38c8bb3241b61d3d3a12ab19585351ae4d4;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=2980afafd33dbc63a0a7416e6aed4ca7cb2396c9;hpb=da48a523c81e59fe0eac34e43d12937396161f25;p=utils

diff --git a/support/general/src/main/java/org/wamblee/observer/Observable.java b/support/general/src/main/java/org/wamblee/observer/Observable.java
index 2980afaf..820db38c 100644
--- a/support/general/src/main/java/org/wamblee/observer/Observable.java
+++ b/support/general/src/main/java/org/wamblee/observer/Observable.java
@@ -34,22 +34,22 @@ public class Observable<ObservableType, Event> {
     /**
      * Observable.
      */
-    private ObservableType _observable;
+    private ObservableType observable;
 
     /**
      * Used to notify observers.
      */
-    private ObserverNotifier<ObservableType, Event> _notifier;
+    private ObserverNotifier<ObservableType, Event> notifier;
 
     /**
      * Map of subscription to observer.
      */
-    private Map<Long, Observer<ObservableType, Event>> _observers;
+    private Map<Long, Observer<ObservableType, Event>> observers;
 
     /**
      * Counter for subscriptions. Holds the next subscription.
      */
-    private long _counter;
+    private long counter;
 
     /**
      * Constructs the observable.
@@ -61,10 +61,10 @@ public class Observable<ObservableType, Event> {
      */
     public Observable(ObservableType aObservable,
             ObserverNotifier<ObservableType, Event> aNotifier) {
-        _observable = aObservable;
-        _notifier = aNotifier;
-        _observers = new TreeMap<Long, Observer<ObservableType, Event>>();
-        _counter = 0;
+        observable = aObservable;
+        notifier = aNotifier;
+        observers = new TreeMap<Long, Observer<ObservableType, Event>>();
+        counter = 0;
     }
 
     /**
@@ -75,9 +75,9 @@ public class Observable<ObservableType, Event> {
      * @return Event Event to send.
      */
     public synchronized long subscribe(Observer<ObservableType, Event> aObserver) {
-        long subscription = _counter++; // integer rage is so large it will
+        long subscription = counter++; // integer rage is so large it will
                                         // never roll over.
-        _observers.put(subscription, aObserver);
+        observers.put(subscription, aObserver);
         return subscription;
     }
 
@@ -90,7 +90,7 @@ public class Observable<ObservableType, Event> {
      *             In case the subscription is not known.
      */
     public synchronized void unsubscribe(long aSubscription) {
-        Object obj = _observers.remove(aSubscription);
+        Object obj = observers.remove(aSubscription);
         if (obj == null) {
             throw new IllegalArgumentException("Subscription '" + aSubscription
                     + "'");
@@ -103,7 +103,7 @@ public class Observable<ObservableType, Event> {
      * @return Number of subscribed observers.
      */
     public int getObserverCount() {
-        return _observers.size();
+        return observers.size();
     }
 
     /**
@@ -116,12 +116,12 @@ public class Observable<ObservableType, Event> {
         // Make sure we do the notification while not holding the lock to avoid
         // potential deadlock
         // situations.
-        List<Observer<ObservableType, Event>> observers = new ArrayList<Observer<ObservableType, Event>>();
+        List<Observer<ObservableType, Event>> myObservers = new ArrayList<Observer<ObservableType, Event>>();
         synchronized (this) {
-            observers.addAll(_observers.values());
+            myObservers.addAll(observers.values());
         }
-        for (Observer<ObservableType, Event> observer : observers) {
-            _notifier.update(observer, _observable, aEvent);
+        for (Observer<ObservableType, Event> observer : myObservers) {
+            notifier.update(observer, observable, aEvent);
         }
     }
 
@@ -132,10 +132,10 @@ public class Observable<ObservableType, Event> {
      */
     @Override
     protected void finalize() throws Throwable {
-        if (_observers.size() > 0) {
+        if (observers.size() > 0) {
             LOGGER
                     .error("Still observers registered at finalization of observer!");
-            for (Observer observer : _observers.values()) {
+            for (Observer observer : observers.values()) {
                 LOGGER.error("  observer: " + observer);
             }
         }