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/10/14 02:28:52 UTC
[07/12] isis git commit: ISIS-1194: removed the reset of the
ObjectActionParameterParseable stuff, plus unused subclasses.
ISIS-1194: removed the reset of the ObjectActionParameterParseable stuff, plus unused subclasses.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c62f937d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c62f937d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c62f937d
Branch: refs/heads/ISIS-1213
Commit: c62f937d0653c6c0ea25ae571350caf56414395b
Parents: e618fdc
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Oct 13 06:44:12 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Oct 13 06:44:12 2015 +0100
----------------------------------------------------------------------
.../specimpl/ObjectActionContributee.java | 14 +---
.../specloader/specimpl/ObjectActionImpl.java | 7 +-
.../specimpl/ObjectActionMixedIn.java | 8 +-
.../ObjectActionParameterParseable.java | 33 --------
...jectActionParameterParseableContributee.java | 86 --------------------
.../ObjectActionParameterParseableMixedIn.java | 59 --------------
.../OneToOneActionParameterContributee.java | 3 -
.../OneToOneActionParameterMixedIn.java | 10 +--
8 files changed, 12 insertions(+), 208 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c62f937d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
index 7db1bdf..8fcf8d8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
@@ -136,17 +136,9 @@ public class ObjectActionContributee extends ObjectActionImpl implements Contrib
final ObjectActionParameterAbstract serviceParameter =
(ObjectActionParameterAbstract) serviceParameters.get(serviceParamNum);
final ObjectActionParameterContributee contributedParam;
- if(serviceParameter instanceof ObjectActionParameterParseable) {
- contributedParam = new ObjectActionParameterParseableContributee(
- getServiceAdapter(), serviceAction, serviceParameter, serviceParamNum,
- contributeeParamNum, this);
- } else if(serviceParameter instanceof OneToOneActionParameterImpl) {
- contributedParam = new OneToOneActionParameterContributee(
- getServiceAdapter(), serviceAction, serviceParameter, serviceParamNum,
- contributeeParamNum, this);
- } else {
- throw new RuntimeException("Unknown implementation of ObjectActionParameter; " + serviceParameter.getClass().getName());
- }
+ contributedParam = new OneToOneActionParameterContributee(
+ getServiceAdapter(), serviceAction, serviceParameter, serviceParamNum,
+ contributeeParamNum, this);
contributeeParameters.add(contributedParam);
contributeeParamNum++;
http://git-wip-us.apache.org/repos/asf/isis/blob/c62f937d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
index 02e63a9..cdc0d56 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
@@ -43,13 +43,13 @@ import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.FacetedMethodParameter;
import org.apache.isis.core.metamodel.facets.TypedHolder;
-import org.apache.isis.core.metamodel.facets.param.choices.ActionChoicesFacet;
+import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacet;
import org.apache.isis.core.metamodel.facets.actions.debug.DebugFacet;
import org.apache.isis.core.metamodel.facets.actions.defaults.ActionDefaultsFacet;
import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacet;
-import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacet;
import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
+import org.apache.isis.core.metamodel.facets.param.choices.ActionChoicesFacet;
import org.apache.isis.core.metamodel.facets.param.choices.ActionParameterChoicesFacet;
import org.apache.isis.core.metamodel.facets.param.defaults.ActionParameterDefaultsFacet;
import org.apache.isis.core.metamodel.interactions.ActionInvocationContext;
@@ -61,7 +61,6 @@ import org.apache.isis.core.metamodel.interactions.ValidityContext;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
import org.apache.isis.core.metamodel.spec.ActionType;
import org.apache.isis.core.metamodel.spec.DomainModelException;
-import org.apache.isis.core.metamodel.spec.Instance;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
@@ -196,7 +195,7 @@ public class ObjectActionImpl extends ObjectMemberAbstract implements ObjectActi
final ObjectActionParameter parameter;
if (specification.isParseable()) {
- parameter = new ObjectActionParameterParseable(i, this, paramPeer);
+ parameter = new OneToOneActionParameterImpl(i, this, paramPeer);
} else if (specification.isNotCollection()) {
parameter = new OneToOneActionParameterImpl(i, this, paramPeer);
} else if (specification.isParentedOrFreeCollection()) {
http://git-wip-us.apache.org/repos/asf/isis/blob/c62f937d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
index 8e113a5..9574080 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
@@ -121,13 +121,7 @@ public class ObjectActionMixedIn extends ObjectActionImpl implements MixedInMemb
final ObjectActionParameterAbstract mixinParameter =
(ObjectActionParameterAbstract) mixinActionParameters.get(paramNum);
final ObjectActionParameterMixedIn mixedInParameter;
- if(mixinParameter instanceof ObjectActionParameterParseable) {
- mixedInParameter = new ObjectActionParameterParseableMixedIn(mixinParameter, this);
- } else if(mixinParameter instanceof OneToOneActionParameterImpl) {
- mixedInParameter = new OneToOneActionParameterMixedIn(mixinParameter, this);
- } else {
- throw new RuntimeException("Unknown implementation of ObjectActionParameter; " + mixinParameter.getClass().getName());
- }
+ mixedInParameter = new OneToOneActionParameterMixedIn(mixinParameter, this);
mixedInParameters.add(mixedInParameter);
}
this.parameters = mixedInParameters;
http://git-wip-us.apache.org/repos/asf/isis/blob/c62f937d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java
deleted file mode 100644
index 8d44071..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java
+++ /dev/null
@@ -1,33 +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.facets.TypedHolder;
-import org.apache.isis.core.metamodel.spec.feature.OneToOneActionParameter;
-
-public class ObjectActionParameterParseable extends ObjectActionParameterAbstract implements OneToOneActionParameter {
-
- public ObjectActionParameterParseable(final int index, final ObjectActionImpl action, final TypedHolder peer) {
- super(index, action, peer);
- }
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/c62f937d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseableContributee.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseableContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseableContributee.java
deleted file mode 100644
index d70de92..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseableContributee.java
+++ /dev/null
@@ -1,86 +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 java.util.List;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.lang.ListExtensions;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-
-/**
- * REVIEW: this is a bit hacky having 'Contributed' subtypes of both {@link ObjectActionParameterParseable} and also
- * {@link OneToOneActionParameterImpl}. However, the {@link ObjectActionParameterParseable parseable} version
- * only seems to be used by the DnD viewer; Scimpi, Wicket and RO do not. So, we could hopefully simplify the
- * hierarchy at some point.
- */
-public class ObjectActionParameterParseableContributee extends ObjectActionParameterParseable implements ObjectActionParameterContributee {
-
- private final ObjectAdapter serviceAdapter;
- @SuppressWarnings("unused")
- private final ObjectActionImpl serviceAction;
- private final ObjectActionParameter serviceActionParameter;
- @SuppressWarnings("unused")
- private final int serviceParamNumber;
- @SuppressWarnings("unused")
- private final int contributeeParamNumber;
- private final ObjectActionContributee contributeeAction;
-
- public ObjectActionParameterParseableContributee(
- final ObjectAdapter serviceAdapter,
- final ObjectActionImpl serviceAction,
- final ObjectActionParameterAbstract serviceActionParameter,
- final int serviceParamNumber,
- final int contributeeParamNumber,
- final ObjectActionContributee contributeeAction) {
- super(contributeeParamNumber, contributeeAction, serviceActionParameter.getPeer());
- this.serviceAdapter = serviceAdapter;
- this.serviceAction = serviceAction;
- this.serviceActionParameter = serviceActionParameter;
- this.serviceParamNumber = serviceParamNumber;
- this.contributeeParamNumber = contributeeParamNumber;
- this.contributeeAction = contributeeAction;
- }
-
- @Override
- public ObjectAdapter[] getAutoComplete(
- final ObjectAdapter adapter,
- final String searchArg,
- final InteractionInitiatedBy interactionInitiatedBy) {
- return serviceActionParameter.getAutoComplete(serviceAdapter, searchArg,
- interactionInitiatedBy);
- }
-
- protected ObjectAdapter targetForDefaultOrChoices(ObjectAdapter adapter, final List<ObjectAdapter> argumentsIfAvailable) {
- return serviceAdapter;
- }
-
- protected List<ObjectAdapter> argsForDefaultOrChoices(final ObjectAdapter contributee, final List<ObjectAdapter> argumentsIfAvailable) {
-
- final List<ObjectAdapter> suppliedArgs = ListExtensions.mutableCopy(argumentsIfAvailable);
-
- final int contributeeParam = contributeeAction.getContributeeParam();
- ListExtensions.insert(suppliedArgs, contributeeParam, contributee);
-
- return suppliedArgs;
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/c62f937d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseableMixedIn.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseableMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseableMixedIn.java
deleted file mode 100644
index 333487a..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseableMixedIn.java
+++ /dev/null
@@ -1,59 +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 java.util.List;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-
-/**
- * REVIEW: this is a bit hacky having 'Contributed' subtypes of both {@link ObjectActionParameterParseable} and also
- * {@link OneToOneActionParameterImpl}. However, the {@link ObjectActionParameterParseable parseable} version
- * only seems to be used by the DnD viewer; Scimpi, Wicket and RO do not. So, we could hopefully simplify the
- * hierarchy at some point.
- */
-public class ObjectActionParameterParseableMixedIn extends ObjectActionParameterParseable implements ObjectActionParameterMixedIn {
-
- private final ObjectActionParameterAbstract mixinParameter;
- private final ObjectActionMixedIn objectActionMixedIn;
-
- public ObjectActionParameterParseableMixedIn(
- final ObjectActionParameterAbstract mixinParameter,
- final ObjectActionMixedIn objectActionMixedIn) {
- super(mixinParameter.getNumber(), objectActionMixedIn, mixinParameter.getPeer());
- this.mixinParameter = mixinParameter;
- this.objectActionMixedIn = objectActionMixedIn;
- }
-
- @Override
- public ObjectAdapter[] getAutoComplete(
- final ObjectAdapter mixedInAdapter,
- final String searchArg,
- final InteractionInitiatedBy interactionInitiatedBy) {
- return mixinParameter.getAutoComplete(objectActionMixedIn.mixinAdapterFor(mixedInAdapter), searchArg, interactionInitiatedBy);
- }
-
- protected ObjectAdapter targetForDefaultOrChoices(
- final ObjectAdapter mixedInAdapter,
- final List<ObjectAdapter> argumentsIfAvailable) {
- return objectActionMixedIn.mixinAdapterFor(mixedInAdapter);
- }
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/c62f937d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterContributee.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterContributee.java
index 77ed327..c9df053 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterContributee.java
@@ -26,12 +26,9 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
public class OneToOneActionParameterContributee extends OneToOneActionParameterImpl implements ObjectActionParameterContributee{
private final ObjectAdapter serviceAdapter;
- @SuppressWarnings("unused")
private final ObjectActionImpl serviceAction;
private final ObjectActionParameter serviceActionParameter;
- @SuppressWarnings("unused")
private final int serviceParamNumber;
- @SuppressWarnings("unused")
private final int contributeeParamNumber;
private final ObjectActionContributee contributeeAction;
http://git-wip-us.apache.org/repos/asf/isis/blob/c62f937d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterMixedIn.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterMixedIn.java
index f8e12a0..d832cf8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterMixedIn.java
@@ -24,14 +24,14 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
public class OneToOneActionParameterMixedIn extends OneToOneActionParameterImpl implements ObjectActionParameterMixedIn {
- private final ObjectActionParameter mixinActionParameter;
+ private final ObjectActionParameter mixinParameter;
private final ObjectActionMixedIn mixedInAction;
public OneToOneActionParameterMixedIn(
- final ObjectActionParameterAbstract mixinActionParameter,
+ final ObjectActionParameterAbstract mixinParameter,
final ObjectActionMixedIn mixedInAction) {
- super(mixinActionParameter.getNumber(), mixedInAction, mixinActionParameter.getPeer());
- this.mixinActionParameter = mixinActionParameter;
+ super(mixinParameter.getNumber(), mixedInAction, mixinParameter.getPeer());
+ this.mixinParameter = mixinParameter;
this.mixedInAction = mixedInAction;
}
@@ -40,7 +40,7 @@ public class OneToOneActionParameterMixedIn extends OneToOneActionParameterImpl
final ObjectAdapter mixedInAdapter,
final String searchArg,
final InteractionInitiatedBy interactionInitiatedBy) {
- return mixinActionParameter.getAutoComplete(
+ return mixinParameter.getAutoComplete(
mixinAdapterFor(mixedInAdapter), searchArg,
interactionInitiatedBy);
}