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:42:33 UTC
[isis] branch master updated: ISIS-2877: rename scalarValueContainer -> container-scalarValue-inputFormat
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 abf5996 ISIS-2877: rename scalarValueContainer -> container-scalarValue-inputFormat
abf5996 is described below
commit abf59967712ce4ef3a16ee5ec18080264c396eac
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Mar 21 07:42:24 2022 +0100
ISIS-2877: rename scalarValueContainer ->
container-scalarValue-inputFormat
---
.../viewer/wicket/ui/components/scalars/ScalarFragmentFactory.java | 3 ++-
.../viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java | 2 --
.../viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java | 5 +++--
.../wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.html | 2 +-
.../wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.java | 4 +++-
5 files changed, 9 insertions(+), 7 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 488ae92..e13ae14 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
@@ -56,6 +56,7 @@ public class ScalarFragmentFactory {
@RequiredArgsConstructor
public static enum CompactFrame {
OUTPUT_FORMAT_CONTAINER("container-scalarValue-outputFormat"),
+ INPUT_FORMAT_CONTAINER("container-scalarValue-inputFormat"),
;
@Getter
private final String containerId;
@@ -92,7 +93,7 @@ public class ScalarFragmentFactory {
private final String fragmentId;
public Fragment createFragment(final MarkupContainer container, final FormComponent<?> inputComponent) {
val fragment = Wkt.fragmentAdd(
- container, ScalarPanelAbstract.ID_SCALAR_VALUE_CONTAINER, fragmentId);
+ container, CompactFrame.INPUT_FORMAT_CONTAINER.getContainerId(), fragmentId);
fragment.add(inputComponent);
return fragment;
}
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 0eea829..bec8720 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
@@ -81,8 +81,6 @@ implements ScalarModelSubscriber {
private static final long serialVersionUID = 1L;
protected static final String ID_SCALAR_TYPE_CONTAINER = "scalarTypeContainer";
- protected static final String ID_SCALAR_VALUE_CONTAINER = "scalarValueContainer";
-
protected static final String ID_SCALAR_NAME = "scalarName";
protected static final String ID_SCALAR_VALUE = "scalarValue";
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 d97f0e4..ddb775f 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
@@ -181,8 +181,9 @@ extends ScalarPanelAbstract {
configureInlinePromptLink(inlinePromptLink);
- final Component editInlineLinkLabel =
- createInlinePromptComponent(CompactFrame.OUTPUT_FORMAT_CONTAINER.getContainerId(), inlinePromptModel);
+ final Component editInlineLinkLabel = CompactFrame.OUTPUT_FORMAT_CONTAINER
+ .createComponent(id->createInlinePromptComponent(id, 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 5b7f7f4..d40052a 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
@@ -46,7 +46,7 @@
<!-- input format -->
<wicket:container
- wicket:id="scalarValueContainer" />
+ wicket:id="container-scalarValue-inputFormat" />
<a href="##" class="edit btn btn-sm btn-link"
wicket:id="editProperty">
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.java
index 1284e29..a2fba68 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.java
@@ -38,6 +38,7 @@ import org.apache.isis.core.runtime.context.IsisAppCommonContext;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.model.util.CommonContextUtils;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.CompactFragment;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.CompactFrame;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.FrameFragment;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.InputFragment;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
@@ -146,7 +147,8 @@ extends ScalarPanelAbstract2 {
protected void onFormGroupCreated(final FormGroup formGroup) {
if(scalarModel().isViewMode()
&& getInlinePromptConfig().isUseEditIconWithLink()) {
- formGroup.add(createComponentForOutput(ID_SCALAR_VALUE_CONTAINER));
+ formGroup.add(CompactFrame.INPUT_FORMAT_CONTAINER
+ .createComponent(this::createComponentForOutput));
return;
}
getInputFragmentType()