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:43 UTC

[19/50] isis git commit: ISIS-1194: PersistenceSession: pass in Variant param to the createInstance overloads (unused as of yet)

ISIS-1194: PersistenceSession: pass in Variant param to the createInstance overloads (unused as of yet)


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/71dd91da
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/71dd91da
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/71dd91da

Branch: refs/heads/master
Commit: 71dd91da6955f21c0a9e8a1cfd6cfd3bba1680ac
Parents: c7424d5
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 10 15:05:26 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 10 15:05:26 2015 +0100

----------------------------------------------------------------------
 .../runtime/system/persistence/PersistenceSession.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/71dd91da/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 ca3de0d..419e6ae 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
@@ -387,11 +387,11 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
      * {@link org.apache.isis.applib.DomainObjectContainer}.
      */
     public ObjectAdapter createTransientInstance(final ObjectSpecification objectSpec) {
-        return createInstance(objectSpec);
+        return createInstance(objectSpec, Variant.TRANSIENT);
     }
 
     public ObjectAdapter createViewModelInstance(final ObjectSpecification objectSpec, final String memento) {
-        return createInstance(objectSpec, memento);
+        return createInstance(objectSpec, Variant.VIEW_MODEL, memento);
     }
 
     private enum Variant {
@@ -399,7 +399,9 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
         VIEW_MODEL
     }
 
-    private ObjectAdapter createInstance(final ObjectSpecification objectSpec) {
+    private ObjectAdapter createInstance(
+            final ObjectSpecification objectSpec,
+            final Variant variant) {
         if (LOG.isDebugEnabled()) {
             LOG.debug("creating transient instance of " + objectSpec);
         }
@@ -409,7 +411,10 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
     }
 
 
-    private ObjectAdapter createInstance(final ObjectSpecification objectSpec, final String memento) {
+    private ObjectAdapter createInstance(
+            final ObjectSpecification objectSpec,
+            final Variant variant,
+            final String memento) {
         if (LOG.isDebugEnabled()) {
             LOG.debug("creating view model instance of " + objectSpec);
         }