You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/11/17 10:05:17 UTC
[isis] branch master updated: ISIS-2896: remove ScalarPanel#getScalarPanelType as can be inferred
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 3ba9f22 ISIS-2896: remove ScalarPanel#getScalarPanelType as can be inferred
3ba9f22 is described below
commit 3ba9f22ea8aa933c7513962b2e903e74449e95d9
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Nov 17 11:04:11 2021 +0100
ISIS-2896: remove ScalarPanel#getScalarPanelType as can be inferred
---
.../ui/app/registry/ComponentFactoryRegistry.java | 6 ++++--
.../ui/components/scalars/ScalarPanelAbstract.java | 8 +++++---
.../scalars/blobclob/IsisBlobOrClobPanelAbstract.java | 6 ------
.../ui/components/scalars/bookmark/BookmarkPanel.java | 7 -------
.../components/scalars/jdk8time/Jdk8LocalDatePanel.java | 4 ----
.../scalars/jdk8time/Jdk8LocalDateTimePanel.java | 5 -----
.../scalars/jdk8time/Jdk8OffsetDateTimePanel.java | 7 ++-----
.../components/scalars/jdkdates/JavaSqlDatePanel.java | 4 ----
.../components/scalars/jdkdates/JavaSqlTimePanel.java | 6 ------
.../scalars/jdkdates/JavaSqlTimestampPanel.java | 5 -----
.../components/scalars/jdkdates/JavaUtilDatePanel.java | 7 ++-----
.../scalars/jdkmath/JavaMathBigDecimalPanel.java | 6 ------
.../scalars/jdkmath/JavaMathBigIntegerPanel.java | 5 -----
.../components/scalars/jodatime/JodaDateTimePanel.java | 4 ----
.../components/scalars/jodatime/JodaLocalDatePanel.java | 4 ----
.../scalars/jodatime/JodaLocalDateTimePanel.java | 4 ----
.../components/scalars/jodatime/JodaLocalTimePanel.java | 13 +++++--------
.../components/scalars/markup/ParentedMarkupPanel.java | 5 -----
.../ui/components/scalars/oiddto/OidDtoPanel.java | 7 -------
.../ui/components/scalars/passwd/IsisPasswordPanel.java | 9 ++-------
.../ui/components/scalars/primitive/BooleanPanel.java | 6 ------
.../ui/components/scalars/primitive/BytePanel.java | 5 -----
.../ui/components/scalars/primitive/CharacterPanel.java | 4 ----
.../ui/components/scalars/primitive/DoublePanel.java | 5 -----
.../ui/components/scalars/primitive/FloatPanel.java | 5 -----
.../ui/components/scalars/primitive/IntegerPanel.java | 5 -----
.../ui/components/scalars/primitive/LongPanel.java | 5 -----
.../ui/components/scalars/primitive/ShortPanel.java | 5 -----
.../ui/components/scalars/reference/ReferencePanel.java | 17 +++++------------
.../components/scalars/string/MultiLineStringPanel.java | 5 -----
.../ui/components/scalars/string/StringPanel.java | 7 -------
.../wicket/ui/components/scalars/uuid/UuidPanel.java | 5 -----
.../scalars/value/compound/ValueCompoundPanel.java | 5 -----
.../scalars/value/fallback/ValueFallbackPanel.java | 5 -----
.../scalars/valuechoices/ValueChoicesSelect2Panel.java | 5 -----
.../viewer/wicket/ui/components/tree/TreePanel.java | 5 -----
36 files changed, 25 insertions(+), 191 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistry.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistry.java
index 087fc4b..e5b7815 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistry.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistry.java
@@ -59,8 +59,10 @@ public interface ComponentFactoryRegistry {
return streamComponentFactories(componentType, model)
.findFirst()
.orElseThrow(()->new RuntimeException(String.format(
- "could not find component for componentType = '%s'; model object is of type %s",
- componentType, model.getClass().getName())));
+ "could not find component for componentType = '%s'; "
+ + "model object is of type %s; "
+ + "model object='%s'",
+ componentType, model.getClass().getName(), model.getObject())));
}
/**
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index 77e204a..4474a0f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -265,9 +265,11 @@ implements ScalarModelSubscriber {
}
/**
- * Mandatory hook; simply determines the CSS that is added to the outermost 'scalarTypeContainer' div.
+ * determines the CSS that is added to the outermost 'scalarTypeContainer' div.
*/
- protected abstract String getScalarPanelType();
+ public final String getCssClassName() {
+ return _Strings.decapitalize(getClass().getSimpleName());
+ }
/**
* Mandatory hook for implementations to indicate whether it supports the {@link PromptStyle#INLINE inline} or
@@ -301,7 +303,7 @@ implements ScalarModelSubscriber {
private void buildGui() {
scalarTypeContainer = Wkt.containerAdd(this, ID_SCALAR_TYPE_CONTAINER);
- Wkt.cssAppend(scalarTypeContainer, getScalarPanelType());
+ Wkt.cssAppend(scalarTypeContainer, getCssClassName());
this.scalarIfCompact = createComponentForCompact();
this.scalarIfRegular = createComponentForRegular();
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java
index 0151093..8ad5463 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java
@@ -389,10 +389,4 @@ extends ScalarPanelAbstract {
protected abstract IResource newResource(final T namedWithMimeType);
- @Override
- protected String getScalarPanelType() {
- return "isisBlobPanel";
- }
-
-
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/bookmark/BookmarkPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/bookmark/BookmarkPanel.java
index a558005..37dbef6 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/bookmark/BookmarkPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/bookmark/BookmarkPanel.java
@@ -34,11 +34,4 @@ public class BookmarkPanel extends ScalarPanelTextFieldParseableAbstract {
super(id, scalarModel);
}
- @Override
- protected String getScalarPanelType() {
- return "bookmarkPanel";
- }
-
-
-
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDatePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDatePanel.java
index 3d1c080..6d0e192 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDatePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDatePanel.java
@@ -34,8 +34,4 @@ public class Jdk8LocalDatePanel extends ScalarPanelTextFieldDatePickerAbstract<L
init(new DateConverterForJdk8LocalDate(getWicketViewerSettings(), getAdjustBy()));
}
- @Override
- protected String getScalarPanelType() {
- return "jdk8DateTimePanel";
- }
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDateTimePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDateTimePanel.java
index e3989b1..e0ce9f1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDateTimePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDateTimePanel.java
@@ -45,9 +45,4 @@ public class Jdk8LocalDateTimePanel extends ScalarPanelTextFieldDatePickerAbstra
return new TextFieldWithDateTimePicker<>(super.getCommonContext(), id, textFieldValueModel, cls, converter);
}
- @Override
- protected String getScalarPanelType() {
- return "jdk8LocalDateTimePanel";
- }
-
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8OffsetDateTimePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8OffsetDateTimePanel.java
index 4e58385..bfed31f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8OffsetDateTimePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8OffsetDateTimePanel.java
@@ -30,7 +30,8 @@ import org.apache.isis.viewer.wicket.ui.components.scalars.datepicker.TextFieldW
/**
* Panel for rendering scalars of type {@link OffsetDateTime}.
*/
-public class Jdk8OffsetDateTimePanel extends ScalarPanelTextFieldDatePickerAbstract<OffsetDateTime> {
+public class Jdk8OffsetDateTimePanel
+extends ScalarPanelTextFieldDatePickerAbstract<OffsetDateTime> {
private static final long serialVersionUID = 1L;
@@ -45,8 +46,4 @@ public class Jdk8OffsetDateTimePanel extends ScalarPanelTextFieldDatePickerAbstr
return new TextFieldWithDateTimePicker<>(super.getCommonContext(), id, textFieldValueModel, cls, converter);
}
- @Override
- protected String getScalarPanelType() {
- return "jdk8DateTimePanel";
- }
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.java
index 25c63a9..f4e6415 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.java
@@ -35,8 +35,4 @@ public class JavaSqlDatePanel extends ScalarPanelTextFieldDatePickerAbstract<jav
init(new DateConverterForJavaSqlDate(getWicketViewerSettings(), getAdjustBy()));
}
- @Override
- protected String getScalarPanelType() {
- return "javaSqlDatePanel";
- }
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.java
index f7d4b5d..b7dba61 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.java
@@ -34,10 +34,4 @@ public class JavaSqlTimePanel extends ScalarPanelTextFieldParseableAbstract {
super(id, scalarModel);
}
- @Override
- protected String getScalarPanelType() {
- return "javaSqlTimePanel";
- }
-
-
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.java
index 5134f76..7b0b138 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.java
@@ -41,9 +41,4 @@ public class JavaSqlTimestampPanel extends ScalarPanelTextFieldDatePickerAbstrac
return +3;
}
- @Override
- protected String getScalarPanelType() {
- return "javaSqlTimestampPanel";
- }
-
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.java
index 795856b..1ec1fd3 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.java
@@ -26,7 +26,8 @@ import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldD
/**
* Panel for rendering scalars of type {@link java.util.Date}.
*/
-public class JavaUtilDatePanel extends ScalarPanelTextFieldDatePickerAbstract<java.util.Date> {
+public class JavaUtilDatePanel
+extends ScalarPanelTextFieldDatePickerAbstract<java.util.Date> {
private static final long serialVersionUID = 1L;
@@ -40,8 +41,4 @@ public class JavaUtilDatePanel extends ScalarPanelTextFieldDatePickerAbstract<ja
return +3;
}
- @Override
- protected String getScalarPanelType() {
- return "javaUtilDatePanel";
- }
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java
index 5f05074..f465364 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java
@@ -52,12 +52,6 @@ extends ScalarPanelTextFieldNumeric<BigDecimal> {
id, newTextFieldValueModel(), BigDecimal.class, getConverter(getModel()));
}
-
- @Override
- protected String getScalarPanelType() {
- return "javaMathBigDecimalPanel";
- }
-
@Override
protected IConverter<BigDecimal> getConverter(
final @NonNull ObjectFeature propOrParam,
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
index dd095df..d96811f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
@@ -51,11 +51,6 @@ extends ScalarPanelTextFieldNumeric<BigInteger> {
}
@Override
- protected String getScalarPanelType() {
- return "javaMathBigIntegerPanel";
- }
-
- @Override
protected IConverter<BigInteger> getConverter(
final @NonNull ObjectFeature propOrParam,
final @NonNull ScalarRepresentation scalarRepresentation) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.java
index 536e1b7..f4b4819 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.java
@@ -45,8 +45,4 @@ public class JodaDateTimePanel extends ScalarPanelTextFieldDatePickerAbstract<Da
return new TextFieldWithDateTimePicker<>(super.getCommonContext(), id, textFieldValueModel, cls, converter);
}
- @Override
- protected String getScalarPanelType() {
- return "jodaDateTimePanel";
- }
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.java
index fc7d9ae..a2bf487 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.java
@@ -35,8 +35,4 @@ public class JodaLocalDatePanel extends ScalarPanelTextFieldDatePickerAbstract<L
init(new DateConverterForJodaLocalDate(getWicketViewerSettings(), getAdjustBy()));
}
- @Override
- protected String getScalarPanelType() {
- return "jodaDateTimePanel";
- }
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.java
index 7a3560d..5267d01 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.java
@@ -45,8 +45,4 @@ public class JodaLocalDateTimePanel extends ScalarPanelTextFieldDatePickerAbstra
return new TextFieldWithDateTimePicker<>(super.getCommonContext(), id, textFieldValueModel, cls, converter);
}
- @Override
- protected String getScalarPanelType() {
- return "jodaLocalDateTimePanel";
- }
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalTimePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalTimePanel.java
index ffcf2a6..dd5f9cd 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalTimePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalTimePanel.java
@@ -18,14 +18,15 @@
*/
package org.apache.isis.viewer.wicket.ui.components.scalars.jodatime;
-import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldAbstract;
-import org.apache.isis.viewer.wicket.ui.components.scalars.TextFieldValueModel;
import org.apache.wicket.markup.html.form.AbstractTextComponent;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.util.convert.IConverter;
import org.joda.time.LocalTime;
+import org.apache.isis.viewer.wicket.model.models.ScalarModel;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldAbstract;
+import org.apache.isis.viewer.wicket.ui.components.scalars.TextFieldValueModel;
+
/**
* Panel for rendering scalars of type {@link LocalTime}.
*/
@@ -45,14 +46,10 @@ public class JodaLocalTimePanel extends ScalarPanelTextFieldAbstract<LocalTime>
@SuppressWarnings("unchecked")
@Override
- public <C> IConverter<C> getConverter(Class<C> type) {
+ public <C> IConverter<C> getConverter(final Class<C> type) {
return (IConverter<C>) (type == LocalTime.class ? new ConverterForJodaLocalTime() : super.getConverter(type));
}
};
}
- @Override
- protected String getScalarPanelType() {
- return "jodaLocalTimePanel";
- }
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/ParentedMarkupPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/ParentedMarkupPanel.java
index 2d73b41..f3d5295 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/ParentedMarkupPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/ParentedMarkupPanel.java
@@ -46,11 +46,6 @@ public class ParentedMarkupPanel extends MultiLineStringPanel {
}
@Override
- protected String getScalarPanelType() {
- return "markupPanel";
- }
-
- @Override
protected MarkupContainer createScalarIfRegularFormGroup() {
if(getModel().isEditMode()) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/oiddto/OidDtoPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/oiddto/OidDtoPanel.java
index 08a449e..8aefc91 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/oiddto/OidDtoPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/oiddto/OidDtoPanel.java
@@ -33,11 +33,4 @@ public class OidDtoPanel extends ScalarPanelTextFieldParseableAbstract {
super(id, scalarModel);
}
- @Override
- protected String getScalarPanelType() {
- return "oidDtoPanel";
- }
-
-
-
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/passwd/IsisPasswordPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/passwd/IsisPasswordPanel.java
index a70409e..cc7e799 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/passwd/IsisPasswordPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/passwd/IsisPasswordPanel.java
@@ -42,13 +42,13 @@ public class IsisPasswordPanel extends ScalarPanelTextFieldParseableAbstract {
@Override
- protected AbstractTextComponent<String> createTextFieldForRegular(String id) {
+ protected AbstractTextComponent<String> createTextFieldForRegular(final String id) {
final TextFieldStringModel textModel = new TextFieldStringModel(this);
final PasswordTextField passwordField = new PasswordTextField(id, textModel) {
private static final long serialVersionUID = 1L;
@Override
- protected void onComponentTag(ComponentTag tag) {
+ protected void onComponentTag(final ComponentTag tag) {
Attributes.set(tag, "type", "password");
super.onComponentTag(tag);
}
@@ -59,9 +59,4 @@ public class IsisPasswordPanel extends ScalarPanelTextFieldParseableAbstract {
return passwordField;
}
- @Override
- protected String getScalarPanelType() {
- return "isisPasswordPanel";
- }
-
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
index e06a012..9f0e2e7 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
@@ -254,10 +254,4 @@ public class BooleanPanel extends ScalarPanelAbstract {
return variation;
}
- @Override
- protected String getScalarPanelType() {
- return "booleanPanel";
- }
-
-
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java
index b92f34a..6b8a476 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java
@@ -49,11 +49,6 @@ extends ScalarPanelTextFieldNumeric<Byte> {
}
@Override
- protected String getScalarPanelType() {
- return "bytePanel";
- }
-
- @Override
protected IConverter<Byte> getConverter(
final @NonNull ObjectFeature propOrParam,
final @NonNull ScalarRepresentation scalarRepresentation) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.java
index f7c2973..b4be3d3 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.java
@@ -32,8 +32,4 @@ public class CharacterPanel extends ScalarPanelTextFieldParseableAbstract {
super(id, scalarModel);
}
- @Override
- protected String getScalarPanelType() {
- return "characterPanel";
- }
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java
index 82678c6..a164ebc 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java
@@ -48,11 +48,6 @@ public class DoublePanel extends ScalarPanelTextFieldNumeric<Double> {
}
@Override
- protected String getScalarPanelType() {
- return "doublePanel";
- }
-
- @Override
protected IConverter<Double> getConverter(
final @NonNull ObjectFeature propOrParam,
final @NonNull ScalarRepresentation scalarRepresentation) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java
index 177e610..d79aa76 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java
@@ -48,11 +48,6 @@ public class FloatPanel extends ScalarPanelTextFieldNumeric<Float> {
}
@Override
- protected String getScalarPanelType() {
- return "floatPanel";
- }
-
- @Override
protected IConverter<Float> getConverter(
final @NonNull ObjectFeature propOrParam,
final @NonNull ScalarRepresentation scalarRepresentation) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java
index b43d880..800dbde 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java
@@ -48,11 +48,6 @@ public class IntegerPanel extends ScalarPanelTextFieldNumeric<Integer> {
}
@Override
- protected String getScalarPanelType() {
- return "integerPanel";
- }
-
- @Override
protected IConverter<Integer> getConverter(
final @NonNull ObjectFeature propOrParam,
final @NonNull ScalarRepresentation scalarRepresentation) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java
index eca762e..80a2393 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java
@@ -48,11 +48,6 @@ public class LongPanel extends ScalarPanelTextFieldNumeric<Long> {
}
@Override
- protected String getScalarPanelType() {
- return "longPanel";
- }
-
- @Override
protected IConverter<Long> getConverter(
final @NonNull ObjectFeature propOrParam,
final @NonNull ScalarRepresentation scalarRepresentation) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java
index a6a8129..795d3ce 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java
@@ -48,11 +48,6 @@ public class ShortPanel extends ScalarPanelTextFieldNumeric<Short> {
}
@Override
- protected String getScalarPanelType() {
- return "shortPanel";
- }
-
- @Override
protected IConverter<Short> getConverter(
final @NonNull ObjectFeature propOrParam,
final @NonNull ScalarRepresentation scalarRepresentation) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
index cac42c3..5750573 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
@@ -243,11 +243,11 @@ public class ReferencePanel extends ScalarPanelSelectAbstract {
val scalarModel = getModel();
- val component = getComponentFactoryRegistry()
- .addOrReplaceComponent(componentForRegular,
- ComponentType.ENTITY_ICON_AND_TITLE.getId(),
- ComponentType.ENTITY_ICON_AND_TITLE,
- scalarModel);
+ val componentFactory = getComponentFactoryRegistry()
+ .findComponentFactory(ComponentType.ENTITY_ICON_AND_TITLE, scalarModel);
+ val component = componentFactory
+ .createComponent(ComponentType.ENTITY_ICON_AND_TITLE.getId(), scalarModel);
+ componentForRegular.addOrReplace(component);
val isInlinePrompt = scalarModel.isInlinePrompt();
if(isInlinePrompt) {
@@ -414,13 +414,6 @@ public class ReferencePanel extends ScalarPanelSelectAbstract {
return autoCompleteFacet != null;
}
-
- @Override
- protected String getScalarPanelType() {
- return "referencePanel";
- }
-
-
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
index b42df91..678e1e4 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
@@ -79,11 +79,6 @@ extends ScalarPanelTextFieldParseableAbstract {
return null;
}
- @Override
- protected String getScalarPanelType() {
- return "multiLineStringPanel";
- }
-
// -- HELPER
private void setRowsAndMaxLengthAttributesOn(final TextArea<String> textField) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.java
index b43361a..88deebf 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.java
@@ -33,11 +33,4 @@ public class StringPanel extends ScalarPanelTextFieldParseableAbstract {
super(id, scalarModel);
}
- @Override
- protected String getScalarPanelType() {
- return "stringPanel";
- }
-
-
-
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidPanel.java
index eb396f8..43c2dac 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidPanel.java
@@ -48,11 +48,6 @@ public class UuidPanel extends ScalarPanelTextFieldAbstract<UUID> {
return new UuidTextField(id, textFieldValueModel, cls, model, converter);
}
-
- @Override
- protected String getScalarPanelType() {
- return "uuidPanel";
- }
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/compound/ValueCompoundPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/compound/ValueCompoundPanel.java
index 7c3437c..b191920 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/compound/ValueCompoundPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/compound/ValueCompoundPanel.java
@@ -38,11 +38,6 @@ extends ScalarPanelTextFieldParseableAbstract {
}
@Override
- protected String getScalarPanelType() {
- return "valuePanel";
- }
-
- @Override
protected void onInitialize() {
System.err.printf("%s%n", scalarModel.getMetaModel().getFeatureIdentifier());
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/fallback/ValueFallbackPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/fallback/ValueFallbackPanel.java
index 3736dce..a9f0afd 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/fallback/ValueFallbackPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/fallback/ValueFallbackPanel.java
@@ -41,9 +41,4 @@ extends ScalarPanelTextFieldParseableAbstract {
super(id, scalarModel);
}
-
- @Override
- protected String getScalarPanelType() {
- return "valuePanel";
- }
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
index b404c5b..4a2d192 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
@@ -173,9 +173,4 @@ extends ScalarPanelSelectAbstract {
return scalarModel;
}
- @Override
- protected String getScalarPanelType() {
- return "valueChoicesSelect2Panel";
- }
-
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.java
index 625fa0a..ddf31fb 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.java
@@ -40,11 +40,6 @@ public class TreePanel extends ScalarPanelTextFieldParseableAbstract {
}
@Override
- protected String getScalarPanelType() {
- return "treePanel";
- }
-
- @Override
protected MarkupContainer createScalarIfRegularFormGroup() {
if(getModel().isEditMode()) {