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
commit 205f9f04dbe82d39143efcc0a992a59907443a4d Author: Andi Huber <[email protected]> AuthorDate: Thu Sep 22 07:06:08 2022 +0200 ISIS-3201: cleanup select2 on change behaviors --- .../ui/components/scalars/ScalarPanelSelectAbstract.java | 9 +++++++++ ...ectChoiceFormComponent.html => ChoiceFormComponent.html} | 0 ...ectChoiceFormComponent.java => ChoiceFormComponent.java} | 4 ++-- .../scalars/choices/ObjectChoicesSelect2Panel.java | 13 ++----------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java index 398bbe88d6..55d6a6ed2a 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java +++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java @@ -86,6 +86,15 @@ extends ScalarPanelFormFieldAbstract<ManagedObject> { return select2; } + // -- CUSTOM UPDATING BEHAVIOR + + @Override + protected final void installScalarModelChangeBehavior() { + /* no-op, as we already have the Select2OnSelect behavior + * (directly) installed with the Select2 form component + */ + } + protected final boolean isEditableWithEitherAutoCompleteOrChoices() { if(scalarModel().getRenderingHint().isInTable()) { return false; diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ObjectChoiceFormComponent.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ChoiceFormComponent.html similarity index 100% rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ObjectChoiceFormComponent.html rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ChoiceFormComponent.html diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ObjectChoiceFormComponent.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ChoiceFormComponent.java similarity index 94% rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ObjectChoiceFormComponent.java rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ChoiceFormComponent.java index a5ea4c6429..facd759670 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ObjectChoiceFormComponent.java +++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ChoiceFormComponent.java @@ -25,7 +25,7 @@ import org.apache.isis.core.metamodel.object.ManagedObject; import org.apache.isis.viewer.wicket.ui.components.widgets.formcomponent.CancelHintRequired; import org.apache.isis.viewer.wicket.ui.components.widgets.formcomponent.FormComponentPanelAbstract; -class ObjectChoiceFormComponent +class ChoiceFormComponent extends FormComponentPanelAbstract<ManagedObject> implements CancelHintRequired { @@ -33,7 +33,7 @@ implements CancelHintRequired { private ObjectChoicesSelect2Panel owningPanel; - public ObjectChoiceFormComponent(final String id, final ObjectChoicesSelect2Panel owningPanel) { + public ChoiceFormComponent(final String id, final ObjectChoicesSelect2Panel owningPanel) { super(id, owningPanel.scalarModel()); this.owningPanel = owningPanel; setType(ManagedObject.class); diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ObjectChoicesSelect2Panel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ObjectChoicesSelect2Panel.java index 1f3b707563..a4b5317ab0 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ObjectChoicesSelect2Panel.java +++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/choices/ObjectChoicesSelect2Panel.java @@ -58,7 +58,7 @@ implements ChoiceTitleHandler { private static final String ID_AUTO_COMPLETE = "autoComplete"; private static final String ID_ENTITY_TITLE_IF_NULL = "entityTitleIfNull"; - private ObjectChoiceFormComponent entityLink; + private ChoiceFormComponent entityLink; private EntityLinkSimplePanel entityLinkOutputFormat; private final boolean isCompactFormat; @@ -85,7 +85,7 @@ implements ChoiceTitleHandler { @Override protected FormComponent<ManagedObject> createFormComponent(final String id, final ScalarModel scalarModel) { - this.entityLink = new ObjectChoiceFormComponent(UiComponentType.ENTITY_LINK.getId(), this); + this.entityLink = new ChoiceFormComponent(UiComponentType.ENTITY_LINK.getId(), this); entityLink.setRequired(scalarModel.isRequired()); this.select2 = createSelect2(ID_AUTO_COMPLETE, @@ -97,15 +97,6 @@ implements ChoiceTitleHandler { return entityLink; } - // -- CUSTOM UPDATING BEHAVIOR - - @Override - protected void installScalarModelChangeBehavior() { - /* no-op, as we already have the Select2OnSelect behavior - * (directly) installed with the Select2 form component - */ - } - // -- ON BEFORE RENDER @Override
