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 dd1448248d ISIS-3198: simplify scalar model (1)
dd1448248d is described below
commit dd1448248d448aa870f90e5554fd0d96a4b794ca
Author: Andi Huber <[email protected]>
AuthorDate: Thu Sep 15 13:23:09 2022 +0200
ISIS-3198: simplify scalar model (1)
---
.../isis/viewer/commons/model/scalar/HasUiParameter.java | 12 ------------
.../isis/viewer/commons/model/scalar/UiParameter.java | 13 +------------
.../apache/isis/viewer/commons/model/scalar/UiScalar.java | 11 ++++++-----
.../apache/isis/viewer/wicket/model/models/ScalarModel.java | 10 +++++-----
.../viewer/wicket/model/models/ScalarPropertyModel.java | 5 -----
.../wicket/ui/components/widgets/select2/Select2.java | 4 ++--
6 files changed, 14 insertions(+), 41 deletions(-)
diff --git
a/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/scalar/HasUiParameter.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/scalar/HasUiParameter.java
index a3a2cd09c9..6e26b5cd74 100644
---
a/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/scalar/HasUiParameter.java
+++
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/scalar/HasUiParameter.java
@@ -23,7 +23,6 @@ import java.util.Optional;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
import
org.apache.isis.core.metamodel.interactions.managed.ActionInteractionHead;
import
org.apache.isis.core.metamodel.interactions.managed.ParameterNegotiationModel;
import org.apache.isis.core.metamodel.object.ManagedObject;
@@ -98,17 +97,6 @@ public interface HasUiParameter extends UiParameter {
return getMetaModel().getFriendlyName(this::getOwner);
}
- @Override
- default boolean isCollection() {
- return getMetaModel().getFeatureType() ==
FeatureType.ACTION_PARAMETER_COLLECTION
- || getMetaModel().getFeatureType() == FeatureType.COLLECTION;
- }
-
- @Override
- default boolean isScalar() {
- return !isCollection();
- }
-
@Override
default Optional<String> getDescribedAs() {
return getMetaModel().getDescription(this::getOwner);
diff --git
a/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/scalar/UiParameter.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/scalar/UiParameter.java
index 555c80d283..d3bdf82005 100644
---
a/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/scalar/UiParameter.java
+++
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/scalar/UiParameter.java
@@ -23,7 +23,6 @@ import java.util.Optional;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
import
org.apache.isis.core.metamodel.interactions.managed.ActionInteractionHead;
import
org.apache.isis.core.metamodel.interactions.managed.ParameterNegotiationModel;
import org.apache.isis.core.metamodel.object.ManagedObject;
@@ -83,17 +82,6 @@ public interface UiParameter extends UiScalar {
return getMetaModel().getFriendlyName(this::getOwner);
}
- @Override
- default boolean isCollection() {
- return getMetaModel().getFeatureType() ==
FeatureType.ACTION_PARAMETER_COLLECTION
- || getMetaModel().getFeatureType() == FeatureType.COLLECTION;
- }
-
- @Override
- default boolean isScalar() {
- return !isCollection();
- }
-
@Override
default Optional<String> getDescribedAs() {
return getMetaModel().getDescription(this::getOwner);
@@ -123,6 +111,7 @@ public interface UiParameter extends UiScalar {
return getMetaModel().getParameterIndex();
}
+ @Override
default String getCssClass() {
return getMetaModel().getCssClass("isis-");
}
diff --git
a/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/scalar/UiScalar.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/scalar/UiScalar.java
index 1b417b541c..7db28747ae 100644
---
a/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/scalar/UiScalar.java
+++
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/scalar/UiScalar.java
@@ -52,13 +52,14 @@ public interface UiScalar extends UiModel,
HasMetaModelContext {
return getMetaModel().getFriendlyName(this::getOwner);
}
- default boolean isCollection() {
- return getMetaModel().getFeatureType() ==
FeatureType.ACTION_PARAMETER_COLLECTION
- || getMetaModel().getFeatureType() == FeatureType.COLLECTION;
+ default boolean isSingular() {
+ return getMetaModel().getFeatureType() ==
FeatureType.ACTION_PARAMETER_SCALAR
+ || getMetaModel().getFeatureType() == FeatureType.PROPERTY;
}
- default boolean isScalar() {
- return !isCollection();
+ default boolean isPlural() {
+ return getMetaModel().getFeatureType() ==
FeatureType.ACTION_PARAMETER_COLLECTION
+ || getMetaModel().getFeatureType() == FeatureType.COLLECTION;
}
default Optional<String> getDescribedAs() {
diff --git
a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index 2615fa155a..3b19990877 100644
---
a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++
b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -62,7 +62,7 @@ import lombok.val;
*
* @implSpec
* <pre>
- * ScalarModel --chained-to--> EntityModel
+ * ScalarModel --chained-to--> UiObjectWkt
* ScalarModel --provides--> ManagedObject <--provides-- ManagedValue
* </pre>
*/
@@ -98,9 +98,9 @@ implements HasRenderingHints, UiScalar, LinksProvider,
FormExecutorContext {
* value (if any) of that action parameter.
*/
protected ScalarModel(
- final UiObjectWkt parentEntityModel) {
+ final UiObjectWkt parentUiObject) {
this(EitherParamOrProp.PARAMETER,
- parentEntityModel, ScalarRepresentation.EDITING,
RenderingHint.REGULAR);
+ parentUiObject, ScalarRepresentation.EDITING,
RenderingHint.REGULAR);
}
/**
@@ -109,11 +109,11 @@ implements HasRenderingHints, UiScalar, LinksProvider,
FormExecutorContext {
* property.
*/
protected ScalarModel(
- final UiObjectWkt parentEntityModel,
+ final UiObjectWkt parentUiObject,
final ScalarRepresentation viewOrEdit,
final UiObject.RenderingHint renderingHint) {
this(EitherParamOrProp.PROPERTY,
- parentEntityModel, viewOrEdit, renderingHint);
+ parentUiObject, viewOrEdit, renderingHint);
}
private ScalarModel(
diff --git
a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarPropertyModel.java
b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarPropertyModel.java
index 880c663016..9cacb238e2 100644
---
a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarPropertyModel.java
+++
b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarPropertyModel.java
@@ -95,11 +95,6 @@ implements HasUiProperty {
.orElse(null);
}
- @Override
- public boolean isCollection() {
- return false;
- }
-
@Override
public String toStringOf() {
val featureId = uiProperty.getMetaModel().getFeatureIdentifier();
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
index 5282cb552a..258089212d 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
@@ -62,7 +62,7 @@ implements
final String id,
final ScalarModel scalarModel,
final ChoiceProviderAbstract choiceProvider) {
- val select2 = new Select2(scalarModel.isScalar()
+ val select2 = new Select2(scalarModel.isSingular()
? Either.left(
Select2ChoiceExt.create(id,
ScalarModelWithSingleChoice.chain(scalarModel),
@@ -155,7 +155,7 @@ implements
}
public void syncIfNull(final ScalarModel model) {
- if(!model.isCollection()) {
+ if(!model.isPlural()) {
if(memento() == null) {
this.mementoModel().setObject(null);
model.setObject(null);
