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 2020/09/15 17:46:46 UTC
[isis] 01/02: ISIS-2427: minor cleanup
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
commit 34dadd4aac79c22fc312da967736c2a390e18f97
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Sep 15 19:27:25 2020 +0200
ISIS-2427: minor cleanup
---
.../isis/core/metamodel/services/title/TitleServiceDefault.java | 7 +++----
examples/demo/wicket/pom.xml | 5 -----
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
index 4102aec..75ffe4a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
@@ -61,11 +61,10 @@ public class TitleServiceDefault implements TitleService {
val pojo = unwrapped(domainObject);
val objectAdapter = ManagedObject.of(specificationLoader::loadSpecification, pojo);
- val destroyed = EntityUtil.isDestroyed(objectAdapter);
- if(!destroyed) {
- return objectAdapter.getSpecification().getTitle(null, objectAdapter);
- } else {
+ if(EntityUtil.isDestroyed(objectAdapter)) {
return "[DELETED]";
+ } else {
+ return objectAdapter.getSpecification().getTitle(null, objectAdapter);
}
}
diff --git a/examples/demo/wicket/pom.xml b/examples/demo/wicket/pom.xml
index 241d74e..d676b7a 100644
--- a/examples/demo/wicket/pom.xml
+++ b/examples/demo/wicket/pom.xml
@@ -29,9 +29,6 @@
<properties>
<sonar.skip>true</sonar.skip>
-
- <maven-war-plugin.warName>${project.artifactId}</maven-war-plugin.warName>
-
</properties>
<build>
@@ -144,10 +141,8 @@
</property>
</activation>
<properties>
- <package-as-war>false</package-as-war>
</properties>
<dependencies>
- <!-- add flavor specific here -->
</dependencies>
<build>
<plugins>