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/12/21 11:54:30 UTC
[isis] branch master updated: ISIS-2882: renaming TitelFacet thats based on ValueFacet
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 d60752b ISIS-2882: renaming TitelFacet thats based on ValueFacet
d60752b is described below
commit d60752bfcbd07c383dcbe33f03f25ea2256b3928
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Dec 21 12:54:24 2021 +0100
ISIS-2882: renaming TitelFacet thats based on ValueFacet
- for symmetry with the others we just worked on in prev. commits
---
...FacetUsingValueFacet.java => TitleFacetFromValueFacet.java} | 10 +++++-----
...ValueAnnotationOrAnyMatchingValueSemanticsFacetFactory.java | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/parser/TitleFacetUsingValueFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/parser/TitleFacetFromValueFacet.java
similarity index 91%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/parser/TitleFacetUsingValueFacet.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/parser/TitleFacetFromValueFacet.java
index 3fe53ba..05ffdc8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/parser/TitleFacetUsingValueFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/parser/TitleFacetFromValueFacet.java
@@ -33,17 +33,17 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import lombok.NonNull;
import lombok.val;
-public final class TitleFacetUsingValueFacet
+public final class TitleFacetFromValueFacet
extends FacetAbstract
implements TitleFacet {
private final @NonNull ValueFacet<?> valueFacet;
- public static TitleFacetUsingValueFacet create(final ValueFacet<?> valueFacet, final FacetHolder holder) {
- return new TitleFacetUsingValueFacet(valueFacet, holder);
+ public static TitleFacetFromValueFacet create(final ValueFacet<?> valueFacet, final FacetHolder holder) {
+ return new TitleFacetFromValueFacet(valueFacet, holder);
}
- private TitleFacetUsingValueFacet(final ValueFacet<?> valueFacet, final FacetHolder holder) {
+ private TitleFacetFromValueFacet(final ValueFacet<?> valueFacet, final FacetHolder holder) {
// facets from the title() method have higher precedence
super(TitleFacet.class, holder, Precedence.LOW);
this.valueFacet = valueFacet;
@@ -92,7 +92,7 @@ implements TitleFacet {
@Override
public boolean semanticEquals(final @NonNull Facet other) {
- return other instanceof TitleFacetUsingValueFacet
+ return other instanceof TitleFacetFromValueFacet
? true //TODO this.valueFacet.semanticEquals(((TitleFacetUsingValueFacet)other).valueFacet)
: false;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetForValueAnnotationOrAnyMatchingValueSemanticsFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetForValueAnnotationOrAnyMatchingValueSemanticsFacetFactory.java
index 3431e93..21e0d2b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetForValueAnnotationOrAnyMatchingValueSemanticsFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetForValueAnnotationOrAnyMatchingValueSemanticsFacetFactory.java
@@ -37,7 +37,7 @@ import org.apache.isis.core.metamodel.facets.object.icon.IconFacet;
import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
import org.apache.isis.core.metamodel.facets.object.parented.ParentedCollectionFacet;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
-import org.apache.isis.core.metamodel.facets.object.title.parser.TitleFacetUsingValueFacet;
+import org.apache.isis.core.metamodel.facets.object.title.parser.TitleFacetFromValueFacet;
import org.apache.isis.core.metamodel.facets.object.value.ImmutableFacetViaValueSemantics;
import org.apache.isis.core.metamodel.facets.object.value.MaxLengthFacetFromValueFacet;
import org.apache.isis.core.metamodel.facets.object.value.TypicalLengthFacetFromValueFacet;
@@ -129,7 +129,7 @@ extends FacetFactoryAbstract {
addFacet(valueFacet);
addFacet(new ImmutableFacetViaValueSemantics(holder));
- addFacet(TitleFacetUsingValueFacet.create(valueFacet, holder));
+ addFacet(TitleFacetFromValueFacet.create(valueFacet, holder));
addFacetIfPresent(EncodableFacetFromValueFacet.create(valueFacet, holder));
addFacetIfPresent(TypicalLengthFacetFromValueFacet.create(valueFacet, holder));