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 2007/07/29 22:49:07 UTC
svn commit: r560812 - in
/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/intercept:
DataChannelCallbackInterceptor.java SyncCallbackProcessor.java
Author: aadamchik
Date: Sun Jul 29 13:49:06 2007
New Revision: 560812
URL: http://svn.apache.org/viewvc?view=rev&rev=560812
Log:
CAY-797 Lifecycle callbacks *CallbackInterceptor concept introduces problems for testing equality of contexts
(merging PrePersist and PreRemove callbacks to the DataContext class)
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/intercept/DataChannelCallbackInterceptor.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/intercept/SyncCallbackProcessor.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/intercept/DataChannelCallbackInterceptor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/intercept/DataChannelCallbackInterceptor.java?view=diff&rev=560812&r1=560811&r2=560812
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/intercept/DataChannelCallbackInterceptor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/intercept/DataChannelCallbackInterceptor.java Sun Jul 29 13:49:06 2007
@@ -47,7 +47,6 @@
public class DataChannelCallbackInterceptor extends DataChannelDecorator {
protected LifecycleCallbackRegistry callbackRegistry;
- protected boolean contextCallbacksEnabled;
public void setChannel(DataChannel channel) {
this.channel = channel;
@@ -66,8 +65,7 @@
return false;
}
- return contextCallbacksEnabled ? callbackRegistry.isEmpty(LifecycleListener.PRE_REMOVE)
- && callbackRegistry.isEmpty(LifecycleListener.PRE_PERSIST) : true;
+ return true;
}
public QueryResponse onQuery(ObjectContext originatingContext, Query query) {
@@ -111,19 +109,6 @@
SyncCallbackProcessor createSyncProcessor(GraphManager graphManager, GraphDiff changes) {
return new SyncCallbackProcessor(this, graphManager, changes);
- }
-
- /**
- * Returns whether "PrePersist" and "PreRemove" callbacks should be executed during
- * sync. By default this is false, as they are executed by the parent ObjectContext.
- * This can be changed by calling {@link #setContextCallbacksEnabled(boolean)}.
- */
- public boolean isContextCallbacksEnabled() {
- return contextCallbacksEnabled;
- }
-
- public void setContextCallbacksEnabled(boolean contextCallbacksEnabled) {
- this.contextCallbacksEnabled = contextCallbacksEnabled;
}
public LifecycleCallbackRegistry getCallbackRegistry() {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/intercept/SyncCallbackProcessor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/intercept/SyncCallbackProcessor.java?view=diff&rev=560812&r1=560811&r2=560812
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/intercept/SyncCallbackProcessor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/intercept/SyncCallbackProcessor.java Sun Jul 29 13:49:06 2007
@@ -51,11 +51,6 @@
case DataChannel.FLUSH_CASCADE_SYNC:
case DataChannel.FLUSH_NOCASCADE_SYNC:
apply(LifecycleListener.PRE_UPDATE, updated);
-
- if (interceptor.isContextCallbacksEnabled()) {
- apply(LifecycleListener.PRE_PERSIST, persisted);
- apply(LifecycleListener.PRE_REMOVE, removed);
- }
}
}