You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2012/07/16 21:02:50 UTC

svn commit: r1362196 - /cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneRuntime.java

Author: aadamchik
Date: Mon Jul 16 19:02:50 2012
New Revision: 1362196

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

(cherry picked from commit 9cc43aa7313b11bf09391db1f3d2c429c3c4580c)

Modified:
    cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneRuntime.java

Modified: cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneRuntime.java
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneRuntime.java?rev=1362196&r1=1362195&r2=1362196&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneRuntime.java (original)
+++ cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneRuntime.java Mon Jul 16 19:02:50 2012
@@ -174,18 +174,16 @@ public abstract class CayenneRuntime {
     }
 
     /**
-     * Returns an ObjectContext based on the runtime DataChannel. Default configuration
-     * will return a new instance of the ObjectContext on every call, as the corresponding
-     * factory is bound using "no scope" scope. Custom modules may change this behavior.
+     * Returns a new ObjectContext instance based on the runtime's main DataChannel.
      */
     public ObjectContext getContext() {
         return injector.getInstance(ObjectContextFactory.class).createContext();
     }
 
     /**
-     * Returns an ObjectContext based on the runtime DataChannel. Default configuration
-     * will return a new instance of the ObjectContext on every call, as the corresponding
-     * factory is bound using "no scope" scope. Custom modules may change this behavior.
+     * Returns a new ObjectContext which is a child of the specified DataChannel. This
+     * method is used for creation of nested ObjectContexts, with parent ObjectContext
+     * passed as an argument.
      */
     public ObjectContext getContext(DataChannel parentChannel) {
         return injector.getInstance(ObjectContextFactory.class).createContext(