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/05/10 08:02:07 UTC
[isis] branch master updated: ISIS-2648: minor: housekeeping,
comments
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 163b975 ISIS-2648: minor: housekeeping, comments
163b975 is described below
commit 163b9754bf4f8ea53db855d027ff95c056ccf55a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon May 10 10:01:51 2021 +0200
ISIS-2648: minor: housekeeping, comments
---
.../core/metamodel/spec/feature/ObjectAction.java | 3 +++
.../entityactions/AdditionalLinksPanel.java | 20 ++++++++++----------
.../ui/components/entity/fieldset/PropertyGroup.java | 6 +++---
3 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
index 84f1ea7..7780c44 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
@@ -340,6 +340,9 @@ public interface ObjectAction extends ObjectMember {
return cssClassFacet != null ? cssClassFacet.cssClass(objectAdapter) : null;
}
+ /**
+ * Those to be rendered with the entity header panel.
+ */
public static Stream<ObjectAction> streamTopLevelActions(
final ManagedObject adapter) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
index cc19b50..16362bf 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
@@ -118,15 +118,15 @@ extends PanelAbstract<List<LinkAndLabel>, ListOfLinksModel> {
val link = linkAndLabel.getUiComponent();
final Model<String> tooltipModel = link instanceof ActionLink
? new Model<String>() {
- private static final long serialVersionUID = 1L;
- @Override
- public String getObject() {
- final ActionLink actionLink = (ActionLink) link;
- final String reasonDisabledIfAny = actionLink.getReasonDisabledIfAny();
- return first(reasonDisabledIfAny, actionMeta.getDescription());
- }
- }
- : Model.of(actionMeta.getDescription());
+ private static final long serialVersionUID = 1L;
+ @Override
+ public String getObject() {
+ return firstNonNull(
+ ((ActionLink) link).getReasonDisabledIfAny(),
+ actionMeta.getDescription());
+ }
+ }
+ : Model.of(actionMeta.getDescription());
Tooltips.addTooltip(link, tooltipModel.getObject());
@@ -171,7 +171,7 @@ extends PanelAbstract<List<LinkAndLabel>, ListOfLinksModel> {
container.addOrReplace(listView);
}
- private static String first(String... str) {
+ private static String firstNonNull(String... str) {
for (String s : str) {
if(s != null) return s;
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
index 84d50d4..49615b8 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
@@ -195,12 +195,12 @@ public class PropertyGroup extends PanelAbstract<ManagedObject, EntityModel> imp
private Component addPropertyToForm(
final EntityModel entityModel,
- final OneToOneAssociation otoa,
+ final OneToOneAssociation property,
final WebMarkupContainer container,
final Consumer<LinkAndLabel> onEntityAction) {
final ScalarModel scalarModel =
- entityModel.getPropertyModel(otoa, EntityModel.Mode.VIEW, EntityModel.RenderingHint.REGULAR);
+ entityModel.getPropertyModel(property, EntityModel.Mode.VIEW, EntityModel.RenderingHint.REGULAR);
final Component component = getComponentFactoryRegistry()
.addOrReplaceComponent(container, ID_PROPERTY, ComponentType.SCALAR_NAME_AND_VALUE, scalarModel);
@@ -210,7 +210,7 @@ public class PropertyGroup extends PanelAbstract<ManagedObject, EntityModel> imp
}
val adapter = entityModel.getManagedObject();
- val associatedActions = ObjectAction.Util.findForAssociation(adapter, otoa);
+ val associatedActions = ObjectAction.Util.findForAssociation(adapter, property);
LinkAndLabelUtil.asActionLinksForAdditionalLinksPanel(entityModel, associatedActions, null)
.forEach(onEntityAction);