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 09:43:29 UTC
[isis] branch master updated: ISIS-2877: separation of concerns: ScalarPanelAbstract2 is responsible for inlinePromptLink handling
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 1b7fab7 ISIS-2877: separation of concerns: ScalarPanelAbstract2 is responsible for inlinePromptLink handling
1b7fab7 is described below
commit 1b7fab71ee63b997ae1f3eadad796ed4a4a1a830
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Mar 21 10:43:23 2022 +0100
ISIS-2877: separation of concerns: ScalarPanelAbstract2 is responsible
for inlinePromptLink handling
---
.../ui/components/scalars/ScalarPanelAbstract.java | 13 -------------
.../ui/components/scalars/ScalarPanelAbstract2.java | 19 +++++++++++++++----
2 files changed, 15 insertions(+), 17 deletions(-)
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 6cd7bb5..1b65ad7 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
@@ -491,19 +491,6 @@ implements ScalarModelSubscriber {
return scalarNameLabel;
}
- protected void configureInlinePromptLink(final WebMarkupContainer inlinePromptLink) {
- Wkt.cssAppend(inlinePromptLink, obtainInlinePromptLinkCssIfAny());
- }
-
- protected String obtainInlinePromptLinkCssIfAny() {
- return "form-control form-control-sm";
- }
-
- protected Component createInlinePromptComponent(
- final String id, final IModel<String> inlinePromptModel) {
- return Wkt.labelNoTab(id, inlinePromptModel);
- }
-
// ///////////////////////////////////////////////////////////////////
// -- EDIT PROPERTY ICON
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 eb2c53e..3d6b233 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
@@ -85,6 +85,8 @@ extends ScalarPanelAbstract {
regularFrame
.add(inlinePromptLink = createInlinePromptLink());
+ addOnClickBehaviorTo(inlinePromptLink, inlinePromptConfig);
+
// even if this particular scalarModel (property) is not configured for inline edits,
// it's possible that one of the associated actions is. Thus we set the prompt context
scalarModel.setInlinePromptContext(
@@ -92,8 +94,6 @@ extends ScalarPanelAbstract {
scalarModel,
scalarFrameContainer,
regularFrame, getFormFrame()));
-
- addOnClickBehaviorTo(inlinePromptLink, inlinePromptConfig);
}
addEditPropertyIf(
@@ -119,6 +119,19 @@ extends ScalarPanelAbstract {
final AjaxRequestTarget target) {
}
+ protected void configureInlinePromptLink(final WebMarkupContainer inlinePromptLink) {
+ Wkt.cssAppend(inlinePromptLink, obtainInlinePromptLinkCssIfAny());
+ }
+
+ protected String obtainInlinePromptLinkCssIfAny() {
+ return "form-control form-control-sm";
+ }
+
+ protected Component createInlinePromptComponent(
+ final String id, final IModel<String> inlinePromptModel) {
+ return Wkt.labelNoTab(id, inlinePromptModel);
+ }
+
// -- HELPER
private void addOnClickBehaviorTo(
@@ -195,6 +208,4 @@ extends ScalarPanelAbstract {
Wkt.focusOnMarkerAttribute(getFormFrame(), target);
}
-
-
}