svn commit: r1234349 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContext.java

[aa...@apache.org]

Author: aadamchik
Date: Sat Jan 21 15:40:23 2012
New Revision: 1234349

URL: http://svn.apache.org/viewvc?rev=1234349&view=rev
Log:
javadocs

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContext.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContext.java?rev=1234349&r1=1234348&r2=1234349&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContext.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContext.java Sat Jan 21 15:40:23 2012
@@ -81,10 +81,14 @@ public interface ObjectContext extends S
     Persistent localObject(ObjectId id, Object prototype);
 
     /**
-     * Returns a copy of 'objectFromAnotherContext' object that is registered in this
-     * context, creating and registering a local hollow object if needed. No DB query is
-     * performed. This method will cause an exception if an object is not already
-     * registered in this context or its parent DataChannel and the ObjectId is temporary.
+     * Returns a local copy of 'objectFromAnotherContext' object. "Local" means that the
+     * returned object is registered in this context. If the local object hasn't been
+     * previously cached in this context, a hollow object is created and returned to the
+     * caller. No DB query is performed to resolve an object.
+     * <p>
+     * This method will cause an exception if 'objectFromAnotherContext' has a temporary
+     * ObjectId and a copy of an object can't be found in this context or its parent
+     * DataChannel.
      * 
      * @since 3.1
      */