You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/08/24 07:32:29 UTC
[causeway] branch master updated: CAUSEWAY-3522: minor: renaming vars
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/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new 6779fa1535 CAUSEWAY-3522: minor: renaming vars
6779fa1535 is described below
commit 6779fa1535c2fbf064a4b49156ea5d89217f4713
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Aug 24 09:28:19 2023 +0200
CAUSEWAY-3522: minor: renaming vars
---
.../ui/components/entity/icontitle/EntityIconAndTitlePanel.java | 9 ++++-----
.../viewer/wicket/ui/components/tree/_TreeModelTreeAdapter.java | 4 ++--
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
index 41b31afc77..77ada53818 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
@@ -149,12 +149,11 @@ extends PanelAbstract<ManagedObject, ObjectAdapterModel> {
// not visible if null
// (except its null because its a detached entity,
// which we can re-fetch due to memoized bookmark)
- val targetAdapter = EntityIconAndTitlePanel.this.getModel().getObject();
- return targetAdapter != null
- && (targetAdapter.getPojo()!=null
- || targetAdapter.isBookmarkMemoized());
+ val linkedDomainObject = EntityIconAndTitlePanel.this.linkedDomainObject();
+ return linkedDomainObject != null
+ && (linkedDomainObject.getPojo()!=null
+ || linkedDomainObject.isBookmarkMemoized());
});
-
}
private String titleAbbreviated(final String titleString) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/_TreeModelTreeAdapter.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/_TreeModelTreeAdapter.java
index 5ad8320c11..e96ea28dca 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/_TreeModelTreeAdapter.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/tree/_TreeModelTreeAdapter.java
@@ -55,9 +55,9 @@ implements
private transient MetaModelContext metaModelContext;
_TreeModelTreeAdapter(
- final MetaModelContext mmc,
+ final MetaModelContext metaModelContext,
final Class<? extends TreeAdapter> treeAdapterClass) {
- this.metaModelContext = mmc;
+ this.metaModelContext = metaModelContext;
this.treeAdapterClass = treeAdapterClass;
}