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/03/05 08:06:44 UTC
[isis] 06/10: ISIS-439: removes disabled interaction advisor
reponsibility from CollectionDomainEventFacet (dead code)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2444
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6c0ae8e17eec4aa4b4176ac7d2c43ca550e94abe
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Mar 3 09:06:11 2021 +0000
ISIS-439: removes disabled interaction advisor reponsibility from CollectionDomainEventFacet (dead code)
---
.../modify/CollectionDomainEventFacet.java | 2 +-
.../modify/CollectionDomainEventFacetAbstract.java | 29 ----------------------
2 files changed, 1 insertion(+), 30 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacet.java
index 6ebc17a..8d79acb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacet.java
@@ -28,7 +28,7 @@ import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor;
* Corresponds to <tt>@Collection(domainEvent=...)</tt> annotation in the Isis programming model.
*/
public interface CollectionDomainEventFacet
-extends SingleClassValueFacet, HidingInteractionAdvisor, DisablingInteractionAdvisor {
+extends SingleClassValueFacet, HidingInteractionAdvisor {
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java
index 7046627..39c1bdc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java
@@ -21,14 +21,10 @@ package org.apache.isis.core.metamodel.facets.collections.collection.modify;
import org.apache.isis.applib.events.domain.AbstractDomainEvent;
import org.apache.isis.applib.events.domain.CollectionDomainEvent;
-import org.apache.isis.applib.services.i18n.TranslatableString;
-import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
import org.apache.isis.core.metamodel.facets.DomainEventHelper;
import org.apache.isis.core.metamodel.facets.SingleClassValueFacetAbstract;
-import org.apache.isis.core.metamodel.interactions.UsabilityContext;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
public abstract class CollectionDomainEventFacetAbstract
@@ -36,8 +32,6 @@ public abstract class CollectionDomainEventFacetAbstract
implements CollectionDomainEventFacet {
private final DomainEventHelper domainEventHelper;
- private final TranslationService translationService;
- private final String translationContext;
public CollectionDomainEventFacetAbstract(
final Class<? extends CollectionDomainEvent<?, ?>> eventType,
@@ -46,10 +40,6 @@ public abstract class CollectionDomainEventFacetAbstract
super(CollectionDomainEventFacet.class, holder, eventType);
this.eventType = eventType;
- this.translationService = getTranslationService();
- // sadness: same as in TranslationFactory
- this.translationContext = ((IdentifiedHolder)holder).getIdentifier().getTranslationContext();
-
domainEventHelper = DomainEventHelper.ofServiceRegistry(getServiceRegistry());
}
@@ -83,23 +73,4 @@ public abstract class CollectionDomainEventFacetAbstract
return null;
}
- @Override
- public String disables(final UsabilityContext ic) {
-
- final CollectionDomainEvent<?, ?> event =
- domainEventHelper.postEventForCollection(
- AbstractDomainEvent.Phase.DISABLE,
- getEventType(),
- getIdentified(), ic.getHead()
- );
- if (event != null && event.isDisabled()) {
- final TranslatableString reasonTranslatable = event.getDisabledReasonTranslatable();
- if(reasonTranslatable != null) {
- return reasonTranslatable.translate(translationService, translationContext);
- }
- return event.getDisabledReason();
- }
- return null;
- }
-
}