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 2021/11/17 08:10:34 UTC
[isis] branch master updated: ISIS-2882: some minor cleanup around ReferencePanel
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 7153620 ISIS-2882: some minor cleanup around ReferencePanel
7153620 is described below
commit 7153620cee86f1264ad154c7bd6e064ef055b6d6
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Nov 17 09:10:25 2021 +0100
ISIS-2882: some minor cleanup around ReferencePanel
---
.../ui/components/ScalarPanelAbstractLegacy.java | 4 +-
.../viewer/wicket/model/models/ScalarModel.java | 4 +-
.../wicket/model/models/ScalarParameterModel.java | 2 +-
.../wicket/model/models/ScalarPropertyModel.java | 2 +-
.../ui/components/scalars/ScalarPanelAbstract.java | 2 +-
.../scalars/reference/ReferencePanel.java | 44 +++++++---------------
6 files changed, 21 insertions(+), 37 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 c559f9f..c9e947e 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
@@ -178,12 +178,12 @@ implements ScalarModelProvider {
final ScalarModel scalarModel = getModel();
- final String disableReasonIfAny = scalarModel.whetherDisabled();
+ final String disableReasonIfAny = scalarModel.disableReasonIfAny();
if (disableReasonIfAny != null) {
if(disableReasonIfAny.contains("Always disabled")) {
onBeforeRenderWhenViewMode();
} else {
- onBeforeRenderWhenDisabled(disableReasonIfAny.toString());
+ onBeforeRenderWhenDisabled(disableReasonIfAny);
}
} else {
if (scalarModel.isViewMode()) {
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index 46d54da..c5fe80c 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -206,7 +206,7 @@ implements HasRenderingHints, ScalarUiModel, LinksProvider, FormExecutorContext
public abstract boolean whetherHidden();
- public abstract String whetherDisabled();
+ public abstract String disableReasonIfAny();
public abstract String validate(ManagedObject proposedAdapter);
@@ -257,7 +257,7 @@ implements HasRenderingHints, ScalarUiModel, LinksProvider, FormExecutorContext
}
public boolean isEnabled() {
- return whetherDisabled() == null;
+ return disableReasonIfAny() == null;
}
// //////////////////////////////////////
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarParameterModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarParameterModel.java
index d7f6265..55883e4 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarParameterModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarParameterModel.java
@@ -77,7 +77,7 @@ implements ParameterUiModel {
}
@Override
- public String whetherDisabled() {
+ public String disableReasonIfAny() {
return getParameterNegotiationModel().getUsabilityConsent(getParameterIndex()).getReason();
}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarPropertyModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarPropertyModel.java
index b6a49af..4aaa345 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarPropertyModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarPropertyModel.java
@@ -107,7 +107,7 @@ implements PropertyUiModel {
}
@Override
- public String whetherDisabled() {
+ public String disableReasonIfAny() {
return getManagedProperty()
.checkUsability()
.map(InteractionVeto::getReason)
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 5e6240e..77e204a 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
@@ -246,7 +246,7 @@ implements ScalarModelSubscriber {
final ScalarModel scalarModel = getModel();
- final String disableReasonIfAny = scalarModel.whetherDisabled();
+ final String disableReasonIfAny = scalarModel.disableReasonIfAny();
final boolean mustBeEditable = scalarModel.mustBeEditable();
if (disableReasonIfAny != null) {
if(mustBeEditable) {
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 da7fa9f..cac42c3 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
@@ -106,7 +106,7 @@ public class ReferencePanel extends ScalarPanelSelectAbstract {
this.select2 = createSelect2AndSemantics();
entityLink.addOrReplace(select2.component());
- syncWithInput();
+ //syncWithInput();
entityLink.setOutputMarkupId(true);
@@ -208,11 +208,11 @@ public class ReferencePanel extends ScalarPanelSelectAbstract {
@Override
protected void onInitializeReadonly(final String disableReason) {
super.onInitializeReadonly(disableReason);
- syncWithInput();
val entityLinkModel = (HasRenderingHints) entityLink.getModel();
entityLinkModel.toViewMode();
entityLink.setEnabled(false);
Tooltips.addTooltip(entityLink, disableReason);
+ syncWithInput();
}
@Override
@@ -231,13 +231,6 @@ public class ReferencePanel extends ScalarPanelSelectAbstract {
entityLink.add(new AttributeModifier("title", Model.of("")));
}
-
-
- // //////////////////////////////////////
- // syncWithInput
- // //////////////////////////////////////
-
-
// called from onInitialize*
// (was previous called by EntityLinkSelect2Panel in onBeforeRender, this responsibility now moved)
private void syncWithInput() {
@@ -250,30 +243,23 @@ public class ReferencePanel extends ScalarPanelSelectAbstract {
val scalarModel = getModel();
- val componentFactory = getComponentFactoryRegistry()
- .findComponentFactory(ComponentType.ENTITY_ICON_AND_TITLE, scalarModel);
- val component = componentFactory
- .createComponent(ComponentType.ENTITY_ICON_AND_TITLE.getId(), scalarModel);
-
- componentForRegular.addOrReplace(component);
+ val component = getComponentFactoryRegistry()
+ .addOrReplaceComponent(componentForRegular,
+ ComponentType.ENTITY_ICON_AND_TITLE.getId(),
+ ComponentType.ENTITY_ICON_AND_TITLE,
+ scalarModel);
- boolean inlinePrompt = scalarModel.isInlinePrompt();
- if(inlinePrompt) {
+ val isInlinePrompt = scalarModel.isInlinePrompt();
+ if(isInlinePrompt) {
// bit of a hack... allows us to suppress the title using CSS
Wkt.cssAppend(component, "inlinePrompt");
}
- if (adapter != null) {
-
+ if(adapter != null
+ || isInlinePrompt) {
Components.permanentlyHide(componentForRegular, "entityTitleIfNull");
-
} else {
-
- if(inlinePrompt) {
- Components.permanentlyHide(componentForRegular, "entityTitleIfNull");
- } else {
- Wkt.labelAdd(componentForRegular, "entityTitleIfNull", "(none)");
- }
+ Wkt.labelAdd(componentForRegular, "entityTitleIfNull", "(none)");
}
}
@@ -304,13 +290,11 @@ public class ReferencePanel extends ScalarPanelSelectAbstract {
select2.clearInput();
}
- if(getComponentForRegular() != null) {
- Components.permanentlyHide((MarkupContainer)getComponentForRegular(), ID_ENTITY_ICON_TITLE);
+ if(componentForRegular != null) {
+ Components.permanentlyHide(componentForRegular, ID_ENTITY_ICON_TITLE);
Components.permanentlyHide(componentForRegular, "entityTitleIfNull");
}
-
-
// syncUsability
if(select2 != null) {
final boolean mutability = entityLink.isEnableAllowed() && !getModel().isViewMode();