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:59 UTC
[35/50] isis git commit: ISIS-1194: law of demeter for
IsisLifecycleListener2 and AdapterManager ... use PersistenceSession instead.
ISIS-1194: law of demeter for IsisLifecycleListener2 and AdapterManager ... use PersistenceSession instead.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ada327f9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ada327f9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ada327f9
Branch: refs/heads/master
Commit: ada327f96ec4154f8cf0f831ff005dc020d8fb9f
Parents: 1864641
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 10 16:31:28 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 10 16:31:28 2015 +0100
----------------------------------------------------------------------
.../system/persistence/IsisLifecycleListener2.java | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/ada327f9/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 ffb4bcb..ae96f87 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
@@ -35,7 +35,6 @@ import com.google.common.collect.Maps;
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.persistence.FrameworkSynchronizer.CalledFrom;
import org.apache.isis.objectstore.jdo.datanucleus.persistence.IsisLifecycleListener;
@@ -271,17 +270,9 @@ public class IsisLifecycleListener2
private String logString(Phase phase, LoggingLocation location, InstanceLifecycleEvent event) {
final Persistable pojo = Utils.persistenceCapableFor(event);
- final AdapterManager adapterManager = getAdapterManager();
- final ObjectAdapter adapter = adapterManager.getAdapterFor(pojo);
+ final ObjectAdapter adapter = persistenceSession.getAdapterFor(pojo);
return phase + " " + location.prefix + " " + LifecycleEventType.lookup(event.getEventType()) + ": oid=" + (adapter !=null? adapter.getOid(): "(null)") + " ,pojo " + pojo;
}
- // /////////////////////////////////////////////////////////
- // Dependencies (from context)
- // /////////////////////////////////////////////////////////
-
- protected AdapterManager getAdapterManager() {
- return persistenceSession.getAdapterManager();
- }
}