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:45 UTC
[isis] branch master updated (79ed355 -> 8a3f721)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 79ed355 ISIS-2429: demo: fixes broken class (ThereCanBeOnlyOne)
new 34dadd4 ISIS-2427: minor cleanup
new 8a3f721 ISIS-2427: deactivate ThereCanBeOnlyOne (seems to break proper bootstrapping)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../isis/core/metamodel/services/title/TitleServiceDefault.java | 7 +++----
.../vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java | 3 +--
examples/demo/wicket/pom.xml | 5 -----
.../wicket/src/main/java/demoapp/webapp/wicket/DemoAppWicket.java | 2 +-
4 files changed, 5 insertions(+), 12 deletions(-)
[isis] 01/02: ISIS-2427: minor cleanup
Posted by ah...@apache.org.
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>
[isis] 02/02: ISIS-2427: deactivate ThereCanBeOnlyOne (seems to
break proper bootstrapping)
Posted by ah...@apache.org.
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 8a3f721151b745b686fec6ab36c0717e9240f8ff
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Sep 15 19:46:27 2020 +0200
ISIS-2427: deactivate ThereCanBeOnlyOne (seems to break proper
bootstrapping)
---
.../demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java | 3 +--
.../demo/wicket/src/main/java/demoapp/webapp/wicket/DemoAppWicket.java | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java b/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java
index b614c3e..4e471a8 100644
--- a/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java
+++ b/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java
@@ -33,7 +33,6 @@ import org.apache.isis.valuetypes.sse.ui.wkt.IsisModuleValSseUiWkt;
import org.apache.isis.viewer.wicket.viewer.IsisModuleViewerWicketViewer;
import demoapp.web.DemoAppManifest;
-import demoapp.web._infra.utils.ThereCanBeOnlyOne;
/**
* Bootstrap the application.
@@ -42,7 +41,7 @@ import demoapp.web._infra.utils.ThereCanBeOnlyOne;
@Import({
DemoAppManifest.class,
- ThereCanBeOnlyOne.class, // shutdown demo instance if any already running (specific to the demo only)
+ //ThereCanBeOnlyOne.class, // shutdown demo instance if any already running (specific to the demo only)
// INCUBATING
IsisModuleIncViewerVaadinViewer.class, // vaadin viewer
diff --git a/examples/demo/wicket/src/main/java/demoapp/webapp/wicket/DemoAppWicket.java b/examples/demo/wicket/src/main/java/demoapp/webapp/wicket/DemoAppWicket.java
index e17c629..e782fea 100644
--- a/examples/demo/wicket/src/main/java/demoapp/webapp/wicket/DemoAppWicket.java
+++ b/examples/demo/wicket/src/main/java/demoapp/webapp/wicket/DemoAppWicket.java
@@ -42,7 +42,7 @@ import demoapp.web._infra.utils.ThereCanBeOnlyOne;
@Import({
DemoAppManifest.class,
- ThereCanBeOnlyOne.class, // shutdown demo instance if any already running (specific to the demo only)
+ //ThereCanBeOnlyOne.class, // shutdown demo instance if any already running (specific to the demo only)
// Metamodel
IsisModuleValAsciidocMetaModel.class,