You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/09/11 00:08:58 UTC
[34/50] isis git commit: ISIS-1194: removing IsisLifecycleListener2's
dependency on IsisContext (by passing in PersistenceSession through
constructor).
ISIS-1194: removing IsisLifecycleListener2's dependency on IsisContext (by passing in PersistenceSession through constructor).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1864641b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1864641b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1864641b
Branch: refs/heads/master
Commit: 1864641b147a3d9a3f5c277f4bdb5f94255fa41c
Parents: 17cd7bc
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 10 16:30:20 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 10 16:30:20 2015 +0100
----------------------------------------------------------------------
.../runtime/system/persistence/IsisLifecycleListener2.java | 9 ++++++---
.../core/runtime/system/persistence/PersistenceSession.java | 2 +-
.../jdo/datanucleus/persistence/IsisLifecycleListener.java | 7 +++++--
3 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/1864641b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/IsisLifecycleListener2.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/IsisLifecycleListener2.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/IsisLifecycleListener2.java
index 5477e90..ffb4bcb 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/IsisLifecycleListener2.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/IsisLifecycleListener2.java
@@ -36,7 +36,6 @@ import org.datanucleus.enhancement.Persistable;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.FrameworkSynchronizer.CalledFrom;
import org.apache.isis.objectstore.jdo.datanucleus.persistence.IsisLifecycleListener;
@@ -45,9 +44,13 @@ public class IsisLifecycleListener2
DetachLifecycleListener, DirtyLifecycleListener, LoadLifecycleListener, StoreLifecycleListener,
SuspendableListener {
+ private final PersistenceSession persistenceSession;
private final FrameworkSynchronizer synchronizer;
- public IsisLifecycleListener2(FrameworkSynchronizer synchronizer) {
+ public IsisLifecycleListener2(
+ final PersistenceSession persistenceSession,
+ final FrameworkSynchronizer synchronizer) {
+ this.persistenceSession = persistenceSession;
this.synchronizer = synchronizer;
}
@@ -279,6 +282,6 @@ public class IsisLifecycleListener2
// /////////////////////////////////////////////////////////
protected AdapterManager getAdapterManager() {
- return IsisContext.getPersistenceSession().getAdapterManager();
+ return persistenceSession.getAdapterManager();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/1864641b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
index 9e7baf1..f5aded2 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
@@ -224,7 +224,7 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
persistenceManager = applicationComponents.getPersistenceManagerFactory().getPersistenceManager();
- final IsisLifecycleListener isisLifecycleListener = new IsisLifecycleListener(frameworkSynchronizer);
+ final IsisLifecycleListener isisLifecycleListener = new IsisLifecycleListener(this, frameworkSynchronizer);
persistenceManager.addInstanceLifecycleListener(isisLifecycleListener, (Class[])null);
persistenceQueryProcessorByClass.put(
http://git-wip-us.apache.org/repos/asf/isis/blob/1864641b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/IsisLifecycleListener.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/IsisLifecycleListener.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/IsisLifecycleListener.java
index fb442fd..f138725 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/IsisLifecycleListener.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/IsisLifecycleListener.java
@@ -23,6 +23,7 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.core.runtime.system.persistence.FrameworkSynchronizer;
import org.apache.isis.core.runtime.system.persistence.IsisLifecycleListener2;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
/**
* @deprecated - retained only for backward compatibility of logging (in logging.properties file).
@@ -32,7 +33,9 @@ public class IsisLifecycleListener extends IsisLifecycleListener2 {
public static final Logger LOG = LoggerFactory.getLogger(IsisLifecycleListener.class);
- public IsisLifecycleListener(final FrameworkSynchronizer synchronizer) {
- super(synchronizer);
+ public IsisLifecycleListener(
+ final PersistenceSession persistenceSession,
+ final FrameworkSynchronizer synchronizer) {
+ super(persistenceSession, synchronizer);
}
}