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 2020/06/23 07:21:36 UTC
[isis] branch master updated: ISIS-2340: some renaming and
de-duplication
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 5624c9c ISIS-2340: some renaming and de-duplication
5624c9c is described below
commit 5624c9c6acee9676dc53a78ed1fda87fdf1891da
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Jun 23 09:21:16 2020 +0200
ISIS-2340: some renaming and de-duplication
---
.../ui/components/ScalarPanelAbstractLegacy.java | 4 +--
.../components/actions/ActionParametersForm.java | 10 +++---
.../ui/components/collection/CollectionPanel.java | 4 +--
.../components/entity/fieldset/PropertyGroup.java | 12 +++----
.../ui/components/property/PropertyEditForm.java | 12 +++----
...Subscriber2.java => ScalarModelSubscriber.java} | 6 ++--
...anelAbstract2.java => ScalarPanelAbstract.java} | 38 +++++++++++-----------
...bstract.java => ScalarPanelSelectAbstract.java} | 4 +--
.../scalars/ScalarPanelTextFieldAbstract.java | 27 ++++++++++++++-
.../ScalarPanelTextFieldDatePickerAbstract.java | 22 +++----------
.../scalars/ScalarPanelTextFieldNumeric.java | 22 ++-----------
...bleBehavior2.java => XEditableBehaviorWkt.java} | 6 ++--
.../isisapplib/IsisBlobOrClobPanelAbstract.java | 4 +--
.../components/scalars/primitive/BooleanPanel.java | 4 +--
.../scalars/reference/ReferencePanel.java | 8 ++---
.../ui/components/scalars/value/ValuePanel.java | 4 +--
.../valuechoices/ValueChoicesSelect2Panel.java | 4 +--
.../ui/components/value/StandaloneValuePanel.java | 4 +--
.../linkandlabel/LinkAndLabelFactoryAbstract.java | 4 +--
.../wicket/ui/panels/PromptFormAbstract.java | 10 +++---
20 files changed, 104 insertions(+), 105 deletions(-)
diff --git a/extensions/vw/pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/ScalarPanelAbstractLegacy.java b/extensions/vw/pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/ScalarPanelAbstractLegacy.java
index cc1c816..ca3a2dd 100644
--- a/extensions/vw/pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/ScalarPanelAbstractLegacy.java
+++ b/extensions/vw/pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/ScalarPanelAbstractLegacy.java
@@ -41,7 +41,7 @@ import org.apache.isis.viewer.common.model.object.ObjectUiModel.RenderingHint;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.actionmenu.entityactions.AdditionalLinksPanel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract2;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
import org.apache.isis.viewer.wicket.ui.components.scalars.TextFieldValueModel.ScalarModelProvider;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
@@ -57,7 +57,7 @@ import lombok.val;
* {@link Rendering#REGULAR regular} (eg within a form).
*
* <p>
- * REVIEW: this has been replaced by {@link ScalarPanelAbstract2} and is unused by the core framework.
+ * REVIEW: this has been replaced by {@link ScalarPanelAbstract} and is unused by the core framework.
* It is however still used by some wicket addons (specifically, pdfjs).
* </p>
*/
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java
index 0775c0e..c07b4c8 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java
@@ -38,7 +38,7 @@ import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.model.models.ScalarParameterModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract2;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
import org.apache.isis.viewer.wicket.ui.panels.FormExecutorStrategy;
import org.apache.isis.viewer.wicket.ui.panels.PromptFormAbstract;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
@@ -95,7 +95,7 @@ class ActionParametersForm extends PromptFormAbstract<ActionModel> {
}
- private Optional<ScalarPanelAbstract2> newParamPanel(
+ private Optional<ScalarPanelAbstract> newParamPanel(
final WebMarkupContainer container,
final ScalarParameterModel paramModel) {
@@ -111,8 +111,8 @@ class ActionParametersForm extends PromptFormAbstract<ActionModel> {
}
val paramPanel =
- component instanceof ScalarPanelAbstract2
- ? (ScalarPanelAbstract2) component
+ component instanceof ScalarPanelAbstract
+ ? (ScalarPanelAbstract) component
: null;
if (paramPanel != null) {
@@ -149,7 +149,7 @@ class ActionParametersForm extends PromptFormAbstract<ActionModel> {
}
@Override
- public void onUpdate(final AjaxRequestTarget target, final ScalarPanelAbstract2 scalarPanelUpdated) {
+ public void onUpdate(final AjaxRequestTarget target, final ScalarPanelAbstract scalarPanelUpdated) {
val actionModel = getActionModel();
val paramModel = (ParameterUiModel)scalarPanelUpdated.getModel();
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
index 25e0ebe..be783ff 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
@@ -44,7 +44,7 @@ import org.apache.isis.viewer.wicket.ui.components.collection.bulk.BulkActionsPr
import org.apache.isis.viewer.wicket.ui.components.collection.selector.CollectionSelectorPanel;
import org.apache.isis.viewer.wicket.ui.components.collection.selector.CollectionSelectorProvider;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ObjectAdapterToggleboxColumn;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract2;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
import org.apache.isis.viewer.wicket.ui.components.widgets.checkbox.ContainedToggleboxPanel;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
@@ -54,7 +54,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel
/**
* Panel for rendering entity collection; analogous to (any concrete subclass
- * of) {@link ScalarPanelAbstract2}.
+ * of) {@link ScalarPanelAbstract}.
*/
public class CollectionPanel
extends PanelAbstract<EntityCollectionModel>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
index 551021b..8457e11 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
@@ -46,7 +46,7 @@ import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.components.actionmenu.entityactions.AdditionalLinksPanel;
import org.apache.isis.viewer.wicket.ui.components.actionmenu.entityactions.LinkAndLabelUtil;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract2;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
import org.apache.isis.viewer.wicket.ui.panels.HasDynamicallyVisibleContent;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.Components;
@@ -66,7 +66,7 @@ public class PropertyGroup extends PanelAbstract<EntityModel> implements HasDyna
private static final String ID_PROPERTY = "property";
private final FieldSet fieldSet;
- private final List<ScalarPanelAbstract2> childScalarPanelAbstract2s;
+ private final List<ScalarPanelAbstract> childScalarPanelAbstract2s;
private final List<Component> childComponents;
public PropertyGroup(final String id, final EntityModel model, final FieldSet fieldSet) {
@@ -77,8 +77,8 @@ public class PropertyGroup extends PanelAbstract<EntityModel> implements HasDyna
childComponents = buildGui();
childScalarPanelAbstract2s =
_NullSafe.stream(childComponents)
- .filter(ScalarPanelAbstract2.class::isInstance)
- .map(ScalarPanelAbstract2.class::cast)
+ .filter(ScalarPanelAbstract.class::isInstance)
+ .map(ScalarPanelAbstract.class::cast)
.collect(Collectors.toList());
}
@@ -216,7 +216,7 @@ public class PropertyGroup extends PanelAbstract<EntityModel> implements HasDyna
@Override
public void onConfigure() {
- for (final ScalarPanelAbstract2 childComponent : childScalarPanelAbstract2s) {
+ for (final ScalarPanelAbstract childComponent : childScalarPanelAbstract2s) {
childComponent.configure();
}
super.onConfigure();
@@ -236,7 +236,7 @@ public class PropertyGroup extends PanelAbstract<EntityModel> implements HasDyna
}
// HACK:END
- for (final ScalarPanelAbstract2 childComponent : childScalarPanelAbstract2s) {
+ for (final ScalarPanelAbstract childComponent : childScalarPanelAbstract2s) {
if(childComponent.isVisibilityAllowed()) {
return true;
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditForm.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditForm.java
index 030c110..1707d4b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditForm.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditForm.java
@@ -30,7 +30,7 @@ import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.model.models.ScalarPropertyModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract2;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
import org.apache.isis.viewer.wicket.ui.panels.FormExecutorStrategy;
import org.apache.isis.viewer.wicket.ui.panels.PromptFormAbstract;
@@ -62,13 +62,13 @@ class PropertyEditForm extends PromptFormAbstract<ScalarPropertyModel> {
newParamPanel(container, scalarModel);
}
- private ScalarPanelAbstract2 newParamPanel(final WebMarkupContainer container, final IModel<?> model) {
+ private ScalarPanelAbstract newParamPanel(final WebMarkupContainer container, final IModel<?> model) {
final Component component = getComponentFactoryRegistry()
.addOrReplaceComponent(container, ComponentType.SCALAR_NAME_AND_VALUE, model);
- final ScalarPanelAbstract2 paramPanel =
- component instanceof ScalarPanelAbstract2
- ? (ScalarPanelAbstract2) component
+ final ScalarPanelAbstract paramPanel =
+ component instanceof ScalarPanelAbstract
+ ? (ScalarPanelAbstract) component
: null;
if (paramPanel != null) {
paramPanel.setOutputMarkupId(true);
@@ -84,7 +84,7 @@ class PropertyEditForm extends PromptFormAbstract<ScalarPropertyModel> {
@Override
public void onUpdate(
- final AjaxRequestTarget target, final ScalarPanelAbstract2 scalarPanel) {
+ final AjaxRequestTarget target, final ScalarPanelAbstract scalarPanel) {
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarModelSubscriber2.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarModelSubscriber.java
similarity index 83%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarModelSubscriber2.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarModelSubscriber.java
index 432cdaf..53355f2 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarModelSubscriber2.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarModelSubscriber.java
@@ -20,10 +20,10 @@ package org.apache.isis.viewer.wicket.ui.components.scalars;
import org.apache.wicket.ajax.AjaxRequestTarget;
-public interface ScalarModelSubscriber2 {
+public interface ScalarModelSubscriber {
- void onUpdate(AjaxRequestTarget target, ScalarPanelAbstract2 scalarPanel);
+ void onUpdate(AjaxRequestTarget target, ScalarPanelAbstract scalarPanel);
- void onError(AjaxRequestTarget target, ScalarPanelAbstract2 scalarPanel);
+ void onError(AjaxRequestTarget target, ScalarPanelAbstract scalarPanel);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
similarity index 96%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index 46b5db6..b45e4c4 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -79,9 +79,9 @@ import lombok.val;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-public abstract class ScalarPanelAbstract2
+public abstract class ScalarPanelAbstract
extends PanelAbstract<ScalarModel>
-implements ScalarModelSubscriber2 {
+implements ScalarModelSubscriber {
private static final long serialVersionUID = 1L;
@@ -236,13 +236,13 @@ implements ScalarModelSubscriber2 {
/**
* Populated
- * Used by most subclasses ({@link ScalarPanelAbstract2}, {@link ReferencePanel}, {@link ValueChoicesSelect2Panel}) but not all ({@link IsisBlobOrClobPanelAbstract}, {@link BooleanPanel})
+ * Used by most subclasses ({@link ScalarPanelAbstract}, {@link ReferencePanel}, {@link ValueChoicesSelect2Panel}) but not all ({@link IsisBlobOrClobPanelAbstract}, {@link BooleanPanel})
*/
private WebMarkupContainer scalarIfRegularInlinePromptForm;
WebMarkupContainer inlinePromptLink;
- public ScalarPanelAbstract2(final String id, final ScalarModel scalarModel) {
+ public ScalarPanelAbstract(final String id, final ScalarModel scalarModel) {
super(id, scalarModel);
this.scalarModel = scalarModel;
}
@@ -309,7 +309,7 @@ implements ScalarModelSubscriber2 {
* </p>
*
* <p>
- * Implementations that support inline prompts are: ({@link ScalarPanelAbstract2}, {@link ReferencePanel} and
+ * Implementations that support inline prompts are: ({@link ScalarPanelAbstract}, {@link ReferencePanel} and
* {@link ValueChoicesSelect2Panel}; those that don't are {@link IsisBlobOrClobPanelAbstract} and {@link BooleanPanel}.
* </p>
*
@@ -497,16 +497,16 @@ implements ScalarModelSubscriber2 {
static class ScalarUpdatingBehavior extends AjaxFormComponentUpdatingBehavior {
private static final long serialVersionUID = 1L;
- private final ScalarPanelAbstract2 scalarPanel;
+ private final ScalarPanelAbstract scalarPanel;
- private ScalarUpdatingBehavior(final ScalarPanelAbstract2 scalarPanel) {
+ private ScalarUpdatingBehavior(final ScalarPanelAbstract scalarPanel) {
super("change");
this.scalarPanel = scalarPanel;
}
@Override
protected void onUpdate(AjaxRequestTarget target) {
- for (ScalarModelSubscriber2 subscriber : scalarPanel.subscribers) {
+ for (ScalarModelSubscriber subscriber : scalarPanel.subscribers) {
subscriber.onUpdate(target, scalarPanel);
}
}
@@ -514,15 +514,15 @@ implements ScalarModelSubscriber2 {
@Override
protected void onError(AjaxRequestTarget target, RuntimeException e) {
super.onError(target, e);
- for (ScalarModelSubscriber2 subscriber : scalarPanel.subscribers) {
+ for (ScalarModelSubscriber subscriber : scalarPanel.subscribers) {
subscriber.onError(target, scalarPanel);
}
}
}
- private final List<ScalarModelSubscriber2> subscribers = _Lists.newArrayList();
+ private final List<ScalarModelSubscriber> subscribers = _Lists.newArrayList();
- public void notifyOnChange(final ScalarModelSubscriber2 subscriber) {
+ public void notifyOnChange(final ScalarModelSubscriber subscriber) {
subscribers.add(subscriber);
}
@@ -541,7 +541,7 @@ implements ScalarModelSubscriber2 {
@Override
public void onUpdate(
- final AjaxRequestTarget target, final ScalarPanelAbstract2 scalarPanel) {
+ final AjaxRequestTarget target, final ScalarPanelAbstract scalarPanel) {
if(getModel().isParameter()) {
target.appendJavaScript(
@@ -552,7 +552,7 @@ implements ScalarModelSubscriber2 {
@Override
public void onError(
- final AjaxRequestTarget target, final ScalarPanelAbstract2 scalarPanel) {
+ final AjaxRequestTarget target, final ScalarPanelAbstract scalarPanel) {
}
@@ -571,7 +571,7 @@ implements ScalarModelSubscriber2 {
}
@Override
- public void buildGui(final ScalarPanelAbstract2 panel) {
+ public void buildGui(final ScalarPanelAbstract panel) {
panel.getComponentForRegular().setVisible(false);
}
@@ -586,7 +586,7 @@ implements ScalarModelSubscriber2 {
}
@Override
- public void buildGui(final ScalarPanelAbstract2 panel) {
+ public void buildGui(final ScalarPanelAbstract panel) {
panel.scalarIfCompact.setVisible(false);
}
@@ -594,7 +594,7 @@ implements ScalarModelSubscriber2 {
public abstract String getLabelCaption(LabeledWebMarkupContainer labeledContainer);
- public abstract void buildGui(ScalarPanelAbstract2 panel);
+ public abstract void buildGui(ScalarPanelAbstract panel);
private static Rendering renderingFor(EntityModel.RenderingHint renderingHint) {
return renderingHint.isRegular()? Rendering.REGULAR :Rendering.COMPACT;
@@ -811,16 +811,16 @@ implements ScalarModelSubscriber2 {
final BeanSort sort = metaModelService.sortOf(specification.getCorrespondingClass(), MetaModelService.Mode.RELAXED);
final ActionPrompt prompt = ActionPromptProvider
- .getFrom(ScalarPanelAbstract2.this).getActionPrompt(promptStyle, sort);
+ .getFrom(ScalarPanelAbstract.this).getActionPrompt(promptStyle, sort);
PropertyEditPromptHeaderPanel titlePanel = new PropertyEditPromptHeaderPanel(
prompt.getTitleId(),
- (ScalarPropertyModel)ScalarPanelAbstract2.this.scalarModel);
+ (ScalarPropertyModel)ScalarPanelAbstract.this.scalarModel);
final PropertyEditPanel propertyEditPanel =
(PropertyEditPanel) getComponentFactoryRegistry().createComponent(
ComponentType.PROPERTY_EDIT_PROMPT, prompt.getContentId(),
- ScalarPanelAbstract2.this.scalarModel);
+ ScalarPanelAbstract.this.scalarModel);
propertyEditPanel.setShowHeader(false);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java
similarity index 98%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java
index 610d5c7..0844159 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java
@@ -45,13 +45,13 @@ import org.apache.isis.viewer.wicket.ui.util.Tooltips;
import lombok.NonNull;
import lombok.val;
-public abstract class ScalarPanelSelect2Abstract extends ScalarPanelAbstract2 {
+public abstract class ScalarPanelSelectAbstract extends ScalarPanelAbstract {
private static final long serialVersionUID = 1L;
protected Select2 select2;
- public ScalarPanelSelect2Abstract(final String id, final ScalarModel scalarModel) {
+ public ScalarPanelSelectAbstract(final String id, final ScalarModel scalarModel) {
super(id, scalarModel);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
index 5f21b24..717301b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
@@ -34,6 +34,7 @@ import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.ValidationError;
@@ -44,6 +45,7 @@ import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ManagedObject;
+import org.apache.isis.core.metamodel.spec.ManagedObjects;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
@@ -51,6 +53,7 @@ import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
+import lombok.NonNull;
import lombok.val;
/**
@@ -67,7 +70,7 @@ import lombok.val;
* </p>
*/
public abstract class ScalarPanelTextFieldAbstract<T extends Serializable>
-extends ScalarPanelAbstract2
+extends ScalarPanelAbstract
implements TextFieldValueModel.ScalarModelProvider {
private static final long serialVersionUID = 1L;
@@ -316,7 +319,29 @@ implements TextFieldValueModel.ScalarModelProvider {
// must be "live", for ajax updates.
return _Casts.uncheckedCast(model);
}
+
+ protected class ToStringConvertingModel<X> extends Model<String> {
+ private static final long serialVersionUID = 1L;
+
+ @NonNull private final IConverter<X> converter;
+
+ private ToStringConvertingModel(@NonNull IConverter<X> converter) {
+ this.converter = converter;
+ }
+ @Override public String getObject() {
+ val adapter = scalarModel.getObject();
+ val value = ManagedObjects.UnwrapUtil.single(adapter);
+ final String str = value != null
+ ? converter.convertToString(_Casts.uncheckedCast(value), getLocaleProvider().getLocale())
+ : null;
+ return str;
+ }
+ }
+
+ protected ToStringConvertingModel<T> toStringConvertingModelOf(IConverter<T> converter) {
+ return new ToStringConvertingModel<>(converter);
+ }
// //////////////////////////////////////
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
index a3e524a..3833a87 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
@@ -30,12 +30,11 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.IConverter;
+import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.core.metamodel.facets.objectvalue.renderedadjusted.RenderedAdjustedFacet;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.datepicker.TextFieldWithDateTimePicker;
-import lombok.val;
-
/**
* Panel for rendering scalars representing dates, along with a date picker.
*/
@@ -84,7 +83,7 @@ extends ScalarPanelTextFieldAbstract<T> {
@Override
public <C> IConverter<C> getConverter(Class<C> type) {
- return (IConverter<C>) converter;
+ return _Casts.uncheckedCast(converter);
}
};
label.setEnabled(false);
@@ -100,24 +99,13 @@ extends ScalarPanelTextFieldAbstract<T> {
return label;
}
-
+
@Override
protected IModel<String> obtainInlinePromptModel() {
- return new Model<String>() {
- private static final long serialVersionUID = 1L;
-
- @Override public String getObject() {
- val adapter = scalarModel.getObject();
- final T value = adapter != null ? (T) adapter.getPojo() : null;
- final String str =
- value != null
- ? converter.convertToString(value, getLocaleProvider().getLocale())
- : null;
- return str;
- }
- };
+ return super.toStringConvertingModelOf(converter);
}
+
/**
* Optional override for subclasses to explicitly indicate desired amount to adjust compact form of textField
*/
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
index dda1b29..0e12f5a 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
@@ -25,13 +25,11 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.IConverter;
+import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import lombok.val;
-
/**
* Panel for rendering numeric scalars.
*/
@@ -61,7 +59,7 @@ public abstract class ScalarPanelTextFieldNumeric<T extends Serializable> extend
@Override
public <C> IConverter<C> getConverter(Class<C> type) {
- return (IConverter<C>) converter;
+ return _Casts.uncheckedCast(converter);
}
};
@@ -73,21 +71,7 @@ public abstract class ScalarPanelTextFieldNumeric<T extends Serializable> extend
@Override
protected IModel<String> obtainInlinePromptModel() {
- return new Model<String>(){
-
- private static final long serialVersionUID = 1L;
-
- @Override public String getObject() {
- val adapter = scalarModel.getObject();
- final T value = adapter != null ? (T) adapter.getPojo() : null;
- final String str =
- value != null
- ? converter.convertToString(value, getLocaleProvider().getLocale())
- : null;
- return str;
- }
- };
-
+ return super.toStringConvertingModelOf(converter);
}
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/XEditableBehavior2.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/XEditableBehaviorWkt.java
similarity index 93%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/XEditableBehavior2.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/XEditableBehaviorWkt.java
index d8bf40b..df486fd 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/XEditableBehavior2.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/XEditableBehaviorWkt.java
@@ -28,8 +28,9 @@ import org.apache.wicket.util.string.StringValue;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.xeditable.XEditableBehavior;
-public class XEditableBehavior2 extends XEditableBehavior {
+public class XEditableBehaviorWkt extends XEditableBehavior {
+ private static final long serialVersionUID = 1L;
private AjaxEventBehavior validateListener;
/**
@@ -39,7 +40,6 @@ public class XEditableBehavior2 extends XEditableBehavior {
}
-
@Override
public void bind(Component component) {
super.bind(component);
@@ -58,6 +58,8 @@ public class XEditableBehavior2 extends XEditableBehavior {
protected AjaxEventBehavior newValidateListener() {
return new AjaxEventBehavior("validate") {
+ private static final long serialVersionUID = 1L;
+
/**
* what's bound to "validate" event in Javascript, and sent to the server
*/
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
index ea30761..08ba8b3 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
@@ -48,7 +48,7 @@ import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.NamedWithMimeType;
import org.apache.isis.core.metamodel.commons.CloseableExtensions;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract2;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.util.Components;
@@ -57,7 +57,7 @@ import lombok.val;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.fileinput.BootstrapFileInputField;
public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType>
-extends ScalarPanelAbstract2 {
+extends ScalarPanelAbstract {
private static final long serialVersionUID = 1L;
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 9e39485..f3db645 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
@@ -34,7 +34,7 @@ import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract2;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
@@ -48,7 +48,7 @@ import de.agilecoders.wicket.jquery.Key;
/**
* Panel for rendering scalars of type {@link Boolean} or <tt>boolean</tt>.
*/
-public class BooleanPanel extends ScalarPanelAbstract2 {
+public class BooleanPanel extends ScalarPanelAbstract {
private static final long serialVersionUID = 1L;
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 a07fbb0..2e7850b 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
@@ -39,8 +39,8 @@ import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import org.apache.isis.viewer.common.model.object.ObjectUiModel.HasRenderingHints;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract2;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelSelect2Abstract;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelSelectAbstract;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.components.widgets.entitysimplelink.EntityLinkSimplePanel;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.Select2;
@@ -57,7 +57,7 @@ import lombok.val;
* Panel for rendering scalars which of are of reference type (as opposed to
* value types).
*/
-public class ReferencePanel extends ScalarPanelSelect2Abstract {
+public class ReferencePanel extends ScalarPanelSelectAbstract {
private static final long serialVersionUID = 1L;
@@ -402,7 +402,7 @@ public class ReferencePanel extends ScalarPanelSelect2Abstract {
@Override
public void onUpdate(
- final AjaxRequestTarget target, final ScalarPanelAbstract2 scalarPanel) {
+ final AjaxRequestTarget target, final ScalarPanelAbstract scalarPanel) {
super.onUpdate(target, scalarPanel);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.java
index 6c8fe3f..7771b34 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.java
@@ -21,12 +21,12 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.value;
import org.apache.isis.applib.annotation.Value;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract2;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
/**
* Panel for rendering any value types that do not have their own custom
- * {@link ScalarPanelAbstract2 panel} to render them.
+ * {@link ScalarPanelAbstract panel} to render them.
*
* <p>
* This is a fallback panel; values are expected to be {@link Parser parseable}
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 8ec3ca8..5adab03 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
@@ -33,14 +33,14 @@ import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelSelect2Abstract;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelSelectAbstract;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.Select2;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.ObjectAdapterMementoProviderForValueChoices;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
import lombok.val;
-public class ValueChoicesSelect2Panel extends ScalarPanelSelect2Abstract {
+public class ValueChoicesSelect2Panel extends ScalarPanelSelectAbstract {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.java
index 53ff861..fef2d79 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.java
@@ -22,14 +22,14 @@ package org.apache.isis.viewer.wicket.ui.components.value;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.isis.viewer.wicket.model.models.ValueModel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract2;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import lombok.val;
/**
* Panel for rendering any value types that do not have their own custom
- * {@link ScalarPanelAbstract2 panel} to render them.
+ * {@link ScalarPanelAbstract panel} to render them.
*/
public class StandaloneValuePanel extends PanelAbstract<ValueModel> {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/LinkAndLabelFactoryAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/LinkAndLabelFactoryAbstract.java
index c382f11..9e80831 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/LinkAndLabelFactoryAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/LinkAndLabelFactoryAbstract.java
@@ -58,7 +58,7 @@ import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAcc
import org.apache.isis.viewer.wicket.ui.components.actions.ActionFormExecutorStrategy;
import org.apache.isis.viewer.wicket.ui.components.actions.ActionParametersPanel;
import org.apache.isis.viewer.wicket.ui.components.layout.bs3.BS3GridPanel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract2;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
@@ -280,7 +280,7 @@ implements Serializable {
actionModel.setInlinePromptContext(inlinePromptContext);
getComponentFactoryRegistry().addOrReplaceComponent(scalarTypeContainer,
- ScalarPanelAbstract2.ID_SCALAR_IF_REGULAR_INLINE_PROMPT_FORM, ComponentType.PARAMETERS, actionModel);
+ ScalarPanelAbstract.ID_SCALAR_IF_REGULAR_INLINE_PROMPT_FORM, ComponentType.PARAMETERS, actionModel);
inlinePromptContext.getScalarIfRegular().setVisible(false);
inlinePromptContext.getScalarIfRegularInlinePromptForm().setVisible(true);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormAbstract.java
index 6532a39..930a6c7 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormAbstract.java
@@ -46,8 +46,8 @@ import org.apache.isis.viewer.wicket.model.models.ActionPromptProvider;
import org.apache.isis.viewer.wicket.model.models.FormExecutor;
import org.apache.isis.viewer.wicket.model.models.FormExecutorContext;
import org.apache.isis.viewer.wicket.model.models.ScalarPropertyModel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarModelSubscriber2;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract2;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarModelSubscriber;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
import org.apache.isis.viewer.wicket.ui.components.widgets.formcomponent.FormFeedbackPanel;
import org.apache.isis.viewer.wicket.ui.errors.JGrowlBehaviour;
import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
@@ -58,7 +58,7 @@ public abstract class PromptFormAbstract<T extends
FormExecutorContext
& IModel<ManagedObject>>
extends FormAbstract<ManagedObject>
-implements ScalarModelSubscriber2 {
+implements ScalarModelSubscriber {
private static final long serialVersionUID = 1L;
@@ -67,7 +67,7 @@ implements ScalarModelSubscriber2 {
private static final String ID_FEEDBACK = "feedback";
- protected final List<ScalarPanelAbstract2> paramPanels = _Lists.newArrayList();
+ protected final List<ScalarPanelAbstract> paramPanels = _Lists.newArrayList();
private final Component parentPanel;
private final WicketViewerSettings settings;
@@ -270,7 +270,7 @@ implements ScalarModelSubscriber2 {
final Form<?> form);
@Override
- public void onError(AjaxRequestTarget target, ScalarPanelAbstract2 scalarPanel) {
+ public void onError(AjaxRequestTarget target, ScalarPanelAbstract scalarPanel) {
if (scalarPanel != null) {
// ensure that any feedback error associated with the providing component is shown.
target.add(scalarPanel);