Author: aadamchik
Date: Sat Oct 14 16:05:06 2006
New Revision: 464049
URL: http://svn.apache.org/viewvc?view=rev&rev=464049
Log:
CAY-692: Extra argument needed in ObjectContext.prepareForAccess - whether the
property is a fault or not.
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/BaseContext.java
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/main/java/org/apache/cayenne/CayenneDataObject.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/ObjectContext.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContextDeleteAction.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/intercept/ObjectContextDecorator.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/SimplePersistentProperty.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/resources/dotemplates/v1_2/client-superclass.vm
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/MockObjectContext.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteCascade.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteDeny.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteNullify.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteRule.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable1.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable2.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable3.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable4.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable5.java
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/BaseContext.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/BaseContext.java?view=diff&rev=464049&r1=464048&r2=464049
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/BaseContext.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/BaseContext.java
Sat Oct 14 16:05:06 2006
@@ -58,7 +58,7 @@
public abstract Collection modifiedObjects();
public abstract Persistent newObject(Class persistentClass);
-
+
public abstract void registerNewObject(Object object);
public abstract Collection newObjects();
@@ -67,7 +67,18 @@
public abstract List performQuery(Query query);
- public abstract void prepareForAccess(Persistent object, String property);
+ /**
+ * @deprecated since 3.0 this method is replaced by
+ * [EMAIL PROTECTED] #prepareForAccess(Persistent, String,
boolean)}.
+ */
+ public void prepareForAccess(Persistent object, String property) {
+ prepareForAccess(object, property, true);
+ }
+
+ public abstract void prepareForAccess(
+ Persistent object,
+ String property,
+ boolean lazyFaulting);
public abstract void propertyChanged(
Persistent object,
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=464049&r1=464048&r2=464049
==============================================================================
---
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
Sat Oct 14 16:05:06 2006
@@ -32,6 +32,7 @@
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.property.ClassDescriptor;
+import org.apache.cayenne.property.Property;
import org.apache.cayenne.query.ObjectIdQuery;
import org.apache.cayenne.query.Query;
import org.apache.cayenne.util.EventUtil;
@@ -429,8 +430,10 @@
/**
* Resolves an object if it is HOLLOW.
+ *
+ * @since 3.0
*/
- public void prepareForAccess(Persistent object, String property) {
+ public void prepareForAccess(Persistent object, String property, boolean
lazyFaulting) {
if (object.getPersistenceState() == PersistenceState.HOLLOW) {
ObjectId gid = object.getObjectId();
@@ -446,6 +449,15 @@
"Error resolving fault, more than one row exists in
the database for GlobalID: "
+ gid);
}
+ }
+
+ // resolve relationship fault
+ if (lazyFaulting && property != null) {
+ Property propertyDescriptor =
getEntityResolver().getClassDescriptor(
+
object.getObjectId().getEntityName()).getProperty(property);
+
+ // this should trigger fault resolving
+ propertyDescriptor.readProperty(object);
}
}
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=464049&r1=464048&r2=464049
==============================================================================
---
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 14 16:05:06 2006
@@ -193,18 +193,13 @@
public Object readProperty(String propName) {
if (objectContext != null) {
- objectContext.prepareForAccess(this, propName);
- }
-
- Object object = readPropertyDirectly(propName);
- // must resolve faults immediately
- if (object instanceof Fault) {
- object = ((Fault) object).resolveFault(this, propName);
- writePropertyDirectly(propName, object);
+ // TODO: andrus, 10/14/2006 - ensure "lazyFaulting" flag is not
set to true if
+ // this is a simple property to improve ObjectContext performance
+ objectContext.prepareForAccess(this, propName, true);
}
- return object;
+ return readPropertyDirectly(propName);
}
public Object readPropertyDirectly(String propName) {
@@ -213,11 +208,12 @@
public void writeProperty(String propName, Object val) {
if (objectContext != null) {
- objectContext.prepareForAccess(this, propName);
+
+ // this calls "prepareForAccess" internally
+ Object oldValue = readProperty(propName);
// note how we notify DataContext of change BEFORE the object is
actually
// changed... this is needed to take a valid current snapshot
- Object oldValue = readPropertyDirectly(propName);
objectContext.propertyChanged(this, propName, oldValue, val);
}
@@ -293,7 +289,7 @@
}
}
- objectContext.prepareForAccess(this, relationshipName);
+ objectContext.prepareForAccess(this, relationshipName, false);
writePropertyDirectly(relationshipName, value);
}
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/ObjectContext.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/ObjectContext.java?view=diff&rev=464049&r1=464048&r2=464049
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/ObjectContext.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/ObjectContext.java
Sat Oct 14 16:05:06 2006
@@ -102,9 +102,17 @@
void deleteObject(Object object) throws DeleteDenyException;
/**
- * A callback method that child Persistent objects are expected to call
from inside
- * the getter before returning a value of a persistent property. Such
callback allows
- * ObjectContext to "inflate" unresolved objects on demand.
+ * A callback method that child Persistent objects are expected to call
before
+ * accessing property values. This callback allows ObjectContext to
"inflate"
+ * unresolved objects on demand and also resolve properties that rely on
lazy
+ * faulting.
+ *
+ * @since 3.0
+ */
+ void prepareForAccess(Persistent object, String property, boolean
lazyFaulting);
+
+ /**
+ * @deprecated since 3.0 use [EMAIL PROTECTED]
#prepareForAccess(Persistent, String, boolean)}.
*/
void prepareForAccess(Persistent object, String property);
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java?view=diff&rev=464049&r1=464048&r2=464049
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java
Sat Oct 14 16:05:06 2006
@@ -1589,13 +1589,11 @@
}
/**
- * Resolves object fault if needed. If a property is not null, it is
assumed that the
- * object will be modified, so object snapshot is retained and object
state is
- * changed.
+ * Resolves object fault if needed.
*
- * @since 1.2
+ * @since 3.0
*/
- public void prepareForAccess(Persistent object, String property) {
+ public void prepareForAccess(Persistent object, String property, boolean
lazyFaulting) {
if (object.getPersistenceState() == PersistenceState.HOLLOW) {
@@ -1615,6 +1613,15 @@
+ state
+ "). Possible cause - matching row is missing
from the database.");
}
+ }
+
+ // resolve relationship fault
+ if (lazyFaulting && property != null) {
+ Property propertyDescriptor =
getEntityResolver().getClassDescriptor(
+
object.getObjectId().getEntityName()).getProperty(property);
+
+ // this should trigger fault resolving
+ propertyDescriptor.readProperty(object);
}
}
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContextDeleteAction.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContextDeleteAction.java?view=diff&rev=464049&r1=464048&r2=464049
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContextDeleteAction.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContextDeleteAction.java
Sat Oct 14 16:05:06 2006
@@ -78,7 +78,7 @@
// must resolve HOLLOW objects before delete... needed
// to process relationships and optimistic locking...
- dataContext.prepareForAccess(object, null);
+ dataContext.prepareForAccess(object, null, false);
if (oldState == PersistenceState.NEW) {
deleteNew(object, oldState);
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/intercept/ObjectContextDecorator.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/intercept/ObjectContextDecorator.java?view=diff&rev=464049&r1=464048&r2=464049
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/intercept/ObjectContextDecorator.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/intercept/ObjectContextDecorator.java
Sat Oct 14 16:05:06 2006
@@ -98,8 +98,15 @@
return context.performQuery(query);
}
+ /**
+ * @deprecated since 3.0, use [EMAIL PROTECTED]
#prepareForAccess(Persistent, String, boolean)}.
+ */
public void prepareForAccess(Persistent object, String property) {
context.prepareForAccess(object, property);
+ }
+
+ public void prepareForAccess(Persistent object, String property, boolean
lazyFaulting) {
+ context.prepareForAccess(object, property, lazyFaulting);
}
public void propertyChanged(
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/SimplePersistentProperty.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/SimplePersistentProperty.java?view=diff&rev=464049&r1=464048&r2=464049
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/SimplePersistentProperty.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/property/SimplePersistentProperty.java
Sat Oct 14 16:05:06 2006
@@ -56,7 +56,7 @@
Persistent persistent = (Persistent) object;
ObjectContext context = persistent.getObjectContext();
if (context != null) {
- context.prepareForAccess(persistent, getName());
+ context.prepareForAccess(persistent, getName(), false);
}
}
catch (ClassCastException e) {
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/resources/dotemplates/v1_2/client-superclass.vm
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/resources/dotemplates/v1_2/client-superclass.vm?view=diff&rev=464049&r1=464048&r2=464049
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/resources/dotemplates/v1_2/client-superclass.vm
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/resources/dotemplates/v1_2/client-superclass.vm
Sat Oct 14 16:05:06 2006
@@ -75,7 +75,7 @@
#foreach( $attr in ${objEntity.DeclaredAttributes} )
public $importUtils.formatJavaType(${attr.Type})
get${stringUtils.capitalized($attr.Name)}() {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "${attr.Name}");
+ objectContext.prepareForAccess(this, "${attr.Name}", false);
}
return ${attr.Name};
@@ -83,7 +83,7 @@
#if ("true" != "${objEntity.isReadOnly()}")
public void
set${stringUtils.capitalized($attr.Name)}($importUtils.formatJavaType(${attr.Type})
$stringUtils.formatVariableName(${attr.Name})) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "${attr.Name}");
+ objectContext.prepareForAccess(this, "${attr.Name}", false);
}
Object oldValue = this.${stringUtils.formatVariableName($attr.Name)};
@@ -105,7 +105,7 @@
#if( $rel.ToMany )
public List get${stringUtils.capitalized($rel.Name)}() {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "${rel.Name}");
+ objectContext.prepareForAccess(this, "${rel.Name}", true);
}
return ${rel.Name};
@@ -113,14 +113,14 @@
#if ( ! $rel.ReadOnly )
public void
addTo${stringUtils.capitalized($rel.Name)}($importUtils.formatJavaType(${rel.TargetEntity.ClientClassName})
object) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "${rel.Name}");
+ objectContext.prepareForAccess(this, "${rel.Name}", true);
}
this.${rel.Name}.add(object);
}
public void
removeFrom${stringUtils.capitalized($rel.Name)}($importUtils.formatJavaType(${rel.TargetEntity.ClientClassName})
object) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "${rel.Name}");
+ objectContext.prepareForAccess(this, "${rel.Name}", true);
}
this.${rel.Name}.remove(object);
@@ -129,7 +129,7 @@
#else
public $importUtils.formatJavaType(${rel.TargetEntity.ClientClassName})
get${stringUtils.capitalized($rel.Name)}() {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "${rel.Name}");
+ objectContext.prepareForAccess(this, "${rel.Name}", true);
}
return
($importUtils.formatJavaType(${rel.TargetEntity.ClientClassName}))
${rel.Name}.getValue();
@@ -137,7 +137,7 @@
#if ( !${objEntity.isReadOnly()} && !$rel.ReadOnly )
public void
set${stringUtils.capitalized($rel.Name)}(${importUtils.formatJavaType($rel.TargetEntity.ClientClassName)}
$stringUtils.formatVariableName(${rel.Name})) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "${rel.Name}");
+ objectContext.prepareForAccess(this, "${rel.Name}", true);
}
this.${stringUtils.formatVariableName($rel.Name)}.setValue(${stringUtils.formatVariableName($rel.Name)});
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/MockObjectContext.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/MockObjectContext.java?view=diff&rev=464049&r1=464048&r2=464049
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/MockObjectContext.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/MockObjectContext.java
Sat Oct 14 16:05:06 2006
@@ -102,7 +102,13 @@
public void registerNewObject(Object object) {
}
+ /**
+ * @deprecated since 3.0
+ */
public void prepareForAccess(Persistent persistent, String property) {
+ }
+
+ public void prepareForAccess(Persistent object, String property, boolean
lazyFaulting) {
}
public void propertyChanged(
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteCascade.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteCascade.java?view=diff&rev=464049&r1=464048&r2=464049
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteCascade.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteCascade.java
Sat Oct 14 16:05:06 2006
@@ -19,14 +19,14 @@
public String getName() {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "name");
+ objectContext.prepareForAccess(this, "name", false);
}
return name;
}
public void setName(String name) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "name");
+ objectContext.prepareForAccess(this, "name", false);
}
Object oldValue = this.name;
@@ -41,14 +41,14 @@
public ClientMtDeleteRule getCascade() {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "cascade");
+ objectContext.prepareForAccess(this, "cascade", true);
}
return (ClientMtDeleteRule) cascade.getValue();
}
public void setCascade(ClientMtDeleteRule cascade) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "cascade");
+ objectContext.prepareForAccess(this, "cascade", true);
}
this.cascade.setValue(cascade);
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteDeny.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteDeny.java?view=diff&rev=464049&r1=464048&r2=464049
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteDeny.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteDeny.java
Sat Oct 14 16:05:06 2006
@@ -19,14 +19,14 @@
public String getName() {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "name");
+ objectContext.prepareForAccess(this, "name", false);
}
return name;
}
public void setName(String name) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "name");
+ objectContext.prepareForAccess(this, "name", false);
}
Object oldValue = this.name;
@@ -41,14 +41,14 @@
public ClientMtDeleteRule getDeny() {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "deny");
+ objectContext.prepareForAccess(this, "deny", true);
}
return (ClientMtDeleteRule) deny.getValue();
}
public void setDeny(ClientMtDeleteRule deny) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "deny");
+ objectContext.prepareForAccess(this, "deny", true);
}
this.deny.setValue(deny);
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteNullify.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteNullify.java?view=diff&rev=464049&r1=464048&r2=464049
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteNullify.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteNullify.java
Sat Oct 14 16:05:06 2006
@@ -19,14 +19,14 @@
public String getName() {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "name");
+ objectContext.prepareForAccess(this, "name", false);
}
return name;
}
public void setName(String name) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "name");
+ objectContext.prepareForAccess(this, "name", false);
}
Object oldValue = this.name;
@@ -41,14 +41,14 @@
public ClientMtDeleteRule getNullify() {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "nullify");
+ objectContext.prepareForAccess(this, "nullify", true);
}
return (ClientMtDeleteRule) nullify.getValue();
}
public void setNullify(ClientMtDeleteRule nullify) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "nullify");
+ objectContext.prepareForAccess(this, "nullify", true);
}
this.nullify.setValue(nullify);
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteRule.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteRule.java?view=diff&rev=464049&r1=464048&r2=464049
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteRule.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteRule.java
Sat Oct 14 16:05:06 2006
@@ -26,14 +26,14 @@
public String getName() {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "name");
+ objectContext.prepareForAccess(this, "name", false);
}
return name;
}
public void setName(String name) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "name");
+ objectContext.prepareForAccess(this, "name", false);
}
Object oldValue = this.name;
@@ -48,21 +48,21 @@
public List getFromCascade() {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "fromCascade");
+ objectContext.prepareForAccess(this, "fromCascade", true);
}
return fromCascade;
}
public void addToFromCascade(ClientMtDeleteCascade object) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "fromCascade");
+ objectContext.prepareForAccess(this, "fromCascade", true);
}
this.fromCascade.add(object);
}
public void removeFromFromCascade(ClientMtDeleteCascade object) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "fromCascade");
+ objectContext.prepareForAccess(this, "fromCascade", true);
}
this.fromCascade.remove(object);
@@ -70,21 +70,21 @@
public List getFromDeny() {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "fromDeny");
+ objectContext.prepareForAccess(this, "fromDeny", true);
}
return fromDeny;
}
public void addToFromDeny(ClientMtDeleteDeny object) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "fromDeny");
+ objectContext.prepareForAccess(this, "fromDeny", true);
}
this.fromDeny.add(object);
}
public void removeFromFromDeny(ClientMtDeleteDeny object) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "fromDeny");
+ objectContext.prepareForAccess(this, "fromDeny", true);
}
this.fromDeny.remove(object);
@@ -92,21 +92,21 @@
public List getFromNullify() {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "fromNullify");
+ objectContext.prepareForAccess(this, "fromNullify", true);
}
return fromNullify;
}
public void addToFromNullify(ClientMtDeleteNullify object) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "fromNullify");
+ objectContext.prepareForAccess(this, "fromNullify", true);
}
this.fromNullify.add(object);
}
public void removeFromFromNullify(ClientMtDeleteNullify object) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "fromNullify");
+ objectContext.prepareForAccess(this, "fromNullify", true);
}
this.fromNullify.remove(object);
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable1.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable1.java?view=diff&rev=464049&r1=464048&r2=464049
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable1.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable1.java
Sat Oct 14 16:05:06 2006
@@ -22,14 +22,14 @@
public String getGlobalAttribute1() {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "globalAttribute1");
+ objectContext.prepareForAccess(this, "globalAttribute1", false);
}
return globalAttribute1;
}
public void setGlobalAttribute1(String globalAttribute1) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "globalAttribute1");
+ objectContext.prepareForAccess(this, "globalAttribute1", false);
}
Object oldValue = this.globalAttribute1;
@@ -44,14 +44,14 @@
public String getServerAttribute1() {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "serverAttribute1");
+ objectContext.prepareForAccess(this, "serverAttribute1", false);
}
return serverAttribute1;
}
public void setServerAttribute1(String serverAttribute1) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "serverAttribute1");
+ objectContext.prepareForAccess(this, "serverAttribute1", false);
}
Object oldValue = this.serverAttribute1;
@@ -66,21 +66,21 @@
public List getTable2Array() {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "table2Array");
+ objectContext.prepareForAccess(this, "table2Array", true);
}
return table2Array;
}
public void addToTable2Array(ClientMtTable2 object) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "table2Array");
+ objectContext.prepareForAccess(this, "table2Array", true);
}
this.table2Array.add(object);
}
public void removeFromTable2Array(ClientMtTable2 object) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "table2Array");
+ objectContext.prepareForAccess(this, "table2Array", true);
}
this.table2Array.remove(object);
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable2.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable2.java?view=diff&rev=464049&r1=464048&r2=464049
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable2.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable2.java
Sat Oct 14 16:05:06 2006
@@ -19,14 +19,14 @@
public String getGlobalAttribute() {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "globalAttribute");
+ objectContext.prepareForAccess(this, "globalAttribute", false);
}
return globalAttribute;
}
public void setGlobalAttribute(String globalAttribute) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "globalAttribute");
+ objectContext.prepareForAccess(this, "globalAttribute", false);
}
Object oldValue = this.globalAttribute;
@@ -41,14 +41,14 @@
public ClientMtTable1 getTable1() {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "table1");
+ objectContext.prepareForAccess(this, "table1", true);
}
return (ClientMtTable1) table1.getValue();
}
public void setTable1(ClientMtTable1 table1) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "table1");
+ objectContext.prepareForAccess(this, "table1", true);
}
this.table1.setValue(table1);
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable3.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable3.java?view=diff&rev=464049&r1=464048&r2=464049
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable3.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable3.java
Sat Oct 14 16:05:06 2006
@@ -19,14 +19,14 @@
public byte[] getBinaryColumn() {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "binaryColumn");
+ objectContext.prepareForAccess(this, "binaryColumn", false);
}
return binaryColumn;
}
public void setBinaryColumn(byte[] binaryColumn) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "binaryColumn");
+ objectContext.prepareForAccess(this, "binaryColumn", false);
}
Object oldValue = this.binaryColumn;
@@ -41,14 +41,14 @@
public String getCharColumn() {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "charColumn");
+ objectContext.prepareForAccess(this, "charColumn", false);
}
return charColumn;
}
public void setCharColumn(String charColumn) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "charColumn");
+ objectContext.prepareForAccess(this, "charColumn", false);
}
Object oldValue = this.charColumn;
@@ -63,14 +63,14 @@
public Integer getIntColumn() {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "intColumn");
+ objectContext.prepareForAccess(this, "intColumn", false);
}
return intColumn;
}
public void setIntColumn(Integer intColumn) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "intColumn");
+ objectContext.prepareForAccess(this, "intColumn", false);
}
Object oldValue = this.intColumn;
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable4.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable4.java?view=diff&rev=464049&r1=464048&r2=464049
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable4.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable4.java
Sat Oct 14 16:05:06 2006
@@ -18,21 +18,21 @@
public List getTable5s() {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "table5s");
+ objectContext.prepareForAccess(this, "table5s", true);
}
return table5s;
}
public void addToTable5s(ClientMtTable5 object) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "table5s");
+ objectContext.prepareForAccess(this, "table5s", true);
}
this.table5s.add(object);
}
public void removeFromTable5s(ClientMtTable5 object) {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "table5s");
+ objectContext.prepareForAccess(this, "table5s", true);
}
this.table5s.remove(object);
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable5.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable5.java?view=diff&rev=464049&r1=464048&r2=464049
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable5.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable5.java
Sat Oct 14 16:05:06 2006
@@ -18,10 +18,24 @@
public List getTable4s() {
if(objectContext != null) {
- objectContext.prepareForAccess(this, "table4s");
+ objectContext.prepareForAccess(this, "table4s", true);
}
return table4s;
+ }
+ public void addToTable4s(ClientMtTable4 object) {
+ if(objectContext != null) {
+ objectContext.prepareForAccess(this, "table4s", true);
+ }
+
+ this.table4s.add(object);
+ }
+ public void removeFromTable4s(ClientMtTable4 object) {
+ if(objectContext != null) {
+ objectContext.prepareForAccess(this, "table4s", true);
+ }
+
+ this.table4s.remove(object);
}
}
