You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/01/10 09:34:41 UTC
[isis] branch master updated (5fcad44 -> 8d1e30a)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 5fcad44 ISIS-2081: updates .adocs
add 4573d5b ISIS-2082: updates download.adoc, parameterize using __versions.adoc[].
new 867d148 ISIS-2082: updates tg.adoc to use {isiscurr} rather than hardcoded version
new 8d1e30a ISIS-2081: adds null guards for LayoutFacet
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:
adocs/documentation/src/main/asciidoc/downloads.adoc | 19 ++++++++++---------
.../documentation/src/main/asciidoc/pages/tg/tg.adoc | 2 +-
...ainObjectLayoutAnnotationUsingCssClassUiEvent.java | 4 ++++
...ViewModelLayoutAnnotationUsingCssClassUiEvent.java | 4 ++++
...aDomainObjectLayoutAnnotationUsingIconUiEvent.java | 4 ++++
...tViaViewModelLayoutAnnotationUsingIconUiEvent.java | 4 ++++
...omainObjectLayoutAnnotationUsingLayoutUiEvent.java | 4 ++++
...iaViewModelLayoutAnnotationUsingLayoutUiEvent.java | 4 ++++
...DomainObjectLayoutAnnotationUsingTitleUiEvent.java | 4 ++++
...ViaViewModelLayoutAnnotationUsingTitleUiEvent.java | 4 ++++
.../facets/object/grid/GridFacetDefault.java | 4 +++-
11 files changed, 46 insertions(+), 11 deletions(-)
[isis] 02/02: ISIS-2081: adds null guards for LayoutFacet
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 8d1e30aa768db8ec1896de15f22dd7f7277f634c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 10 10:34:20 2019 +0100
ISIS-2081: adds null guards for LayoutFacet
since can be invoked from GridFacetDefault when there may be no objectAdapter (eg in collections).
Also added null guards for other ui event facets.
---
...ClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java | 4 ++++
...CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.java | 4 ++++
.../IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java | 4 ++++
.../IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java | 4 ++++
.../LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java | 4 ++++
.../LayoutFacetViaViewModelLayoutAnnotationUsingLayoutUiEvent.java | 4 ++++
.../TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java | 4 ++++
.../TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.java | 4 ++++
.../isis/core/metamodel/facets/object/grid/GridFacetDefault.java | 4 +++-
9 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
index 2f90964..50b340f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
@@ -82,6 +82,10 @@ public class CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent ex
@Override
public String cssClass(final ObjectAdapter owningAdapter) {
+ if(owningAdapter == null) {
+ return null;
+ }
+
final CssClassUiEvent<Object> cssClassUiEvent = newCssClassUiEvent(owningAdapter);
eventBusService.post(cssClassUiEvent);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.java
index 0ad34b5..f9c1342 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.java
@@ -83,6 +83,10 @@ public class CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent exten
@Override
public String cssClass(final ObjectAdapter owningAdapter) {
+ if(owningAdapter == null) {
+ return null;
+ }
+
final CssClassUiEvent<Object> cssClassUiEvent = newCssClassUiEvent(owningAdapter);
eventBusService.post(cssClassUiEvent);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
index 10a7a9f..29594f9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
@@ -80,6 +80,10 @@ public class IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent extends Ic
@Override
public String iconName(final ObjectAdapter owningAdapter) {
+ if(owningAdapter == null) {
+ return null;
+ }
+
final IconUiEvent<Object> iconUiEvent = newIconUiEvent(owningAdapter);
eventBusService.post(iconUiEvent);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java
index 596f2d8..d628e98 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java
@@ -81,6 +81,10 @@ public class IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent extends IconF
@Override
public String iconName(final ObjectAdapter owningAdapter) {
+ if(owningAdapter == null) {
+ return null;
+ }
+
final IconUiEvent<Object> iconUiEvent = newIconUiEvent(owningAdapter);
eventBusService.post(iconUiEvent);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java
index b2bd9bd..ea67259 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java
@@ -83,6 +83,10 @@ public class LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent extend
@Override
public String layout(final ObjectAdapter owningAdapter) {
+ if(owningAdapter == null) {
+ return null;
+ }
+
final LayoutUiEvent<Object> layoutUiEvent = newLayoutUiEvent(owningAdapter);
eventBusService.post(layoutUiEvent);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaViewModelLayoutAnnotationUsingLayoutUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaViewModelLayoutAnnotationUsingLayoutUiEvent.java
index a2c17b8..024ffa7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaViewModelLayoutAnnotationUsingLayoutUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaViewModelLayoutAnnotationUsingLayoutUiEvent.java
@@ -83,6 +83,10 @@ public class LayoutFacetViaViewModelLayoutAnnotationUsingLayoutUiEvent extends F
@Override
public String layout(final ObjectAdapter owningAdapter) {
+ if(owningAdapter == null) {
+ return null;
+ }
+
final LayoutUiEvent<Object> layoutUiEvent = newLayoutUiEvent(owningAdapter);
eventBusService.post(layoutUiEvent);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
index 87b2023..b83d04b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
@@ -92,6 +92,10 @@ public class TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent extends
@Override
public String title(final ObjectAdapter owningAdapter) {
+ if(owningAdapter == null) {
+ return null;
+ }
+
final TitleUiEvent<Object> titleUiEvent = newTitleUiEvent(owningAdapter);
eventBusService.post(titleUiEvent);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.java
index e16b058..c5effcf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.java
@@ -93,6 +93,10 @@ public class TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent extends Tit
@Override
public String title(final ObjectAdapter owningAdapter) {
+ if(owningAdapter == null) {
+ return null;
+ }
+
final TitleUiEvent<Object> titleUiEvent = newTitleUiEvent(owningAdapter);
eventBusService.post(titleUiEvent);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacetDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacetDefault.java
index b36de92..77d8def 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacetDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacetDefault.java
@@ -65,7 +65,9 @@ public class GridFacetDefault
}
final Class<?> domainClass = getSpecification().getCorrespondingClass();
final LayoutFacet layoutFacet = getFacetHolder().getFacet(LayoutFacet.class);
- final String layout = layoutFacet != null ? layoutFacet.layout(objectAdapterIfAny) : null;
+ final String layout = layoutFacet != null && objectAdapterIfAny != null
+ ? layoutFacet.layout(objectAdapterIfAny)
+ : null;
this.grid = load(domainClass, layout);
return this.grid;
[isis] 01/02: ISIS-2082: updates tg.adoc to use {isiscurr} rather
than hardcoded version
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 867d148323a206ac0cf384cea9efe74b1a12186a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 10 08:03:19 2019 +0100
ISIS-2082: updates tg.adoc to use {isiscurr} rather than hardcoded version
---
adocs/documentation/src/main/asciidoc/pages/tg/tg.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/adocs/documentation/src/main/asciidoc/pages/tg/tg.adoc b/adocs/documentation/src/main/asciidoc/pages/tg/tg.adoc
index a08e811..e1a6e4d 100644
--- a/adocs/documentation/src/main/asciidoc/pages/tg/tg.adoc
+++ b/adocs/documentation/src/main/asciidoc/pages/tg/tg.adoc
@@ -35,7 +35,7 @@ With the *nix bash shell, use:
mvn archetype:generate \
-D archetypeGroupId=org.apache.isis.archetype \
-D archetypeArtifactId=simpleapp-archetype \
- -D archetypeVersion=1.17.0 \
+ -D archetypeVersion={isiscurr} \
-D groupId=com.mycompany \
-D artifactId=myapp \
-D version=1.0-SNAPSHOT \