This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v3
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/v3 by this push:
new 4195e0459ba CAUSEWAY-2297: misnomer 'scalar' when allows plural (part
5)
4195e0459ba is described below
commit 4195e0459ba9e0178b838ea3af36a7989617f98b
Author: Andi Huber <[email protected]>
AuthorDate: Sun Nov 24 10:32:45 2024 +0100
CAUSEWAY-2297: misnomer 'scalar' when allows plural (part 5)
- renaming dispatchers and change listeners
---
...thChoice.java => AttributeModelWithChoice.java} | 2 +-
...ice.java => AttributeModelWithMultiChoice.java} | 10 ++++----
...ce.java => AttributeModelWithSingleChoice.java} | 10 ++++----
...er.java => AttributeModelChangeDispatcher.java} | 4 +--
...ener.java => AttributeModelChangeListener.java} | 2 +-
...va => AttributeModelDefaultChangeBehavior.java} | 8 +++---
.../ui/components/scalars/ScalarPanelAbstract.java | 30 +++++++++++-----------
.../scalars/ScalarPanelSelectAbstract.java | 4 +--
.../ScalarPanelTextFieldWithTemporalPicker.java | 4 +--
.../scalars/composite/CompositeValuePanel.java | 2 +-
.../ui/components/widgets/select2/Select2.java | 12 ++++-----
.../widgets/select2/Select2OnSelect.java | 4 +--
...> ChoiceProviderAbstractForAttributeModel.java} | 4 +--
.../select2/providers/ChoiceProviderDefault.java | 2 +-
.../wicket/ui/panels/PromptFormAbstract.java | 4 +--
15 files changed, 51 insertions(+), 51 deletions(-)
diff --git
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarModelWithChoice.java
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/AttributeModelWithChoice.java
similarity index 96%
rename from
viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarModelWithChoice.java
rename to
viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/AttributeModelWithChoice.java
index 05d5863ba1c..0d62f665e5f 100644
---
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarModelWithChoice.java
+++
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/AttributeModelWithChoice.java
@@ -22,7 +22,7 @@ import org.apache.wicket.model.IModel;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedValue;
-public interface ScalarModelWithChoice<T>
+public interface AttributeModelWithChoice<T>
extends
IModel<T>,
HasCommonContext {
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/AttributeModelWithMultiChoice.java
similarity index 89%
rename from
viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarModelWithMultiChoice.java
rename to
viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/AttributeModelWithMultiChoice.java
index adc1cd0a849..efaab9e971d 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/AttributeModelWithMultiChoice.java
@@ -37,22 +37,22 @@ import lombok.extern.log4j.Log4j2;
* with the parent {@link UiAttributeWkt}, allowing also for pending values.
*/
@Log4j2
-public class ScalarModelWithMultiChoice
+public class AttributeModelWithMultiChoice
extends ChainingModel<ArrayList<ObjectMemento>>
implements
- ScalarModelWithChoice<ArrayList<ObjectMemento>> {
+ AttributeModelWithChoice<ArrayList<ObjectMemento>> {
private static final long serialVersionUID = 1L;
// -- FACTORY
- public static ScalarModelWithMultiChoice chain(final @NonNull
UiAttributeWkt attributeModel) {
- return new ScalarModelWithMultiChoice(attributeModel);
+ public static AttributeModelWithMultiChoice chain(final @NonNull
UiAttributeWkt attributeModel) {
+ return new AttributeModelWithMultiChoice(attributeModel);
}
// -- CONSTRUCTION
- private ScalarModelWithMultiChoice(final UiAttributeWkt attributeModel) {
+ private AttributeModelWithMultiChoice(final UiAttributeWkt attributeModel)
{
super(attributeModel); // chaining to attributeModel
}
diff --git
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarModelWithSingleChoice.java
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/AttributeModelWithSingleChoice.java
similarity index 85%
rename from
viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarModelWithSingleChoice.java
rename to
viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/AttributeModelWithSingleChoice.java
index 1baac8128d1..0076f65d64b 100644
---
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarModelWithSingleChoice.java
+++
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/AttributeModelWithSingleChoice.java
@@ -31,22 +31,22 @@ import lombok.NonNull;
* with the parent {@link UiAttributeWkt}.
*/
//@Log4j2
-public class ScalarModelWithSingleChoice
+public class AttributeModelWithSingleChoice
extends ChainingModel<ObjectMemento>
implements
- ScalarModelWithChoice<ObjectMemento> {
+ AttributeModelWithChoice<ObjectMemento> {
private static final long serialVersionUID = 1L;
// -- FACTORY
- public static ScalarModelWithSingleChoice chain(final @NonNull
UiAttributeWkt attributeModel) {
- return new ScalarModelWithSingleChoice(attributeModel);
+ public static AttributeModelWithSingleChoice chain(final @NonNull
UiAttributeWkt attributeModel) {
+ return new AttributeModelWithSingleChoice(attributeModel);
}
// -- CONSTRUCTION
- private ScalarModelWithSingleChoice(final UiAttributeWkt attributeModel) {
+ private AttributeModelWithSingleChoice(final UiAttributeWkt
attributeModel) {
super(attributeModel); // chaining to attributeModel
}
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarModelChangeDispatcher.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeModelChangeDispatcher.java
similarity index 91%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarModelChangeDispatcher.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeModelChangeDispatcher.java
index f1ccfd04bc3..f0d6641e8f7 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarModelChangeDispatcher.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeModelChangeDispatcher.java
@@ -22,9 +22,9 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import lombok.NonNull;
-public interface ScalarModelChangeDispatcher {
+public interface AttributeModelChangeDispatcher {
- @NonNull Iterable<ScalarModelChangeListener> getChangeListeners();
+ @NonNull Iterable<AttributeModelChangeListener> getChangeListeners();
@NonNull ScalarPanelAbstract getScalarPanel();
default void notifyUpdate(final AjaxRequestTarget target) {
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarModelChangeListener.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeModelChangeListener.java
similarity index 95%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarModelChangeListener.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeModelChangeListener.java
index 1c5722686d0..0ba40592db5 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarModelChangeListener.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeModelChangeListener.java
@@ -20,7 +20,7 @@ package
org.apache.causeway.viewer.wicket.ui.components.scalars;
import org.apache.wicket.ajax.AjaxRequestTarget;
-public interface ScalarModelChangeListener {
+public interface AttributeModelChangeListener {
void onUpdate(AjaxRequestTarget target, ScalarPanelAbstract scalarPanel);
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarModelDefaultChangeBehavior.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeModelDefaultChangeBehavior.java
similarity index 81%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarModelDefaultChangeBehavior.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeModelDefaultChangeBehavior.java
index 9b81f6d8865..5bb4445ee06 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarModelDefaultChangeBehavior.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeModelDefaultChangeBehavior.java
@@ -21,25 +21,25 @@ package
org.apache.causeway.viewer.wicket.ui.components.scalars;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-class ScalarModelDefaultChangeBehavior extends
AjaxFormComponentUpdatingBehavior {
+class AttributeModelDefaultChangeBehavior extends
AjaxFormComponentUpdatingBehavior {
private static final long serialVersionUID = 1L;
private final ScalarPanelAbstract scalarPanel;
- ScalarModelDefaultChangeBehavior(final ScalarPanelAbstract scalarPanel) {
+ AttributeModelDefaultChangeBehavior(final ScalarPanelAbstract scalarPanel)
{
super("change");
this.scalarPanel = scalarPanel;
}
@Override
protected void onUpdate(final AjaxRequestTarget target) {
- scalarPanel.getScalarModelChangeDispatcher().notifyUpdate(target);
+ scalarPanel.getAttributeModelChangeDispatcher().notifyUpdate(target);
}
@Override
protected void onError(final AjaxRequestTarget target, final
RuntimeException e) {
super.onError(target, e);
- scalarPanel.getScalarModelChangeDispatcher().notifyError(target);
+ scalarPanel.getAttributeModelChangeDispatcher().notifyError(target);
}
}
\ No newline at end of file
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index 1cfe1f86b4e..335e5c258f7 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -76,7 +76,7 @@ import
de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel
public abstract class ScalarPanelAbstract
extends PanelAbstract<ManagedObject, UiAttributeWkt>
-implements ScalarModelChangeListener {
+implements AttributeModelChangeListener {
private static final long serialVersionUID = 1L;
@@ -319,7 +319,7 @@ implements ScalarModelChangeListener {
addCssFromMetaModel();
addChangeListener(this);
- installScalarModelChangeBehavior();
+ installModelChangeBehavior();
}
protected abstract void setupInlinePrompt();
@@ -402,7 +402,7 @@ implements ScalarModelChangeListener {
final String disabledReason = attributeModel.disabledReason()
.flatMap(InteractionVeto::getReasonAsString)
.orElseThrow(()->_Exceptions
- .unrecoverable("framework bug: ScalarModel
indicates it has a disabled-reason, yet its empty"));
+ .unrecoverable("framework bug: AttributeModel
indicates it has a disabled-reason, yet its empty"));
onInitializeReadonly(disabledReason);
}
@@ -471,15 +471,15 @@ implements ScalarModelChangeListener {
// //////////////////////////////////////
- protected void installScalarModelChangeBehavior() {
- addOrReplaceBehavoir(ScalarModelDefaultChangeBehavior.class, ()->new
ScalarModelDefaultChangeBehavior(this));
+ protected void installModelChangeBehavior() {
+ addOrReplaceBehavoir(AttributeModelDefaultChangeBehavior.class,
()->new AttributeModelDefaultChangeBehavior(this));
}
@RequiredArgsConstructor
- static class ScalarModelChangeDispatcherImpl
- implements ScalarModelChangeDispatcher, Serializable {
+ static class AttributeModelChangeDispatcherImpl
+ implements AttributeModelChangeDispatcher, Serializable {
private static final long serialVersionUID = 1L;
- private final List<ScalarModelChangeListener> changeListeners =
_Lists.newArrayList();
+ private final List<AttributeModelChangeListener> changeListeners =
_Lists.newArrayList();
@Getter(onMethod_={@Override})
private final ScalarPanelAbstract scalarPanel;
@@ -490,25 +490,25 @@ implements ScalarModelChangeListener {
+ "originating from User either having changed a Property
value during inline editing "
+ "or having changed a Parameter value within an open
ActionPrompt.");
_Xray.onParamOrPropertyEdited(scalarPanel);
- ScalarModelChangeDispatcher.super.notifyUpdate(target);
+ AttributeModelChangeDispatcher.super.notifyUpdate(target);
}
@Override
- public @NonNull Iterable<ScalarModelChangeListener>
getChangeListeners() {
+ public @NonNull Iterable<AttributeModelChangeListener>
getChangeListeners() {
return Collections.unmodifiableCollection(changeListeners);
}
- void addChangeListener(final ScalarModelChangeListener listener) {
+ void addChangeListener(final AttributeModelChangeListener listener) {
changeListeners.add(listener);
}
}
@Getter
- private final ScalarModelChangeDispatcher scalarModelChangeDispatcher =
- new ScalarModelChangeDispatcherImpl(this);
+ private final AttributeModelChangeDispatcher
attributeModelChangeDispatcher =
+ new AttributeModelChangeDispatcherImpl(this);
- public void addChangeListener(final ScalarModelChangeListener listener) {
-
((ScalarModelChangeDispatcherImpl)getScalarModelChangeDispatcher()).addChangeListener(listener);
+ public void addChangeListener(final AttributeModelChangeListener listener)
{
+
((AttributeModelChangeDispatcherImpl)getAttributeModelChangeDispatcher()).addChangeListener(listener);
}
protected final <T extends Behavior> void addOrReplaceBehavoir(
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 15e312b12cb..4554ae32f79 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
@@ -63,7 +63,7 @@ extends ScalarPanelFormFieldAbstract<ManagedObject> {
var attributeModel = attributeModel();
var select2 = Select2.createSelect2(id, attributeModel,
choiceProviderFactory.apply(attributeModel),
- getScalarModelChangeDispatcher());
+ getAttributeModelChangeDispatcher());
var settings = select2.getSettings();
settings.setPlaceholder(attributeModel.getFriendlyName());
@@ -87,7 +87,7 @@ extends ScalarPanelFormFieldAbstract<ManagedObject> {
// -- CUSTOM UPDATING BEHAVIOR
@Override
- protected final void installScalarModelChangeBehavior() {
+ protected final void installModelChangeBehavior() {
/* no-op, as we already have the Select2OnSelect behavior
* (directly) installed with the Select2 form component
*/
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithTemporalPicker.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithTemporalPicker.java
index 2098fe571f8..ee1b46c4e4e 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithTemporalPicker.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithTemporalPicker.java
@@ -124,7 +124,7 @@ extends ScalarPanelTextFieldWithValueSemantics<T> {
}
@Override
- protected void installScalarModelChangeBehavior() {
+ protected void installModelChangeBehavior() {
// don't install the default change listener, instead
OnChangeAjaxBehavior is installed above
}
@@ -150,7 +150,7 @@ extends ScalarPanelTextFieldWithValueSemantics<T> {
protected void onUpdate(final AjaxRequestTarget target) {
// triggers update of following args (action prompt)
ScalarPanelTextFieldWithTemporalPicker.this
- .getScalarModelChangeDispatcher().notifyUpdate(target);
+ .getAttributeModelChangeDispatcher().notifyUpdate(target);
}
});
return textField;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/composite/CompositeValuePanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/composite/CompositeValuePanel.java
index 5b6d8c740f1..4b8292f2064 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/composite/CompositeValuePanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/composite/CompositeValuePanel.java
@@ -80,7 +80,7 @@ extends ScalarPanelFormFieldAbstract<T> {
@Override
public void updateModel() {
// update not allowed; the CompositeValueUpdaterForParameter
updates
- // the underlying ScalarModel on nested dialog submission
+ // the underlying attribute model on nested dialog submission
}
};
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2.java
index fec78af2125..c7792ca2340 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2.java
@@ -32,10 +32,10 @@ import org.apache.causeway.commons.functional.Either;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.objectmanager.memento.ObjectMemento;
import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
-import
org.apache.causeway.viewer.wicket.model.models.ScalarModelWithMultiChoice;
-import
org.apache.causeway.viewer.wicket.model.models.ScalarModelWithSingleChoice;
+import
org.apache.causeway.viewer.wicket.model.models.AttributeModelWithMultiChoice;
+import
org.apache.causeway.viewer.wicket.model.models.AttributeModelWithSingleChoice;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarModelChangeDispatcher;
+import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeModelChangeDispatcher;
import
org.apache.causeway.viewer.wicket.ui.components.widgets.select2.providers.ChoiceProviderAbstract;
import lombok.NonNull;
@@ -56,16 +56,16 @@ implements
final String id,
final UiAttributeWkt attributeModel,
final ChoiceProviderAbstract choiceProvider,
- final ScalarModelChangeDispatcher select2ChangeDispatcher) {
+ final AttributeModelChangeDispatcher select2ChangeDispatcher) {
var select2 = new Select2(attributeModel.isSingular()
? Either.left(
Select2ChoiceExt.create(id,
-
ScalarModelWithSingleChoice.chain(attributeModel),
+
AttributeModelWithSingleChoice.chain(attributeModel),
attributeModel,
choiceProvider))
: Either.right(
Select2MultiChoiceExt.create(id,
-
ScalarModelWithMultiChoice.chain(attributeModel),
+
AttributeModelWithMultiChoice.chain(attributeModel),
attributeModel,
choiceProvider)));
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 c977c83a588..cd0c40bce96 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
@@ -45,7 +45,7 @@ import
org.apache.causeway.core.metamodel.objectmanager.memento.ObjectMemento;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
import org.apache.causeway.viewer.wicket.model.util.PageParameterUtils;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarModelChangeDispatcher;
+import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeModelChangeDispatcher;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
@@ -63,7 +63,7 @@ class Select2OnSelect extends AbstractAjaxBehavior {
private static final long serialVersionUID = 1L;
private final UiAttributeWkt attributeModel;
- private final ScalarModelChangeDispatcher select2ChangeDispatcher;
+ private final AttributeModelChangeDispatcher select2ChangeDispatcher;
private static enum Event {
SELECT, UNSELECT, CLEAR;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderAbstractForScalarModel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderAbstractForAttributeModel.java
similarity index 94%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderAbstractForScalarModel.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderAbstractForAttributeModel.java
index 8aef686fb3c..329e24fa3da 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderAbstractForScalarModel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderAbstractForAttributeModel.java
@@ -26,7 +26,7 @@ import
org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
import lombok.Getter;
import lombok.experimental.Accessors;
-public abstract class ChoiceProviderAbstractForScalarModel
+public abstract class ChoiceProviderAbstractForAttributeModel
extends ChoiceProviderAbstract {
private static final long serialVersionUID = 1L;
@@ -35,7 +35,7 @@ extends ChoiceProviderAbstract {
private final UiAttributeWkt attributeModel;
private final UiAttribute.ChoiceProviderSort choiceProviderSort;
- protected ChoiceProviderAbstractForScalarModel(final UiAttributeWkt
attributeModel) {
+ protected ChoiceProviderAbstractForAttributeModel(final UiAttributeWkt
attributeModel) {
super();
this.attributeModel = attributeModel;
this.choiceProviderSort =
UiAttribute.ChoiceProviderSort.valueOf(attributeModel);
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderDefault.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderDefault.java
index 467cc68ddd1..c357a5eed33 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderDefault.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/providers/ChoiceProviderDefault.java
@@ -27,7 +27,7 @@ import
org.apache.causeway.viewer.commons.model.scalar.UiParameter;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
public class ChoiceProviderDefault
-extends ChoiceProviderAbstractForScalarModel {
+extends ChoiceProviderAbstractForAttributeModel {
private static final long serialVersionUID = 1L;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PromptFormAbstract.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PromptFormAbstract.java
index e435c68824f..0801828b5e9 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PromptFormAbstract.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PromptFormAbstract.java
@@ -42,7 +42,7 @@ import
org.apache.causeway.viewer.wicket.model.models.ActionModel;
import org.apache.causeway.viewer.wicket.model.models.ActionPromptProvider;
import org.apache.causeway.viewer.wicket.model.models.FormExecutorContext;
import org.apache.causeway.viewer.wicket.model.models.PropertyModel;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarModelChangeListener;
+import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeModelChangeListener;
import
org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
import org.apache.causeway.viewer.wicket.ui.pages.entity.EntityPage;
@@ -54,7 +54,7 @@ public abstract class PromptFormAbstract<T extends
FormExecutorContext
& IModel<ManagedObject>>
extends OkCancelForm<T>
-implements ScalarModelChangeListener {
+implements AttributeModelChangeListener {
private static final long serialVersionUID = 1L;
