This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new a72266f96c ISIS-3198: purge ObjectUiModelWkt
a72266f96c is described below
commit a72266f96c6118eaf906a8cdda6d167a75ccc848
Author: Andi Huber <[email protected]>
AuthorDate: Thu Sep 15 11:06:57 2022 +0200
ISIS-3198: purge ObjectUiModelWkt
---
.../managed/ParameterNegotiationModel.java | 12 +++++-----
.../wicket/model/models/ScalarParameterModel.java | 1 +
.../model/models/interaction/ObjectUiModelWkt.java | 27 ----------------------
.../interaction/act/ParameterUiModelWkt.java | 6 ++---
.../models/interaction/coll/DataTableModelWkt.java | 6 ++---
.../interaction/prop/PropertyUiModelWkt.java | 6 ++---
6 files changed, 16 insertions(+), 42 deletions(-)
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ParameterNegotiationModel.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ParameterNegotiationModel.java
index 4402cb2ccd..d3cbed33b8 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ParameterNegotiationModel.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ParameterNegotiationModel.java
@@ -172,16 +172,16 @@ public class ParameterNegotiationModel {
@NonNull public Consent getVisibilityConsent(final int paramNr) {
val pendingArgValues = getParamValues();
val paramMeta = getParamMetamodel(paramNr);
- val head = this.getHead();
- return paramMeta
- .isVisible(head, pendingArgValues,
InteractionInitiatedBy.USER);
+ val isVisible = paramMeta
+ .isVisible(getHead(), pendingArgValues,
InteractionInitiatedBy.USER);
+ return isVisible;
}
@NonNull public Consent getUsabilityConsent(final int paramNr) {
val pendingArgValues = getParamValues();
val paramMeta = getParamMetamodel(paramNr);
- val head = this.getHead();
- return paramMeta
- .isUsable(head, pendingArgValues, InteractionInitiatedBy.USER);
+ val isUsable = paramMeta
+ .isUsable(getHead(), pendingArgValues,
InteractionInitiatedBy.USER);
+ return isUsable;
}
// -- MULTI SELECT
diff --git
a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarParameterModel.java
b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarParameterModel.java
index 6b0a2e3c8d..479630423a 100644
---
a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarParameterModel.java
+++
b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarParameterModel.java
@@ -31,6 +31,7 @@ import
org.apache.isis.viewer.commons.model.scalar.UiParameter;
import
org.apache.isis.viewer.wicket.model.models.interaction.act.ParameterUiModelWkt;
import lombok.NonNull;
+import lombok.val;
public class ScalarParameterModel
extends ScalarModel
diff --git
a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/ObjectUiModelWkt.java
b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/ObjectUiModelWkt.java
deleted file mode 100644
index ce23c48cc1..0000000000
---
a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/ObjectUiModelWkt.java
+++ /dev/null
@@ -1,27 +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.interaction;
-
-import org.apache.isis.viewer.commons.model.object.UiObject;
-
-@FunctionalInterface
-public interface ObjectUiModelWkt
-extends UiObject {
-
-}
diff --git
a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/act/ParameterUiModelWkt.java
b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/act/ParameterUiModelWkt.java
index a6b92de27b..05491bae61 100644
---
a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/act/ParameterUiModelWkt.java
+++
b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/act/ParameterUiModelWkt.java
@@ -26,9 +26,9 @@ import
org.apache.isis.core.metamodel.interactions.managed.ParameterNegotiationM
import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.viewer.commons.model.object.HasUiParentObject;
+import org.apache.isis.viewer.commons.model.object.UiObject;
import org.apache.isis.viewer.commons.model.scalar.UiParameter;
import org.apache.isis.viewer.wicket.model.models.HasCommonContext;
-import org.apache.isis.viewer.wicket.model.models.interaction.ObjectUiModelWkt;
import lombok.NonNull;
@@ -41,7 +41,7 @@ public final class ParameterUiModelWkt
extends ChainingModel<ActionInteraction>
implements
HasCommonContext,
- HasUiParentObject<ObjectUiModelWkt>,
+ HasUiParentObject<UiObject>,
UiParameter {
private static final long serialVersionUID = 1L;
@@ -67,7 +67,7 @@ implements
}
@Override
- public ObjectUiModelWkt getParentUiModel() {
+ public UiObject getParentUiModel() {
return ()->getOwner();
}
diff --git
a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/coll/DataTableModelWkt.java
b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/coll/DataTableModelWkt.java
index 2056450d1d..fb7cdf2851 100644
---
a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/coll/DataTableModelWkt.java
+++
b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/coll/DataTableModelWkt.java
@@ -28,9 +28,9 @@ import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.viewer.commons.model.object.HasUiParentObject;
+import org.apache.isis.viewer.commons.model.object.UiObject;
import
org.apache.isis.viewer.wicket.model.models.interaction.BookmarkedObjectWkt;
import
org.apache.isis.viewer.wicket.model.models.interaction.HasBookmarkedOwnerAbstract;
-import org.apache.isis.viewer.wicket.model.models.interaction.ObjectUiModelWkt;
import lombok.Getter;
import lombok.NonNull;
@@ -49,7 +49,7 @@ import lombok.val;
public class DataTableModelWkt
extends HasBookmarkedOwnerAbstract<DataTableModel>
implements
- HasUiParentObject<ObjectUiModelWkt> {
+ HasUiParentObject<UiObject> {
// -- FACTORIES
@@ -114,7 +114,7 @@ implements
// --
@Override
- public ObjectUiModelWkt getParentUiModel() {
+ public UiObject getParentUiModel() {
return ()->super.getBookmarkedOwner();
}
diff --git
a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/prop/PropertyUiModelWkt.java
b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/prop/PropertyUiModelWkt.java
index 921d7598e0..df7c65a84e 100644
---
a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/prop/PropertyUiModelWkt.java
+++
b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/prop/PropertyUiModelWkt.java
@@ -26,9 +26,9 @@ import
org.apache.isis.core.metamodel.interactions.managed.PropertyNegotiationMo
import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.viewer.commons.model.object.HasUiParentObject;
+import org.apache.isis.viewer.commons.model.object.UiObject;
import org.apache.isis.viewer.commons.model.scalar.UiProperty;
import org.apache.isis.viewer.wicket.model.models.HasCommonContext;
-import org.apache.isis.viewer.wicket.model.models.interaction.ObjectUiModelWkt;
/**
* <i>Property Interaction</i> model bound to its owner {@link
PropertyInteractionWkt}.
@@ -43,7 +43,7 @@ public final class PropertyUiModelWkt
extends ChainingModel<PropertyInteraction>
implements
HasCommonContext,
- HasUiParentObject<ObjectUiModelWkt>,
+ HasUiParentObject<UiObject>,
UiProperty {
private static final long serialVersionUID = 1L;
@@ -66,7 +66,7 @@ implements
}
@Override
- public final ObjectUiModelWkt getParentUiModel() {
+ public final UiObject getParentUiModel() {
return ()->getOwner();
}
