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 2022/04/16 09:39:35 UTC
[isis] branch master updated: ISIS-3010: metamodel bug fixes; restores CommandLog UI for JDO
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
The following commit(s) were added to refs/heads/master by this push:
new 3ec1206dc2 ISIS-3010: metamodel bug fixes; restores CommandLog UI for JDO
3ec1206dc2 is described below
commit 3ec1206dc2fbb1e1ad780e91888d812b49c75db1
Author: andi-huber <ah...@apache.org>
AuthorDate: Sat Apr 16 11:39:30 2022 +0200
ISIS-3010: metamodel bug fixes; restores CommandLog UI for JDO
---
...sClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java | 3 ++-
.../IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java | 3 ++-
.../TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java | 3 ++-
.../src/main/java/org/apache/isis/core/metamodel/util/Facets.java | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
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 6bf9fbed37..7aba4ff890 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
@@ -31,6 +31,7 @@ import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacetAbstract;
import org.apache.isis.core.metamodel.services.events.MetamodelEventService;
import org.apache.isis.core.metamodel.spec.ManagedObject;
+import org.apache.isis.core.metamodel.spec.ManagedObjects;
import org.apache.isis.core.metamodel.util.EventUtil;
public class CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent
@@ -72,7 +73,7 @@ extends CssClassFacetAbstract {
@Override
public String cssClass(final ManagedObject owningAdapter) {
- if(owningAdapter == null) {
+ if(ManagedObjects.isNullOrUnspecifiedOrEmpty(owningAdapter)) {
return null;
}
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 50d9ef3039..b3c1cfcbb9 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
@@ -31,6 +31,7 @@ import org.apache.isis.core.metamodel.facets.object.icon.IconFacet;
import org.apache.isis.core.metamodel.facets.object.icon.IconFacetAbstract;
import org.apache.isis.core.metamodel.services.events.MetamodelEventService;
import org.apache.isis.core.metamodel.spec.ManagedObject;
+import org.apache.isis.core.metamodel.spec.ManagedObjects;
import org.apache.isis.core.metamodel.util.EventUtil;
public class IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent
@@ -70,7 +71,7 @@ extends IconFacetAbstract {
@Override
public String iconName(final ManagedObject owningAdapter) {
- if(owningAdapter == null) {
+ if(ManagedObjects.isNullOrUnspecifiedOrEmpty(owningAdapter)) {
return null;
}
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 978cf50718..daa961b528 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
@@ -35,6 +35,7 @@ import org.apache.isis.core.metamodel.facets.object.title.TitleFacetAbstract;
import org.apache.isis.core.metamodel.facets.object.title.TitleRenderRequest;
import org.apache.isis.core.metamodel.services.events.MetamodelEventService;
import org.apache.isis.core.metamodel.spec.ManagedObject;
+import org.apache.isis.core.metamodel.spec.ManagedObjects;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.util.EventUtil;
@@ -94,7 +95,7 @@ extends TitleFacetAbstract {
final ManagedObject owningAdapter = titleRenderRequest.getObject();
- if(owningAdapter == null) {
+ if(ManagedObjects.isNullOrUnspecifiedOrEmpty(owningAdapter)) {
return null;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/Facets.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/Facets.java
index a21a6c9a3f..d1befad8df 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/Facets.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/Facets.java
@@ -321,7 +321,7 @@ public final class Facets {
final Integer result = (typicalLength != null
&& maxLength.isPresent()
&& typicalLength > maxLength.getAsInt())
- ? maxLength.getAsInt()
+ ? (Integer)maxLength.getAsInt()
: typicalLength;
return Optional.ofNullable(result)
.map(OptionalInt::of)