svn commit: r1358361 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne: map/EntityResolver.java util/DeepMergeOperation.java

[aadamchik]

Author: aadamchik
Date: Fri Jul  6 19:13:22 2012
New Revision: 1358361

URL: http://svn.apache.org/viewvc?rev=1358361&view=rev
Log:
CAY-1718 Remove everything deprecated in 3.1

in progress

Modified:
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/DeepMergeOperation.java

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java?rev=1358361&r1=1358360&r2=1358361&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java
 Fri Jul  6 19:13:22 2012
@@ -227,8 +227,10 @@ public class EntityResolver implements M
                         for (String method : callback.getCallbackMethods()) {
 
                             // note that callbacks[i].getCallbackType() == i
-                            callbackRegistry.addDefaultListener(callback
-                                    .getCallbackType(), listenerInstance, 
method);
+                            callbackRegistry.addDefaultListener(
+                                    callback.getCallbackType(),
+                                    listenerInstance,
+                                    method);
                         }
                     }
                 }
@@ -653,17 +655,6 @@ public class EntityResolver implements M
 
     /**
      * Returns EntityInheritanceTree representing inheritance hierarchy that 
starts with a
-     * given ObjEntity as root, and includes all its subentities.
-     * 
-     * @deprecated since 3.1 use {@link #lookupInheritanceTree(String)}.
-     */
-    @Deprecated
-    public EntityInheritanceTree lookupInheritanceTree(ObjEntity entity) {
-        return lookupInheritanceTree(entity.getName());
-    }
-
-    /**
-     * Returns EntityInheritanceTree representing inheritance hierarchy that 
starts with a
      * given ObjEntity as root, and includes all its subentities. Returns 
non-null object
      * for all existing entities, even those that don't have super or 
subclasses.
      * 

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/DeepMergeOperation.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/DeepMergeOperation.java?rev=1358361&r1=1358360&r2=1358361&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/DeepMergeOperation.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/DeepMergeOperation.java
 Fri Jul  6 19:13:22 2012
@@ -55,27 +55,6 @@ public class DeepMergeOperation {
         this.shallowMergeOperation = new ShallowMergeOperation(context);
     }
 
-    /**
-     * @deprecated since 3.1 - unused as the object is now stateless
-     */
-    @Deprecated
-    public void reset() {
-        // noop
-    }
-
-    /**
-     * @deprecated since 3.1 use {@link #merge(Persistent)}.
-     */
-    @Deprecated
-    public Object merge(Object object, ClassDescriptor descriptor) {
-
-        if (!(object instanceof Persistent)) {
-            throw new CayenneRuntimeException("Expected Persistent, got: " + 
object);
-        }
-
-        return merge((Persistent) object);
-    }
-
     public <T extends Persistent> T merge(T peerInParentContext) {
         ClassDescriptor descriptor = entityResolver
                 
.getClassDescriptor(peerInParentContext.getObjectId().getEntityName());