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 2021/01/15 17:43:47 UTC
[isis] 04/06: ISIS-439: completely removes the
DisabledFacetForCollection
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-439
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b800e611f7e2de06f964ff7843a7e3ea684c26e3
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 13 18:39:33 2021 +0000
ISIS-439: completely removes the DisabledFacetForCollection
what I had before wasn't quite right - was making _everything_ immutable!
---
.../CollectionAnnotationFacetFactory.java | 11 +------
.../disabled/DisabledFacetForCollection.java | 37 ----------------------
2 files changed, 1 insertion(+), 47 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
index 84fdca4..c9dea13 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
@@ -34,10 +34,9 @@ import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromArray;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromGenerics;
-import org.apache.isis.core.metamodel.facets.actions.contributing.ContributingFacetAbstract;
import org.apache.isis.core.metamodel.facets.actions.contributing.ContributingFacet.Contributing;
+import org.apache.isis.core.metamodel.facets.actions.contributing.ContributingFacetAbstract;
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacetAbstract;
-import org.apache.isis.core.metamodel.facets.collections.collection.disabled.DisabledFacetForCollection;
import org.apache.isis.core.metamodel.facets.collections.collection.hidden.HiddenFacetForCollectionAnnotation;
import org.apache.isis.core.metamodel.facets.collections.collection.modify.CollectionAddToFacetForDomainEventFromAbstract;
import org.apache.isis.core.metamodel.facets.collections.collection.modify.CollectionAddToFacetForDomainEventFromCollectionAnnotation;
@@ -73,7 +72,6 @@ public class CollectionAnnotationFacetFactory extends FacetFactoryAbstract {
processModify(processMethodContext, collectionIfAny);
processHidden(processMethodContext, collectionIfAny);
- processEditing(processMethodContext);
processTypeOf(processMethodContext, collectionIfAny);
}
@@ -208,13 +206,6 @@ public class CollectionAnnotationFacetFactory extends FacetFactoryAbstract {
super.addFacet(facet);
}
- void processEditing(final ProcessMethodContext processMethodContext) {
- val holder = processMethodContext.getFacetHolder();
- val facet = DisabledFacetForCollection.create(holder);
-
- super.addFacet(facet);
- }
-
void processTypeOf(final ProcessMethodContext processMethodContext, Optional<Collection> collectionIfAny) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/disabled/DisabledFacetForCollection.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/disabled/DisabledFacetForCollection.java
deleted file mode 100644
index b99e1b1..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/disabled/DisabledFacetForCollection.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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 agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.collections.collection.disabled;
-
-import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacet;
-import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacetAbstractImpl;
-
-public class DisabledFacetForCollection extends DisabledFacetAbstractImpl {
-
- public static DisabledFacet create(final FacetHolder holder) {
- return new DisabledFacetForCollection(holder);
- }
-
- private DisabledFacetForCollection(final FacetHolder holder) {
- super(Where.EVERYWHERE, "Always disabled", holder);
- }
-
-}