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 3c707402de ISIS-2965: rename mentions of RC1 -> M8
3c707402de is described below
commit 3c707402de6d65d8e107193a18a67eea3ce47f04
Author: Andi Huber <[email protected]>
AuthorDate: Tue Jun 14 07:38:36 2022 +0200
ISIS-2965: rename mentions of RC1 -> M8
---
.../modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc | 2 +-
.../apache/isis/applib/annotation/DomainObject.java | 2 +-
.../apache/isis/applib/annotation/DomainService.java | 2 +-
.../isis/applib/annotation/LogicalTypeName.java | 2 +-
.../org/apache/isis/applib/annotation/Value.java | 2 +-
.../isis/core/metamodel/spec/ManagedObject.java | 1 +
.../isis/core/metamodel/spec/ManagedObjects.java | 20 +++++++++++---------
7 files changed, 17 insertions(+), 14 deletions(-)
diff --git
a/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
b/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
index dde42a526a..4769687770 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
@@ -1,4 +1,4 @@
-= Migrating from M7 to RC1
+= Migrating from M7 to M8
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with this work
for additional information regarding copyright ownership. The ASF licenses this
file to you under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance with the License. You may obtain a copy of
the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by
applicable law or ag [...]
:page-partial:
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
index b2b5e751e1..fbda3c2293 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
@@ -193,7 +193,7 @@ public @interface DomainObject {
* @deprecated use {@link Named} instead
* @see Named
*/
- @Deprecated(forRemoval = true, since = "2.0.0-RC1")
+ @Deprecated(forRemoval = true, since = "2.0.0-M8")
String logicalTypeName()
default "";
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
index 343a91fa52..931e1275d7 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
@@ -85,7 +85,7 @@ public @interface DomainService {
* @deprecated use Spring semantics instead, eg. {@link Named} or
equivalent
* @see Named
*/
- @Deprecated(forRemoval = true, since = "2.0.0-RC1")
+ @Deprecated(forRemoval = true, since = "2.0.0-M8")
// commented out: let the IsisBeanFactoryPostProcessorForSpring take care
of that!
//@AliasFor(annotation = Named.class, attribute = "value")
String logicalTypeName()
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/annotation/LogicalTypeName.java
b/api/applib/src/main/java/org/apache/isis/applib/annotation/LogicalTypeName.java
index 93d964aa5a..721436777d 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/annotation/LogicalTypeName.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/annotation/LogicalTypeName.java
@@ -38,7 +38,7 @@ import javax.inject.Named;
ElementType.ANNOTATION_TYPE
})
@Retention(RetentionPolicy.RUNTIME)
-@Deprecated(forRemoval = true, since = "2.0.0-RC1")
+@Deprecated(forRemoval = true, since = "2.0.0-M8")
public @interface LogicalTypeName {
/**
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/annotation/Value.java
b/api/applib/src/main/java/org/apache/isis/applib/annotation/Value.java
index 5ed5ed72a5..5e70aea654 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Value.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Value.java
@@ -51,7 +51,7 @@ public @interface Value {
* @deprecated use {@link Named} instead
* @see Named
*/
- @Deprecated(forRemoval = true, since = "2.0.0-RC1")
+ @Deprecated(forRemoval = true, since = "2.0.0-M8")
String logicalTypeName()
default "";
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
index faa10660fa..9aa8fd8491 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
@@ -128,6 +128,7 @@ public interface ManagedObject {
return String.format("missing ValueFacet %s",
spec.getCorrespondingClass());
}
+ @SuppressWarnings("unchecked")
val renderer = (Renderer<Object>)
valueFacet.selectRendererForFeature(feature).orElse(null);
if(renderer==null) {
return String.format("missing Renderer %s",
spec.getCorrespondingClass());
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
index fb3be95d8f..2d073c8738 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
@@ -514,6 +514,17 @@ public final class ManagedObjects {
}
};
+ // -- VIEWMODEL UTILITIES
+
+ public static void refreshViewmodel(
+ final @Nullable ManagedObject viewmodel,
+ final @Nullable Supplier<Bookmark> bookmarkSupplier) {
+ if(isNullOrUnspecifiedOrEmpty(viewmodel)) {
+ return; // do nothing
+ }
+ viewmodel.refreshViewmodel(bookmarkSupplier);
+ }
+
// -- TITLE UTILITIES
@UtilityClass
@@ -1123,13 +1134,4 @@ public final class ManagedObjects {
}
- public static void refreshViewmodel(
- final @Nullable ManagedObject viewmodel,
- final @Nullable Supplier<Bookmark> bookmarkSupplier) {
- if(isNullOrUnspecifiedOrEmpty(viewmodel)) {
- return; // do nothing
- }
- viewmodel.refreshViewmodel(bookmarkSupplier);
- }
-
}
