svn commit: r454063 - in /incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne: CayenneDataObject.java DataObject.java access/ObjectResolver.java

[aadamchik]

Author: aadamchik
Date: Sat Oct  7 19:00:43 2006
New Revision: 454063

URL: http://svn.apache.org/viewvc?view=rev&rev=454063
Log:
CAY-681

Modified:
    
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneDataObject.java
    
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/DataObject.java
    
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/ObjectResolver.java

Modified: 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneDataObject.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneDataObject.java?view=diff&rev=454063&r1=454062&r2=454063
==============================================================================
--- 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneDataObject.java
 (original)
+++ 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneDataObject.java
 Sat Oct  7 19:00:43 2006
@@ -264,7 +264,7 @@
 
         // call 'recordArcCreated' AFTER readProperty as readProperty ensures 
that this
         // object fault is resolved
-       // getObjectContext().getGraphManager().
+        // getObjectContext().getGraphManager().
         getDataContext().getObjectStore().recordArcCreated(
                 this,
                 value.getObjectId(),
@@ -438,7 +438,8 @@
     /**
      * Default implementation does nothing.
      * 
-     * @see org.apache.cayenne.DataObject#fetchFinished()
+     * @deprecated since 3.0 use callbacks.
+     * @see LifecycleEventCallback
      */
     public void fetchFinished() {
     }
@@ -513,7 +514,9 @@
      */
     protected void validateForSave(ValidationResult validationResult) {
 
-        ObjEntity objEntity = 
getObjectContext().getEntityResolver().lookupObjEntity(this);
+        ObjEntity objEntity = getObjectContext()
+                .getEntityResolver()
+                .lookupObjEntity(this);
         if (objEntity == null) {
             throw new CayenneRuntimeException(
                     "No ObjEntity mapping found for DataObject " + 
getClass().getName());

Modified: 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/DataObject.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/DataObject.java?view=diff&rev=454063&r1=454062&r2=454063
==============================================================================
--- 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/DataObject.java
 (original)
+++ 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/DataObject.java
 Sat Oct  7 19:00:43 2006
@@ -144,8 +144,9 @@
             boolean setReverse);
 
     /**
-     * Notification method called by DataContext after the object was read 
from the
-     * database.
+     * @deprecated since 3.0 users must use callbacks instead. This method is 
no longer
+     *             invoked by Cayenne runtime.
+     * @see LifecycleEventCallback
      */
     public void fetchFinished();
 

Modified: 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/ObjectResolver.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/ObjectResolver.java?view=diff&rev=454063&r1=454062&r2=454063
==============================================================================
--- 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/ObjectResolver.java
 (original)
+++ 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/ObjectResolver.java
 Sat Oct  7 19:00:43 2006
@@ -228,7 +228,6 @@
                 break;
         }
 
-        object.fetchFinished();
         return object;
     }