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:52:56 UTC
[isis] 01/01: Merge branch 'master' into v2
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 7800a5c5c42b17bb74b33abe296c8244c0c68aee
Merge: ce55270 8d1e30a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 10 10:48:33 2019 +0100
Merge branch 'master' into v2
...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 --cc core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
index 8d41509,50b340f..5a1433d
--- 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
@@@ -78,8 -80,12 +78,12 @@@ CssClassFacet
}
@Override
- public String cssClass(final ObjectAdapter owningAdapter) {
+ public String cssClass(final ManagedObject owningAdapter) {
+ if(owningAdapter == null) {
+ return null;
+ }
+
final CssClassUiEvent<Object> cssClassUiEvent = newCssClassUiEvent(owningAdapter);
eventBusService.post(cssClassUiEvent);
diff --cc core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaViewModelLayoutAnnotationUsingCssClassUiEvent.java
index 58cf372,f9c1342..1fa04e5
--- 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
@@@ -77,8 -81,12 +77,12 @@@ public class CssClassFacetViaViewModelL
}
@Override
- public String cssClass(final ObjectAdapter owningAdapter) {
+ public String cssClass(final ManagedObject owningAdapter) {
+ if(owningAdapter == null) {
+ return null;
+ }
+
final CssClassUiEvent<Object> cssClassUiEvent = newCssClassUiEvent(owningAdapter);
eventBusService.post(cssClassUiEvent);
diff --cc core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
index 39d14b4,29594f9..1884221
--- 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
@@@ -79,8 -78,12 +79,12 @@@ public class IconFacetViaDomainObjectLa
}
@Override
- public String iconName(final ObjectAdapter owningAdapter) {
+ public String iconName(final ManagedObject owningAdapter) {
+ if(owningAdapter == null) {
+ return null;
+ }
+
final IconUiEvent<Object> iconUiEvent = newIconUiEvent(owningAdapter);
eventBusService.post(iconUiEvent);
diff --cc core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaViewModelLayoutAnnotationUsingIconUiEvent.java
index abe591f,d628e98..a8e715c
--- 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
@@@ -77,8 -79,12 +77,12 @@@ public class IconFacetViaViewModelLayou
}
@Override
- public String iconName(final ObjectAdapter owningAdapter) {
+ public String iconName(final ManagedObject owningAdapter) {
+ if(owningAdapter == null) {
+ return null;
+ }
+
final IconUiEvent<Object> iconUiEvent = newIconUiEvent(owningAdapter);
eventBusService.post(iconUiEvent);
diff --cc core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java
index 2e79d11,ea67259..ae85191
--- 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
@@@ -77,8 -81,12 +77,12 @@@ public class LayoutFacetViaDomainObject
}
@Override
- public String layout(final ObjectAdapter owningAdapter) {
+ public String layout(final ManagedObject owningAdapter) {
+ if(owningAdapter == null) {
+ return null;
+ }
+
final LayoutUiEvent<Object> layoutUiEvent = newLayoutUiEvent(owningAdapter);
eventBusService.post(layoutUiEvent);
diff --cc core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaViewModelLayoutAnnotationUsingLayoutUiEvent.java
index 733b3e3,024ffa7..27e28d6
--- 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
@@@ -77,8 -81,12 +77,12 @@@ public class LayoutFacetViaViewModelLay
}
@Override
- public String layout(final ObjectAdapter owningAdapter) {
+ public String layout(final ManagedObject owningAdapter) {
+ if(owningAdapter == null) {
+ return null;
+ }
+
final LayoutUiEvent<Object> layoutUiEvent = newLayoutUiEvent(owningAdapter);
eventBusService.post(layoutUiEvent);
diff --cc core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
index a680a49,b83d04b..141f103
--- 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
@@@ -97,8 -90,12 +97,12 @@@ public class TitleFacetViaDomainObjectL
}
@Override
- public String title(final ObjectAdapter owningAdapter) {
+ public String title(final ManagedObject owningAdapter) {
+ if(owningAdapter == null) {
+ return null;
+ }
+
final TitleUiEvent<Object> titleUiEvent = newTitleUiEvent(owningAdapter);
eventBusService.post(titleUiEvent);
diff --cc core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaViewModelLayoutAnnotationUsingTitleUiEvent.java
index dcb67e7,c5effcf..f6c3307
--- 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
@@@ -96,8 -91,12 +96,12 @@@ public class TitleFacetViaViewModelLayo
}
@Override
- public String title(final ObjectAdapter owningAdapter) {
+ public String title(final ManagedObject owningAdapter) {
+ if(owningAdapter == null) {
+ return null;
+ }
+
final TitleUiEvent<Object> titleUiEvent = newTitleUiEvent(owningAdapter);
eventBusService.post(titleUiEvent);