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 2017/01/19 11:09:26 UTC
[20/24] isis git commit: ISIS-785: removes implementation of
ActionArgumentCollectionModel, gonna use ScalarModel after all.
ISIS-785: removes implementation of ActionArgumentCollectionModel, gonna use ScalarModel after all.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a6a79e48
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a6a79e48
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a6a79e48
Branch: refs/heads/maint-1.13.3
Commit: a6a79e48f8efad7e08a1480ad49bb1e3ceb674d1
Parents: bc9320e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jan 18 14:48:56 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jan 18 14:48:56 2017 +0000
----------------------------------------------------------------------
.../models/ActionArgumentCollectionModel.java | 82 --------------------
.../viewer/wicket/model/models/ActionModel.java | 6 +-
2 files changed, 1 insertion(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a6a79e48/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionArgumentCollectionModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionArgumentCollectionModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionArgumentCollectionModel.java
deleted file mode 100644
index 646631e..0000000
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionArgumentCollectionModel.java
+++ /dev/null
@@ -1,82 +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.viewer.wicket.model.models;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.viewer.wicket.model.mementos.ActionParameterMemento;
-import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
-
-class ActionArgumentCollectionModel extends ModelAbstract<ObjectAdapter> implements
- ActionArgumentModel {
-
- private final ActionParameterMemento parameterMemento;
- private ObjectAdapterMemento adapterMemento;
-
- public ActionArgumentCollectionModel(
- final ObjectAdapterMemento adapterMemento,
- final ActionParameterMemento parameterMemento) {
- this.adapterMemento = adapterMemento;
- this.parameterMemento = parameterMemento;
- }
-
- @Override
- public ActionParameterMemento getParameterMemento() {
- return parameterMemento;
- }
-
- @Override
- protected ObjectAdapter load() {
- final ObjectActionParameter actionParameter = parameterMemento.getActionParameter(getSpecificationLoader());
- final ObjectSpecification specification = parameterMemento.getSpecification(getSpecificationLoader());
-
- return adapterMemento
- .getObjectAdapter(AdapterManager.ConcurrencyChecking.CHECK, getPersistenceSession(), getSpecificationLoader());
- }
-
- @Override
- public void setObject(final ObjectAdapter adapter) {
- super.setObject(adapter);
- adapterMemento = ObjectAdapterMemento.createOrNull(adapter);
- }
-
- @Override
- public void reset() {
- final ObjectActionParameter actionParameter = parameterMemento.getActionParameter(
- getSpecificationLoader());
- final ObjectAdapter parentAdapter =
- adapterMemento.getObjectAdapter(AdapterManager.ConcurrencyChecking.NO_CHECK,
- getPersistenceSession(), getSpecificationLoader());
- final ObjectAdapter defaultAdapter = actionParameter.getDefault(parentAdapter);
- setObject(defaultAdapter);
- }
-
- /**
- * transient because only temporary hint.
- */
- private transient ObjectAdapter[] actionArgsHint;
-
- @Override
- public void setActionArgsHint(ObjectAdapter[] actionArgsHint) {
- this.actionArgsHint = actionArgsHint;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/a6a79e48/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
index 40c9188..0219729 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
@@ -59,7 +59,6 @@ import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.services.ServicesInjector;
@@ -434,10 +433,7 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> implements Has
final int i = apm.getNumber();
ActionArgumentModel actionArgumentModel = arguments.get(i);
if (actionArgumentModel == null) {
- final ObjectActionParameter actionParameter = apm.getActionParameter(getSpecificationLoader());
- actionArgumentModel = actionParameter.getFeatureType() == FeatureType.ACTION_PARAMETER_SCALAR
- ? new ScalarModel(targetAdapterMemento, apm)
- : new ActionArgumentCollectionModel(targetAdapterMemento, apm);
+ actionArgumentModel = new ScalarModel(targetAdapterMemento, apm);
final int number = actionArgumentModel.getParameterMemento().getNumber();
arguments.put(number, actionArgumentModel);
}