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:47 UTC
[23/50] isis git commit: ISIS-1194: removing CreateObjectContext
ISIS-1194: removing CreateObjectContext
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4a5a2eea
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4a5a2eea
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4a5a2eea
Branch: refs/heads/master
Commit: 4a5a2eeadf997361789d9998f338da41008b010c
Parents: 3a5eb39
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 10 15:46:56 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 10 15:46:56 2015 +0100
----------------------------------------------------------------------
.../specloader/ObjectReflectorDefault.java | 3 +-
.../specimpl/CreateObjectContext.java | 38 --------------------
.../dflt/ObjectSpecificationDefault.java | 16 +--------
3 files changed, 2 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4a5a2eea/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
index bc56df1..e34454f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
@@ -463,12 +463,11 @@ public final class ObjectReflectorDefault implements SpecificationLoaderSpi, App
return new ObjectSpecificationOnStandaloneList(specContext, objectMemberDependencies);
} else {
final SpecificationLoaderSpi specificationLoader = this;
- final CreateObjectContext createObjectContext = new CreateObjectContext(adapterManager, servicesInjector);
final FacetedMethodsBuilderContext facetedMethodsBuilderContext =
new FacetedMethodsBuilderContext(
specificationLoader, facetProcessor, layoutMetadataReaders);
return new ObjectSpecificationDefault(cls, facetedMethodsBuilderContext, specContext,
- objectMemberDependencies, createObjectContext);
+ objectMemberDependencies);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/4a5a2eea/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/CreateObjectContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/CreateObjectContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/CreateObjectContext.java
deleted file mode 100644
index dca42b1..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/CreateObjectContext.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.isis.core.metamodel.specloader.specimpl;
-
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-
-public class CreateObjectContext {
- private final AdapterManager adapterManager;
- private final ServicesInjector dependencyInjector;
-
- public CreateObjectContext(final AdapterManager adapterManager, final ServicesInjector dependencyInjector) {
- this.adapterManager = adapterManager;
- this.dependencyInjector = dependencyInjector;
- }
-
- public AdapterManager getAdapterManager() {
- return adapterManager;
- }
-
- public ServicesInjector getDependencyInjector() {
- return dependencyInjector;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/4a5a2eea/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index 3e87171..2e0512f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -53,7 +53,6 @@ import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.facets.object.wizard.WizardFacet;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ActionType;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.ObjectSpecificationDependencies;
@@ -64,7 +63,6 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
-import org.apache.isis.core.metamodel.specloader.specimpl.CreateObjectContext;
import org.apache.isis.core.metamodel.specloader.specimpl.FacetedMethodsBuilder;
import org.apache.isis.core.metamodel.specloader.specimpl.FacetedMethodsBuilderContext;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionImpl;
@@ -94,8 +92,6 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
*/
private Map<Method, ObjectMember> membersByMethod = null;
- private final CreateObjectContext createObjectContext;
-
private final FacetedMethodsBuilder facetedMethodsBuilder;
@@ -107,12 +103,10 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
final Class<?> correspondingClass,
final FacetedMethodsBuilderContext facetedMethodsBuilderContext,
final ObjectSpecificationDependencies specContext,
- final ObjectMemberDependencies objectMemberDependencies,
- final CreateObjectContext createObjectContext) {
+ final ObjectMemberDependencies objectMemberDependencies) {
super(correspondingClass, determineShortName(correspondingClass), specContext, objectMemberDependencies);
this.facetedMethodsBuilder = new FacetedMethodsBuilder(this, facetedMethodsBuilderContext);
- this.createObjectContext = createObjectContext;
}
@Override
@@ -482,13 +476,5 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
return str.toString();
}
- // //////////////////////////////////////////////////////////////////
- // Dependencies (from constructor)
- // //////////////////////////////////////////////////////////////////
-
- protected ServicesInjector getDependencyInjector() {
- return createObjectContext.getDependencyInjector();
- }
-
}