svn commit: r1470392 - /ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java

[adrianc]

Author: adrianc
Date: Mon Apr 22 06:29:19 2013
New Revision: 1470392

URL: http://svn.apache.org/r1470392
Log:
Refactored GenericEntity so it contains Observable instead of extending 
Observable. This will enable copying the Observable aspect of the class.

Also replaced java.util.Observable with org.ofbiz.base.util.Observable. Anyone 
using the Observable functionality will need to change their imports.

Modified:
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java?rev=1470392&r1=1470391&r2=1470392&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java 
(original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java Mon 
Apr 22 06:29:19 2013
@@ -33,7 +33,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.MissingResourceException;
-import java.util.Observable;
 import java.util.ResourceBundle;
 import java.util.TreeSet;
 
@@ -42,6 +41,8 @@ import org.ofbiz.base.util.Base64;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.ObjectType;
+import org.ofbiz.base.util.Observable;
+import org.ofbiz.base.util.Observer;
 import org.ofbiz.base.util.TimeDuration;
 import org.ofbiz.base.util.UtilDateTime;
 import org.ofbiz.base.util.UtilGenerics;
@@ -67,12 +68,14 @@ import org.w3c.dom.Element;
  *
  */
 @SuppressWarnings("serial")
-public class GenericEntity extends Observable implements Map<String, Object>, 
LocalizedMap<Object>, Serializable, Comparable<GenericEntity>, Cloneable {
+public class GenericEntity implements Map<String, Object>, 
LocalizedMap<Object>, Serializable, Comparable<GenericEntity>, Cloneable {
 
     public static final String module = GenericEntity.class.getName();
     public static final GenericEntity NULL_ENTITY = new NullGenericEntity();
     public static final NullField NULL_FIELD = new NullField();
 
+    private Observable observable = new Observable();
+
     /** Name of the GenericDelegator, used to re-get the GenericDelegator when 
deserialized */
     protected String delegatorName = null;
 
@@ -1444,6 +1447,38 @@ public class GenericEntity extends Obser
         return condition.entityMatches(this);
     }
 
+    public void addObserver(Observer observer) {
+        observable.addObserver(observer);
+    }
+
+    public void clearChanged() {
+        observable.clearChanged();
+    }
+
+    public void deleteObserver(Observer observer) {
+        observable.deleteObserver(observer);
+    }
+
+    public void deleteObservers() {
+        observable.deleteObservers();
+    }
+
+    public boolean hasChanged() {
+        return observable.hasChanged();
+    }
+
+    public void notifyObservers() {
+        observable.notifyObservers();
+    }
+
+    public void notifyObservers(Object arg) {
+        observable.notifyObservers(arg);
+    }
+
+    public void setChanged() {
+        observable.setChanged();
+    }
+
     public static interface NULL {
     }