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 995c4af029 ISIS-3198: remove tupleIndex
995c4af029 is described below
commit 995c4af029abf7aa7d5077741289eedcf5aa6e8e
Author: Andi Huber <[email protected]>
AuthorDate: Thu Sep 15 11:43:26 2022 +0200
ISIS-3198: remove tupleIndex
---
.../model/models/interaction/act/ActionInteractionWkt.java | 5 ++---
.../wicket/model/models/interaction/act/ParameterUiModelWkt.java | 5 +----
.../model/models/interaction/prop/PropertyInteractionWkt.java | 3 +--
.../wicket/model/models/interaction/prop/PropertyUiModelWkt.java | 9 +--------
4 files changed, 5 insertions(+), 17 deletions(-)
diff --git
a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/act/ActionInteractionWkt.java
b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/act/ActionInteractionWkt.java
index 7c757249d5..772751bc15 100644
---
a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/act/ActionInteractionWkt.java
+++
b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/act/ActionInteractionWkt.java
@@ -35,10 +35,10 @@ import
org.apache.isis.core.metamodel.interactions.managed.ActionInteraction;
import
org.apache.isis.core.metamodel.interactions.managed.ParameterNegotiationModel;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
-import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.model.models.InlinePromptContext;
import org.apache.isis.viewer.wicket.model.models.ScalarParameterModel;
import org.apache.isis.viewer.wicket.model.models.ScalarPropertyModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import
org.apache.isis.viewer.wicket.model.models.interaction.BookmarkedObjectWkt;
import
org.apache.isis.viewer.wicket.model.models.interaction.HasBookmarkedOwnerAbstract;
@@ -158,9 +158,8 @@ extends HasBookmarkedOwnerAbstract<ActionInteraction> {
public Stream<ParameterUiModelWkt> streamParameterUiModels() {
if(childModels==null) {
final int paramCount =
actionInteraction().getMetamodel().get().getParameterCount();
- final int tupleIndex = 0;
this.childModels = IntStream.range(0, paramCount)
- .mapToObj(paramIndex -> new ParameterUiModelWkt(this,
paramIndex, tupleIndex))
+ .mapToObj(paramIndex -> new ParameterUiModelWkt(this,
paramIndex))
.collect(Can.toCan());
}
return childModels.stream();
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 05491bae61..44274a1bbc 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
@@ -47,15 +47,12 @@ implements
private static final long serialVersionUID = 1L;
final int paramIndex;
- final int tupleIndex; //future extension
ParameterUiModelWkt(
final ActionInteractionWkt model,
- final int paramIndex,
- final int tupleIndex) {
+ final int paramIndex) {
super(model);
this.paramIndex = paramIndex;
- this.tupleIndex = tupleIndex;
}
public final ActionInteraction actionInteraction() {
diff --git
a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/prop/PropertyInteractionWkt.java
b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/prop/PropertyInteractionWkt.java
index 8a29a0fcd8..7103bee94e 100644
---
a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/prop/PropertyInteractionWkt.java
+++
b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/prop/PropertyInteractionWkt.java
@@ -104,8 +104,7 @@ extends HasBookmarkedOwnerAbstract<PropertyInteraction> {
public Stream<PropertyUiModelWkt> streamPropertyUiModels() {
if(childModels==null) {
- final int tupleIndex = 0;
- childModels = Can.ofSingleton(new PropertyUiModelWkt(this,
tupleIndex));
+ childModels = Can.ofSingleton(new PropertyUiModelWkt(this));
}
return childModels.stream();
}
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 df7c65a84e..d1d0776fd4 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
@@ -33,9 +33,6 @@ import
org.apache.isis.viewer.wicket.model.models.HasCommonContext;
/**
* <i>Property Interaction</i> model bound to its owner {@link
PropertyInteractionWkt}.
*
- * @apiNote a single <i>Property Interaction</i> could in theory provide a
compound of multiple
- * {@link UiProperty}(s).
- *
* @see PropertyInteractionWkt
* @see ChainingModel
*/
@@ -48,13 +45,9 @@ implements
private static final long serialVersionUID = 1L;
- final int tupleIndex; //future extension
-
PropertyUiModelWkt(
- final PropertyInteractionWkt model,
- final int tupleIndex) {
+ final PropertyInteractionWkt model) {
super(model);
- this.tupleIndex = tupleIndex;
}
public final PropertyInteraction propertyInteraction() {
