You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/09/23 11:28:39 UTC
[causeway] branch master updated: CAUSEWAY-2297: wkt vwr: batch rename getScalarTypeSpec() -> getElementType()
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/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new 6ac787a7da CAUSEWAY-2297: wkt vwr: batch rename getScalarTypeSpec() -> getElementType()
6ac787a7da is described below
commit 6ac787a7da2cd8b8cc35deb2e74d9cbaaef8695c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Sep 23 13:28:34 2023 +0200
CAUSEWAY-2297: wkt vwr: batch rename getScalarTypeSpec() ->
getElementType()
---
.../java/org/apache/causeway/applib/annotation/Where.java | 15 +++++++--------
.../core/metamodel/spec/feature/ObjectAssociation.java | 10 +++++-----
.../viewer/commons/model/scalar/HasUiParameter.java | 4 ++--
.../causeway/viewer/commons/model/scalar/UiParameter.java | 4 ++--
.../causeway/viewer/commons/model/scalar/UiScalar.java | 4 ++--
.../causeway/viewer/wicket/model/models/BooleanModel.java | 4 ++--
.../viewer/wicket/model/models/ChainingObjectModel.java | 2 +-
.../viewer/wicket/model/models/ScalarConvertingModel.java | 2 +-
.../causeway/viewer/wicket/model/models/ScalarModel.java | 8 ++++----
.../wicket/model/models/ScalarModelWithMultiChoice.java | 2 +-
.../viewer/wicket/model/models/ScalarParameterModel.java | 2 +-
.../viewer/wicket/model/models/ScalarUnwrappingModel.java | 4 ++--
.../entity/icontitle/EntityIconAndTitlePanelFactory.java | 2 +-
.../components/scalars/ScalarPanelFormFieldAbstract.java | 2 +-
.../ui/components/scalars/ScalarPanelSelectAbstract.java | 2 +-
.../components/scalars/ScalarPanelTextFieldAbstract.java | 4 ++--
.../viewer/wicket/ui/components/scalars/_Util.java | 4 ++--
.../scalars/choices/ChoicesSelect2PanelFactory.java | 4 ++--
.../scalars/image/JavaAwtImagePanelFactory.java | 2 +-
.../wicket/ui/components/scalars/image/_WktImageUtil.java | 2 +-
.../scalars/value/fallback/ValueFallbackPanelFactory.java | 2 +-
.../ui/components/widgets/select2/Select2ChoiceExt.java | 2 +-
.../components/widgets/select2/Select2MultiChoiceExt.java | 2 +-
.../ui/components/widgets/select2/Select2OnSelect.java | 4 ++--
.../select2/providers/ChoiceProviderForReferences.java | 2 +-
25 files changed, 47 insertions(+), 48 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Where.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Where.java
index b95490f544..47a4daef78 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Where.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Where.java
@@ -20,7 +20,6 @@ package org.apache.causeway.applib.annotation;
import javax.xml.bind.annotation.XmlType;
-import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.util.Enums;
/**
@@ -59,7 +58,7 @@ public enum Where {
EVERYWHERE {
@Override
- public boolean includes(Where context) {
+ public boolean includes(final Where context) {
return true;
}
@@ -75,7 +74,7 @@ public enum Where {
ANYWHERE {
@Override
- public boolean includes(Where context) {
+ public boolean includes(final Where context) {
return true;
}
@@ -142,7 +141,7 @@ public enum Where {
ALL_TABLES {
@Override
- public boolean includes(Where context) {
+ public boolean includes(final Where context) {
return context == this || context == PARENTED_TABLES || context == STANDALONE_TABLES;
}
@@ -158,7 +157,7 @@ public enum Where {
ALL_EXCEPT_STANDALONE_TABLES {
@Override
- public boolean includes(Where context) {
+ public boolean includes(final Where context) {
return context != STANDALONE_TABLES;
}
@@ -175,7 +174,7 @@ public enum Where {
NOWHERE {
@Override
- public boolean includes(Where context) {
+ public boolean includes(final Where context) {
return false;
}
@@ -188,7 +187,7 @@ public enum Where {
NOT_SPECIFIED {
@Override
- public boolean includes(Where context) {
+ public boolean includes(final Where context) {
return false;
}
@@ -220,7 +219,7 @@ public enum Where {
* <p>
* For example, {@link #ALL_TABLES} includes {@link #STANDALONE_TABLES}; {@link #ANYWHERE} includes all others.
*/
- public boolean includes(Where context) {
+ public boolean includes(final Where context) {
return context == this
|| (this.isAlways()
&& context.isAlways());
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/ObjectAssociation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/ObjectAssociation.java
index 83743f03d1..0d63119fea 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/ObjectAssociation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/ObjectAssociation.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.core.metamodel.spec.feature;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.function.Predicate;
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.Domain;
import org.apache.causeway.applib.annotation.Where;
@@ -40,13 +41,12 @@ import org.apache.causeway.core.metamodel.layout.memberorderfacet.MemberOrderCom
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.util.Facets;
-import org.springframework.lang.Nullable;
-
-import lombok.val;
import static org.apache.causeway.applib.annotation.Where.PARENTED_TABLES;
import static org.apache.causeway.applib.annotation.Where.STANDALONE_TABLES;
+import lombok.val;
+
/**
* Provides reflective access to a field on a domain object.
*/
@@ -221,7 +221,7 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
* </ul>
* </p>
*/
- private static boolean equivalent(ObjectSpecification parentSpec, ObjectSpecification childSpec) {
+ private static boolean equivalent(final ObjectSpecification parentSpec, final ObjectSpecification childSpec) {
return parentSpec.isOfType(childSpec) || childSpec.isOfType(parentSpec);
}
}
diff --git a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/HasUiParameter.java b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/HasUiParameter.java
index 5f869f426b..01857c47fa 100644
--- a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/HasUiParameter.java
+++ b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/HasUiParameter.java
@@ -114,13 +114,13 @@ public interface HasUiParameter extends UiParameter {
}
@Override
- default ObjectSpecification getScalarTypeSpec() {
+ default ObjectSpecification getElementType() {
return getMetaModel().getElementType();
}
@Override
default boolean hasObjectAutoComplete() {
- return Facets.autoCompleteIsPresent(getScalarTypeSpec());
+ return Facets.autoCompleteIsPresent(getElementType());
}
@Override
diff --git a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/UiParameter.java b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/UiParameter.java
index 48a733302c..49ea461839 100644
--- a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/UiParameter.java
+++ b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/UiParameter.java
@@ -112,13 +112,13 @@ public interface UiParameter extends UiScalar {
}
@Override
- default ObjectSpecification getScalarTypeSpec() {
+ default ObjectSpecification getElementType() {
return getMetaModel().getElementType();
}
@Override
default boolean hasObjectAutoComplete() {
- return Facets.autoCompleteIsPresent(getScalarTypeSpec());
+ return Facets.autoCompleteIsPresent(getElementType());
}
default int getParameterIndex() {
diff --git a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/UiScalar.java b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/UiScalar.java
index 8cf58b86bf..a7f5693419 100644
--- a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/UiScalar.java
+++ b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/UiScalar.java
@@ -91,7 +91,7 @@ public interface UiScalar extends UiModel, HasMetaModelContext {
return !getMetaModel().isOptional();
}
- default ObjectSpecification getScalarTypeSpec() {
+ default ObjectSpecification getElementType() {
return getMetaModel().getElementType();
}
@@ -100,7 +100,7 @@ public interface UiScalar extends UiModel, HasMetaModelContext {
boolean hasChoices();
boolean hasAutoComplete();
default boolean hasObjectAutoComplete() {
- return Facets.autoCompleteIsPresent(getScalarTypeSpec());
+ return Facets.autoCompleteIsPresent(getElementType());
}
Can<ManagedObject> getChoices();
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/BooleanModel.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/BooleanModel.java
index 0cce2ff22e..dd4b952a99 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/BooleanModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/BooleanModel.java
@@ -41,7 +41,7 @@ extends ChainingModel<Boolean> {
protected BooleanModel(final ScalarModel scalarModel) {
super(scalarModel);
- val spec = scalarModel().getScalarTypeSpec();
+ val spec = scalarModel().getElementType();
this.isPrimitive = spec.getFullIdentifier().equals("boolean");
}
@@ -60,7 +60,7 @@ extends ChainingModel<Boolean> {
@Override
public void setObject(final Boolean value) {
val adaptedValue = ManagedObject.value(
- scalarModel().getScalarTypeSpec(),
+ scalarModel().getElementType(),
(value==null
&& isPrimitive)
? Boolean.FALSE
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ChainingObjectModel.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ChainingObjectModel.java
index 0e62307025..c22e596ad9 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ChainingObjectModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ChainingObjectModel.java
@@ -66,7 +66,7 @@ implements ObjectAdapterModel {
@Override
public ObjectSpecification getTypeOfSpecification() {
- return scalarModel().getScalarTypeSpec();
+ return scalarModel().getElementType();
}
@Override
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarConvertingModel.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarConvertingModel.java
index 04077dee0c..8d29f36e7c 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarConvertingModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarConvertingModel.java
@@ -47,7 +47,7 @@ extends ChainingModel<T> {
val value = toScalarValue(modelValue);
val objectAdapter = value != null
? scalarModel().getMetaModelContext().getObjectManager().adapt(value)
- : ManagedObject.empty(scalarModel.getScalarTypeSpec());
+ : ManagedObject.empty(scalarModel.getElementType());
scalarModel.setObject(objectAdapter);
}
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarModel.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarModel.java
index fabbbdc387..b2d662d747 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarModel.java
@@ -158,14 +158,14 @@ implements HasRenderingHints, UiScalar, FormExecutorContext {
}
public final boolean isScalarTypeAnyOf(final Can<Class<?>> requiredClasses) {
- final String fullName = getScalarTypeSpec().getFullIdentifier();
+ final String fullName = getElementType().getFullIdentifier();
return requiredClasses.stream()
.map(Class::getName)
.anyMatch(fullName::equals);
}
public final boolean isScalarTypeSubtypeOf(final Class<?> requiredClass) {
- final Class<?> scalarType = getScalarTypeSpec().getCorrespondingClass();
+ final Class<?> scalarType = getElementType().getCorrespondingClass();
return _NullSafe.streamNullable(requiredClass)
.anyMatch(x -> x.isAssignableFrom(scalarType));
}
@@ -274,11 +274,11 @@ implements HasRenderingHints, UiScalar, FormExecutorContext {
}
public final OptionalInt maxLength() {
- return Facets.maxLength(getScalarTypeSpec());
+ return Facets.maxLength(getElementType());
}
public final OptionalInt typicalLength() {
- return Facets.typicalLength(getScalarTypeSpec(), maxLength());
+ return Facets.typicalLength(getElementType(), maxLength());
}
// -- TO STRING
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarModelWithMultiChoice.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarModelWithMultiChoice.java
index 75a1183a30..fca5574293 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarModelWithMultiChoice.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarModelWithMultiChoice.java
@@ -84,7 +84,7 @@ implements
@Override
public void setObject(final ArrayList<ObjectMemento> unpackedMemento) {
log.debug("setObject() as unpackedMemento {}", unpackedMemento);
- val logicalType = scalarModel().getScalarTypeSpec().getLogicalType();
+ val logicalType = scalarModel().getElementType().getLogicalType();
val packedMemento = ObjectMemento.pack(unpackedMemento, logicalType);
pendingValue().getValue().setValue(getObjectManager().demementify(packedMemento));
}
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarParameterModel.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarParameterModel.java
index 48deb8407f..497b1027c1 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarParameterModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarParameterModel.java
@@ -69,7 +69,7 @@ implements HasUiParameter {
@Override
protected Can<ObjectAction> calcAssociatedActions() {
- return getScalarTypeSpec().streamActions(ActionScope.ANY, MixedIn.INCLUDED)
+ return getElementType().streamActions(ActionScope.ANY, MixedIn.INCLUDED)
.collect(Can.toCan());
}
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarUnwrappingModel.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarUnwrappingModel.java
index 4e9db373ed..13524be017 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarUnwrappingModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarUnwrappingModel.java
@@ -46,9 +46,9 @@ extends ChainingModel<T> {
final @NonNull ScalarModel scalarModel) {
super(scalarModel);
this.type = type;
- _Assert.assertTrue(scalarModel.getScalarTypeSpec().isAssignableFrom(type), ()->
+ _Assert.assertTrue(scalarModel.getElementType().isAssignableFrom(type), ()->
String.format("cannot possibly unwrap model of type %s into target type %s",
- scalarModel.getScalarTypeSpec().getCorrespondingClass(),
+ scalarModel.getElementType().getCorrespondingClass(),
type));
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelFactory.java
index 0718978db9..fae8a8caf6 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelFactory.java
@@ -72,7 +72,7 @@ public class EntityIconAndTitlePanelFactory extends ComponentFactoryAbstract {
if (model instanceof ObjectAdapterModel) {
spec = ((ObjectAdapterModel) model).getTypeOfSpecification();
} else if (model instanceof ScalarModel) {
- spec = ((ScalarModel) model).getScalarTypeSpec();
+ spec = ((ScalarModel) model).getElementType();
} else {
return ApplicationAdvice.DOES_NOT_APPLY;
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.java
index 897aa84b91..bedac124b9 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.java
@@ -154,7 +154,7 @@ extends ScalarPanelAbstract2 {
xrayDetails.put("scalarModel.identifier", ""+scalarModel().getIdentifier());
xrayDetails.put("scalarModel.choices (count)", ""+scalarModel().getChoices().size());
xrayDetails.put("scalarModel.metaModel.featureIdentifier", ""+scalarModel().getMetaModel().getFeatureIdentifier());
- xrayDetails.put("scalarModel.scalarTypeSpec", ""+scalarModel().getScalarTypeSpec().toString());
+ xrayDetails.put("scalarModel.scalarTypeSpec", ""+scalarModel().getElementType().toString());
xrayDetails.put("scalarModel.proposedValue", ""+scalarModel().proposedValue().getValue().getValue());
// getSpecialization()
// .fold(
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java
index ea75c2782c..ddc511587f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java
@@ -74,7 +74,7 @@ extends ScalarPanelFormFieldAbstract<ManagedObject> {
settings.setMinimumInputLength(scalarModel.getAutoCompleteMinLength());
break;
case OBJECT_AUTO_COMPLETE:
- Facets.autoCompleteMinLength(scalarModel.getScalarTypeSpec())
+ Facets.autoCompleteMinLength(scalarModel.getElementType())
.ifPresent(settings::setMinimumInputLength);
break;
case NO_CHOICES:
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
index 1230acda33..0f0e207fc8 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
@@ -120,11 +120,11 @@ extends ScalarPanelFormFieldAbstract<T> {
// -- HELPER
private void guardAgainstIncompatibleScalarType() {
- _Assert.assertTrue(scalarModel().getScalarTypeSpec().isAssignableFrom(type), ()->
+ _Assert.assertTrue(scalarModel().getElementType().isAssignableFrom(type), ()->
String.format("[%s:%s] cannot possibly unwrap model of type %s into target type %s",
this.getClass().getSimpleName(),
scalarModel().getIdentifier(),
- scalarModel().getScalarTypeSpec().getCorrespondingClass(),
+ scalarModel().getElementType().getCorrespondingClass(),
type));
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/_Util.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/_Util.java
index 7bd122ebe6..85e70cc359 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/_Util.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/_Util.java
@@ -173,7 +173,7 @@ class _Util {
.map(v->scalarModel
.getObjectManager().demementify((ObjectMemento)v))
.collect(Can.toCan());
- return Optional.of(ManagedObject.packed(scalarModel.getScalarTypeSpec(), unpackedValues));
+ return Optional.of(ManagedObject.packed(scalarModel.getElementType(), unpackedValues));
}
if(valueObject instanceof ObjectMemento) {
@@ -190,7 +190,7 @@ class _Util {
}
private Optional<ObjectAction> lookupCompositeValueMixinForFeature(final ScalarModel scalarModel) {
- val spec = scalarModel.getScalarTypeSpec();
+ val spec = scalarModel.getElementType();
if(!spec.isValue()) {
return Optional.empty();
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ChoicesSelect2PanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ChoicesSelect2PanelFactory.java
index 55f82d71e6..7ac90d9750 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ChoicesSelect2PanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ChoicesSelect2PanelFactory.java
@@ -36,7 +36,7 @@ extends ComponentFactoryScalarAbstract {
VALUE_CHOICES,
OBJECT_CHOICES;
static ComponentSort valueOf(final ScalarModel scalarModel) {
- if(scalarModel.getScalarTypeSpec().isValue()
+ if(scalarModel.getElementType().isValue()
&& scalarModel.getChoiceProviderSort().isChoicesAny()) {
return scalarModel.isViewingMode()
? TITLE_BADGE
@@ -55,7 +55,7 @@ extends ComponentFactoryScalarAbstract {
val componentSort = ComponentSort.valueOf(scalarModel);
switch(componentSort) {
case TITLE_BADGE:
- val valueType = scalarModel.getScalarTypeSpec().getCorrespondingClass();
+ val valueType = scalarModel.getElementType().getCorrespondingClass();
return new ScalarTitleBadgePanel<>(id, scalarModel, valueType);
case VALUE_CHOICES:
return new ValueChoicesSelect2Panel(id, scalarModel);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanelFactory.java
index 9b06148665..7e2b328e99 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanelFactory.java
@@ -43,7 +43,7 @@ extends ComponentFactoryScalarAbstract {
@Override
protected ApplicationAdvice appliesTo(final ScalarModel scalarModel) {
- val typeSpec = scalarModel.getScalarTypeSpec();
+ val typeSpec = scalarModel.getElementType();
return appliesIf(typeSpec != null
&& Facets.valueHasSemantics(typeSpec, ImageValueSemantics.class));
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/_WktImageUtil.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/_WktImageUtil.java
index 7ba6440a6e..ae7cc1ed97 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/_WktImageUtil.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/_WktImageUtil.java
@@ -83,7 +83,7 @@ class _WktImageUtil {
return Optional.empty();
}
- val typeSpec = model.getScalarTypeSpec();
+ val typeSpec = model.getElementType();
return Facets.valueStreamSemantics(typeSpec, ImageValueSemantics.class)
.map(imageValueSemantics->imageValueSemantics.getImage(adapter).orElse(null))
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/value/fallback/ValueFallbackPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/value/fallback/ValueFallbackPanelFactory.java
index d007a782a6..e7eb7f89e6 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/value/fallback/ValueFallbackPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/value/fallback/ValueFallbackPanelFactory.java
@@ -45,7 +45,7 @@ extends ComponentFactoryScalarAbstract {
@Override
protected ApplicationAdvice appliesTo(final ScalarModel scalarModel) {
- if(!scalarModel.getScalarTypeSpec().isValue()) {
+ if(!scalarModel.getElementType().isValue()) {
return ApplicationAdvice.DOES_NOT_APPLY;
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java
index 1353ce2498..d94290aed8 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java
@@ -52,7 +52,7 @@ implements HasLogicalType {
final ChoiceProviderAbstract choiceProvider) {
super(id, model, choiceProvider);
- logicalType = scalarModel.getScalarTypeSpec().getLogicalType();
+ logicalType = scalarModel.getElementType().getLogicalType();
getSettings().setCloseOnSelect(true);
getSettings().setWidth("auto");
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
index ac9e7b467d..9998d4c9f9 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
@@ -58,7 +58,7 @@ implements HasLogicalType {
final ChoiceProviderAbstract choiceProvider) {
super(id, model, choiceProvider);
- logicalType = scalarModel.getScalarTypeSpec().getLogicalType();
+ logicalType = scalarModel.getElementType().getLogicalType();
getSettings().setCloseOnSelect(true);
getSettings().setWidth("auto");
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2OnSelect.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2OnSelect.java
index 3b2e66f77c..453f1bb4f5 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2OnSelect.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2OnSelect.java
@@ -214,8 +214,8 @@ class Select2OnSelect extends AbstractAjaxBehavior {
private @NonNull ObjectSpecification elementSpec() {
val updateReceiver = scalarModel.getSpecialization().fold(
- param->param.getScalarTypeSpec(),
- prop->prop.getScalarTypeSpec());
+ param->param.getElementType(),
+ prop->prop.getElementType());
return updateReceiver;
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderForReferences.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderForReferences.java
index 6791b709d8..bc7dc723dc 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderForReferences.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderForReferences.java
@@ -68,7 +68,7 @@ extends ChoiceProviderAbstractForScalarModel {
private Can<ObjectMemento> queryWithAutoCompleteUsingObjectSpecification(final String term) {
val autoCompleteAdapters = Facets
- .autoCompleteExecute(scalarModel().getScalarTypeSpec(), term);
+ .autoCompleteExecute(scalarModel().getElementType(), term);
return autoCompleteAdapters
.map(ManagedObject::getMementoElseFail);
}