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 6c04a5a814f CAUSEWAY-2297: misnomer 'scalar' when allows plural (part
7)
6c04a5a814f is described below
commit 6c04a5a814f5d22f9ae2e9e7839c6ba75ebdfa6b
Author: Andi Huber <[email protected]>
AuthorDate: Sun Nov 24 17:19:32 2024 +0100
CAUSEWAY-2297: misnomer 'scalar' when allows plural (part 7)
- renaming packages
---
.../wicket/markup/ListeningMarkupComponent.java | 2 +-
.../ListeningMarkupPanelFactoriesForWicket.java | 4 ++--
.../testdomain/conf/Configuration_usingWicket.java | 4 ++--
.../ui/wkt/components/AsciiDocComponentWkt.java | 4 ++--
.../wkt/components/AsciiDocPanelFactoriesWkt.java | 4 ++--
.../ui/wkt/components/MarkdownComponentWkt.java | 2 +-
.../wkt/components/MarkdownPanelFactoriesWkt.java | 4 ++--
.../vega/ui/wkt/components/VegaComponentWkt.java | 4 ++--
.../ui/wkt/components/VegaPanelFactoriesWkt.java | 4 ++--
viewers/wicket/ui/src/main/java/module-info.java | 20 ++++++++--------
.../components/actions/ActionParametersForm.java | 4 ++--
.../AttributeComponentFactoryAbstract.java | 2 +-
...uteComponentFactoryTypeConstrainedAbstract.java | 2 +-
.../AttributeFragmentFactory.java | 2 +-
.../AttributeModelChangeDispatcher.java | 2 +-
.../AttributeModelChangeListener.java | 2 +-
.../AttributeModelDefaultChangeBehavior.java | 2 +-
.../{scalars => attributes}/AttributePanel.java | 6 ++---
.../AttributePanelAdditionalButton.java | 6 ++---
.../AttributePanelWithFormField.html | 0
.../AttributePanelWithFormField.java | 12 +++++-----
.../AttributePanelWithFormField_xray.html | 0
.../AttributePanelWithInlinePrompt.java | 10 ++++----
.../AttributePanelWithTextField.java | 4 ++--
.../NumericAttributePanel.java | 4 ++--
.../TextualAttributePanel.java | 2 +-
.../components/{scalars => attributes}/_Util.java | 2 +-
.../components/{scalars => attributes}/_Xray.java | 2 +-
.../blobclob/BlobAttributePanel.java | 2 +-
.../blobclob/BlobAttributePanelFactory.java | 4 ++--
.../blobclob/BlobOrClobAttributePanel.java | 8 +++----
.../blobclob/ClobAttributePanel.java | 2 +-
.../blobclob/ClobAttributePanelFactory.java | 4 ++--
.../bool/BooleanAttributePanel.java | 10 ++++----
.../bool/BooleanAttributePanelFactory.java | 4 ++--
.../choices/AttributePanelWithSelect.java | 4 ++--
.../choices/ChoiceFormComponent.html | 0
.../choices/ChoiceFormComponent.java | 2 +-
.../choices/ChoicesSelect2PanelFactory.java | 6 ++---
.../choices/ObjectChoicesAttributePanel.java | 10 ++++----
.../choices/TitleBadgeAttributePanel.java | 6 ++---
.../choices/ValueChoicesAttributePanel.java | 6 ++---
.../image/JavaAwtImagePanel.css | 0
.../image/JavaAwtImagePanel.java | 4 ++--
.../JavaAwtImagePanelCssResourceReference.java | 2 +-
.../image/JavaAwtImagePanelFactory.java | 4 ++--
.../image/JavaAwtImagePanel_LEFT.html | 0
.../image/JavaAwtImagePanel_NONE.html | 0
.../image/JavaAwtImagePanel_RIGHT.html | 0
.../image/JavaAwtImagePanel_TOP.html | 0
.../image/_WktImageUtil.java | 2 +-
.../markup/MarkupAttributePanel.java | 4 ++--
.../markup/MarkupAttributePanelFactories.java | 4 ++--
.../markup/MarkupComponent.java | 2 +-
.../markup/MarkupComponentFactory.java | 2 +-
.../markup/MarkupComponent_reloadJs.java | 2 +-
.../markup/StandaloneMarkupPanel.html | 0
.../markup/StandaloneMarkupPanel.java | 2 +-
.../markup/_HighlightBehavior.java | 2 +-
.../markup/_HighlightBehaviorPrism.java | 2 +-
.../passwd/PasswordAttributePanel.java | 4 ++--
.../passwd/PasswordAttributePanelFactory.java | 4 ++--
.../string/MultiLineAttributePanel.java | 4 ++--
.../string/StringAttributePanel.java | 4 ++--
.../string/StringAttributePanelFactory.java | 4 ++--
.../temporal/DateTimeConfig.java | 2 +-
.../temporal/DatetimePickerJsReference.java | 2 +-
.../temporal/MomentJsReference.java | 2 +-
.../temporal/TemporalAttributePanel.java | 6 ++---
.../temporal/TemporalDecompositionModel.java | 2 +-
.../temporal/TextFieldWithDateTimePicker.java | 2 +-
.../temporal/_TimeFormatUtil.java | 2 +-
.../value/CompositeValueAttributePanel.java | 10 ++++----
.../value/ValueAttributePanel.java | 4 ++--
.../value/ValueFallbackAttributePanel.java | 6 ++---
.../value/ValueFallbackAttributePanelFactory.java | 4 ++--
.../ui/components/collection/CollectionPanel.java | 2 +-
.../components/entity/fieldset/PropertyGroup.java | 2 +-
.../ui/components/property/PropertyEditForm.java | 2 +-
.../ui/components/tree/TreeAttributePanel.java | 4 ++--
.../ui/components/tree/TreePanelFactories.java | 2 +-
.../ui/components/value/StandaloneValuePanel.java | 2 +-
.../components/widgets/actionlink/ActionLink.java | 2 +-
.../ui/components/widgets/select2/Select2.java | 2 +-
.../widgets/select2/Select2OnSelect.java | 2 +-
.../viewer/wicket/ui/pages/PageAbstract.java | 2 +-
.../wicket/ui/panels/PromptFormAbstract.java | 4 ++--
.../apache/causeway/viewer/wicket/ui/util/Wkt.java | 2 +-
.../components/ComponentFactoryConfigWkt.java | 28 +++++++++++-----------
.../config/WicketViewerCssBundleInit.java | 2 +-
90 files changed, 168 insertions(+), 168 deletions(-)
diff --git
a/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/markup/ListeningMarkupComponent.java
b/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/markup/ListeningMarkupComponent.java
index 2e531b662a4..ef7ba6de7ff 100644
---
a/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/markup/ListeningMarkupComponent.java
+++
b/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/markup/ListeningMarkupComponent.java
@@ -27,7 +27,7 @@ import org.apache.causeway.applib.value.LocalResourcePath;
import org.apache.causeway.core.config.viewer.web.WebAppContextPath;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
import org.apache.causeway.viewer.wicket.model.models.ValueModel;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.markup.MarkupComponent;
public class ListeningMarkupComponent extends MarkupComponent {
diff --git
a/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/markup/ListeningMarkupPanelFactoriesForWicket.java
b/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/markup/ListeningMarkupPanelFactoriesForWicket.java
index 775645a8ee4..e2dc838c845 100644
---
a/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/markup/ListeningMarkupPanelFactoriesForWicket.java
+++
b/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/markup/ListeningMarkupPanelFactoriesForWicket.java
@@ -25,8 +25,8 @@ import org.apache.causeway.applib.value.Markup;
import org.apache.causeway.extensions.sse.metamodel.facets.SseObserveFacet;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
import org.apache.causeway.viewer.wicket.model.models.ValueModel;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupAttributePanelFactories;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.markup.MarkupAttributePanelFactories;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.markup.MarkupComponent;
/**
* @implNote Almost a copy of {@code Parented} and {@code Standalone} in
diff --git
a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java
b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java
index 559ce91f3cf..3b3f036c640 100644
---
a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java
+++
b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java
@@ -58,8 +58,8 @@ import
org.apache.causeway.viewer.wicket.model.models.PageType;
import org.apache.causeway.viewer.wicket.model.util.PageParameterUtils;
import
org.apache.causeway.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import
org.apache.causeway.viewer.wicket.ui.app.registry.HasComponentFactoryRegistry;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.FieldFrame;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.RegularFrame;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.FieldFrame;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.RegularFrame;
import org.apache.causeway.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.causeway.viewer.wicket.ui.pages.entity.EntityPage;
import
org.apache.causeway.viewer.wicket.viewer.CausewayModuleViewerWicketViewer;
diff --git
a/valuetypes/asciidoc/ui/wicket/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/wkt/components/AsciiDocComponentWkt.java
b/valuetypes/asciidoc/ui/wicket/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/wkt/components/AsciiDocComponentWkt.java
index b60231ad161..71da6f27bfc 100644
---
a/valuetypes/asciidoc/ui/wicket/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/wkt/components/AsciiDocComponentWkt.java
+++
b/valuetypes/asciidoc/ui/wicket/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/wkt/components/AsciiDocComponentWkt.java
@@ -21,7 +21,7 @@ package
org.apache.causeway.valuetypes.asciidoc.ui.wkt.components;
import org.apache.wicket.model.IModel;
import org.apache.causeway.applib.value.semantics.Renderer.SyntaxHighlighter;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.markup.MarkupComponent;
public class AsciiDocComponentWkt extends MarkupComponent {
@@ -29,7 +29,7 @@ public class AsciiDocComponentWkt extends MarkupComponent {
public AsciiDocComponentWkt(final String id, final IModel<?> model){
super(id, model,
-
org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupComponent.Options.builder()
+
org.apache.causeway.viewer.wicket.ui.components.attributes.markup.MarkupComponent.Options.builder()
.syntaxHighlighter(SyntaxHighlighter.PRISM_COY)
.build());
}
diff --git
a/valuetypes/asciidoc/ui/wicket/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/wkt/components/AsciiDocPanelFactoriesWkt.java
b/valuetypes/asciidoc/ui/wicket/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/wkt/components/AsciiDocPanelFactoriesWkt.java
index 10167dc2103..333fc56afce 100644
---
a/valuetypes/asciidoc/ui/wicket/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/wkt/components/AsciiDocPanelFactoriesWkt.java
+++
b/valuetypes/asciidoc/ui/wicket/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/wkt/components/AsciiDocPanelFactoriesWkt.java
@@ -23,8 +23,8 @@ import org.springframework.stereotype.Component;
import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
import org.apache.causeway.viewer.wicket.model.models.ValueModel;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupAttributePanelFactories;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.markup.MarkupAttributePanelFactories;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.markup.MarkupComponent;
/**
* @implNote Almost a copy of {@code Parented} and {@code Standalone} in
diff --git
a/valuetypes/markdown/ui/wicket/src/main/java/org/apache/causeway/valuetypes/markdown/ui/wkt/components/MarkdownComponentWkt.java
b/valuetypes/markdown/ui/wicket/src/main/java/org/apache/causeway/valuetypes/markdown/ui/wkt/components/MarkdownComponentWkt.java
index b43d4f5c89d..3a90583a47b 100644
---
a/valuetypes/markdown/ui/wicket/src/main/java/org/apache/causeway/valuetypes/markdown/ui/wkt/components/MarkdownComponentWkt.java
+++
b/valuetypes/markdown/ui/wicket/src/main/java/org/apache/causeway/valuetypes/markdown/ui/wkt/components/MarkdownComponentWkt.java
@@ -20,7 +20,7 @@ package
org.apache.causeway.valuetypes.markdown.ui.wkt.components;
import org.apache.wicket.model.IModel;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.markup.MarkupComponent;
public class MarkdownComponentWkt extends MarkupComponent {
diff --git
a/valuetypes/markdown/ui/wicket/src/main/java/org/apache/causeway/valuetypes/markdown/ui/wkt/components/MarkdownPanelFactoriesWkt.java
b/valuetypes/markdown/ui/wicket/src/main/java/org/apache/causeway/valuetypes/markdown/ui/wkt/components/MarkdownPanelFactoriesWkt.java
index 4f0e7369242..c0b84dc9f48 100644
---
a/valuetypes/markdown/ui/wicket/src/main/java/org/apache/causeway/valuetypes/markdown/ui/wkt/components/MarkdownPanelFactoriesWkt.java
+++
b/valuetypes/markdown/ui/wicket/src/main/java/org/apache/causeway/valuetypes/markdown/ui/wkt/components/MarkdownPanelFactoriesWkt.java
@@ -23,8 +23,8 @@ import org.springframework.stereotype.Component;
import org.apache.causeway.valuetypes.markdown.applib.value.Markdown;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
import org.apache.causeway.viewer.wicket.model.models.ValueModel;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupAttributePanelFactories;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.markup.MarkupAttributePanelFactories;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.markup.MarkupComponent;
/**
* @implNote Almost a copy of {@code Parented} and {@code Standalone} in
diff --git
a/valuetypes/vega/ui/wicket/src/main/java/org/apache/causeway/valuetypes/vega/ui/wkt/components/VegaComponentWkt.java
b/valuetypes/vega/ui/wicket/src/main/java/org/apache/causeway/valuetypes/vega/ui/wkt/components/VegaComponentWkt.java
index 9877a6af2c6..ba724fb22f3 100644
---
a/valuetypes/vega/ui/wicket/src/main/java/org/apache/causeway/valuetypes/vega/ui/wkt/components/VegaComponentWkt.java
+++
b/valuetypes/vega/ui/wicket/src/main/java/org/apache/causeway/valuetypes/vega/ui/wkt/components/VegaComponentWkt.java
@@ -31,7 +31,7 @@ import org.apache.causeway.valuetypes.vega.applib.value.Vega;
import
org.apache.causeway.valuetypes.vega.ui.wkt.components.js.VegaEmbedJsReference;
import
org.apache.causeway.valuetypes.vega.ui.wkt.components.js.VegaJsReference;
import
org.apache.causeway.valuetypes.vega.ui.wkt.components.js.VegaLiteJsReference;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.markup.MarkupComponent;
import lombok.extern.log4j.Log4j2;
@@ -42,7 +42,7 @@ public class VegaComponentWkt extends MarkupComponent {
public VegaComponentWkt(final String id, final IModel<?> model){
super(id, model,
-
org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupComponent.Options.builder()
+
org.apache.causeway.viewer.wicket.ui.components.attributes.markup.MarkupComponent.Options.builder()
.syntaxHighlighter(SyntaxHighlighter.NONE)
.build());
}
diff --git
a/valuetypes/vega/ui/wicket/src/main/java/org/apache/causeway/valuetypes/vega/ui/wkt/components/VegaPanelFactoriesWkt.java
b/valuetypes/vega/ui/wicket/src/main/java/org/apache/causeway/valuetypes/vega/ui/wkt/components/VegaPanelFactoriesWkt.java
index a569fd293f3..0af5fc88bcd 100644
---
a/valuetypes/vega/ui/wicket/src/main/java/org/apache/causeway/valuetypes/vega/ui/wkt/components/VegaPanelFactoriesWkt.java
+++
b/valuetypes/vega/ui/wicket/src/main/java/org/apache/causeway/valuetypes/vega/ui/wkt/components/VegaPanelFactoriesWkt.java
@@ -23,8 +23,8 @@ import org.springframework.stereotype.Component;
import org.apache.causeway.valuetypes.vega.applib.value.Vega;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
import org.apache.causeway.viewer.wicket.model.models.ValueModel;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupAttributePanelFactories;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.markup.MarkupAttributePanelFactories;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.markup.MarkupComponent;
/**
* @implNote Almost a copy of {@code Parented} and {@code Standalone} in
diff --git a/viewers/wicket/ui/src/main/java/module-info.java
b/viewers/wicket/ui/src/main/java/module-info.java
index 394b5cdec67..6bfac44f3e5 100644
--- a/viewers/wicket/ui/src/main/java/module-info.java
+++ b/viewers/wicket/ui/src/main/java/module-info.java
@@ -30,6 +30,16 @@ module org.apache.causeway.viewer.wicket.ui {
exports org.apache.causeway.viewer.wicket.ui.components.actionprompt;
exports org.apache.causeway.viewer.wicket.ui.components.actionpromptsb;
exports org.apache.causeway.viewer.wicket.ui.components.actions;
+ exports org.apache.causeway.viewer.wicket.ui.components.attributes;
+ exports
org.apache.causeway.viewer.wicket.ui.components.attributes.blobclob;
+ exports org.apache.causeway.viewer.wicket.ui.components.attributes.bool;
+ exports org.apache.causeway.viewer.wicket.ui.components.attributes.choices;
+ exports org.apache.causeway.viewer.wicket.ui.components.attributes.image;
+ exports org.apache.causeway.viewer.wicket.ui.components.attributes.markup;
+ exports org.apache.causeway.viewer.wicket.ui.components.attributes.passwd;
+ exports org.apache.causeway.viewer.wicket.ui.components.attributes.string;
+ exports
org.apache.causeway.viewer.wicket.ui.components.attributes.temporal;
+ exports org.apache.causeway.viewer.wicket.ui.components.attributes.value;
exports org.apache.causeway.viewer.wicket.ui.components.bookmarkedpages;
exports org.apache.causeway.viewer.wicket.ui.components.collection.count;
exports
org.apache.causeway.viewer.wicket.ui.components.collection.selector;
@@ -55,16 +65,6 @@ module org.apache.causeway.viewer.wicket.ui {
exports org.apache.causeway.viewer.wicket.ui.components.layout.bs;
exports org.apache.causeway.viewer.wicket.ui.components.property;
exports org.apache.causeway.viewer.wicket.ui.components.propertyheader;
- exports org.apache.causeway.viewer.wicket.ui.components.scalars;
- exports org.apache.causeway.viewer.wicket.ui.components.scalars.blobclob;
- exports org.apache.causeway.viewer.wicket.ui.components.scalars.bool;
- exports org.apache.causeway.viewer.wicket.ui.components.scalars.choices;
- exports org.apache.causeway.viewer.wicket.ui.components.scalars.image;
- exports org.apache.causeway.viewer.wicket.ui.components.scalars.markup;
- exports org.apache.causeway.viewer.wicket.ui.components.scalars.passwd;
- exports org.apache.causeway.viewer.wicket.ui.components.scalars.string;
- exports org.apache.causeway.viewer.wicket.ui.components.scalars.temporal;
- exports org.apache.causeway.viewer.wicket.ui.components.scalars.value;
exports
org.apache.causeway.viewer.wicket.ui.components.standalonecollection;
exports
org.apache.causeway.viewer.wicket.ui.components.tree.themes.bootstrap;
exports org.apache.causeway.viewer.wicket.ui.components.tree.themes;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/ActionParametersForm.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/ActionParametersForm.java
index b31fa442770..2949b895074 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/ActionParametersForm.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/ActionParametersForm.java
@@ -38,8 +38,8 @@ import
org.apache.causeway.viewer.wicket.model.models.ActionModel;
import org.apache.causeway.viewer.wicket.model.models.ParameterModel;
import org.apache.causeway.viewer.wicket.model.models.PropertyModel;
import
org.apache.causeway.viewer.wicket.model.models.interaction.act.UiParameterWkt;
-import org.apache.causeway.viewer.wicket.ui.components.scalars.AttributePanel;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributePanel.Repaint;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributePanel;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributePanel.Repaint;
import org.apache.causeway.viewer.wicket.ui.panels.PromptFormAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktDecorators;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeComponentFactoryAbstract.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributeComponentFactoryAbstract.java
similarity index 96%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeComponentFactoryAbstract.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributeComponentFactoryAbstract.java
index 06fd6b7d02e..2b48ca61dc7 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeComponentFactoryAbstract.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributeComponentFactoryAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars;
+package org.apache.causeway.viewer.wicket.ui.components.attributes;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeComponentFactoryTypeConstrainedAbstract.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributeComponentFactoryTypeConstrainedAbstract.java
similarity index 97%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeComponentFactoryTypeConstrainedAbstract.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributeComponentFactoryTypeConstrainedAbstract.java
index d6646b87ef3..963cad5f97b 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeComponentFactoryTypeConstrainedAbstract.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributeComponentFactoryTypeConstrainedAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars;
+package org.apache.causeway.viewer.wicket.ui.components.attributes;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeFragmentFactory.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributeFragmentFactory.java
similarity index 99%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeFragmentFactory.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributeFragmentFactory.java
index 6218b8b967b..1bd8712e866 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeFragmentFactory.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributeFragmentFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars;
+package org.apache.causeway.viewer.wicket.ui.components.attributes;
import java.util.Optional;
import java.util.function.Consumer;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeModelChangeDispatcher.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributeModelChangeDispatcher.java
similarity index 95%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeModelChangeDispatcher.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributeModelChangeDispatcher.java
index f1b27f3f116..99c40ca2cd8 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeModelChangeDispatcher.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributeModelChangeDispatcher.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars;
+package org.apache.causeway.viewer.wicket.ui.components.attributes;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeModelChangeListener.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributeModelChangeListener.java
similarity index 94%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeModelChangeListener.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributeModelChangeListener.java
index 602222ea830..da04f3614a5 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeModelChangeListener.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributeModelChangeListener.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars;
+package org.apache.causeway.viewer.wicket.ui.components.attributes;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeModelDefaultChangeBehavior.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributeModelDefaultChangeBehavior.java
similarity index 96%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeModelDefaultChangeBehavior.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributeModelDefaultChangeBehavior.java
index 2a09edbd899..f51dce9e8a9 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributeModelDefaultChangeBehavior.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributeModelDefaultChangeBehavior.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars;
+package org.apache.causeway.viewer.wicket.ui.components.attributes;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributePanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributePanel.java
similarity index 99%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributePanel.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributePanel.java
index a6e50e05089..d0e82dfa3aa 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributePanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributePanel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars;
+package org.apache.causeway.viewer.wicket.ui.components.attributes;
import java.io.Serializable;
import java.util.Collections;
@@ -58,8 +58,8 @@ import
org.apache.causeway.viewer.commons.model.scalar.UiParameter;
import org.apache.causeway.viewer.wicket.model.models.ActionModel;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
import
org.apache.causeway.viewer.wicket.ui.components.actionlinks.entityactions.ActionLinksPanel;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.FrameFragment;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.RegularFrame;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.FrameFragment;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.RegularFrame;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.Wkt.EventTopic;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributePanelAdditionalButton.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributePanelAdditionalButton.java
similarity index 94%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributePanelAdditionalButton.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributePanelAdditionalButton.java
index 6f8e4e7abb4..f6d0415bdf1 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributePanelAdditionalButton.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributePanelAdditionalButton.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars;
+package org.apache.causeway.viewer.wicket.ui.components.attributes;
import org.apache.causeway.core.metamodel.consent.Consent;
import org.apache.causeway.core.metamodel.consent.Consent.VetoReason;
import org.apache.causeway.core.metamodel.interactions.managed.InteractionVeto;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.FieldFragment;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributePanel.RenderScenario;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.FieldFragment;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributePanel.RenderScenario;
/**
* In order of appearance in the UI.
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributePanelWithFormField.html
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributePanelWithFormField.html
similarity index 100%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributePanelWithFormField.html
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributePanelWithFormField.html
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributePanelWithFormField.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributePanelWithFormField.java
similarity index 94%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributePanelWithFormField.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributePanelWithFormField.java
index 351b7218577..f5d338d7996 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributePanelWithFormField.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributePanelWithFormField.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars;
+package org.apache.causeway.viewer.wicket.ui.components.attributes;
import java.util.Optional;
@@ -33,11 +33,11 @@ import
org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.interactions.managed.InteractionVeto;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.FieldFragment;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.FieldFrame;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.FrameFragment;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.InputFragment;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.choices.AttributePanelWithSelect;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.FieldFragment;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.FieldFrame;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.FrameFragment;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.InputFragment;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.choices.AttributePanelWithSelect;
import
org.apache.causeway.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktTooltips;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributePanelWithFormField_xray.html
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributePanelWithFormField_xray.html
similarity index 100%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributePanelWithFormField_xray.html
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributePanelWithFormField_xray.html
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributePanelWithInlinePrompt.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributePanelWithInlinePrompt.java
similarity index 96%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributePanelWithInlinePrompt.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributePanelWithInlinePrompt.java
index 754433be2e6..71af429e065 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributePanelWithInlinePrompt.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributePanelWithInlinePrompt.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars;
+package org.apache.causeway.viewer.wicket.ui.components.attributes;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
@@ -35,10 +35,10 @@ import
org.apache.causeway.viewer.commons.model.components.UiString;
import org.apache.causeway.viewer.wicket.model.models.ActionModel;
import org.apache.causeway.viewer.wicket.model.models.InlinePromptContext;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.CompactFragment;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.FieldFragment;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.FieldFrame;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.PromptFragment;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.CompactFragment;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.FieldFragment;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.FieldFrame;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.PromptFragment;
import
org.apache.causeway.viewer.wicket.ui.components.widgets.actionlink.ActionLink;
import org.apache.causeway.viewer.wicket.ui.panels.FormExecutorDefault;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributePanelWithTextField.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributePanelWithTextField.java
similarity index 96%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributePanelWithTextField.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributePanelWithTextField.java
index 4c1ff6130eb..142a230a74f 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/AttributePanelWithTextField.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/AttributePanelWithTextField.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars;
+package org.apache.causeway.viewer.wicket.ui.components.attributes;
import java.util.Optional;
@@ -29,7 +29,7 @@ import
org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.viewer.commons.model.components.UiString;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.InputFragment;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.InputFragment;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
/**
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/NumericAttributePanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/NumericAttributePanel.java
similarity index 88%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/NumericAttributePanel.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/NumericAttributePanel.java
index ee4de22f9a6..040e7f2b3e8 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/NumericAttributePanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/NumericAttributePanel.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars;
+package org.apache.causeway.viewer.wicket.ui.components.attributes;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.value.ValueAttributePanel;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.value.ValueAttributePanel;
/**
* Panel for rendering numeric attributes.
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/TextualAttributePanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/TextualAttributePanel.java
similarity index 96%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/TextualAttributePanel.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/TextualAttributePanel.java
index ee9fa52a48c..f231a9aec1f 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/TextualAttributePanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/TextualAttributePanel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars;
+package org.apache.causeway.viewer.wicket.ui.components.attributes;
import java.util.EnumSet;
import java.util.Optional;
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/attributes/_Util.java
similarity index 99%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/_Util.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/_Util.java
index fd5a801b525..c65a3489b9a 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/attributes/_Util.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars;
+package org.apache.causeway.viewer.wicket.ui.components.attributes;
import java.util.Collection;
import java.util.Optional;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/_Xray.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/_Xray.java
similarity index 97%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/_Xray.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/_Xray.java
index 505679a1d6a..345140028aa 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/_Xray.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/_Xray.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars;
+package org.apache.causeway.viewer.wicket.ui.components.attributes;
import java.util.stream.Collectors;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/BlobAttributePanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/blobclob/BlobAttributePanel.java
similarity index 96%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/BlobAttributePanel.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/blobclob/BlobAttributePanel.java
index acf843f1a21..6af8367735d 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/BlobAttributePanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/blobclob/BlobAttributePanel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.blobclob;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.blobclob;
import java.util.List;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/BlobAttributePanelFactory.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/blobclob/BlobAttributePanelFactory.java
similarity index 88%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/BlobAttributePanelFactory.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/blobclob/BlobAttributePanelFactory.java
index 524c9948eee..37017baa4a1 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/BlobAttributePanelFactory.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/blobclob/BlobAttributePanelFactory.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.blobclob;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.blobclob;
import org.apache.wicket.Component;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeComponentFactoryTypeConstrainedAbstract;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeComponentFactoryTypeConstrainedAbstract;
/**
* {@link ComponentFactory} for {@link BlobAttributePanel}.
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/BlobOrClobAttributePanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/blobclob/BlobOrClobAttributePanel.java
similarity index 92%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/BlobOrClobAttributePanel.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/blobclob/BlobOrClobAttributePanel.java
index 6bfaa80a42a..618a21cb956 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/BlobOrClobAttributePanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/blobclob/BlobOrClobAttributePanel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.blobclob;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.blobclob;
import java.util.List;
import java.util.Optional;
@@ -34,9 +34,9 @@ import org.apache.causeway.applib.value.Clob;
import org.apache.causeway.applib.value.NamedWithMimeType;
import org.apache.causeway.viewer.commons.model.components.UiString;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.CompactFragment;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.InputFragment;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributePanelWithFormField;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributePanelWithFormField;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.CompactFragment;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.InputFragment;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktTooltips;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/ClobAttributePanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/blobclob/ClobAttributePanel.java
similarity index 96%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/ClobAttributePanel.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/blobclob/ClobAttributePanel.java
index acad8ad9f45..89042b07363 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/ClobAttributePanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/blobclob/ClobAttributePanel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.blobclob;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.blobclob;
import java.nio.charset.StandardCharsets;
import java.util.List;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/ClobAttributePanelFactory.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/blobclob/ClobAttributePanelFactory.java
similarity index 88%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/ClobAttributePanelFactory.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/blobclob/ClobAttributePanelFactory.java
index c8c31c67beb..38f2d011c93 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/blobclob/ClobAttributePanelFactory.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/blobclob/ClobAttributePanelFactory.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.blobclob;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.blobclob;
import org.apache.wicket.Component;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeComponentFactoryTypeConstrainedAbstract;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeComponentFactoryTypeConstrainedAbstract;
/**
* {@link ComponentFactory} for {@link BlobAttributePanel}.
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/bool/BooleanAttributePanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/bool/BooleanAttributePanel.java
similarity index 89%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/bool/BooleanAttributePanel.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/bool/BooleanAttributePanel.java
index 6643078825d..dfaec6f6a13 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/bool/BooleanAttributePanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/bool/BooleanAttributePanel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.bool;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.bool;
import java.util.Optional;
@@ -27,10 +27,10 @@ import
org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.viewer.commons.model.components.UiString;
import org.apache.causeway.viewer.wicket.model.models.BooleanModel;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributePanelWithFormField;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.CompactFragment;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.InputFragment;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.PromptFragment;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributePanelWithFormField;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.CompactFragment;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.InputFragment;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.PromptFragment;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import
de.agilecoders.wicket.extensions.markup.html.bootstrap.form.checkboxx.CheckBoxX;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/bool/BooleanAttributePanelFactory.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/bool/BooleanAttributePanelFactory.java
similarity index 89%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/bool/BooleanAttributePanelFactory.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/bool/BooleanAttributePanelFactory.java
index 1633ef2b984..287a1d5d25e 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/bool/BooleanAttributePanelFactory.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/bool/BooleanAttributePanelFactory.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.bool;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.bool;
import org.apache.wicket.Component;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeComponentFactoryTypeConstrainedAbstract;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeComponentFactoryTypeConstrainedAbstract;
/**
* {@link ComponentFactory} for {@link BooleanAttributePanel}.
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/AttributePanelWithSelect.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/choices/AttributePanelWithSelect.java
similarity index 96%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/AttributePanelWithSelect.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/choices/AttributePanelWithSelect.java
index 528f9714aab..db972eb38d3 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/AttributePanelWithSelect.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/choices/AttributePanelWithSelect.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.choices;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.choices;
import java.io.Serializable;
import java.util.function.Function;
@@ -31,7 +31,7 @@ import org.apache.causeway.core.metamodel.util.Facets;
import org.apache.causeway.viewer.commons.model.components.UiString;
import org.apache.causeway.viewer.commons.model.scalar.UiParameter;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributePanelWithFormField;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributePanelWithFormField;
import org.apache.causeway.viewer.wicket.ui.components.widgets.select2.Select2;
import
org.apache.causeway.viewer.wicket.ui.components.widgets.select2.providers.ChoiceProviderAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ChoiceFormComponent.html
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/choices/ChoiceFormComponent.html
similarity index 100%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ChoiceFormComponent.html
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/choices/ChoiceFormComponent.html
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ChoiceFormComponent.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/choices/ChoiceFormComponent.java
similarity index 96%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ChoiceFormComponent.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/choices/ChoiceFormComponent.java
index ea91765c4b9..14f67715c0c 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ChoiceFormComponent.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/choices/ChoiceFormComponent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.choices;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.choices;
import org.apache.wicket.markup.html.form.FormComponentPanel;
import org.wicketstuff.select2.Select2MultiChoice;
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/attributes/choices/ChoicesSelect2PanelFactory.java
similarity index 90%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ChoicesSelect2PanelFactory.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/choices/ChoicesSelect2PanelFactory.java
index ecd7e4ac170..1e15ed74810 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/attributes/choices/ChoicesSelect2PanelFactory.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.choices;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.choices;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeComponentFactoryAbstract;
-import org.apache.causeway.viewer.wicket.ui.components.scalars.AttributePanel;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeComponentFactoryAbstract;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributePanel;
public class ChoicesSelect2PanelFactory
extends AttributeComponentFactoryAbstract {
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ObjectChoicesAttributePanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/choices/ObjectChoicesAttributePanel.java
similarity index 95%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ObjectChoicesAttributePanel.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/choices/ObjectChoicesAttributePanel.java
index 18e016bd248..c10fd7b621b 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ObjectChoicesAttributePanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/choices/ObjectChoicesAttributePanel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.choices;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.choices;
import java.util.Optional;
@@ -33,10 +33,10 @@ import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.CompactFragment;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.FieldFrame;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.InputFragment;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.choices.AttributePanelWithSelect.ChoiceTitleHandler;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.CompactFragment;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.FieldFrame;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.InputFragment;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.choices.AttributePanelWithSelect.ChoiceTitleHandler;
import
org.apache.causeway.viewer.wicket.ui.components.widgets.entitysimplelink.EntityLinkSimplePanel;
import
org.apache.causeway.viewer.wicket.ui.components.widgets.select2.providers.ChoiceProviderDefault;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/TitleBadgeAttributePanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/choices/TitleBadgeAttributePanel.java
similarity index 87%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/TitleBadgeAttributePanel.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/choices/TitleBadgeAttributePanel.java
index c17e75ca66c..32837a601b1 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/TitleBadgeAttributePanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/choices/TitleBadgeAttributePanel.java
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.choices;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.choices;
import java.util.EnumSet;
import org.apache.wicket.Component;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.CompactFragment;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.value.ValueAttributePanel;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.CompactFragment;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.value.ValueAttributePanel;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
/**
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ValueChoicesAttributePanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/choices/ValueChoicesAttributePanel.java
similarity index 93%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ValueChoicesAttributePanel.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/choices/ValueChoicesAttributePanel.java
index 017903c1c0f..08635636343 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ValueChoicesAttributePanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/choices/ValueChoicesAttributePanel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.choices;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.choices;
import java.util.Optional;
@@ -26,8 +26,8 @@ import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.InputFragment;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.choices.AttributePanelWithSelect.ChoiceTitleHandler;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.InputFragment;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.choices.AttributePanelWithSelect.ChoiceTitleHandler;
import
org.apache.causeway.viewer.wicket.ui.components.widgets.select2.providers.ChoiceProviderDefault;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktTooltips;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.css
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/image/JavaAwtImagePanel.css
similarity index 100%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.css
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/image/JavaAwtImagePanel.css
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/image/JavaAwtImagePanel.java
similarity index 95%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/image/JavaAwtImagePanel.java
index ac1a8dd99db..dac08d115e2 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/image/JavaAwtImagePanel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.image;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.image;
import org.apache.wicket.feedback.ComponentFeedbackMessageFilter;
import org.apache.wicket.markup.html.basic.Label;
@@ -25,7 +25,7 @@ import
org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.util.Facets;
import
org.apache.causeway.viewer.commons.model.decorators.FormLabelDecorator.FormLabelDecorationModel;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
-import org.apache.causeway.viewer.wicket.ui.components.scalars.AttributePanel;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributePanel;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanelCssResourceReference.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/image/JavaAwtImagePanelCssResourceReference.java
similarity index 95%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanelCssResourceReference.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/image/JavaAwtImagePanelCssResourceReference.java
index 8a60bdb9bfb..a5fb85fdc9e 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanelCssResourceReference.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/image/JavaAwtImagePanelCssResourceReference.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.image;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.image;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
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/attributes/image/JavaAwtImagePanelFactory.java
similarity index 90%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanelFactory.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/image/JavaAwtImagePanelFactory.java
index e8eccdfabd3..a45d5c010d7 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/attributes/image/JavaAwtImagePanelFactory.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.image;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.image;
import org.apache.wicket.Component;
import org.apache.causeway.core.metamodel.util.Facets;
import org.apache.causeway.core.metamodel.valuesemantics.ImageValueSemantics;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeComponentFactoryAbstract;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeComponentFactoryAbstract;
public class JavaAwtImagePanelFactory
extends AttributeComponentFactoryAbstract {
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel_LEFT.html
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/image/JavaAwtImagePanel_LEFT.html
similarity index 100%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel_LEFT.html
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/image/JavaAwtImagePanel_LEFT.html
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel_NONE.html
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/image/JavaAwtImagePanel_NONE.html
similarity index 100%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel_NONE.html
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/image/JavaAwtImagePanel_NONE.html
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel_RIGHT.html
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/image/JavaAwtImagePanel_RIGHT.html
similarity index 100%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel_RIGHT.html
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/image/JavaAwtImagePanel_RIGHT.html
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel_TOP.html
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/image/JavaAwtImagePanel_TOP.html
similarity index 100%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel_TOP.html
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/image/JavaAwtImagePanel_TOP.html
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/attributes/image/_WktImageUtil.java
similarity index 97%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/_WktImageUtil.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/image/_WktImageUtil.java
index 3912c646186..67e17965328 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/attributes/image/_WktImageUtil.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.image;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.image;
import java.awt.image.BufferedImage;
import java.util.Optional;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/MarkupAttributePanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/MarkupAttributePanel.java
similarity index 93%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/MarkupAttributePanel.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/MarkupAttributePanel.java
index b1556d2ca04..66b9b15e3fc 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/MarkupAttributePanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/MarkupAttributePanel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.markup;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.markup;
import java.util.EnumSet;
@@ -24,7 +24,7 @@ import org.apache.wicket.Component;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
import org.apache.causeway.viewer.wicket.ui.app.registry.ComponentFactoryKey;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.value.ValueAttributePanel;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.value.ValueAttributePanel;
/**
* Panel for rendering scalars of type {@link
org.apache.causeway.applib.value.Markup}.
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/MarkupAttributePanelFactories.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/MarkupAttributePanelFactories.java
similarity index 96%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/MarkupAttributePanelFactories.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/MarkupAttributePanelFactories.java
index cac65a27af7..d4ccc4748c7 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/MarkupAttributePanelFactories.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/MarkupAttributePanelFactories.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.markup;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.markup;
import java.io.Serializable;
@@ -30,7 +30,7 @@ import
org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
import org.apache.causeway.viewer.wicket.model.models.ValueModel;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeComponentFactoryTypeConstrainedAbstract;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeComponentFactoryTypeConstrainedAbstract;
/**
* {@link ComponentFactory} for {@link MarkupAttributePanel}.
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/MarkupComponent.java
similarity index 98%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/MarkupComponent.java
index 5aff1befee2..80e5f391cd9 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/MarkupComponent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.markup;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.markup;
import java.io.Serializable;
import java.util.Optional;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/MarkupComponentFactory.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/MarkupComponentFactory.java
similarity index 93%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/MarkupComponentFactory.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/MarkupComponentFactory.java
index db50e6038ba..f9b4777b010 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/MarkupComponentFactory.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/MarkupComponentFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.markup;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.markup;
import java.io.Serializable;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/MarkupComponent_reloadJs.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/MarkupComponent_reloadJs.java
similarity index 96%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/MarkupComponent_reloadJs.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/MarkupComponent_reloadJs.java
index 87280fca07c..dc75ad97f9e 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/MarkupComponent_reloadJs.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/MarkupComponent_reloadJs.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.markup;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.markup;
import java.util.List;
import java.util.UUID;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.html
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/StandaloneMarkupPanel.html
similarity index 100%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.html
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/StandaloneMarkupPanel.html
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/StandaloneMarkupPanel.java
similarity index 95%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/StandaloneMarkupPanel.java
index 6d08f6e0385..c4cd46d10bc 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/StandaloneMarkupPanel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.markup;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.markup;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.viewer.wicket.model.models.ValueModel;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/_HighlightBehavior.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/_HighlightBehavior.java
similarity index 96%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/_HighlightBehavior.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/_HighlightBehavior.java
index b781155cb27..508be3ff3dd 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/_HighlightBehavior.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/_HighlightBehavior.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.markup;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.markup;
import org.apache.wicket.markup.head.IHeaderResponse;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/_HighlightBehaviorPrism.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/_HighlightBehaviorPrism.java
similarity index 96%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/_HighlightBehaviorPrism.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/_HighlightBehaviorPrism.java
index 4d6bc5bd330..daa127a3c67 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/markup/_HighlightBehaviorPrism.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/markup/_HighlightBehaviorPrism.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.markup;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.markup;
import java.util.List;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/passwd/PasswordAttributePanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/passwd/PasswordAttributePanel.java
similarity index 90%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/passwd/PasswordAttributePanel.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/passwd/PasswordAttributePanel.java
index cf77d72b6b8..6d4afc6d68b 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/passwd/PasswordAttributePanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/passwd/PasswordAttributePanel.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.passwd;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.passwd;
import org.apache.wicket.markup.html.form.AbstractTextComponent;
import org.apache.causeway.applib.value.Password;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.value.ValueAttributePanel;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.value.ValueAttributePanel;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
/**
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/passwd/PasswordAttributePanelFactory.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/passwd/PasswordAttributePanelFactory.java
similarity index 88%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/passwd/PasswordAttributePanelFactory.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/passwd/PasswordAttributePanelFactory.java
index e3072d0e6d9..6cfb8da9a3f 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/passwd/PasswordAttributePanelFactory.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/passwd/PasswordAttributePanelFactory.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.passwd;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.passwd;
import org.apache.wicket.Component;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeComponentFactoryTypeConstrainedAbstract;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeComponentFactoryTypeConstrainedAbstract;
/**
* {@link ComponentFactory} for {@link PasswordAttributePanel}.
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/string/MultiLineAttributePanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/string/MultiLineAttributePanel.java
similarity index 89%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/string/MultiLineAttributePanel.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/string/MultiLineAttributePanel.java
index 9f9341e9783..9ba4703bc25 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/string/MultiLineAttributePanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/string/MultiLineAttributePanel.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.string;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.string;
import java.util.EnumSet;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.TextualAttributePanel;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.TextualAttributePanel;
/**
* Panel for rendering MultiLine scalars of type String
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/string/StringAttributePanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/string/StringAttributePanel.java
similarity index 88%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/string/StringAttributePanel.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/string/StringAttributePanel.java
index e5ec944328c..3f57ca1551d 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/string/StringAttributePanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/string/StringAttributePanel.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.string;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.string;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.TextualAttributePanel;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.TextualAttributePanel;
/**
* Panel for rendering scalars of type {@link String}.
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/string/StringAttributePanelFactory.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/string/StringAttributePanelFactory.java
similarity index 90%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/string/StringAttributePanelFactory.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/string/StringAttributePanelFactory.java
index 350e58e2443..3cce2164684 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/string/StringAttributePanelFactory.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/string/StringAttributePanelFactory.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.string;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.string;
import org.apache.wicket.Component;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.causeway.core.metamodel.util.Facets;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeComponentFactoryTypeConstrainedAbstract;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeComponentFactoryTypeConstrainedAbstract;
import org.apache.causeway.viewer.wicket.ui.panels.PanelUtil;
public class StringAttributePanelFactory extends
AttributeComponentFactoryTypeConstrainedAbstract {
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/temporal/DateTimeConfig.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/DateTimeConfig.java
similarity index 99%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/temporal/DateTimeConfig.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/DateTimeConfig.java
index 71c210a8a91..14384fc38b9 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/temporal/DateTimeConfig.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/DateTimeConfig.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.temporal;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.temporal;
import java.io.IOException;
import java.util.Locale;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/temporal/DatetimePickerJsReference.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/DatetimePickerJsReference.java
similarity index 97%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/temporal/DatetimePickerJsReference.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/DatetimePickerJsReference.java
index 2a8562bd42b..829966d5d80 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/temporal/DatetimePickerJsReference.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/DatetimePickerJsReference.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.temporal;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.temporal;
import java.util.List;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/temporal/MomentJsReference.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/MomentJsReference.java
similarity index 95%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/temporal/MomentJsReference.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/MomentJsReference.java
index 7e3980dab69..37392ba843b 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/temporal/MomentJsReference.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/MomentJsReference.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.temporal;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.temporal;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/temporal/TemporalAttributePanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/TemporalAttributePanel.java
similarity index 95%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/temporal/TemporalAttributePanel.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/TemporalAttributePanel.java
index e9fdbc2dc53..c64f56db2dd 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/temporal/TemporalAttributePanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/TemporalAttributePanel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.temporal;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.temporal;
import java.time.ZoneId;
import java.time.ZoneOffset;
@@ -35,8 +35,8 @@ import org.apache.causeway.core.metamodel.object.MmValueUtils;
import org.apache.causeway.core.metamodel.util.Facets;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
import
org.apache.causeway.viewer.wicket.model.value.ConverterBasedOnValueSemantics;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.InputFragment;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.value.ValueAttributePanel;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.InputFragment;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.value.ValueAttributePanel;
import
org.apache.causeway.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/temporal/TemporalDecompositionModel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/TemporalDecompositionModel.java
similarity index 98%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/temporal/TemporalDecompositionModel.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/TemporalDecompositionModel.java
index 5609c0fbf60..97df1572509 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/temporal/TemporalDecompositionModel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/TemporalDecompositionModel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.temporal;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.temporal;
import java.time.Instant;
import java.time.ZoneId;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/temporal/TextFieldWithDateTimePicker.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/TextFieldWithDateTimePicker.java
similarity index 98%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/temporal/TextFieldWithDateTimePicker.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/TextFieldWithDateTimePicker.java
index 83271d3e9d3..b489093907d 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/temporal/TextFieldWithDateTimePicker.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/TextFieldWithDateTimePicker.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.temporal;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.temporal;
import static de.agilecoders.wicket.jquery.JQuery.$;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/temporal/_TimeFormatUtil.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/_TimeFormatUtil.java
similarity index 96%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/temporal/_TimeFormatUtil.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/_TimeFormatUtil.java
index 855471d506f..b3a4b32b178 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/temporal/_TimeFormatUtil.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/_TimeFormatUtil.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.temporal;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.temporal;
import lombok.experimental.UtilityClass;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/value/CompositeValueAttributePanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/value/CompositeValueAttributePanel.java
similarity index 86%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/value/CompositeValueAttributePanel.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/value/CompositeValueAttributePanel.java
index 45770bd2a64..64c264ae3b2 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/value/CompositeValueAttributePanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/value/CompositeValueAttributePanel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.value;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.value;
import java.util.Optional;
@@ -25,10 +25,10 @@ import
org.apache.wicket.markup.html.form.AbstractTextComponent;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.FieldFrame;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.InputFragment;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributePanelWithFormField;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributePanelWithFormField;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.FieldFrame;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.InputFragment;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.markup.MarkupComponent;
import
org.apache.causeway.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
public class CompositeValueAttributePanel<T>
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/value/ValueAttributePanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/value/ValueAttributePanel.java
similarity index 90%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/value/ValueAttributePanel.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/value/ValueAttributePanel.java
index c35fdd278d5..2a3e73a3656 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/value/ValueAttributePanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/value/ValueAttributePanel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.value;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.value;
import java.util.Optional;
@@ -24,7 +24,7 @@ import org.apache.wicket.util.convert.IConverter;
import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributePanelWithTextField;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributePanelWithTextField;
/**
* Specialization of {@link AttributePanelWithTextField},
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/value/ValueFallbackAttributePanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/value/ValueFallbackAttributePanel.java
similarity index 86%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/value/ValueFallbackAttributePanel.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/value/ValueFallbackAttributePanel.java
index 396de1b8237..cab689149e8 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/value/ValueFallbackAttributePanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/value/ValueFallbackAttributePanel.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.value;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.value;
import org.apache.causeway.applib.annotation.Value;
import org.apache.causeway.applib.value.semantics.Parser;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
-import org.apache.causeway.viewer.wicket.ui.components.scalars.AttributePanel;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.TextualAttributePanel;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributePanel;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.TextualAttributePanel;
/**
* Panel for rendering any value types that do not have their own custom
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/value/ValueFallbackAttributePanelFactory.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/value/ValueFallbackAttributePanelFactory.java
similarity index 91%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/value/ValueFallbackAttributePanelFactory.java
rename to
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/value/ValueFallbackAttributePanelFactory.java
index a258e8e5a49..aa3e558b719 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/value/ValueFallbackAttributePanelFactory.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/value/ValueFallbackAttributePanelFactory.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.scalars.value;
+package org.apache.causeway.viewer.wicket.ui.components.attributes.value;
import org.apache.wicket.Component;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeComponentFactoryAbstract;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeComponentFactoryAbstract;
/**
* {@link ComponentFactory} for the {@link ValueFallbackAttributePanel}.
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/CollectionPanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/CollectionPanel.java
index 4bae7c45fa7..3b7845d3784 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/CollectionPanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/CollectionPanel.java
@@ -25,9 +25,9 @@ import
org.apache.causeway.core.metamodel.tabular.DataTableInteractive;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.ActionModel;
import
org.apache.causeway.viewer.wicket.model.models.EntityCollectionModelParented;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributePanel;
import
org.apache.causeway.viewer.wicket.ui.components.collection.selector.CollectionPresentationSelectorPanel;
import
org.apache.causeway.viewer.wicket.ui.components.collection.selector.CollectionPresentationSelectorProvider;
-import org.apache.causeway.viewer.wicket.ui.components.scalars.AttributePanel;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import lombok.Getter;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
index 3399857bf1a..10f3808e9e0 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
@@ -43,7 +43,7 @@ import
org.apache.causeway.viewer.wicket.model.models.ActionModel;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
import
org.apache.causeway.viewer.wicket.ui.components.actionlinks.entityactions.ActionLinksPanel;
-import org.apache.causeway.viewer.wicket.ui.components.scalars.AttributePanel;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributePanel;
import
org.apache.causeway.viewer.wicket.ui.panels.HasDynamicallyVisibleContent;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/property/PropertyEditForm.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/property/PropertyEditForm.java
index 39921e6500a..f2a145a0a20 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/property/PropertyEditForm.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/property/PropertyEditForm.java
@@ -26,7 +26,7 @@ import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.ActionModel;
import org.apache.causeway.viewer.wicket.model.models.PropertyModel;
-import org.apache.causeway.viewer.wicket.ui.components.scalars.AttributePanel;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributePanel;
import org.apache.causeway.viewer.wicket.ui.panels.PromptFormAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/TreeAttributePanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/TreeAttributePanel.java
index 2c5ca230774..dbcd0875742 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/TreeAttributePanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/TreeAttributePanel.java
@@ -22,8 +22,8 @@ import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.FrameFragment;
-import org.apache.causeway.viewer.wicket.ui.components.scalars.AttributePanel;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributePanel;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.FrameFragment;
/**
* Renders a non-editable tree.
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/TreePanelFactories.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/TreePanelFactories.java
index 8d61018fffa..c2832ae385a 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/TreePanelFactories.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/TreePanelFactories.java
@@ -26,7 +26,7 @@ import
org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
import org.apache.causeway.viewer.wicket.model.models.ValueModel;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeComponentFactoryAbstract;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeComponentFactoryAbstract;
/**
* {@link ComponentFactory} for {@link TreeAttributePanel}.
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/value/StandaloneValuePanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/value/StandaloneValuePanel.java
index 1928c13898b..d8ac88b118c 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/value/StandaloneValuePanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/value/StandaloneValuePanel.java
@@ -27,7 +27,7 @@ import
org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.MmValueUtils;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.viewer.wicket.model.models.ValueModel;
-import org.apache.causeway.viewer.wicket.ui.components.scalars.AttributePanel;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributePanel;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/actionlink/ActionLink.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/actionlink/ActionLink.java
index ab9f596ae00..99a91cad03a 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/actionlink/ActionLink.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/actionlink/ActionLink.java
@@ -43,8 +43,8 @@ import
org.apache.causeway.viewer.wicket.model.models.ActionPromptWithExtraConte
import org.apache.causeway.viewer.wicket.model.util.PageParameterUtils;
import
org.apache.causeway.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import
org.apache.causeway.viewer.wicket.ui.app.registry.HasComponentFactoryRegistry;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.FrameFragment;
import
org.apache.causeway.viewer.wicket.ui.components.layout.bs.BSGridPanelFactory;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeFragmentFactory.FrameFragment;
import org.apache.causeway.viewer.wicket.ui.pages.entity.EntityPage;
import org.apache.causeway.viewer.wicket.ui.panels.FormExecutorDefault;
import org.apache.causeway.viewer.wicket.ui.panels.PanelUtil;
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 c7792ca2340..89ba8d262d5 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
@@ -35,7 +35,7 @@ import
org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
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.AttributeModelChangeDispatcher;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeModelChangeDispatcher;
import
org.apache.causeway.viewer.wicket.ui.components.widgets.select2.providers.ChoiceProviderAbstract;
import lombok.NonNull;
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 cd0c40bce96..3a40bb71220 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.AttributeModelChangeDispatcher;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeModelChangeDispatcher;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageAbstract.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageAbstract.java
index 6c4e8f74d41..4b65a5c516d 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageAbstract.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageAbstract.java
@@ -68,7 +68,7 @@ import
org.apache.causeway.viewer.wicket.ui.app.registry.ComponentFactoryRegistr
import
org.apache.causeway.viewer.wicket.ui.app.registry.HasComponentFactoryRegistry;
import
org.apache.causeway.viewer.wicket.ui.components.actionprompt.ActionPromptModalWindow;
import
org.apache.causeway.viewer.wicket.ui.components.actionpromptsb.ActionPromptSidebar;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.image.JavaAwtImagePanelCssResourceReference;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.image.JavaAwtImagePanelCssResourceReference;
import
org.apache.causeway.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModel;
import
org.apache.causeway.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModelProvider;
import org.apache.causeway.viewer.wicket.ui.errors.ExceptionModel;
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 d8a48d44385..50472b99097 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,8 +42,8 @@ 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.AttributeModelChangeListener;
-import org.apache.causeway.viewer.wicket.ui.components.scalars.AttributePanel;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeModelChangeListener;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributePanel;
import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
import org.apache.causeway.viewer.wicket.ui.pages.entity.EntityPage;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java
index 818eb2b3822..4bc87991309 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java
@@ -112,7 +112,7 @@ import
org.apache.causeway.viewer.wicket.model.hints.CausewayActionCompletedEven
import org.apache.causeway.viewer.wicket.model.hints.CausewayEnvelopeEvent;
import
org.apache.causeway.viewer.wicket.model.models.interaction.coll.DataRowToggleWkt;
import
org.apache.causeway.viewer.wicket.model.models.interaction.coll.DataRowWkt;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.markup.MarkupComponent;
import
org.apache.causeway.viewer.wicket.ui.components.text.TextAreaWithConverter;
import
org.apache.causeway.viewer.wicket.ui.components.text.TextFieldWithConverter;
import
org.apache.causeway.viewer.wicket.ui.components.widgets.fileinput.FileUploadFieldWithNestingFix;
diff --git
a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/components/ComponentFactoryConfigWkt.java
b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/components/ComponentFactoryConfigWkt.java
index 7a376afcae3..3f218012a11 100644
---
a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/components/ComponentFactoryConfigWkt.java
+++
b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/components/ComponentFactoryConfigWkt.java
@@ -48,6 +48,20 @@ import
org.apache.causeway.viewer.wicket.ui.components.actionlinks.serviceaction
import
org.apache.causeway.viewer.wicket.ui.components.actionlinks.serviceactions.TertiaryMenuPanelFactory;
import
org.apache.causeway.viewer.wicket.ui.components.actions.ActionParametersFormPanelFactory;
import
org.apache.causeway.viewer.wicket.ui.components.actions.ActionParametersPanelFactory;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeComponentFactoryTypeConstrainedAbstract;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.NumericAttributePanel;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.blobclob.BlobAttributePanelFactory;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.blobclob.ClobAttributePanelFactory;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.bool.BooleanAttributePanelFactory;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.choices.ChoicesSelect2PanelFactory;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.image.JavaAwtImagePanelFactory;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.markup.MarkupAttributePanelFactories;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.passwd.PasswordAttributePanelFactory;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.string.StringAttributePanelFactory;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.temporal.TemporalAttributePanel;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.value.CompositeValueAttributePanel;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.value.ValueAttributePanel;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.value.ValueFallbackAttributePanelFactory;
import
org.apache.causeway.viewer.wicket.ui.components.bookmarkedpages.BookmarkedPagesPanelFactory;
import
org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxtable.CollectionContentsAsAjaxTablePanelFactory;
import
org.apache.causeway.viewer.wicket.ui.components.collectioncontents.export.CollectionContentsAsExportFactory;
@@ -64,20 +78,6 @@ import
org.apache.causeway.viewer.wicket.ui.components.header.HeaderPanelFactory
import
org.apache.causeway.viewer.wicket.ui.components.layout.bs.BSGridPanelFactory;
import
org.apache.causeway.viewer.wicket.ui.components.property.PropertyEditFormPanelFactory;
import
org.apache.causeway.viewer.wicket.ui.components.property.PropertyEditPanelFactory;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.AttributeComponentFactoryTypeConstrainedAbstract;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.NumericAttributePanel;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.blobclob.BlobAttributePanelFactory;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.blobclob.ClobAttributePanelFactory;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.bool.BooleanAttributePanelFactory;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.choices.ChoicesSelect2PanelFactory;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.image.JavaAwtImagePanelFactory;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.markup.MarkupAttributePanelFactories;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.passwd.PasswordAttributePanelFactory;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.string.StringAttributePanelFactory;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.temporal.TemporalAttributePanel;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.value.CompositeValueAttributePanel;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.value.ValueAttributePanel;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.value.ValueFallbackAttributePanelFactory;
import
org.apache.causeway.viewer.wicket.ui.components.standalonecollection.StandaloneCollectionPanelFactory;
import org.apache.causeway.viewer.wicket.ui.components.tree.TreePanelFactories;
import
org.apache.causeway.viewer.wicket.ui.components.unknown.UnknownModelPanelFactory;
diff --git
a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/WicketViewerCssBundleInit.java
b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/WicketViewerCssBundleInit.java
index 04436f6e3c7..6cc058d763a 100644
---
a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/WicketViewerCssBundleInit.java
+++
b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/WicketViewerCssBundleInit.java
@@ -29,7 +29,7 @@ import org.apache.causeway.commons.internal.collections._Sets;
import
org.apache.causeway.viewer.wicket.model.causeway.WicketApplicationInitializer;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
import
org.apache.causeway.viewer.wicket.ui.components.actionlinks.entityactions.ActionLinksPanel;
-import
org.apache.causeway.viewer.wicket.ui.components.scalars.string.StringAttributePanelFactory;
+import
org.apache.causeway.viewer.wicket.ui.components.attributes.string.StringAttributePanelFactory;
import org.apache.causeway.viewer.wicket.ui.panels.PanelUtil;
import
org.apache.causeway.viewer.wicket.viewer.wicketapp.CausewayWicketApplication;
