svn commit: r471602 - in /incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src: main/java/org/apache/cayenne/CayenneContext.java test/java/org/apache/cayenne/CayenneContextWithDataContextTst.java

[aadamchik]

Author: aadamchik
Date: Sun Nov  5 17:35:54 2006
New Revision: 471602

URL: http://svn.apache.org/viewvc?view=rev&rev=471602
Log:
CAY-701: property" package refactoring
(getting rid of "injectValueHolders" calls as value holders are resolved on 
demand anyways)

Modified:
    
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneContext.java
    
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTst.java

Modified: 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneContext.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneContext.java?view=diff&rev=471602&r1=471601&r2=471602
==============================================================================
--- 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneContext.java
 (original)
+++ 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneContext.java
 Sun Nov  5 17:35:54 2006
@@ -489,12 +489,8 @@
         object.setObjectContext(this);
         object.setObjectId(id);
 
-        // note that this must be called AFTER setting persistence state, 
otherwise we'd
-        // get ValueHolders incorrectly marked as resolved
-        descriptor.injectValueHolders(object);
-
         graphManager.registerNode(id, object);
-
+        
         return object;
     }
 }

Modified: 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTst.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTst.java?view=diff&rev=471602&r1=471601&r2=471602
==============================================================================
--- 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTst.java
 (original)
+++ 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTst.java
 Sun Nov  5 17:35:54 2006
@@ -36,7 +36,6 @@
 import org.apache.cayenne.unit.CayenneTestCase;
 import org.apache.cayenne.unit.CayenneTestResources;
 import org.apache.cayenne.unit.TestLocalConnection;
-import org.apache.cayenne.util.PersistentObjectList;
 
 public class CayenneContextWithDataContextTst extends CayenneTestCase {
 
@@ -65,10 +64,6 @@
         assertEquals(PersistenceState.HOLLOW, o.getPersistenceState());
         assertSame(context, o.getObjectContext());
         assertNull(o.getGlobalAttribute1Direct());
-
-        // make sure value holders are set but not resolved
-        assertNotNull(o.getTable2ArrayDirect());
-        assertTrue(((PersistentObjectList) 
o.getTable2ArrayDirect()).isFault());
 
         // make sure we haven't tripped the fault yet
         assertEquals(PersistenceState.HOLLOW, o.getPersistenceState());