X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fpersistence%2FJpaMergeSupport.java;h=9f5a87dcaa523c3cffebfdaa5096f31cce35dae6;hb=4a575582a5c2999bd816b197d9cf274b4b3ddcd7;hp=5105d767b9772753ccdea1b0e328608b2cccf49d;hpb=e72743b6a9fac5a99b842f92b1687fba65ef3210;p=utils

diff --git a/support/general/src/main/java/org/wamblee/persistence/JpaMergeSupport.java b/support/general/src/main/java/org/wamblee/persistence/JpaMergeSupport.java
index 5105d767..9f5a87dc 100644
--- a/support/general/src/main/java/org/wamblee/persistence/JpaMergeSupport.java
+++ b/support/general/src/main/java/org/wamblee/persistence/JpaMergeSupport.java
@@ -28,6 +28,7 @@ import java.util.logging.Logger;
 
 import javax.persistence.EntityManager;
 
+import org.wamblee.general.ObjectElem;
 import org.wamblee.reflection.ReflectionUtils;
 
 /**
@@ -53,7 +54,8 @@ import org.wamblee.reflection.ReflectionUtils;
  * @author Erik Brakkee
  */
 public class JpaMergeSupport {
-    private static final Logger LOG = Logger.getLogger(JpaMergeSupport.class.getName());
+    private static final Logger LOG = Logger.getLogger(JpaMergeSupport.class
+        .getName());
 
     /**
      * Constructs the object.
@@ -284,33 +286,4 @@ public class JpaMergeSupport {
             processPersistent(mergedValue, persistentValue, aProcessed);
         }
     }
-
-    /**
-     * This class provided an equality operation based on the object reference
-     * of the wrapped object. This is required because we cannto assume that the
-     * equals operation has any meaning for different types of persistent
-     * objects. This allows us to use the standard collection classes for
-     * detecting cyclic dependences and avoiding recursion.
-     */
-    private static final class ObjectElem {
-        private Object object;
-
-        public ObjectElem(Object aObject) {
-            object = aObject;
-        }
-
-        public boolean equals(Object aObj) {
-            if (aObj == null) {
-                return false;
-            }
-            if (!(aObj instanceof ObjectElem)) {
-                return false;
-            }
-            return ((ObjectElem) aObj).object == object;
-        }
-
-        public int hashCode() {
-            return object.hashCode();
-        }
-    }
 }