http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java index d12407c..ed73cd8 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java @@ -37,10 +37,8 @@ import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet; import org.apache.isis.core.metamodel.facets.object.title.TitleFacet; import org.apache.isis.core.metamodel.facets.object.value.EqualByContentFacet; import org.apache.isis.core.metamodel.facets.object.value.ValueFacet; -import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderContext; + import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderUtil; -import org.apache.isis.core.metamodel.services.ServicesInjector; -import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal; /** * Processes the {@link Value} annotation. @@ -88,7 +86,7 @@ public class ValueFacetAnnotationOrConfigurationFactory extends FacetFactoryAbst // create from annotation, if present final Value annotation = Annotations.getAnnotation(cls, Value.class); if (annotation != null) { - final ValueFacetAnnotation facet = new ValueFacetAnnotation(cls, holder, getConfiguration(), createValueSemanticsProviderContext()); + final ValueFacetAnnotation facet = new ValueFacetAnnotation(cls, holder, servicesInjector); if (facet.isValid()) { return facet; } @@ -97,7 +95,7 @@ public class ValueFacetAnnotationOrConfigurationFactory extends FacetFactoryAbst // otherwise, try to create from configuration, if present final String semanticsProviderName = ValueSemanticsProviderUtil.semanticsProviderNameFromConfiguration(cls, getConfiguration()); if (!Strings.isNullOrEmpty(semanticsProviderName)) { - final ValueFacetFromConfiguration facet = new ValueFacetFromConfiguration(semanticsProviderName, holder, getConfiguration(), createValueSemanticsProviderContext()); + final ValueFacetFromConfiguration facet = new ValueFacetFromConfiguration(semanticsProviderName, holder, servicesInjector); if (facet.isValid()) { return facet; } @@ -107,19 +105,5 @@ public class ValueFacetAnnotationOrConfigurationFactory extends FacetFactoryAbst return null; } - protected ValueSemanticsProviderContext createValueSemanticsProviderContext() { - return new ValueSemanticsProviderContext(getDeploymentCategory(), getSpecificationLoader(), adapterManager, servicesInjector); - } - - - - - @Override - public void setServicesInjector(final ServicesInjector servicesInjector) { - super.setServicesInjector(servicesInjector); - adapterManager = servicesInjector.getPersistenceSessionServiceInternal(); - } - - PersistenceSessionServiceInternal adapterManager; }
http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetFromConfiguration.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetFromConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetFromConfiguration.java index 984e567..6f36fa0 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetFromConfiguration.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetFromConfiguration.java @@ -22,13 +22,14 @@ package org.apache.isis.core.metamodel.facets.object.value.annotcfg; import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.object.value.ValueFacetAbstract; -import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderContext; + import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderUtil; +import org.apache.isis.core.metamodel.services.ServicesInjector; public class ValueFacetFromConfiguration extends ValueFacetAbstract { - public ValueFacetFromConfiguration(final String candidateSemanticsProviderName, final FacetHolder holder, final IsisConfiguration configuration, final ValueSemanticsProviderContext context) { - super(ValueSemanticsProviderUtil.valueSemanticsProviderOrNull(null, candidateSemanticsProviderName), AddFacetsIfInvalidStrategy.DONT_ADD, holder, configuration, context); + public ValueFacetFromConfiguration(final String candidateSemanticsProviderName, final FacetHolder holder, final ServicesInjector context) { + super(ValueSemanticsProviderUtil.valueSemanticsProviderOrNull(null, candidateSemanticsProviderName), AddFacetsIfInvalidStrategy.DONT_ADD, holder, context); } } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProvider.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProvider.java index 8de3b0e..412f43a 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProvider.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProvider.java @@ -23,10 +23,11 @@ import org.apache.isis.applib.adapters.ValueSemanticsProvider; import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.facetapi.FacetUtil; import org.apache.isis.core.metamodel.facets.object.value.ValueFacetAbstract; +import org.apache.isis.core.metamodel.services.ServicesInjector; public class ValueFacetUsingSemanticsProvider extends ValueFacetAbstract { - public ValueFacetUsingSemanticsProvider(final ValueSemanticsProvider<?> adapter, final Facet underlyingValueTypeFacet, final ValueSemanticsProviderContext context) { + public ValueFacetUsingSemanticsProvider(final ValueSemanticsProvider<?> adapter, final Facet underlyingValueTypeFacet, final ServicesInjector context) { super(adapter, AddFacetsIfInvalidStrategy.DO_ADD, underlyingValueTypeFacet.getFacetHolder(), context); // add the adapter in as its own facet (eg StringFacet). http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProviderFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProviderFactory.java index 302b7e1..7f0bf22 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProviderFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProviderFactory.java @@ -28,11 +28,6 @@ import org.apache.isis.core.metamodel.services.persistsession.PersistenceSession public abstract class ValueFacetUsingSemanticsProviderFactory<T> extends FacetFactoryAbstract { - /** - * Lazily created. - */ - private ValueSemanticsProviderContext context; - protected ValueFacetUsingSemanticsProviderFactory() { super(FeatureType.OBJECTS_ONLY); } @@ -42,25 +37,11 @@ public abstract class ValueFacetUsingSemanticsProviderFactory<T> extends FacetFa FacetUtil.addFacet(facet); } - // //////////////////////////////////////////////////// - // Dependencies (injected via setter) - // //////////////////////////////////////////////////// - - - public ValueSemanticsProviderContext getContext() { - if (context == null) { - context = new ValueSemanticsProviderContext(getDeploymentCategory(), getSpecificationLoader(), adapterManager, servicesInjector); - } - return context; - } - @Override - public void setServicesInjector(final ServicesInjector servicesInjector) { - super.setServicesInjector(servicesInjector); - adapterManager = servicesInjector.getPersistenceSessionServiceInternal(); + public ServicesInjector getContext() { + return servicesInjector; } - PersistenceSessionServiceInternal adapterManager; } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java index a182114..605d308 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java @@ -80,7 +80,7 @@ public abstract class ValueSemanticsProviderAndFacetAbstract<T> extends FacetAbs private ObjectSpecification specification; private final IsisConfiguration configuration; - private final ValueSemanticsProviderContext context; + private final ServicesInjector context; public ValueSemanticsProviderAndFacetAbstract( final Class<? extends Facet> adapterFacetType, @@ -91,8 +91,7 @@ public abstract class ValueSemanticsProviderAndFacetAbstract<T> extends FacetAbs final Immutability immutability, final EqualByContent equalByContent, final T defaultValue, - final IsisConfiguration configuration, - final ValueSemanticsProviderContext context) { + final ServicesInjector context) { super(adapterFacetType, holder, Derivation.NOT_DERIVED); this.adaptedClass = adaptedClass; this.typicalLength = typicalLength; @@ -101,7 +100,7 @@ public abstract class ValueSemanticsProviderAndFacetAbstract<T> extends FacetAbs this.equalByContent = (equalByContent == EqualByContent.HONOURED); this.defaultValue = defaultValue; - this.configuration = configuration; + this.configuration = context.getConfigurationServiceInternal(); this.context = context; } @@ -328,7 +327,7 @@ public abstract class ValueSemanticsProviderAndFacetAbstract<T> extends FacetAbs return configuration; } - protected ValueSemanticsProviderContext getContext() { + protected ServicesInjector getContext() { return context; } @@ -336,7 +335,7 @@ public abstract class ValueSemanticsProviderAndFacetAbstract<T> extends FacetAbs * From {@link #getContext() context.} */ protected AdapterManager getAdapterManager() { - return context.getAdapterManager(); + return context.getPersistenceSessionServiceInternal(); } /** @@ -350,7 +349,7 @@ public abstract class ValueSemanticsProviderAndFacetAbstract<T> extends FacetAbs * From {@link #getContext() context.} */ protected ServicesInjector getServicesInjector() { - return context.getServicesInjector(); + return context; } // ////////////////////////////////////////////////////////// http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderContext.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderContext.java deleted file mode 100644 index af78a81..0000000 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderContext.java +++ /dev/null @@ -1,57 +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.object.value.vsp; - -import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager; -import org.apache.isis.core.metamodel.deployment.DeploymentCategory; -import org.apache.isis.core.metamodel.services.ServicesInjector; -import org.apache.isis.core.metamodel.specloader.SpecificationLoader; - -public class ValueSemanticsProviderContext { - - private final DeploymentCategory deploymentCategory; - private final SpecificationLoader specificationLookup; - private final AdapterManager adapterManager; - private final ServicesInjector servicesInjector; - - public ValueSemanticsProviderContext( - final DeploymentCategory deploymentCategory, - final SpecificationLoader specificationLookup, - final AdapterManager adapterManager, - final ServicesInjector servicesInjector) { - this.deploymentCategory = deploymentCategory; - this.specificationLookup = specificationLookup; - this.adapterManager = adapterManager; - this.servicesInjector = servicesInjector; - } - - public DeploymentCategory getDeploymentCategory() { - return deploymentCategory; - } - - public SpecificationLoader getSpecificationLoader() { - return specificationLookup; - } - - public AdapterManager getAdapterManager() { - return adapterManager; - } - - public ServicesInjector getServicesInjector() { - return servicesInjector; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java index 0242422..4518e94 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java @@ -206,7 +206,7 @@ public class ParameterAnnotationFacetFactory extends FacetFactoryAbstract implem @Override public void setServicesInjector(final ServicesInjector servicesInjector) { super.setServicesInjector(servicesInjector); - IsisConfiguration configuration = (IsisConfiguration) servicesInjector.getConfigurationServiceInternal(); + IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal(); maxLengthValidator.setConfiguration(configuration); mustSatisfyValidator.setConfiguration(configuration); regexValidator.setConfiguration(configuration); http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/renderedasdaybefore/annotation/RenderedAsDayBeforeFacetOnParameterAnnotationFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/renderedasdaybefore/annotation/RenderedAsDayBeforeFacetOnParameterAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/renderedasdaybefore/annotation/RenderedAsDayBeforeFacetOnParameterAnnotationFactory.java index 47b463d..ce66f80 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/renderedasdaybefore/annotation/RenderedAsDayBeforeFacetOnParameterAnnotationFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/renderedasdaybefore/annotation/RenderedAsDayBeforeFacetOnParameterAnnotationFactory.java @@ -72,7 +72,7 @@ public class RenderedAsDayBeforeFacetOnParameterAnnotationFactory extends FacetF @Override public void setServicesInjector(final ServicesInjector servicesInjector) { super.setServicesInjector(servicesInjector); - IsisConfiguration configuration = (IsisConfiguration) servicesInjector.getConfigurationServiceInternal(); + IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal(); validator.setConfiguration(configuration); } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/annotation/TypicalLengthFacetOnParameterAnnotationFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/annotation/TypicalLengthFacetOnParameterAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/annotation/TypicalLengthFacetOnParameterAnnotationFactory.java index 5c379f0..0c42735 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/annotation/TypicalLengthFacetOnParameterAnnotationFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/annotation/TypicalLengthFacetOnParameterAnnotationFactory.java @@ -73,7 +73,7 @@ public class TypicalLengthFacetOnParameterAnnotationFactory extends FacetFactory @Override public void setServicesInjector(final ServicesInjector servicesInjector) { super.setServicesInjector(servicesInjector); - IsisConfiguration configuration = (IsisConfiguration) servicesInjector.getConfigurationServiceInternal(); + IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal(); validator.setConfiguration(configuration); } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java index bd9e5d9..01548f6 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java @@ -95,7 +95,7 @@ public class MaskFacetOnParameterAnnotationFactory extends FacetFactoryAbstract @Override public void setServicesInjector(final ServicesInjector servicesInjector) { super.setServicesInjector(servicesInjector); - IsisConfiguration configuration = (IsisConfiguration) servicesInjector.getConfigurationServiceInternal(); + IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal(); validator.setConfiguration(configuration); } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/mandatory/staticmethod/MandatoryFacetOnPropertyStaticMethodFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/mandatory/staticmethod/MandatoryFacetOnPropertyStaticMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/mandatory/staticmethod/MandatoryFacetOnPropertyStaticMethodFactory.java index bff62ff..1872818 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/mandatory/staticmethod/MandatoryFacetOnPropertyStaticMethodFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/mandatory/staticmethod/MandatoryFacetOnPropertyStaticMethodFactory.java @@ -103,7 +103,7 @@ public class MandatoryFacetOnPropertyStaticMethodFactory extends MethodPrefixBas @Override public void setServicesInjector(final ServicesInjector servicesInjector) { super.setServicesInjector(servicesInjector); - IsisConfiguration configuration = (IsisConfiguration) servicesInjector.getConfigurationServiceInternal(); + IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal(); validator.setConfiguration(configuration); } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/multiline/annotation/MultiLineFacetOnPropertyFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/multiline/annotation/MultiLineFacetOnPropertyFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/multiline/annotation/MultiLineFacetOnPropertyFactory.java index 773d970..22dca59 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/multiline/annotation/MultiLineFacetOnPropertyFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/multiline/annotation/MultiLineFacetOnPropertyFactory.java @@ -96,7 +96,7 @@ public class MultiLineFacetOnPropertyFactory extends FacetFactoryAbstract implem @Override public void setServicesInjector(final ServicesInjector servicesInjector) { super.setServicesInjector(servicesInjector); - IsisConfiguration configuration = (IsisConfiguration) servicesInjector.getConfigurationServiceInternal(); + IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal(); multiLineValidator.setConfiguration(configuration); } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java index 69c6cfd..76f1f32 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java @@ -453,7 +453,7 @@ public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract impleme @Override public void setServicesInjector(final ServicesInjector servicesInjector) { super.setServicesInjector(servicesInjector); - IsisConfiguration configuration = (IsisConfiguration) servicesInjector.getConfigurationServiceInternal(); + IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal(); postsPropertyChangedEventValidator.setConfiguration(configuration); propertyInteractionValidator.setConfiguration(configuration); regexValidator.setConfiguration(configuration); http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/renderedasdaybefore/annotation/RenderedAsDayBeforeAnnotationOnPropertyFacetFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/renderedasdaybefore/annotation/RenderedAsDayBeforeAnnotationOnPropertyFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/renderedasdaybefore/annotation/RenderedAsDayBeforeAnnotationOnPropertyFacetFactory.java index f9e5d4a..de9512e 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/renderedasdaybefore/annotation/RenderedAsDayBeforeAnnotationOnPropertyFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/renderedasdaybefore/annotation/RenderedAsDayBeforeAnnotationOnPropertyFacetFactory.java @@ -66,7 +66,7 @@ public class RenderedAsDayBeforeAnnotationOnPropertyFacetFactory extends FacetFa @Override public void setServicesInjector(final ServicesInjector servicesInjector) { super.setServicesInjector(servicesInjector); - IsisConfiguration configuration = (IsisConfiguration) servicesInjector.getConfigurationServiceInternal(); + IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal(); validator.setConfiguration(configuration); } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthOnPropertyFacetFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthOnPropertyFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthOnPropertyFacetFactory.java index 7152051..32ad03e 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthOnPropertyFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthOnPropertyFacetFactory.java @@ -88,7 +88,7 @@ public class TypicalLengthOnPropertyFacetFactory extends FacetFactoryAbstract im @Override public void setServicesInjector(final ServicesInjector servicesInjector) { super.setServicesInjector(servicesInjector); - IsisConfiguration configuration = (IsisConfiguration) servicesInjector.getConfigurationServiceInternal(); + IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal(); validator.setConfiguration(configuration); } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java index 5018aaa..9e4d614 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java @@ -115,7 +115,7 @@ public class MaskFacetOnPropertyAnnotationFactory extends FacetFactoryAbstract i @Override public void setServicesInjector(final ServicesInjector servicesInjector) { super.setServicesInjector(servicesInjector); - IsisConfiguration configuration = (IsisConfiguration) servicesInjector.getConfigurationServiceInternal(); + IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal(); validator.setConfiguration(configuration); } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java index 2d5025d..f366dcd 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java @@ -32,7 +32,8 @@ import org.apache.isis.applib.profiles.Localization; import org.apache.isis.core.commons.config.ConfigurationConstants; import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.metamodel.facetapi.FacetHolder; -import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderContext; +import org.apache.isis.core.metamodel.services.ServicesInjector; + public abstract class DateAndTimeValueSemanticsProviderAbstract<T> extends ValueSemanticsProviderAbstractTemporal<T> { @@ -48,10 +49,10 @@ public abstract class DateAndTimeValueSemanticsProviderAbstract<T> extends Value private static final int TYPICAL_LENGTH = 18; @SuppressWarnings("unchecked") - public DateAndTimeValueSemanticsProviderAbstract(final FacetHolder holder, final Class<T> adaptedClass, final Immutability immutability, final EqualByContent equalByContent, final IsisConfiguration configuration, final ValueSemanticsProviderContext context) { - super("datetime", holder, adaptedClass, TYPICAL_LENGTH, immutability, equalByContent, (T) DEFAULT_VALUE, configuration, context); + public DateAndTimeValueSemanticsProviderAbstract(final FacetHolder holder, final Class<T> adaptedClass, final Immutability immutability, final EqualByContent equalByContent, final ServicesInjector context) { + super("datetime", holder, adaptedClass, TYPICAL_LENGTH, immutability, equalByContent, (T) DEFAULT_VALUE, context); - final String formatRequired = configuration.getString(ConfigurationConstants.ROOT + "value.format.datetime"); + final String formatRequired = getConfiguration().getString(ConfigurationConstants.ROOT + "value.format.datetime"); if (formatRequired == null) { format = formats().get(defaultFormat()); } else { http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java index 3a7b052..8c289f8 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java @@ -35,14 +35,13 @@ import com.google.common.collect.Maps; import org.apache.isis.applib.adapters.EncodingException; import org.apache.isis.applib.profiles.Localization; import org.apache.isis.core.commons.config.ConfigurationConstants; -import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException; import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract; -import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderContext; import org.apache.isis.core.metamodel.facets.value.date.DateValueFacet; +import org.apache.isis.core.metamodel.services.ServicesInjector; public abstract class ValueSemanticsProviderAbstractTemporal<T> extends ValueSemanticsProviderAndFacetAbstract<T> implements DateValueFacet { @@ -102,9 +101,9 @@ public abstract class ValueSemanticsProviderAbstractTemporal<T> extends ValueSem /** * Uses {@link #type()} as the facet type. */ - public ValueSemanticsProviderAbstractTemporal(final String propertyName, final FacetHolder holder, final Class<T> adaptedClass, final int typicalLength, final Immutability immutability, final EqualByContent equalByContent, final T defaultValue, final IsisConfiguration configuration, - final ValueSemanticsProviderContext context) { - this(propertyName, type(), holder, adaptedClass, typicalLength, immutability, equalByContent, defaultValue, configuration, context); + public ValueSemanticsProviderAbstractTemporal(final String propertyName, final FacetHolder holder, final Class<T> adaptedClass, final int typicalLength, final Immutability immutability, final EqualByContent equalByContent, final T defaultValue, + final ServicesInjector context) { + this(propertyName, type(), holder, adaptedClass, typicalLength, immutability, equalByContent, defaultValue, context); } /** @@ -112,8 +111,8 @@ public abstract class ValueSemanticsProviderAbstractTemporal<T> extends ValueSem * {@link #type()}. */ public ValueSemanticsProviderAbstractTemporal(final String propertyType, final Class<? extends Facet> facetType, final FacetHolder holder, final Class<T> adaptedClass, final int typicalLength, final Immutability immutability, final EqualByContent equalByContent, final T defaultValue, - final IsisConfiguration configuration, final ValueSemanticsProviderContext context) { - super(facetType, holder, adaptedClass, typicalLength, null, immutability, equalByContent, defaultValue, configuration, context); + final ServicesInjector context) { + super(facetType, holder, adaptedClass, typicalLength, null, immutability, equalByContent, defaultValue, context); configureFormats(); this.propertyType = propertyType; http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueFacetUsingSemanticsProviderFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueFacetUsingSemanticsProviderFactory.java index acb965e..f8ae8e7 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueFacetUsingSemanticsProviderFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueFacetUsingSemanticsProviderFactory.java @@ -37,7 +37,7 @@ public class BigDecimalValueFacetUsingSemanticsProviderFactory extends ValueFace if (type != BigDecimal.class) { return; } - addFacets(new BigDecimalValueSemanticsProvider(holder, getConfiguration(), getContext())); + addFacets(new BigDecimalValueSemanticsProvider(holder, getContext())); return; } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java index d3b8a2f..0a3583b 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java @@ -27,13 +27,13 @@ import java.util.Locale; import org.apache.isis.applib.adapters.EncoderDecoder; import org.apache.isis.applib.adapters.Parser; import org.apache.isis.applib.profiles.Localization; -import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.commons.exceptions.IsisException; import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException; import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract; -import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderContext; + +import org.apache.isis.core.metamodel.services.ServicesInjector; public class BigDecimalValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<BigDecimal> implements BigDecimalValueFacet { @@ -54,11 +54,11 @@ public class BigDecimalValueSemanticsProvider extends ValueSemanticsProviderAndF * {@link EncoderDecoder}. */ public BigDecimalValueSemanticsProvider() { - this(null, null, null); + this(null, null); } - public BigDecimalValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration, final ValueSemanticsProviderContext context) { - super(type(), holder, BigDecimal.class, TYPICAL_LENGTH, null, Immutability.IMMUTABLE, EqualByContent.HONOURED, DEFAULT_VALUE, configuration, context); + public BigDecimalValueSemanticsProvider(final FacetHolder holder, final ServicesInjector context) { + super(type(), holder, BigDecimal.class, TYPICAL_LENGTH, null, Immutability.IMMUTABLE, EqualByContent.HONOURED, DEFAULT_VALUE, context); format = determineNumberFormat("value.format.decimal"); } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/biginteger/BigIntegerValueFacetUsingSemanticsProviderFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/biginteger/BigIntegerValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/biginteger/BigIntegerValueFacetUsingSemanticsProviderFactory.java index dbfeef2..e970be7 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/biginteger/BigIntegerValueFacetUsingSemanticsProviderFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/biginteger/BigIntegerValueFacetUsingSemanticsProviderFactory.java @@ -37,7 +37,7 @@ public class BigIntegerValueFacetUsingSemanticsProviderFactory extends ValueFace if (type != BigInteger.class) { return; } - addFacets(new BigIntegerValueSemanticsProvider(holder, getConfiguration(), getContext())); + addFacets(new BigIntegerValueSemanticsProvider(holder, getContext())); } } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java index 4f7b603..b7cbfda 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java @@ -26,12 +26,12 @@ import java.text.NumberFormat; import org.apache.isis.applib.adapters.EncoderDecoder; import org.apache.isis.applib.adapters.Parser; import org.apache.isis.applib.profiles.Localization; -import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException; import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract; -import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderContext; +import org.apache.isis.core.metamodel.services.ServicesInjector; + public class BigIntegerValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<BigInteger> implements BigIntegerValueFacet { @@ -50,12 +50,12 @@ public class BigIntegerValueSemanticsProvider extends ValueSemanticsProviderAndF * {@link EncoderDecoder}. */ public BigIntegerValueSemanticsProvider() { - this(null, null, null); + this(null, null); } - public BigIntegerValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration, final ValueSemanticsProviderContext context) { + public BigIntegerValueSemanticsProvider(final FacetHolder holder, final ServicesInjector context) { - super(type(), holder, BigInteger.class, TYPICAL_LENGTH, null, Immutability.IMMUTABLE, EqualByContent.HONOURED, DEFAULT_VALUE, configuration, context); + super(type(), holder, BigInteger.class, TYPICAL_LENGTH, null, Immutability.IMMUTABLE, EqualByContent.HONOURED, DEFAULT_VALUE, context); format = determineNumberFormat("value.format.int"); } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/blobs/BlobValueFacetUsingSemanticsProviderFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/blobs/BlobValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/blobs/BlobValueFacetUsingSemanticsProviderFactory.java index ae3c79d..12e08e1 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/blobs/BlobValueFacetUsingSemanticsProviderFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/blobs/BlobValueFacetUsingSemanticsProviderFactory.java @@ -35,7 +35,7 @@ public class BlobValueFacetUsingSemanticsProviderFactory extends ValueFacetUsing if (type != Blob.class) { return; } - addFacets(new BlobValueSemanticsProvider(holder, getConfiguration(), getContext())); + addFacets(new BlobValueSemanticsProvider(holder, getContext())); } } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/blobs/BlobValueSemanticsProvider.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/blobs/BlobValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/blobs/BlobValueSemanticsProvider.java index 2b9c214..a096d4f 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/blobs/BlobValueSemanticsProvider.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/blobs/BlobValueSemanticsProvider.java @@ -29,11 +29,11 @@ import org.apache.isis.applib.adapters.EncoderDecoder; import org.apache.isis.applib.adapters.Parser; import org.apache.isis.applib.profiles.Localization; import org.apache.isis.applib.value.Blob; -import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract; -import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderContext; +import org.apache.isis.core.metamodel.services.ServicesInjector; + public class BlobValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<Blob> implements BlobValueFacet { @@ -50,11 +50,11 @@ public class BlobValueSemanticsProvider extends ValueSemanticsProviderAndFacetAb * {@link EncoderDecoder}. */ public BlobValueSemanticsProvider() { - this(null, null, null); + this(null, null); } - public BlobValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration, final ValueSemanticsProviderContext context) { - super(type(), holder, Blob.class, TYPICAL_LENGTH, null, Immutability.IMMUTABLE, EqualByContent.NOT_HONOURED, DEFAULT_VALUE, configuration, context); + public BlobValueSemanticsProvider(final FacetHolder holder, final ServicesInjector context) { + super(type(), holder, Blob.class, TYPICAL_LENGTH, null, Immutability.IMMUTABLE, EqualByContent.NOT_HONOURED, DEFAULT_VALUE, context); } @Override http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanPrimitiveValueFacetUsingSemanticsProviderFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanPrimitiveValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanPrimitiveValueFacetUsingSemanticsProviderFactory.java index ee4d52d..715d393 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanPrimitiveValueFacetUsingSemanticsProviderFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanPrimitiveValueFacetUsingSemanticsProviderFactory.java @@ -36,7 +36,7 @@ public class BooleanPrimitiveValueFacetUsingSemanticsProviderFactory extends Val if (type != boolean.class) { return; } - addFacets(new BooleanPrimitiveValueSemanticsProvider(holder, getConfiguration(), getContext())); + addFacets(new BooleanPrimitiveValueSemanticsProvider(holder, getContext())); } } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanPrimitiveValueSemanticsProvider.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanPrimitiveValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanPrimitiveValueSemanticsProvider.java index 8dac70a..d359c94 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanPrimitiveValueSemanticsProvider.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanPrimitiveValueSemanticsProvider.java @@ -21,11 +21,11 @@ package org.apache.isis.core.metamodel.facets.value.booleans; import org.apache.isis.applib.adapters.EncoderDecoder; import org.apache.isis.applib.adapters.Parser; -import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefaultFacet; -import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderContext; +import org.apache.isis.core.metamodel.services.ServicesInjector; + public class BooleanPrimitiveValueSemanticsProvider extends BooleanValueSemanticsProviderAbstract implements PropertyDefaultFacet { @@ -36,11 +36,11 @@ public class BooleanPrimitiveValueSemanticsProvider extends BooleanValueSemantic * {@link EncoderDecoder}. */ public BooleanPrimitiveValueSemanticsProvider() { - this(null, null, null); + this(null, null); } - public BooleanPrimitiveValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration, final ValueSemanticsProviderContext context) { - super(holder, boolean.class, DEFAULT_VALUE, configuration, context); + public BooleanPrimitiveValueSemanticsProvider(final FacetHolder holder, final ServicesInjector context) { + super(holder, boolean.class, DEFAULT_VALUE, context); } // ////////////////////////////////////////////////////////////////// http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java index 2a2a4b2..f78306a 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java @@ -27,7 +27,8 @@ import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException; import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract; -import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderContext; +import org.apache.isis.core.metamodel.services.ServicesInjector; + public abstract class BooleanValueSemanticsProviderAbstract extends ValueSemanticsProviderAndFacetAbstract<Boolean> implements BooleanValueFacet { @@ -38,8 +39,8 @@ public abstract class BooleanValueSemanticsProviderAbstract extends ValueSemanti private static final int MAX_LENGTH = 5; private static final int TYPICAL_LENGTH = MAX_LENGTH; - public BooleanValueSemanticsProviderAbstract(final FacetHolder holder, final Class<Boolean> adaptedClass, final Boolean defaultValue, final IsisConfiguration configuration, final ValueSemanticsProviderContext context) { - super(type(), holder, adaptedClass, TYPICAL_LENGTH, MAX_LENGTH, Immutability.IMMUTABLE, EqualByContent.HONOURED, defaultValue, configuration, context); + public BooleanValueSemanticsProviderAbstract(final FacetHolder holder, final Class<Boolean> adaptedClass, final Boolean defaultValue, final ServicesInjector context) { + super(type(), holder, adaptedClass, TYPICAL_LENGTH, MAX_LENGTH, Immutability.IMMUTABLE, EqualByContent.HONOURED, defaultValue, context); } // ////////////////////////////////////////////////////////////////// http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanWrapperValueFacetUsingSemanticsProviderFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanWrapperValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanWrapperValueFacetUsingSemanticsProviderFactory.java index 658a5e5..262b141 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanWrapperValueFacetUsingSemanticsProviderFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanWrapperValueFacetUsingSemanticsProviderFactory.java @@ -36,7 +36,7 @@ public class BooleanWrapperValueFacetUsingSemanticsProviderFactory extends Value if (type != Boolean.class) { return; } - addFacets(new BooleanWrapperValueSemanticsProvider(holder, getConfiguration(), getContext())); + addFacets(new BooleanWrapperValueSemanticsProvider(holder, getContext())); } } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanWrapperValueSemanticsProvider.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanWrapperValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanWrapperValueSemanticsProvider.java index d8dae39..234684d 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanWrapperValueSemanticsProvider.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanWrapperValueSemanticsProvider.java @@ -21,10 +21,10 @@ package org.apache.isis.core.metamodel.facets.value.booleans; import org.apache.isis.applib.adapters.EncoderDecoder; import org.apache.isis.applib.adapters.Parser; -import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.facetapi.FacetHolder; -import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderContext; +import org.apache.isis.core.metamodel.services.ServicesInjector; + public class BooleanWrapperValueSemanticsProvider extends BooleanValueSemanticsProviderAbstract { @@ -35,11 +35,11 @@ public class BooleanWrapperValueSemanticsProvider extends BooleanValueSemanticsP * {@link EncoderDecoder}. */ public BooleanWrapperValueSemanticsProvider() { - this(null, null, null); + this(null, null); } - public BooleanWrapperValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration, final ValueSemanticsProviderContext context) { - super(holder, Boolean.class, DEFAULT_PROVIDER, configuration, context); + public BooleanWrapperValueSemanticsProvider(final FacetHolder holder, final ServicesInjector context) { + super(holder, Boolean.class, DEFAULT_PROVIDER, context); } // ////////////////////////////////////////////////////////////////// http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/BytePrimitiveValueFacetUsingSemanticsProviderFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/BytePrimitiveValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/BytePrimitiveValueFacetUsingSemanticsProviderFactory.java index 39f0edc..0f9c34e 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/BytePrimitiveValueFacetUsingSemanticsProviderFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/BytePrimitiveValueFacetUsingSemanticsProviderFactory.java @@ -36,7 +36,7 @@ public class BytePrimitiveValueFacetUsingSemanticsProviderFactory extends ValueF if (type != byte.class) { return; } - addFacets(new BytePrimitiveValueSemanticsProvider(holder, getConfiguration(), getContext())); + addFacets(new BytePrimitiveValueSemanticsProvider(holder, getContext())); } } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/BytePrimitiveValueSemanticsProvider.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/BytePrimitiveValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/BytePrimitiveValueSemanticsProvider.java index e7f3ebd..f4f7fb7 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/BytePrimitiveValueSemanticsProvider.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/BytePrimitiveValueSemanticsProvider.java @@ -21,11 +21,11 @@ package org.apache.isis.core.metamodel.facets.value.bytes; import org.apache.isis.applib.adapters.EncoderDecoder; import org.apache.isis.applib.adapters.Parser; -import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefaultFacet; -import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderContext; +import org.apache.isis.core.metamodel.services.ServicesInjector; + public class BytePrimitiveValueSemanticsProvider extends ByteValueSemanticsProviderAbstract implements PropertyDefaultFacet { @@ -34,11 +34,11 @@ public class BytePrimitiveValueSemanticsProvider extends ByteValueSemanticsProvi * {@link EncoderDecoder}. */ public BytePrimitiveValueSemanticsProvider() { - this(null, null, null); + this(null, null); } - public BytePrimitiveValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration, final ValueSemanticsProviderContext context) { - super(holder, byte.class, configuration, context); + public BytePrimitiveValueSemanticsProvider(final FacetHolder holder, final ServicesInjector context) { + super(holder, byte.class, context); } // ////////////////////////////////////////////////////////////////// http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java index ffdce2d..9950919 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java @@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException; import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract; -import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderContext; +import org.apache.isis.core.metamodel.services.ServicesInjector; public abstract class ByteValueSemanticsProviderAbstract extends ValueSemanticsProviderAndFacetAbstract<Byte> implements ByteValueFacet { @@ -44,8 +44,8 @@ public abstract class ByteValueSemanticsProviderAbstract extends ValueSemanticsP private final NumberFormat format; - public ByteValueSemanticsProviderAbstract(final FacetHolder holder, final Class<Byte> adaptedClass, final IsisConfiguration configuration, final ValueSemanticsProviderContext context) { - super(type(), holder, adaptedClass, TYPICAL_LENGTH, MAX_LENGTH, Immutability.IMMUTABLE, EqualByContent.HONOURED, DEFAULT_VALUE, configuration, context); + public ByteValueSemanticsProviderAbstract(final FacetHolder holder, final Class<Byte> adaptedClass, final ServicesInjector context) { + super(type(), holder, adaptedClass, TYPICAL_LENGTH, MAX_LENGTH, Immutability.IMMUTABLE, EqualByContent.HONOURED, DEFAULT_VALUE, context); format = determineNumberFormat("value.format.byte"); } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteWrapperValueFacetUsingSemanticsProviderFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteWrapperValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteWrapperValueFacetUsingSemanticsProviderFactory.java index ac05297..b4d0a68 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteWrapperValueFacetUsingSemanticsProviderFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteWrapperValueFacetUsingSemanticsProviderFactory.java @@ -36,7 +36,7 @@ public class ByteWrapperValueFacetUsingSemanticsProviderFactory extends ValueFac if (type != Byte.class) { return; } - addFacets(new ByteWrapperValueSemanticsProvider(holder, getConfiguration(), getContext())); + addFacets(new ByteWrapperValueSemanticsProvider(holder, getContext())); } } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteWrapperValueSemanticsProvider.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteWrapperValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteWrapperValueSemanticsProvider.java index d38aa3e..499ac46 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteWrapperValueSemanticsProvider.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteWrapperValueSemanticsProvider.java @@ -21,9 +21,9 @@ package org.apache.isis.core.metamodel.facets.value.bytes; import org.apache.isis.applib.adapters.EncoderDecoder; import org.apache.isis.applib.adapters.Parser; -import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.metamodel.facetapi.FacetHolder; -import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderContext; +import org.apache.isis.core.metamodel.services.ServicesInjector; + public class ByteWrapperValueSemanticsProvider extends ByteValueSemanticsProviderAbstract { @@ -32,11 +32,11 @@ public class ByteWrapperValueSemanticsProvider extends ByteValueSemanticsProvide * {@link EncoderDecoder}. */ public ByteWrapperValueSemanticsProvider() { - this(null, null, null); + this(null, null); } - public ByteWrapperValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration, final ValueSemanticsProviderContext context) { - super(holder, Byte.class, configuration, context); + public ByteWrapperValueSemanticsProvider(final FacetHolder holder, final ServicesInjector context) { + super(holder, Byte.class, context); } } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharPrimitiveValueFacetUsingSemanticsProviderFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharPrimitiveValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharPrimitiveValueFacetUsingSemanticsProviderFactory.java index 110cca2..d4c5c55 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharPrimitiveValueFacetUsingSemanticsProviderFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharPrimitiveValueFacetUsingSemanticsProviderFactory.java @@ -36,7 +36,7 @@ public class CharPrimitiveValueFacetUsingSemanticsProviderFactory extends ValueF if (type != char.class) { return; } - addFacets(new CharPrimitiveValueSemanticsProvider(holder, getConfiguration(), getContext())); + addFacets(new CharPrimitiveValueSemanticsProvider(holder, getContext())); } } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharPrimitiveValueSemanticsProvider.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharPrimitiveValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharPrimitiveValueSemanticsProvider.java index 7433983..1d01f0f 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharPrimitiveValueSemanticsProvider.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharPrimitiveValueSemanticsProvider.java @@ -21,11 +21,11 @@ package org.apache.isis.core.metamodel.facets.value.chars; import org.apache.isis.applib.adapters.EncoderDecoder; import org.apache.isis.applib.adapters.Parser; -import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefaultFacet; -import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderContext; +import org.apache.isis.core.metamodel.services.ServicesInjector; + public class CharPrimitiveValueSemanticsProvider extends CharValueSemanticsProviderAbstract implements PropertyDefaultFacet { @@ -34,11 +34,11 @@ public class CharPrimitiveValueSemanticsProvider extends CharValueSemanticsProvi * {@link EncoderDecoder}. */ public CharPrimitiveValueSemanticsProvider() { - this(null, null, null); + this(null, null); } - public CharPrimitiveValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration, final ValueSemanticsProviderContext context) { - super(holder, char.class, configuration, context); + public CharPrimitiveValueSemanticsProvider(final FacetHolder holder, final ServicesInjector context) { + super(holder, char.class, context); } // ////////////////////////////////////////////////////////////////// http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharValueSemanticsProviderAbstract.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharValueSemanticsProviderAbstract.java index 52a4dc2..4001101 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharValueSemanticsProviderAbstract.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharValueSemanticsProviderAbstract.java @@ -28,7 +28,8 @@ import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.object.parseable.InvalidEntryException; import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract; -import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderContext; +import org.apache.isis.core.metamodel.services.ServicesInjector; + public abstract class CharValueSemanticsProviderAbstract extends ValueSemanticsProviderAndFacetAbstract<Character> implements CharValueFacet { @@ -40,8 +41,8 @@ public abstract class CharValueSemanticsProviderAbstract extends ValueSemanticsP private static final int MAX_LENGTH = 1; private static final int TYPICAL_LENGTH = MAX_LENGTH; - public CharValueSemanticsProviderAbstract(final FacetHolder holder, final Class<Character> adaptedClass, final IsisConfiguration configuration, final ValueSemanticsProviderContext context) { - super(type(), holder, adaptedClass, TYPICAL_LENGTH, MAX_LENGTH, Immutability.IMMUTABLE, EqualByContent.HONOURED, DEFAULT_VALUE, configuration, context); + public CharValueSemanticsProviderAbstract(final FacetHolder holder, final Class<Character> adaptedClass, final ServicesInjector context) { + super(type(), holder, adaptedClass, TYPICAL_LENGTH, MAX_LENGTH, Immutability.IMMUTABLE, EqualByContent.HONOURED, DEFAULT_VALUE, context); } // ////////////////////////////////////////////////////////////////// http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharWrapperValueFacetUsingSemanticsProviderFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharWrapperValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharWrapperValueFacetUsingSemanticsProviderFactory.java index 014fe8d..c429d43 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharWrapperValueFacetUsingSemanticsProviderFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharWrapperValueFacetUsingSemanticsProviderFactory.java @@ -36,7 +36,7 @@ public class CharWrapperValueFacetUsingSemanticsProviderFactory extends ValueFac if (type != Character.class) { return; } - addFacets(new CharWrapperValueSemanticsProvider(holder, getConfiguration(), getContext())); + addFacets(new CharWrapperValueSemanticsProvider(holder, getContext())); } } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharWrapperValueSemanticsProvider.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharWrapperValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharWrapperValueSemanticsProvider.java index c9a2131..28785dc 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharWrapperValueSemanticsProvider.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharWrapperValueSemanticsProvider.java @@ -21,9 +21,9 @@ package org.apache.isis.core.metamodel.facets.value.chars; import org.apache.isis.applib.adapters.EncoderDecoder; import org.apache.isis.applib.adapters.Parser; -import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.metamodel.facetapi.FacetHolder; -import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderContext; +import org.apache.isis.core.metamodel.services.ServicesInjector; + public class CharWrapperValueSemanticsProvider extends CharValueSemanticsProviderAbstract { @@ -32,11 +32,11 @@ public class CharWrapperValueSemanticsProvider extends CharValueSemanticsProvide * {@link EncoderDecoder}. */ public CharWrapperValueSemanticsProvider() { - this(null, null, null); + this(null, null); } - public CharWrapperValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration, final ValueSemanticsProviderContext context) { - super(holder, Character.class, configuration, context); + public CharWrapperValueSemanticsProvider(final FacetHolder holder, final ServicesInjector context) { + super(holder, Character.class, context); } } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/clobs/ClobValueFacetUsingSemanticsProviderFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/clobs/ClobValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/clobs/ClobValueFacetUsingSemanticsProviderFactory.java index fa5a02e..a901543 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/clobs/ClobValueFacetUsingSemanticsProviderFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/clobs/ClobValueFacetUsingSemanticsProviderFactory.java @@ -36,7 +36,7 @@ public class ClobValueFacetUsingSemanticsProviderFactory extends ValueFacetUsing if (type != Clob.class) { return; } - addFacets(new ClobValueSemanticsProvider(holder, getConfiguration(), getContext())); + addFacets(new ClobValueSemanticsProvider(holder, getContext())); } } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/clobs/ClobValueSemanticsProvider.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/clobs/ClobValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/clobs/ClobValueSemanticsProvider.java index c888060..2215750 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/clobs/ClobValueSemanticsProvider.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/clobs/ClobValueSemanticsProvider.java @@ -27,11 +27,11 @@ import org.apache.isis.applib.adapters.EncoderDecoder; import org.apache.isis.applib.adapters.Parser; import org.apache.isis.applib.profiles.Localization; import org.apache.isis.applib.value.Clob; -import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract; -import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderContext; +import org.apache.isis.core.metamodel.services.ServicesInjector; + public class ClobValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<Clob> implements ClobValueFacet { @@ -48,11 +48,11 @@ public class ClobValueSemanticsProvider extends ValueSemanticsProviderAndFacetAb * {@link EncoderDecoder}. */ public ClobValueSemanticsProvider() { - this(null, null, null); + this(null, null); } - public ClobValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration, final ValueSemanticsProviderContext context) { - super(type(), holder, Clob.class, TYPICAL_LENGTH, null, Immutability.IMMUTABLE, EqualByContent.NOT_HONOURED, DEFAULT_VALUE, configuration, context); + public ClobValueSemanticsProvider(final FacetHolder holder, final ServicesInjector context) { + super(type(), holder, Clob.class, TYPICAL_LENGTH, null, Immutability.IMMUTABLE, EqualByContent.NOT_HONOURED, DEFAULT_VALUE, context); } @Override http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/color/ColorValueFacetUsingSemanticsProviderFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/color/ColorValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/color/ColorValueFacetUsingSemanticsProviderFactory.java index 77caa5a..68a405d 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/color/ColorValueFacetUsingSemanticsProviderFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/color/ColorValueFacetUsingSemanticsProviderFactory.java @@ -37,7 +37,7 @@ public class ColorValueFacetUsingSemanticsProviderFactory extends ValueFacetUsin if (type != Color.class) { return; } - addFacets(new ColorValueSemanticsProvider(holder, getConfiguration(), getContext())); + addFacets(new ColorValueSemanticsProvider(holder, getContext())); } } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/color/ColorValueSemanticsProvider.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/color/ColorValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/color/ColorValueSemanticsProvider.java index 4e4053c..4b76ee2 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/color/ColorValueSemanticsProvider.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/color/ColorValueSemanticsProvider.java @@ -25,13 +25,13 @@ import org.apache.isis.applib.adapters.EncoderDecoder; import org.apache.isis.applib.adapters.Parser; import org.apache.isis.applib.profiles.Localization; import org.apache.isis.applib.value.Color; -import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException; import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract; -import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderContext; +import org.apache.isis.core.metamodel.services.ServicesInjector; + public class ColorValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<Color> implements ColorValueFacet { @@ -47,11 +47,11 @@ public class ColorValueSemanticsProvider extends ValueSemanticsProviderAndFacetA * {@link EncoderDecoder}. */ public ColorValueSemanticsProvider() { - this(null, null, null); + this(null, null); } - public ColorValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration, final ValueSemanticsProviderContext context) { - super(type(), holder, Color.class, TYPICAL_LENGTH, null, Immutability.IMMUTABLE, EqualByContent.NOT_HONOURED, DEFAULT_VALUE, configuration, context); + public ColorValueSemanticsProvider(final FacetHolder holder, final ServicesInjector context) { + super(type(), holder, Color.class, TYPICAL_LENGTH, null, Immutability.IMMUTABLE, EqualByContent.NOT_HONOURED, DEFAULT_VALUE, context); } // ////////////////////////////////////////////////////////////////// http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueFacetUsingSemanticsProviderFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueFacetUsingSemanticsProviderFactory.java index b94115f..f405ad7 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueFacetUsingSemanticsProviderFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueFacetUsingSemanticsProviderFactory.java @@ -39,7 +39,7 @@ public class DateValueFacetUsingSemanticsProviderFactory extends ValueFacetUsing if (type != org.apache.isis.applib.value.Date.class) { return; } - addFacets(new DateValueSemanticsProvider(holder, getConfiguration(), getContext())); + addFacets(new DateValueSemanticsProvider(holder, getContext())); } } http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueSemanticsProvider.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueSemanticsProvider.java index d8ff818..998ceef 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueSemanticsProvider.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueSemanticsProvider.java @@ -23,9 +23,9 @@ import java.util.Date; import org.apache.isis.applib.adapters.EncoderDecoder; import org.apache.isis.applib.adapters.Parser; -import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.metamodel.facetapi.FacetHolder; -import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderContext; +import org.apache.isis.core.metamodel.services.ServicesInjector; + public class DateValueSemanticsProvider extends DateValueSemanticsProviderAbstract<org.apache.isis.applib.value.Date> { @@ -38,11 +38,11 @@ public class DateValueSemanticsProvider extends DateValueSemanticsProviderAbstra * {@link EncoderDecoder}. */ public DateValueSemanticsProvider() { - this(null, null, null); + this(null, null); } - public DateValueSemanticsProvider(final FacetHolder holder, final IsisConfiguration configuration, final ValueSemanticsProviderContext context) { - super(holder, org.apache.isis.applib.value.Date.class, Immutability.NOT_IMMUTABLE, EqualByContent.NOT_HONOURED, DEFAULT_VALUE, configuration, context); + public DateValueSemanticsProvider(final FacetHolder holder, final ServicesInjector context) { + super(holder, org.apache.isis.applib.value.Date.class, Immutability.NOT_IMMUTABLE, EqualByContent.NOT_HONOURED, DEFAULT_VALUE, context); } @Override http://git-wip-us.apache.org/repos/asf/isis/blob/28bd6dd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java index d05edd2..c4896b8 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java @@ -32,8 +32,8 @@ import org.apache.isis.applib.profiles.Localization; import org.apache.isis.core.commons.config.ConfigurationConstants; import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.metamodel.facetapi.FacetHolder; -import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderContext; import org.apache.isis.core.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal; +import org.apache.isis.core.metamodel.services.ServicesInjector; public abstract class DateValueSemanticsProviderAbstract<T> extends ValueSemanticsProviderAbstractTemporal<T> { @@ -45,10 +45,10 @@ public abstract class DateValueSemanticsProviderAbstract<T> extends ValueSemanti formats.put("medium", DateFormat.getDateInstance(DateFormat.MEDIUM)); } - public DateValueSemanticsProviderAbstract(final FacetHolder holder, final Class<T> adaptedClass, final Immutability immutability, final EqualByContent equalByContent, final T defaultValue, final IsisConfiguration configuration, final ValueSemanticsProviderContext context) { - super("date", holder, adaptedClass, 12, immutability, equalByContent, defaultValue, configuration, context); + public DateValueSemanticsProviderAbstract(final FacetHolder holder, final Class<T> adaptedClass, final Immutability immutability, final EqualByContent equalByContent, final T defaultValue, final ServicesInjector context) { + super("date", holder, adaptedClass, 12, immutability, equalByContent, defaultValue, context); - final String formatRequired = configuration.getString(ConfigurationConstants.ROOT + "value.format.date"); + final String formatRequired = getConfiguration().getString(ConfigurationConstants.ROOT + "value.format.date"); if (formatRequired == null) { format = formats().get(defaultFormat()); } else {
