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 2021/07/01 16:56:26 UTC
[isis] branch master updated: ISIS-1720: fixes wrong facet-types
from prev. commit
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 6b0d99c ISIS-1720: fixes wrong facet-types from prev. commit
6b0d99c is described below
commit 6b0d99ca824543456b92d8a389758443f6079c27
Author: andi-huber <ah...@apache.org>
AuthorDate: Thu Jul 1 18:56:18 2021 +0200
ISIS-1720: fixes wrong facet-types from prev. commit
---
.../CanonicalDescribedFacetForCollectionLayoutAnnotation.java | 8 ++++----
.../layout/CanonicalDescribedFacetForCollectionXml.java | 8 ++++----
.../layout/CanonicalNamedFacetForCollectionLayoutAnnotation.java | 8 ++++----
.../collections/layout/CanonicalNamedFacetForCollectionXml.java | 8 ++++----
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CanonicalDescribedFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CanonicalDescribedFacetForCollectionLayoutAnnotation.java
index 530e47b..1ea489d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CanonicalDescribedFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CanonicalDescribedFacetForCollectionLayoutAnnotation.java
@@ -24,13 +24,13 @@ import java.util.Optional;
import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.all.described.MemberDescribedFacet;
-import org.apache.isis.core.metamodel.facets.all.described.MemberDescribedFacetWithStaticTextAbstract;
+import org.apache.isis.core.metamodel.facets.all.described.CanonicalDescribedFacet;
+import org.apache.isis.core.metamodel.facets.all.described.CanonicalDescribedFacetAbstract;
public class CanonicalDescribedFacetForCollectionLayoutAnnotation
-extends MemberDescribedFacetWithStaticTextAbstract {
+extends CanonicalDescribedFacetAbstract {
- public static Optional<MemberDescribedFacet> create(
+ public static Optional<CanonicalDescribedFacet> create(
final Optional<CollectionLayout> collectionLayoutIfAny,
final FacetHolder holder) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CanonicalDescribedFacetForCollectionXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CanonicalDescribedFacetForCollectionXml.java
index ea226b2..6098688 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CanonicalDescribedFacetForCollectionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CanonicalDescribedFacetForCollectionXml.java
@@ -24,13 +24,13 @@ import java.util.Optional;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.all.described.MemberDescribedFacet;
-import org.apache.isis.core.metamodel.facets.all.described.MemberDescribedFacetWithStaticTextAbstract;
+import org.apache.isis.core.metamodel.facets.all.described.CanonicalDescribedFacet;
+import org.apache.isis.core.metamodel.facets.all.described.CanonicalDescribedFacetAbstract;
public class CanonicalDescribedFacetForCollectionXml
-extends MemberDescribedFacetWithStaticTextAbstract {
+extends CanonicalDescribedFacetAbstract {
- public static Optional<MemberDescribedFacet> create(
+ public static Optional<CanonicalDescribedFacet> create(
final CollectionLayoutData collectionLayout,
final FacetHolder holder) {
if(collectionLayout == null) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CanonicalNamedFacetForCollectionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CanonicalNamedFacetForCollectionLayoutAnnotation.java
index 11eed5b..e2c7d56 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CanonicalNamedFacetForCollectionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CanonicalNamedFacetForCollectionLayoutAnnotation.java
@@ -24,13 +24,13 @@ import java.util.Optional;
import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.all.named.MemberNamedFacet;
-import org.apache.isis.core.metamodel.facets.all.named.MemberNamedFacetWithStaticTextAbstract;
+import org.apache.isis.core.metamodel.facets.all.named.CanonicalNamedFacet;
+import org.apache.isis.core.metamodel.facets.all.named.CanonicalNamedFacetAbstract;
public class CanonicalNamedFacetForCollectionLayoutAnnotation
-extends MemberNamedFacetWithStaticTextAbstract {
+extends CanonicalNamedFacetAbstract {
- public static Optional<MemberNamedFacet> create(
+ public static Optional<CanonicalNamedFacet> create(
final Optional<CollectionLayout> collectionLayoutIfAny,
final FacetHolder holder) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CanonicalNamedFacetForCollectionXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CanonicalNamedFacetForCollectionXml.java
index 4f8e54e..f18c2e6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CanonicalNamedFacetForCollectionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CanonicalNamedFacetForCollectionXml.java
@@ -24,13 +24,13 @@ import java.util.Optional;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.all.named.MemberNamedFacet;
-import org.apache.isis.core.metamodel.facets.all.named.MemberNamedFacetWithStaticTextAbstract;
+import org.apache.isis.core.metamodel.facets.all.named.CanonicalNamedFacet;
+import org.apache.isis.core.metamodel.facets.all.named.CanonicalNamedFacetAbstract;
public class CanonicalNamedFacetForCollectionXml
-extends MemberNamedFacetWithStaticTextAbstract {
+extends CanonicalNamedFacetAbstract {
- public static Optional<MemberNamedFacet> create(
+ public static Optional<CanonicalNamedFacet> create(
final CollectionLayoutData collectionLayout,
final FacetHolder holder) {
if(collectionLayout == null) {