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 2015/02/06 11:40:32 UTC
[6/6] isis git commit: ISIS-1027: marking facet classes as deprecated;
some minor incidental tidy-up
ISIS-1027: marking facet classes as deprecated; some minor incidental tidy-up
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/34423fd5
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/34423fd5
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/34423fd5
Branch: refs/heads/ISIS-1027
Commit: 34423fd5b66762cf467262f8d83dc5f9859bc996
Parents: 31816a6
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Feb 6 10:40:20 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Feb 6 10:40:20 2015 +0000
----------------------------------------------------------------------
.../dispatcher/view/edit/FieldFactory.java | 6 +-
.../viewer/wicket/model/models/ScalarModel.java | 4 +-
.../scalars/IsisConverterLocator.java | 2 +-
.../components/scalars/ScalarPanelAbstract.java | 4 +-
.../scalars/ScalarPanelTextFieldAbstract.java | 4 +-
.../ScalarPanelTextFieldDatePickerAbstract.java | 2 +-
.../ScalarPanelTextFieldParseableAbstract.java | 2 +-
.../scalars/primitive/BooleanPanel.java | 2 +-
.../scalars/string/MultiLineStringPanel.java | 4 +-
.../scalars/string/StringPanelFactory.java | 2 +-
.../action/ActionAnnotationFacetFactory.java | 4 +-
.../PrototypeFacetForPrototypeAnnotation.java | 4 +
.../MaxLengthFacetOnActionAnnotation.java | 31 ++++++
...MaxLengthFacetOnActionAnnotationFactory.java | 68 ++++++++++++
.../PagedFacetForPagedAnnotationOnAction.java | 34 ++++++
.../paged/PagedFacetOnActionFactory.java | 103 +++++++++++++++++++
.../paged/PagedFacetPropertiesOnAction.java | 35 +++++++
.../facets/actions/debug/DebugFacet.java | 3 +
.../actions/debug/DebugFacetAbstract.java | 5 +-
.../debug/annotation/DebugFacetAnnotation.java | 4 +
.../annotation/DebugFacetAnnotationFactory.java | 3 +
.../actions/exploration/ExplorationFacet.java | 3 +
.../exploration/ExplorationFacetAbstract.java | 4 +
.../annotation/ExplorationFacetAnnotation.java | 4 +
.../ExplorationFacetAnnotationFactory.java | 3 +
...ActionNamedDebugExplorationFacetFactory.java | 3 +
.../ExplorationFacetViaNamingConvention.java | 4 +
.../NotContributedFacetAnnotation.java | 4 +
.../NotContributedFacetAnnotationFactory.java | 4 +
.../NotInServiceMenuFacetAnnotation.java | 4 +
.../NotInServiceMenuFacetAnnotationFactory.java | 4 +
.../method/NotInServiceMenuFacetViaMethod.java | 4 +
.../NotInServiceMenuFacetViaMethodFactory.java | 4 +
.../annotation/PagedFacetOnActionFactory.java | 102 ------------------
.../MaxLengthFacetOnActionAnnotation.java | 31 ------
...MaxLengthFacetOnActionAnnotationFactory.java | 65 ------------
.../metamodel/facets/all/hide/HiddenFacet.java | 4 -
.../CollectionAnnotationFacetFactory.java | 4 +-
...agedFacetForPagedAnnotationOnCollection.java | 34 ++++++
.../paged/PagedFacetPropertiesOnCollection.java | 36 +++++++
.../PagedFacetOnCollectionFactory.java | 12 ++-
.../annotation/SortedByFacetAnnotation.java | 4 +
.../SortedByFacetAnnotationFactory.java | 3 +
.../LabelAtFacetFromLayoutConfiguration.java | 2 +-
.../fallback/MaxLengthFacetUnlimited.java | 2 +-
.../facets/fallback/MultiLineFacetNone.java | 2 +-
.../CssClassFacetOnMemberAnnotation.java | 4 +
.../CssClassFaFacetOnMemberAnnotation.java | 4 +
.../DescribedAsFacetOnMemberAnnotation.java | 4 +
.../DescribedAsFacetStaticMethod.java | 4 +
.../DescribedAsFacetStaticMethodFactory.java | 3 +
.../DisabledFacetForStaticMethod.java | 4 +
.../DisabledFacetStaticMethodFacetFactory.java | 4 +
.../HiddenFacetOnMemberAnnotation.java | 4 +
.../staticmethod/HiddenFacetOnStaticMethod.java | 4 +
.../HiddenFacetStaticMethodFactory.java | 4 +
.../annotprop/NamedFacetOnMemberAnnotation.java | 4 +
.../staticmethod/NamedFacetStaticMethod.java | 4 +
.../NamedFacetStaticMethodFactory.java | 3 +
.../render/annotprop/RenderFacetAnnotation.java | 4 +
.../RenderFacetViaResolveAnnotation.java | 4 +
.../objcoll/paged/PagedFacetAnnotation.java | 30 ------
.../objcoll/paged/PagedFacetProperties.java | 36 -------
.../annotation/ActionOrderFacetAnnotation.java | 4 +
.../ActionOrderFacetAnnotationFactory.java | 4 +
.../AuditableFacetMarkerInterfaceFactory.java | 4 +
...arkPolicyFacetViaBookmarkableAnnotation.java | 4 +
...cyFacetViaBookmarkableAnnotationFactory.java | 4 +
.../ChoicesFacetFromBoundedAbstract.java | 2 +-
.../object/choices/ChoicesFacetUtils.java | 2 +-
...sFacetFromBoundedMarkerInterfaceFactory.java | 2 +-
.../object/choices/enums/ChoicesFacetEnum.java | 2 +-
.../CssClassFacetOnTypeAnnotation.java | 4 +
.../CssClassFacetOnTypeAnnotationFactory.java | 4 +
.../CssClassFaFacetOnTypeAnnotation.java | 4 +
.../CssClassFaFacetOnTypeAnnotationFactory.java | 4 +
.../DescribedAsFacetOnTypeAnnotation.java | 4 +
...DescribedAsFacetOnTypeAnnotationFactory.java | 4 +
...oCompleteFacetForAutoCompleteAnnotation.java | 4 +
.../ChoicesFacetFromBoundedAnnotation.java | 6 +-
.../annotation/FieldOrderFacetAnnotation.java | 4 +
.../FieldOrderFacetAnnotationFactory.java | 4 +
.../annotation/HiddenFacetOnTypeAnnotation.java | 4 +
.../HiddenFacetOnTypeAnnotationFactory.java | 4 +
.../metamodel/facets/object/mask/MaskFacet.java | 2 +-
.../annotation/MaskFacetOnTypeAnnotation.java | 4 +
.../MaskFacetOnTypeAnnotationFactory.java | 4 +
.../MaxLengthFacetOnTypeAnnotation.java | 6 +-
.../MaxLengthFacetOnTypeAnnotationFactory.java | 6 +-
.../MultiLineFacetOnTypeAnnotation.java | 6 +-
.../MultiLineFacetOnTypeAnnotationFactory.java | 6 +-
.../annotation/NamedFacetOnTypeAnnotation.java | 4 +
.../NamedFacetOnTypeAnnotationFactory.java | 4 +
.../staticmethod/NamedFacetStaticMethod.java | 4 +
.../NamedFacetStaticMethodFactory.java | 4 +
.../ObjectValidPropertiesFacet.java | 2 +-
.../PagedFacetForPagedAnnotationOnType.java | 34 ++++++
.../PagedFacetOnTypeAnnotationFactory.java | 7 +-
.../PluralAnnotationFacetFactory.java | 4 +
.../annotation/PluralFacetAnnotation.java | 4 +
.../plural/staticmethod/PluralFacetMethod.java | 4 +
.../PluralFacetStaticMethodFactory.java | 4 +
.../facets/object/regex/RegExFacet.java | 48 ---------
.../facets/object/regex/RegExFacetAbstract.java | 81 ---------------
.../regex/TitleFacetFormattedByRegex.java | 40 -------
.../annotation/RegExFacetOnTypeAnnotation.java | 6 +-
.../RegExFacetOnTypeAnnotationFactory.java | 6 +-
.../TypicalLengthFacetOnTypeAnnotation.java | 6 +-
...picalLengthFacetOnTypeAnnotationFactory.java | 6 +-
...ionFromMustSatisfyAnnotationOnTypeFacet.java | 67 ++++++++++++
...MustSatisfyAnnotationOnTypeFacetFactory.java | 96 +++++++++++++++++
.../MustSatisfySpecificationOnTypeFacet.java | 63 ------------
...tSatisfySpecificationOnTypeFacetFactory.java | 92 -----------------
.../value/MaxLengthFacetUsingParser2.java | 2 +-
.../value/TypicalLengthFacetUsingParser.java | 2 +-
.../objectvalue/choices/ChoicesFacet.java | 46 +++++++++
.../choices/ChoicesFacetAbstract.java | 36 +++++++
.../objectvalue/labelat/LabelAtFacet.java | 36 +++++++
.../labelat/LabelAtFacetAbstract.java | 50 +++++++++
.../LabelAtFacetInferredFromMultiLineFacet.java | 38 +++++++
.../objectvalue/mandatory/MandatoryFacet.java | 58 +++++++++++
.../mandatory/MandatoryFacetAbstract.java | 97 +++++++++++++++++
.../mandatory/MandatoryFacetDefault.java | 43 ++++++++
.../objectvalue/maxlen/MaxLengthFacet.java | 41 ++++++++
.../maxlen/MaxLengthFacetAbstract.java | 74 +++++++++++++
.../objectvalue/multiline/MultiLineFacet.java | 51 +++++++++
.../multiline/MultiLineFacetAbstract.java | 56 ++++++++++
.../MustSatisfySpecificationFacet.java | 27 +++++
.../MustSatisfySpecificationFacetAbstract.java | 87 ++++++++++++++++
.../facets/objectvalue/regex/RegExFacet.java | 48 +++++++++
.../objectvalue/regex/RegExFacetAbstract.java | 81 +++++++++++++++
.../regex/TitleFacetFormattedByRegex.java | 40 +++++++
.../renderedadjusted/RenderedAdjustedFacet.java | 39 +++++++
.../RenderedAdjustedFacetAbstract.java | 50 +++++++++
.../typicallen/TypicalLengthFacet.java | 40 +++++++
.../typicallen/TypicalLengthFacetAbstract.java | 45 ++++++++
.../typicallen/TypicalLengthFacet.java | 40 -------
.../typicallen/TypicalLengthFacetAbstract.java | 45 --------
...eterChoicesFacetDerivedFromChoicesFacet.java | 2 +-
...icesFacetDerivedFromChoicesFacetFactory.java | 2 +-
.../DescribedAsFacetOnParameterAnnotation.java | 4 +
...abelAtFacetForParameterLayoutAnnotation.java | 4 +-
...tiLineFacetForParameterLayoutAnnotation.java | 4 +-
...justedFacetForParameterLayoutAnnotation.java | 4 +-
...LengthFacetForParameterLayoutAnnotation.java | 4 +-
...andatoryFacetOnParametersDefaultFactory.java | 4 +-
.../MultiLineFacetOnParameterAnnotation.java | 20 +++-
...tiLineFacetOnParameterAnnotationFactory.java | 43 ++++----
.../NamedFacetOnParameterAnnotation.java | 9 ++
.../NamedFacetOnParameterAnnotationFactory.java | 20 ++--
.../ParameterAnnotationFacetFactory.java | 8 +-
.../MandatoryFacetForParameterAnnotation.java | 4 +-
...InvertedByOptionalAnnotationOnParameter.java | 5 +-
...hFacetForMaxLengthAnnotationOnParameter.java | 41 ++++++++
.../MaxLengthFacetForParameterAnnotation.java | 4 +-
...engthFacetOnParamForMaxLengthAnnotation.java | 37 -------
...acetForMustSatisfyAnnotationOnParameter.java | 6 +-
...pecificationFacetForParameterAnnotation.java | 2 +-
.../regex/RegExFacetForParameterAnnotation.java | 4 +-
...egExFacetFromRegExAnnotationOnParameter.java | 8 +-
...edAsDayBeforeFacetOnParameterAnnotation.java | 6 +-
...BeforeFacetOnParameterAnnotationFactory.java | 6 +-
...TypicalLengthFacetOnParameterAnnotation.java | 6 +-
...LengthFacetOnParameterAnnotationFactory.java | 6 +-
...alLengthFacetOnParameterDerivedFromType.java | 6 +-
...tOnParameterDerivedFromTypeFacetFactory.java | 2 +-
.../MaskFacetOnParameterAnnotation.java | 4 +
.../MaskFacetOnParameterAnnotationFactory.java | 4 +
...ertyChoicesFacetDerivedFromChoicesFacet.java | 2 +-
...icesFacetDerivedFromChoicesFacetFactory.java | 2 +-
.../MandatoryFacetOnProperyDefaultFactory.java | 4 +-
.../MandatoryFacetOnPropertyStaticMethod.java | 5 +-
...atoryFacetOnPropertyStaticMethodFactory.java | 4 +
.../MultiLineFacetOnPropertyAnnotation.java | 6 +-
.../MultiLineFacetOnPropertyFactory.java | 4 +-
.../MultiLineFacetOnPropertyFromProperties.java | 2 +-
.../PropertyAnnotationFacetFactory.java | 16 +--
...ryFacetForMandatoryAnnotationOnProperty.java | 7 +-
.../MandatoryFacetForPropertyAnnotation.java | 4 +-
...tInvertedByOptionalAnnotationOnProperty.java | 7 +-
...thFacetForMaxLengthAnnotationOnProperty.java | 8 +-
.../MaxLengthFacetForPropertyAnnotation.java | 4 +-
...FacetForMustSatisfyAnnotationOnProperty.java | 6 +-
...SpecificationFacetForPropertyAnnotation.java | 2 +-
...acetForNotPersistedAnnotationOnProperty.java | 4 +
.../regex/RegExFacetForPropertyAnnotation.java | 4 +-
.../RegExFacetForRegExAnnotationOnProperty.java | 78 ++++++++++++++
...RegExFacetFromRegExAnnotationOnProperty.java | 74 -------------
...LabelAtFacetForPropertyLayoutAnnotation.java | 4 +-
...elAtFacetOnPropertyFromLayoutProperties.java | 4 +-
...ltiLineFacetForPropertyLayoutAnnotation.java | 4 +-
...LineFacetOnPropertyFromLayoutProperties.java | 4 +-
.../PropertyLayoutFacetFactory.java | 8 +-
...djustedFacetForPropertyLayoutAnnotation.java | 4 +-
...stedFacetOnPropertyFromLayoutProperties.java | 4 +-
...lLengthFacetForPropertyLayoutAnnotation.java | 4 +-
...ngthFacetOnPropertyFromLayoutProperties.java | 4 +-
...yBeforeAnnotationOnPropertyFacetFactory.java | 6 +-
...redAsDayBeforeFacetAnnotationOnProperty.java | 6 +-
.../TypicalLengthFacetOnPropertyAnnotation.java | 6 +-
...icalLengthFacetOnPropertyFromProperties.java | 2 +-
.../TypicalLengthOnPropertyFacetFactory.java | 2 +-
...calLengthFacetOnPropertyDerivedFromType.java | 6 +-
...etOnPropertyDerivedFromTypeFacetFactory.java | 2 +-
.../PropertyValidateFacetAbstract.java | 2 +-
.../facets/propparam/choices/ChoicesFacet.java | 46 ---------
.../propparam/choices/ChoicesFacetAbstract.java | 36 -------
.../facets/propparam/labelat/LabelAtFacet.java | 36 -------
.../propparam/labelat/LabelAtFacetAbstract.java | 50 ---------
.../LabelAtFacetInferredFromMultiLineFacet.java | 38 -------
.../propparam/mandatory/MandatoryFacet.java | 58 -----------
.../mandatory/MandatoryFacetAbstract.java | 97 -----------------
.../mandatory/MandatoryFacetDefault.java | 43 --------
.../facets/propparam/maxlen/MaxLengthFacet.java | 41 --------
.../maxlen/MaxLengthFacetAbstract.java | 74 -------------
.../propparam/multiline/MultiLineFacet.java | 51 ---------
.../multiline/MultiLineFacetAbstract.java | 56 ----------
.../MustSatisfySpecificationFacet.java | 27 -----
.../MustSatisfySpecificationFacetAbstract.java | 87 ----------------
.../renderedadjusted/RenderedAdjustedFacet.java | 39 -------
.../RenderedAdjustedFacetAbstract.java | 50 ---------
.../json/LayoutMetadataReaderFromJson.java | 4 +-
.../specimpl/ObjectActionParameterAbstract.java | 2 +-
.../ObjectActionParameterParseable.java | 6 +-
.../specimpl/ObjectAssociationAbstract.java | 2 +-
.../specimpl/OneToOneAssociationImpl.java | 2 +-
.../MandatoryFacetDerivedFromJdoColumn.java | 2 +-
...toryFacetInferredFromAbsenceOfJdoColumn.java | 2 +-
...toryFromJdoColumnAnnotationFacetFactory.java | 4 +-
...ivedFromJdoColumnAnnotationFacetFactory.java | 2 +-
.../MaxLengthFacetDerivedFromJdoColumn.java | 2 +-
...FacetDerivedFromJdoPrimaryKeyAnnotation.java | 2 +-
.../dflt/ProgrammingModelFacetsJava5.java | 8 +-
.../ActionAnnotationFacetFactoryTest.java | 8 +-
...tationFacetFactoryTest_actionInvocation.java | 12 +--
.../CollectionAnnotationFacetFactoryTest.java | 8 +-
...dAnnotationOnCollectionFacetFactoryTest.java | 3 +-
.../PagedFacetOnTypeAnnotationFactoryTest.java | 3 +-
...etFromBoundedMarkerInterfaceFactoryTest.java | 2 +-
...esFacetFromBoundedAnnotationFactoryTest.java | 2 +-
.../DomainObjectAnnotationFacetFactoryTest.java | 2 +-
...cetAnnotationOrConfigurationFactoryTest.java | 2 +-
...ForParameterLayoutAnnotationFactoryTest.java | 2 +-
...alAnnotationOnParameterFacetFactoryTest.java | 2 +-
.../ParameterAnnotationFacetFactoryTest.java | 8 +-
...ExAnnotationOnParameterFacetFactoryTest.java | 2 +-
...tForPropertyLayoutAnnotationFactoryTest.java | 2 +-
.../MandatoryAnnotationFacetFactoryTest.java | 2 +-
...nalAnnotationOnPropertyFacetFactoryTest.java | 2 +-
.../PropertyAnnotationFacetFactoryTest.java | 16 +--
...gExAnnotationOnPropertyFacetFactoryTest.java | 8 +-
.../MultiLineAnnotationFacetFactoryTest.java | 1 +
...edAsDayBeforeAnnotationFacetFactoryTest.java | 2 +-
...cificationFacetFactoryInstantiationTest.java | 4 +-
...cificationValidatingInteractionMoreTest.java | 6 +-
...ySpecificationValidatingInteractionTest.java | 10 +-
...TypicalLengthAnnotationFacetFactoryTest.java | 2 +-
.../RegExAnnotationOnTypeFacetFactoryTest.java | 2 +-
.../specimpl/ObjectAssociationAbstractTest.java | 2 +-
...FromJdoColumnAnnotationFacetFactoryTest.java | 2 +-
...JdoPrimaryKeyAnnotationFacetFactoryTest.java | 2 +-
.../ActionParameterDescriptionReprRenderer.java | 2 +-
.../PropertyDescriptionReprRenderer.java | 2 +-
.../legacy/MemberInvalidTest.java | 6 +-
264 files changed, 2380 insertions(+), 1876 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FieldFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FieldFactory.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FieldFactory.java
index b301ff8..35a9158 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FieldFactory.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FieldFactory.java
@@ -21,10 +21,10 @@ package org.apache.isis.viewer.scimpi.dispatcher.view.edit;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.all.help.HelpFacet;
-import org.apache.isis.core.metamodel.facets.propparam.maxlen.MaxLengthFacet;
-import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFacet;
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
-import org.apache.isis.core.metamodel.facets.objpropparam.typicallen.TypicalLengthFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index 4053fe2..ceef46b 100644
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -38,9 +38,9 @@ import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.propparam.mandatory.MandatoryFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
-import org.apache.isis.core.metamodel.facets.objpropparam.typicallen.TypicalLengthFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/IsisConverterLocator.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/IsisConverterLocator.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/IsisConverterLocator.java
index 1d0e25f..aeb4c91 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/IsisConverterLocator.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/IsisConverterLocator.java
@@ -4,7 +4,7 @@ import org.apache.wicket.Application;
import org.apache.wicket.IConverterLocator;
import org.apache.wicket.util.convert.IConverter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facets.propparam.renderedadjusted.RenderedAdjustedFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.renderedadjusted.RenderedAdjustedFacet;
import org.apache.isis.core.metamodel.facets.value.bigdecimal.BigDecimalValueFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index b003922..6b76a69 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -38,7 +38,7 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
-import org.apache.isis.core.metamodel.facets.propparam.labelat.LabelAtFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacet;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
@@ -312,7 +312,7 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp
}
/**
- * Applies the {@literal @}{@link org.apache.isis.core.metamodel.facets.propparam.labelat.LabelAtFacet} and also CSS based on
+ * Applies the {@literal @}{@link org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacet} and also CSS based on
* whether any of the associated actions have {@literal @}{@link org.apache.isis.applib.annotation.ActionLayout layout} positioned to
* the {@link org.apache.isis.applib.annotation.ActionLayout.Position#RIGHT right}.
*
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
index 6efaaa7..aed4a23 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
@@ -35,8 +35,8 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.isis.core.metamodel.facets.SingleIntValueFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
-import org.apache.isis.core.metamodel.facets.objpropparam.typicallen.TypicalLengthFacet;
-import org.apache.isis.core.metamodel.facets.propparam.maxlen.MaxLengthFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.actionmenu.entityactions.EntityActionUtil;
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
index 8ab1944..3251105 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
@@ -36,7 +36,7 @@ import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.ValidationError;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facets.propparam.renderedadjusted.RenderedAdjustedFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.renderedadjusted.RenderedAdjustedFacet;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.datepicker.TextFieldWithDatePicker;
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java
index 53a3570..f621679 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java
@@ -27,7 +27,7 @@ import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.ValidationError;
import org.apache.wicket.validation.validator.StringValidator;
-import org.apache.isis.core.metamodel.facets.propparam.maxlen.MaxLengthFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
index 49ed619..b4c9087 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
@@ -32,7 +32,7 @@ import org.apache.wicket.model.Model;
import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
-import org.apache.isis.core.metamodel.facets.propparam.labelat.LabelAtFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
index b475cd1..0bf8198 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
@@ -28,8 +28,8 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.isis.core.metamodel.facets.SingleIntValueFacet;
-import org.apache.isis.core.metamodel.facets.propparam.maxlen.MaxLengthFacet;
-import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFacet;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanelFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanelFactory.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanelFactory.java
index ab86b60..e8345f2 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanelFactory.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanelFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.string;
import org.apache.wicket.Component;
-import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFacet;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ComponentFactoryScalarAbstract;
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
index 3f9b318..38f5d17 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
@@ -128,7 +128,7 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implement
@Override
public void process(final ProcessMethodContext processMethodContext) {
- processDomainEvent(processMethodContext);
+ processInvocation(processMethodContext);
processHidden(processMethodContext);
processDisabled(processMethodContext);
processRestrictTo(processMethodContext);
@@ -144,7 +144,7 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implement
processTypeOf(processMethodContext);
}
- void processDomainEvent(final ProcessMethodContext processMethodContext) {
+ void processInvocation(final ProcessMethodContext processMethodContext) {
final Method actionMethod = processMethodContext.getMethod();
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForPrototypeAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForPrototypeAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForPrototypeAnnotation.java
index 49f5d8a..9676eab 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForPrototypeAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForPrototypeAnnotation.java
@@ -24,6 +24,10 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacetAbstract;
+/**
+ * @deprecated
+ */
+@Deprecated
public class PrototypeFacetForPrototypeAnnotation extends PrototypeFacetAbstract {
public PrototypeFacetForPrototypeAnnotation(final FacetHolder holder) {
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/maxlenannot/MaxLengthFacetOnActionAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/maxlenannot/MaxLengthFacetOnActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/maxlenannot/MaxLengthFacetOnActionAnnotation.java
new file mode 100644
index 0000000..a49e928
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/maxlenannot/MaxLengthFacetOnActionAnnotation.java
@@ -0,0 +1,31 @@
+/*
+ * 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.actions.contributing.maxlenannot;
+
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacetAbstract;
+
+public class MaxLengthFacetOnActionAnnotation extends MaxLengthFacetAbstract {
+
+ public MaxLengthFacetOnActionAnnotation(final int value, final FacetHolder holder) {
+ super(value, holder);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/maxlenannot/MaxLengthFacetOnActionAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/maxlenannot/MaxLengthFacetOnActionAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/maxlenannot/MaxLengthFacetOnActionAnnotationFactory.java
new file mode 100644
index 0000000..f6371bb
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/maxlenannot/MaxLengthFacetOnActionAnnotationFactory.java
@@ -0,0 +1,68 @@
+/*
+ * 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.actions.contributing.maxlenannot;
+
+import org.apache.isis.applib.annotation.MaxLength;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfigurationAware;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
+
+/**
+ * To support contributed properties.
+
+ * @deprecated
+ */
+@Deprecated
+public class MaxLengthFacetOnActionAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+
+ private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(MaxLength.class);
+
+ public MaxLengthFacetOnActionAnnotationFactory() {
+ super(FeatureType.ACTIONS_ONLY);
+ }
+
+ @Override
+ public void process(final ProcessMethodContext processMethodContext) {
+ final MaxLength annotation = Annotations.getAnnotation(processMethodContext.getMethod(), MaxLength.class);
+ validator.addFacetFlagIfPresent(create(annotation, processMethodContext.getFacetHolder()));
+ }
+
+ private MaxLengthFacet create(final MaxLength annotation, final FacetHolder holder) {
+ return annotation == null ? null : new MaxLengthFacetOnActionAnnotation(annotation.value(), holder);
+ }
+
+ @Override
+ public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
+ metaModelValidator.add(validator);
+ }
+
+ @Override
+ public void setConfiguration(final IsisConfiguration configuration) {
+ validator.setConfiguration(configuration);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/paged/PagedFacetForPagedAnnotationOnAction.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/paged/PagedFacetForPagedAnnotationOnAction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/paged/PagedFacetForPagedAnnotationOnAction.java
new file mode 100644
index 0000000..2905676
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/paged/PagedFacetForPagedAnnotationOnAction.java
@@ -0,0 +1,34 @@
+/*
+ * 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.actions.contributing.paged;
+
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.paged.PagedFacetAbstract;
+
+/**
+ * @deprecated
+ */
+@Deprecated
+public class PagedFacetForPagedAnnotationOnAction extends PagedFacetAbstract {
+
+ public PagedFacetForPagedAnnotationOnAction(FacetHolder holder, int value) {
+ super(value, holder);
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/paged/PagedFacetOnActionFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/paged/PagedFacetOnActionFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/paged/PagedFacetOnActionFactory.java
new file mode 100644
index 0000000..a3d7a23
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/paged/PagedFacetOnActionFactory.java
@@ -0,0 +1,103 @@
+/*
+ * 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.actions.contributing.paged;
+
+import java.util.Properties;
+import org.apache.isis.applib.annotation.Paged;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfigurationAware;
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.ContributeeMemberFacetFactory;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.object.paged.PagedFacet;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
+
+/**
+ * To support contributed collections.
+ *
+ * @deprecated
+ */
+@Deprecated
+public class PagedFacetOnActionFactory extends FacetFactoryAbstract
+ implements ContributeeMemberFacetFactory, IsisConfigurationAware, MetaModelValidatorRefiner {
+
+ private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Paged.class);
+
+ private IsisConfiguration configuration;
+
+ public PagedFacetOnActionFactory() {
+ super(FeatureType.ACTIONS_ONLY);
+ }
+
+ @Override
+ public void process(final ProcessMethodContext processMethodContext) {
+
+ PagedFacet pagedFacet = createFromMetadataPropertiesIfPossible(processMethodContext);
+ if(pagedFacet == null) {
+ pagedFacet = validator.flagIfPresent(createFromPagedAnnotationIfPossible(processMethodContext));
+ }
+ // no-op if null
+ FacetUtil.addFacet(pagedFacet);
+ }
+
+ @Override
+ public void process(final ProcessContributeeMemberContext processMemberContext) {
+ final PagedFacet pagedFacet = createFromMetadataPropertiesIfPossible(processMemberContext);
+ // no-op if null
+ FacetUtil.addFacet(pagedFacet);
+ }
+
+ private PagedFacet createFromMetadataPropertiesIfPossible(final ProcessContextWithMetadataProperties<?> processMethodContext) {
+ final Properties properties = processMethodContext.metadataProperties("paged");
+ return properties != null ? new PagedFacetPropertiesOnAction(properties, processMethodContext.getFacetHolder()) : null;
+ }
+
+ private PagedFacet createFromPagedAnnotationIfPossible(final ProcessMethodContext processMethodContext) {
+ final Paged annotation = Annotations.getAnnotation(processMethodContext.getMethod(), Paged.class);
+ return annotation != null ? new PagedFacetForPagedAnnotationOnAction(processMethodContext.getFacetHolder(), annotation.value()) : null;
+ }
+
+ // //////////////////////////////////////
+
+ @Override
+ public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
+ metaModelValidator.add(validator);
+ }
+
+ // //////////////////////////////////////
+
+ public IsisConfiguration getConfiguration() {
+ return configuration;
+ }
+
+ @Override
+ public void setConfiguration(final IsisConfiguration configuration) {
+ this.configuration = configuration;
+ validator.setConfiguration(configuration);
+ }
+
+
+
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/paged/PagedFacetPropertiesOnAction.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/paged/PagedFacetPropertiesOnAction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/paged/PagedFacetPropertiesOnAction.java
new file mode 100644
index 0000000..d4be774
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/paged/PagedFacetPropertiesOnAction.java
@@ -0,0 +1,35 @@
+/*
+ * 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.actions.contributing.paged;
+
+import java.util.Properties;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.paged.PagedFacetAbstract;
+
+public class PagedFacetPropertiesOnAction extends PagedFacetAbstract {
+
+ public PagedFacetPropertiesOnAction(final Properties properties, final FacetHolder holder) {
+ super(valueFrom(properties), holder);
+ }
+
+ private static int valueFrom(Properties properties) {
+ return Integer.parseInt(properties.getProperty("value"));
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacet.java
index dfe928d..dfbaed5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacet.java
@@ -28,7 +28,10 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
* <p>
* In the standard Apache Isis Programming Model, corresponds to annotating the
* action method using <tt>@Debug</tt>.
+ *
+ * @deprecated
*/
+@Deprecated
public interface DebugFacet extends Facet {
}
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacetAbstract.java
index a464106..b6c90fc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacetAbstract.java
@@ -22,8 +22,11 @@ package org.apache.isis.core.metamodel.facets.actions.debug;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.MarkerFacetAbstract;
-import org.apache.isis.core.metamodel.facets.actions.debug.DebugFacet;
+/**
+ * @deprecated
+ */
+@Deprecated
public abstract class DebugFacetAbstract extends MarkerFacetAbstract implements DebugFacet {
public static Class<? extends Facet> type() {
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/annotation/DebugFacetAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/annotation/DebugFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/annotation/DebugFacetAnnotation.java
index f8bc469..c41f14c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/annotation/DebugFacetAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/annotation/DebugFacetAnnotation.java
@@ -22,6 +22,10 @@ package org.apache.isis.core.metamodel.facets.actions.debug.annotation;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.debug.DebugFacetAbstract;
+/**
+ * @deprecated
+ */
+@Deprecated
public class DebugFacetAnnotation extends DebugFacetAbstract {
public DebugFacetAnnotation(final FacetHolder holder) {
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/annotation/DebugFacetAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/annotation/DebugFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/annotation/DebugFacetAnnotationFactory.java
index 864eab5..c1c093b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/annotation/DebugFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/annotation/DebugFacetAnnotationFactory.java
@@ -34,7 +34,10 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
/**
* {@link DebugFacet} can also be installed via a naming convention, see
* {@link org.apache.isis.core.metamodel.facets.actions.interaction.ActionNamedDebugExplorationFacetFactory}.
+ *
+ * @deprecated
*/
+@Deprecated
public class DebugFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Debug.class);
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacet.java
index 06e773d..0793441 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacet.java
@@ -29,7 +29,10 @@ import org.apache.isis.core.metamodel.interactions.HidingInteractionAdvisor;
* <p>
* In the standard Apache Isis Programming Model, corresponds to annotating the
* action method using <tt>@Exploration</tt>.
+ *
+ * @deprecated
*/
+@Deprecated
public interface ExplorationFacet extends Facet, HidingInteractionAdvisor {
}
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAbstract.java
index 455f226..0491f75 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAbstract.java
@@ -25,6 +25,10 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.MarkerFacetAbstract;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+/**
+ * @deprecated
+ */
+@Deprecated
public abstract class ExplorationFacetAbstract extends MarkerFacetAbstract implements ExplorationFacet {
public static Class<? extends Facet> type() {
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotation.java
index 9092cd5..be43a65 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotation.java
@@ -22,6 +22,10 @@ package org.apache.isis.core.metamodel.facets.actions.exploration.annotation;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacetAbstract;
+/**
+ * @deprecated
+ */
+@Deprecated
public class ExplorationFacetAnnotation extends ExplorationFacetAbstract {
public ExplorationFacetAnnotation(final FacetHolder holder) {
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotationFactory.java
index 4daf0e9..cfd0a06 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotationFactory.java
@@ -34,7 +34,10 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
/**
* {@link ExplorationFacet} can also be installed via a naming convention, see
* {@link org.apache.isis.core.metamodel.facets.actions.interaction.ActionNamedDebugExplorationFacetFactory}.
+ *
+ * @deprecated
*/
+@Deprecated
public class ExplorationFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Exploration.class);
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedDebugExplorationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedDebugExplorationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedDebugExplorationFacetFactory.java
index cf588d1..98750a8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedDebugExplorationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedDebugExplorationFacetFactory.java
@@ -44,7 +44,10 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* The supporting methods are: {@link ExplorationFacet}
* and {@link DebugFacet}. In addition a {@link NamedFacet} is inferred from the
* name (taking into account the above well-known prefixes).
+ *
+ * @deprecated
*/
+@Deprecated
public class ActionNamedDebugExplorationFacetFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
private static final String EXPLORATION_PREFIX = "Exploration";
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ExplorationFacetViaNamingConvention.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ExplorationFacetViaNamingConvention.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ExplorationFacetViaNamingConvention.java
index 1195dad..e5abbe1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ExplorationFacetViaNamingConvention.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ExplorationFacetViaNamingConvention.java
@@ -22,6 +22,10 @@ package org.apache.isis.core.metamodel.facets.actions.interaction;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacetAbstract;
+/**
+ * @deprecated
+ */
+@Deprecated
public class ExplorationFacetViaNamingConvention extends ExplorationFacetAbstract {
public ExplorationFacetViaNamingConvention(final FacetHolder holder) {
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotation.java
index 25e9dd6..a9cb337 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotation.java
@@ -23,6 +23,10 @@ import org.apache.isis.applib.annotation.NotContributed.As;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacetAbstract;
+/**
+ * @deprecated
+ */
+@Deprecated
public class NotContributedFacetAnnotation extends NotContributedFacetAbstract {
public NotContributedFacetAnnotation(As as, final FacetHolder holder) {
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotationFactory.java
index e320ade..71fcf1f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotationFactory.java
@@ -31,6 +31,10 @@ import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContribut
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
+/**
+ * @deprecated
+ */
+@Deprecated
public class NotContributedFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(NotContributed.class);
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/annotation/NotInServiceMenuFacetAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/annotation/NotInServiceMenuFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/annotation/NotInServiceMenuFacetAnnotation.java
index baced71..b75f907 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/annotation/NotInServiceMenuFacetAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/annotation/NotInServiceMenuFacetAnnotation.java
@@ -24,6 +24,10 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.NotInServiceMenuFacetAbstract;
+/**
+ * @deprecated
+ */
+@Deprecated
public class NotInServiceMenuFacetAnnotation extends NotInServiceMenuFacetAbstract {
public NotInServiceMenuFacetAnnotation(final FacetHolder holder) {
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/annotation/NotInServiceMenuFacetAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/annotation/NotInServiceMenuFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/annotation/NotInServiceMenuFacetAnnotationFactory.java
index 343673d..0b7f3b8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/annotation/NotInServiceMenuFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/annotation/NotInServiceMenuFacetAnnotationFactory.java
@@ -31,6 +31,10 @@ import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.NotInServi
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
+/**
+ * @deprecated
+ */
+@Deprecated
public class NotInServiceMenuFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(NotInServiceMenu.class);
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethod.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethod.java
index c972779..98edfed 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethod.java
@@ -27,6 +27,10 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.NotInServiceMenuFacetAbstract;
+/**
+ * @deprecated
+ */
+@Deprecated
public class NotInServiceMenuFacetViaMethod extends NotInServiceMenuFacetAbstract {
private final Method notInServiceMenuMethod;
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethodFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethodFactory.java
index fb7cb94..634a8f6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethodFactory.java
@@ -32,6 +32,10 @@ import org.apache.isis.core.metamodel.methodutils.MethodScope;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedMethodPrefix;
+/**
+ * @deprecated
+ */
+@Deprecated
public class NotInServiceMenuFacetViaMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
public static final String NOT_IN_SERVICE_MENU_PREFIX = "notInServiceMenu";
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/paged/annotation/PagedFacetOnActionFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/paged/annotation/PagedFacetOnActionFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/paged/annotation/PagedFacetOnActionFactory.java
deleted file mode 100644
index 421049c..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/paged/annotation/PagedFacetOnActionFactory.java
+++ /dev/null
@@ -1,102 +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.actions.paged.annotation;
-
-import java.util.Properties;
-import org.apache.isis.applib.annotation.Paged;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
-import org.apache.isis.core.metamodel.facetapi.FacetUtil;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
-import org.apache.isis.core.metamodel.facets.Annotations;
-import org.apache.isis.core.metamodel.facets.ContributeeMemberFacetFactory;
-import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.objcoll.paged.PagedFacetAnnotation;
-import org.apache.isis.core.metamodel.facets.objcoll.paged.PagedFacetProperties;
-import org.apache.isis.core.metamodel.facets.object.paged.PagedFacet;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
-
-/**
- * To support contributed collections.
- */
-public class PagedFacetOnActionFactory extends FacetFactoryAbstract
- implements ContributeeMemberFacetFactory, IsisConfigurationAware, MetaModelValidatorRefiner {
-
- private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Paged.class);
-
- private IsisConfiguration configuration;
-
- public PagedFacetOnActionFactory() {
- super(FeatureType.ACTIONS_ONLY);
- }
-
- @Override
- public void process(final ProcessMethodContext processMethodContext) {
-
- PagedFacet pagedFacet = createFromMetadataPropertiesIfPossible(processMethodContext);
- if(pagedFacet == null) {
- pagedFacet = validator.flagIfPresent(createFromPagedAnnotationIfPossible(processMethodContext));
- }
- // no-op if null
- FacetUtil.addFacet(pagedFacet);
- }
-
- @Override
- public void process(final ProcessContributeeMemberContext processMemberContext) {
- final PagedFacet pagedFacet = createFromMetadataPropertiesIfPossible(processMemberContext);
- // no-op if null
- FacetUtil.addFacet(pagedFacet);
- }
-
- private PagedFacet createFromMetadataPropertiesIfPossible(final ProcessContextWithMetadataProperties<?> processMethodContext) {
- final Properties properties = processMethodContext.metadataProperties("paged");
- return properties != null ? new PagedFacetProperties(properties, processMethodContext.getFacetHolder()) : null;
- }
-
- private PagedFacet createFromPagedAnnotationIfPossible(final ProcessMethodContext processMethodContext) {
- final Paged annotation = Annotations.getAnnotation(processMethodContext.getMethod(), Paged.class);
- return annotation != null ? new PagedFacetAnnotation(processMethodContext.getFacetHolder(), annotation.value()) : null;
- }
-
- // //////////////////////////////////////
-
- @Override
- public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
- metaModelValidator.add(validator);
- }
-
- // //////////////////////////////////////
-
- public IsisConfiguration getConfiguration() {
- return configuration;
- }
-
- @Override
- public void setConfiguration(final IsisConfiguration configuration) {
- this.configuration = configuration;
- validator.setConfiguration(configuration);
- }
-
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validating/maxlenannot/MaxLengthFacetOnActionAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validating/maxlenannot/MaxLengthFacetOnActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validating/maxlenannot/MaxLengthFacetOnActionAnnotation.java
deleted file mode 100644
index ac9fd18..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validating/maxlenannot/MaxLengthFacetOnActionAnnotation.java
+++ /dev/null
@@ -1,31 +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.actions.validating.maxlenannot;
-
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.propparam.maxlen.MaxLengthFacetAbstract;
-
-public class MaxLengthFacetOnActionAnnotation extends MaxLengthFacetAbstract {
-
- public MaxLengthFacetOnActionAnnotation(final int value, final FacetHolder holder) {
- super(value, holder);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validating/maxlenannot/MaxLengthFacetOnActionAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validating/maxlenannot/MaxLengthFacetOnActionAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validating/maxlenannot/MaxLengthFacetOnActionAnnotationFactory.java
deleted file mode 100644
index 9e7375c..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validating/maxlenannot/MaxLengthFacetOnActionAnnotationFactory.java
+++ /dev/null
@@ -1,65 +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.actions.validating.maxlenannot;
-
-import org.apache.isis.applib.annotation.MaxLength;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
-import org.apache.isis.core.metamodel.facets.Annotations;
-import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.propparam.maxlen.MaxLengthFacet;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
-
-/**
- * To support contributed properties.
- */
-public class MaxLengthFacetOnActionAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
-
- private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(MaxLength.class);
-
- public MaxLengthFacetOnActionAnnotationFactory() {
- super(FeatureType.ACTIONS_ONLY);
- }
-
- @Override
- public void process(final ProcessMethodContext processMethodContext) {
- final MaxLength annotation = Annotations.getAnnotation(processMethodContext.getMethod(), MaxLength.class);
- validator.addFacetFlagIfPresent(create(annotation, processMethodContext.getFacetHolder()));
- }
-
- private MaxLengthFacet create(final MaxLength annotation, final FacetHolder holder) {
- return annotation == null ? null : new MaxLengthFacetOnActionAnnotation(annotation.value(), holder);
- }
-
- @Override
- public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
- metaModelValidator.add(validator);
- }
-
- @Override
- public void setConfiguration(final IsisConfiguration configuration) {
- validator.setConfiguration(configuration);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/hide/HiddenFacet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/hide/HiddenFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/hide/HiddenFacet.java
index ce1b966..60de2e3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/hide/HiddenFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/hide/HiddenFacet.java
@@ -25,10 +25,6 @@ import org.apache.isis.core.metamodel.interactions.HidingInteractionAdvisor;
/**
* Hide a property, collection or action.
- *
- * <p>
- * In the standard Apache Isis Programming Model, corresponds to annotating the
- * member with <tt>@Hidden</tt>.
*/
public interface HiddenFacet extends WhenAndWhereValueFacet, HidingInteractionAdvisor, MultiTypedFacet {
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
----------------------------------------------------------------------
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 debf7fb..4f332bf 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
@@ -103,14 +103,14 @@ public class CollectionAnnotationFacetFactory extends FacetFactoryAbstract imple
@Override
public void process(final ProcessMethodContext processMethodContext) {
- processDomainEvent(processMethodContext);
+ processModify(processMethodContext);
processHidden(processMethodContext);
processEditing(processMethodContext);
processNotPersisted(processMethodContext);
processTypeOf(processMethodContext);
}
- void processDomainEvent(final ProcessMethodContext processMethodContext) {
+ void processModify(final ProcessMethodContext processMethodContext) {
final Method method = processMethodContext.getMethod();
final FacetHolder holder = processMethodContext.getFacetHolder();
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/paged/PagedFacetForPagedAnnotationOnCollection.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/paged/PagedFacetForPagedAnnotationOnCollection.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/paged/PagedFacetForPagedAnnotationOnCollection.java
new file mode 100644
index 0000000..020bb22
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/paged/PagedFacetForPagedAnnotationOnCollection.java
@@ -0,0 +1,34 @@
+/*
+ * 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.paged;
+
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.paged.PagedFacetAbstract;
+
+/**
+ * @deprecated
+ */
+@Deprecated
+public class PagedFacetForPagedAnnotationOnCollection extends PagedFacetAbstract {
+
+ public PagedFacetForPagedAnnotationOnCollection(FacetHolder holder, int value) {
+ super(value, holder);
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/paged/PagedFacetPropertiesOnCollection.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/paged/PagedFacetPropertiesOnCollection.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/paged/PagedFacetPropertiesOnCollection.java
new file mode 100644
index 0000000..35a29a8
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/paged/PagedFacetPropertiesOnCollection.java
@@ -0,0 +1,36 @@
+/*
+ * 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.paged;
+
+import java.util.Properties;
+
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.paged.PagedFacetAbstract;
+
+public class PagedFacetPropertiesOnCollection extends PagedFacetAbstract {
+
+ public PagedFacetPropertiesOnCollection(final Properties properties, final FacetHolder holder) {
+ super(valueFrom(properties), holder);
+ }
+
+ private static int valueFrom(Properties properties) {
+ return Integer.parseInt(properties.getProperty("value"));
+ }
+}