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 2022/03/21 06:35:07 UTC
[isis] 02/02: ISIS-2877: rename scalarValueInlinePromptLabel -> container-scalarValue-outputFormat
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 3f7a6db1323ab56c951c388350930e911cdd724b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Mar 21 07:34:56 2022 +0100
ISIS-2877: rename scalarValueInlinePromptLabel ->
container-scalarValue-outputFormat
---
.../ui/components/scalars/ScalarFragmentFactory.java | 14 +++++++++++++-
.../wicket/ui/components/scalars/ScalarPanelAbstract.java | 1 -
.../wicket/ui/components/scalars/ScalarPanelAbstract2.java | 3 ++-
.../components/scalars/ScalarPanelFormFieldAbstract.html | 6 +++---
.../ui/components/scalars/primitive/BooleanPanel.html | 2 +-
.../scalars/primitive/BooleanPanel_labelRightPosition.html | 2 +-
.../ui/components/scalars/reference/ReferencePanel.html | 2 +-
.../scalars/valuechoices/ValueChoicesSelect2Panel.html | 2 +-
8 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarFragmentFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarFragmentFactory.java
index 3318aaf..488ae92 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarFragmentFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarFragmentFactory.java
@@ -53,8 +53,20 @@ public class ScalarFragmentFactory {
}
}
+ @RequiredArgsConstructor
+ public static enum CompactFrame {
+ OUTPUT_FORMAT_CONTAINER("container-scalarValue-outputFormat"),
+ ;
+ @Getter
+ private final String containerId;
+ public <T extends Component> T createComponent(final Function<String, T> factory) {
+ return factory.apply(containerId);
+ }
+ }
+
// -- OUTPUT FRAGMENTS
+ //TODO CompactFragment and OutputFragment should be unified
@RequiredArgsConstructor
public static enum CompactFragment {
CHECKBOX("fragment-compact-checkbox"),
@@ -105,7 +117,7 @@ public class ScalarFragmentFactory {
final IModel<String> promptLabelModel,
final @Nullable Consumer<FormComponent<String>> onComponentCreated) {
val fragment = Wkt.fragmentAdd(
- container, ScalarPanelAbstract.ID_SCALAR_VALUE_INLINE_PROMPT_LABEL, fragmentId);
+ container, CompactFrame.OUTPUT_FORMAT_CONTAINER.getContainerId(), fragmentId);
val component = componentFactory.apply(promptLabelModel);
fragment.add(component);
if(onComponentCreated!=null
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 f082515..0eea829 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
@@ -91,7 +91,6 @@ implements ScalarModelSubscriber {
* as per {@link #inlinePromptLink}
*/
protected static final String ID_SCALAR_VALUE_INLINE_PROMPT_LINK = "scalarValueInlinePromptLink";
- protected static final String ID_SCALAR_VALUE_INLINE_PROMPT_LABEL = "scalarValueInlinePromptLabel";
/**
* as per {@link #scalarIfRegularInlinePromptForm}.
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/ScalarPanelAbstract2.java
index 77500da..d97f0e4 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/ScalarPanelAbstract2.java
@@ -31,6 +31,7 @@ import org.apache.isis.viewer.wicket.model.models.InlinePromptContext;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.actionmenu.entityactions.LinkAndLabelFactory;
import org.apache.isis.viewer.wicket.ui.components.property.PropertyEditFormPanel;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.CompactFrame;
import org.apache.isis.viewer.wicket.ui.components.scalars.blobclob.IsisBlobOrClobPanelAbstract;
import org.apache.isis.viewer.wicket.ui.components.scalars.primitive.BooleanPanel;
import org.apache.isis.viewer.wicket.ui.components.scalars.reference.ReferencePanel;
@@ -181,7 +182,7 @@ extends ScalarPanelAbstract {
configureInlinePromptLink(inlinePromptLink);
final Component editInlineLinkLabel =
- createInlinePromptComponent(ID_SCALAR_VALUE_INLINE_PROMPT_LABEL, inlinePromptModel);
+ createInlinePromptComponent(CompactFrame.OUTPUT_FORMAT_CONTAINER.getContainerId(), inlinePromptModel);
inlinePromptLink.add(editInlineLinkLabel);
return inlinePromptLink;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.html
index 56cf08c..5b7f7f4 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.html
@@ -38,13 +38,13 @@
href="##" name="scalarValueInlinePromptLink"
class="scalarValueInlinePromptLink">
- <!-- populated from fragments -->
+ <!-- output format -->
<wicket:container
- wicket:id="scalarValueInlinePromptLabel"/>
+ wicket:id="container-scalarValue-outputFormat"/>
</a>
- <!-- populated from fragments -->
+ <!-- input format -->
<wicket:container
wicket:id="scalarValueContainer" />
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
index 35de2fa..fc12ea5 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
@@ -56,7 +56,7 @@
name="scalarValueInlinePromptLink"
class="form-control form-control-sm scalarValueInlinePromptLink"
wicket:id="scalarValueInlinePromptLink">
- <span wicket:id="scalarValueInlinePromptLabel"></span>
+ <span wicket:id="container-scalarValue-outputFormat"></span>
</a>
</span>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel_labelRightPosition.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel_labelRightPosition.html
index fabcc09..5e035ab 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel_labelRightPosition.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel_labelRightPosition.html
@@ -54,7 +54,7 @@
name="scalarValueInlinePromptLink"
class="form-control form-control-sm scalarValueInlinePromptLink"
wicket:id="scalarValueInlinePromptLink">
- <span wicket:id="scalarValueInlinePromptLabel"></span>
+ <span wicket:id="container-scalarValue-outputFormat"></span>
</a>
</span>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
index 5a31810..eb38701 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
@@ -60,7 +60,7 @@
name="scalarValueInlinePromptLink"
class="form-control form-control-sm scalarValueInlinePromptLink"
wicket:id="scalarValueInlinePromptLink">
- <span wicket:id="scalarValueInlinePromptLabel"></span>
+ <span wicket:id="container-scalarValue-outputFormat"></span>
</a>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.html
index fc6165c..bcb71e6 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.html
@@ -44,7 +44,7 @@
name="scalarValueInlinePromptLink"
class="form-control form-control-sm scalarValueInlinePromptLink"
wicket:id="scalarValueInlinePromptLink">
- <span wicket:id="scalarValueInlinePromptLabel"></span>
+ <span wicket:id="container-scalarValue-outputFormat"></span>
</a>
<select class="choices form-control-sm select2-remote" wicket:id="scalarValue"></select>