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/15 08:02:50 UTC
[26/28] isis git commit: ISIS-1194: removing getAdapterManager() from
RuntimeContext interface.
ISIS-1194: removing getAdapterManager() from RuntimeContext interface.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/df8bd811
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/df8bd811
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/df8bd811
Branch: refs/heads/ISIS-1194
Commit: df8bd81148fd0aff08c151958a824d4ac22966b9
Parents: eeacac6
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Sep 14 23:19:47 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Sep 14 23:19:47 2015 +0100
----------------------------------------------------------------------
.../isis/core/metamodel/runtimecontext/RuntimeContext.java | 3 ---
.../core/metamodel/runtimecontext/RuntimeContextAbstract.java | 1 -
.../runtimecontext/noruntime/RuntimeContextNoRuntime.java | 5 -----
.../runtime/persistence/internal/RuntimeContextFromSession.java | 5 -----
4 files changed, 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/df8bd811/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java
index 766659a..38939fd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java
@@ -23,7 +23,6 @@ import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.components.Injectable;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.transactions.TransactionStateProvider;
@@ -50,8 +49,6 @@ public interface RuntimeContext extends Injectable, ApplicationScopedComponent {
public MessageBrokerService getMessageBrokerService();
- public AdapterManager getAdapterManager();
-
public SpecificationLoader getSpecificationLoader();
public ServicesInjector getServicesInjector();
http://git-wip-us.apache.org/repos/asf/isis/blob/df8bd811/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java
index e2b307b..80dcb37 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java
@@ -90,7 +90,6 @@ public abstract class RuntimeContextAbstract implements RuntimeContext, Specific
}
protected void injectSubcomponentsInto(final Object candidate) {
- getAdapterManager().injectInto(candidate);
getAuthenticationSessionProvider().injectInto(candidate);
getDeploymentCategoryProvider().injectInto(candidate);
getTransactionStateProvider().injectInto(candidate);
http://git-wip-us.apache.org/repos/asf/isis/blob/df8bd811/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
index c977e1b..70591c0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
@@ -229,11 +229,6 @@ public class RuntimeContextNoRuntime extends RuntimeContextAbstract {
}
@Override
- public AdapterManager getAdapterManager() {
- return getPersistenceSessionService();
- }
-
- @Override
public PersistenceSessionService getPersistenceSessionService() {
return persistenceSessionService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/df8bd811/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
index 3c1db40..7c10f11 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
@@ -235,11 +235,6 @@ public class RuntimeContextFromSession extends RuntimeContextAbstract {
}
@Override
- public AdapterManager getAdapterManager() {
- return getPersistenceSessionService();
- }
-
- @Override
public LocalizationProviderAbstract getLocalizationProvider() {
return localizationProvider;
}