(no commit message)

[utils] / support / general / src / main / java / org / wamblee / observer / Observable.java

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 096b0600043f726d9bdc493f83d3aacbe2e19d78..f31ba0dc485d1b839ceb8e354c9d0d0e15f657e5 100644 (file)
--- a/support/general/src/main/java/org/wamblee/observer/Observable.java
+++ b/support/general/src/main/java/org/wamblee/observer/Observable.java
@@ -1,12 +1,12 @@
 /*
- * Copyright 2005 the original author or authors.
- *
+ * Copyright 2005-2010 the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,21 +15,16 @@
  */
 package org.wamblee.observer;
 
-import org.apache.log4j.Logger;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-
 /**
  * Implements subscription and notification logic for an observer pattern. This
  * class is thread safe.
  */
 public class Observable<ObservableType, Event> {
-    private static final Logger LOGGER = Logger.getLogger(Observable.class);
-
     /**
      * Observable.
      */
@@ -52,7 +47,7 @@ public class Observable<ObservableType, Event> {
 
     /**
      * Constructs the observable.
-     *
+     * 
      * @param aObservable
      *            Observable this instance is used for.
      * @param aNotifier
@@ -68,15 +63,14 @@ public class Observable<ObservableType, Event> {
 
     /**
      * Subscribe an obvers.
-     *
+     * 
      * @param aObserver
      *            Observer to subscribe.
      * @return Event Event to send.
      */
-    public synchronized long subscribe(
-        Observer<ObservableType, Event> aObserver) {
+    public synchronized long subscribe(Observer<ObservableType, Event> aObserver) {
         long subscription = counter++; // integer rage is so large it will
-                                       // never roll over.
+        // never roll over.
 
         observers.put(subscription, aObserver);
 
@@ -85,7 +79,7 @@ public class Observable<ObservableType, Event> {
 
     /**
      * Unsubscribe an observer.
-     *
+     * 
      * @param aSubscription
      *            Subscription which is used
      * @throws IllegalArgumentException
@@ -102,7 +96,7 @@ public class Observable<ObservableType, Event> {
 
     /**
      * Gets the number of subscribed observers.
-     *
+     * 
      * @return Number of subscribed observers.
      */
     public int getObserverCount() {
@@ -111,7 +105,7 @@ public class Observable<ObservableType, Event> {
 
     /**
      * Notifies all subscribed observers.
-     *
+     * 
      * @param aEvent
      *            Event to send.
      */
@@ -129,23 +123,4 @@ public class Observable<ObservableType, Event> {
             notifier.update(observer, observable, aEvent);
         }
     }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#finalize()
-     */
-    @Override
-    protected void finalize() throws Throwable {
-        if (observers.size() > 0) {
-            LOGGER.error(
-                "Still observers registered at finalization of observer!");
-
-            for (Observer observer : observers.values()) {
-                LOGGER.error("  observer: " + observer);
-            }
-        }
-
-        super.finalize();
-    }
 }