http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mustsatisfy/MustSatisfySpecificationFacetForPropertyAnnotation.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mustsatisfy/MustSatisfySpecificationFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mustsatisfy/MustSatisfySpecificationFacetForPropertyAnnotation.java index f2939d0..82bb625 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mustsatisfy/MustSatisfySpecificationFacetForPropertyAnnotation.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mustsatisfy/MustSatisfySpecificationFacetForPropertyAnnotation.java @@ -25,7 +25,7 @@ import org.apache.isis.applib.annotation.Property; import org.apache.isis.applib.spec.Specification; import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.facetapi.FacetHolder; -import org.apache.isis.core.metamodel.facets.propparam.mustsatisfyspec.MustSatisfySpecificationFacetAbstract; +import org.apache.isis.core.metamodel.facets.objectvalue.mustsatisfyspec.MustSatisfySpecificationFacetAbstract; public class MustSatisfySpecificationFacetForPropertyAnnotation extends MustSatisfySpecificationFacetAbstract {
http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/notpersisted/NotPersistedFacetForNotPersistedAnnotationOnProperty.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/notpersisted/NotPersistedFacetForNotPersistedAnnotationOnProperty.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/notpersisted/NotPersistedFacetForNotPersistedAnnotationOnProperty.java index 55fe4aa..4c21272 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/notpersisted/NotPersistedFacetForNotPersistedAnnotationOnProperty.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/notpersisted/NotPersistedFacetForNotPersistedAnnotationOnProperty.java @@ -24,6 +24,10 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.propcoll.notpersisted.NotPersistedFacet; import org.apache.isis.core.metamodel.facets.propcoll.notpersisted.NotPersistedFacetAbstract; +/** + * @deprecated + */ +@Deprecated public class NotPersistedFacetForNotPersistedAnnotationOnProperty extends NotPersistedFacetAbstract { public NotPersistedFacetForNotPersistedAnnotationOnProperty(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/properties/property/regex/RegExFacetForPropertyAnnotation.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/regex/RegExFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/regex/RegExFacetForPropertyAnnotation.java index ee784eb..ca1fa53 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/regex/RegExFacetForPropertyAnnotation.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/regex/RegExFacetForPropertyAnnotation.java @@ -24,8 +24,8 @@ import com.google.common.base.Strings; import org.apache.isis.applib.annotation.Property; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.Annotations; -import org.apache.isis.core.metamodel.facets.object.regex.RegExFacet; -import org.apache.isis.core.metamodel.facets.object.regex.RegExFacetAbstract; +import org.apache.isis.core.metamodel.facets.objectvalue.regex.RegExFacet; +import org.apache.isis.core.metamodel.facets.objectvalue.regex.RegExFacetAbstract; public class RegExFacetForPropertyAnnotation extends RegExFacetAbstract { http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/regex/RegExFacetForRegExAnnotationOnProperty.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/regex/RegExFacetForRegExAnnotationOnProperty.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/regex/RegExFacetForRegExAnnotationOnProperty.java new file mode 100644 index 0000000..29612a2 --- /dev/null +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/regex/RegExFacetForRegExAnnotationOnProperty.java @@ -0,0 +1,78 @@ +/* + * 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.properties.property.regex; + +import java.util.regex.Pattern; +import org.apache.isis.applib.annotation.RegEx; +import org.apache.isis.core.metamodel.facetapi.FacetHolder; +import org.apache.isis.core.metamodel.facets.Annotations; +import org.apache.isis.core.metamodel.facets.objectvalue.regex.RegExFacet; +import org.apache.isis.core.metamodel.facets.objectvalue.regex.RegExFacetAbstract; + +/** + * @deprecated + */ +@Deprecated +public class RegExFacetForRegExAnnotationOnProperty extends RegExFacetAbstract { + + private final Pattern pattern; + + public static RegExFacet create(final RegEx annotation, final Class<?> returnType, final FacetHolder holder) { + + if (!Annotations.isString(returnType)) { + return null; + } + + final String validationExpression = annotation.validation(); + final boolean caseSensitive = annotation.caseSensitive(); + final String formatExpression = annotation.format(); + + return new RegExFacetForRegExAnnotationOnProperty(validationExpression, formatExpression, caseSensitive, holder); + } + + private RegExFacetForRegExAnnotationOnProperty(final String validation, final String format, final boolean caseSensitive, final FacetHolder holder) { + super(validation, format, caseSensitive, holder); + pattern = Pattern.compile(validation(), patternFlags()); + } + + @Override + public String format(final String text) { + if (text == null) { + return "<not a string>"; + } + if (format() == null || format().length() == 0) { + return text; + } + return pattern.matcher(text).replaceAll(format()); + } + + @Override + public boolean doesNotMatch(final String text) { + if (text == null) { + return true; + } + return !pattern.matcher(text).matches(); + } + + private int patternFlags() { + return !caseSensitive() ? Pattern.CASE_INSENSITIVE : 0; + } + +} http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/regex/RegExFacetFromRegExAnnotationOnProperty.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/regex/RegExFacetFromRegExAnnotationOnProperty.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/regex/RegExFacetFromRegExAnnotationOnProperty.java deleted file mode 100644 index 97c256c..0000000 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/regex/RegExFacetFromRegExAnnotationOnProperty.java +++ /dev/null @@ -1,74 +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.properties.property.regex; - -import java.util.regex.Pattern; -import org.apache.isis.applib.annotation.RegEx; -import org.apache.isis.core.metamodel.facetapi.FacetHolder; -import org.apache.isis.core.metamodel.facets.Annotations; -import org.apache.isis.core.metamodel.facets.object.regex.RegExFacet; -import org.apache.isis.core.metamodel.facets.object.regex.RegExFacetAbstract; - -public class RegExFacetFromRegExAnnotationOnProperty extends RegExFacetAbstract { - - private final Pattern pattern; - - public static RegExFacet create(final RegEx annotation, final Class<?> returnType, final FacetHolder holder) { - - if (!Annotations.isString(returnType)) { - return null; - } - - final String validationExpression = annotation.validation(); - final boolean caseSensitive = annotation.caseSensitive(); - final String formatExpression = annotation.format(); - - return new RegExFacetFromRegExAnnotationOnProperty(validationExpression, formatExpression, caseSensitive, holder); - } - - private RegExFacetFromRegExAnnotationOnProperty(final String validation, final String format, final boolean caseSensitive, final FacetHolder holder) { - super(validation, format, caseSensitive, holder); - pattern = Pattern.compile(validation(), patternFlags()); - } - - @Override - public String format(final String text) { - if (text == null) { - return "<not a string>"; - } - if (format() == null || format().length() == 0) { - return text; - } - return pattern.matcher(text).replaceAll(format()); - } - - @Override - public boolean doesNotMatch(final String text) { - if (text == null) { - return true; - } - return !pattern.matcher(text).matches(); - } - - private int patternFlags() { - return !caseSensitive() ? Pattern.CASE_INSENSITIVE : 0; - } - -} http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyLayoutAnnotation.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyLayoutAnnotation.java index 77d7d65..c35bd8c 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyLayoutAnnotation.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyLayoutAnnotation.java @@ -22,8 +22,8 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout; import org.apache.isis.applib.annotation.LabelPosition; import org.apache.isis.applib.annotation.PropertyLayout; import org.apache.isis.core.metamodel.facetapi.FacetHolder; -import org.apache.isis.core.metamodel.facets.propparam.labelat.LabelAtFacet; -import org.apache.isis.core.metamodel.facets.propparam.labelat.LabelAtFacetAbstract; +import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacet; +import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacetAbstract; public class LabelAtFacetForPropertyLayoutAnnotation extends LabelAtFacetAbstract { http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetOnPropertyFromLayoutProperties.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetOnPropertyFromLayoutProperties.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetOnPropertyFromLayoutProperties.java index abd1a67..4f57d26 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetOnPropertyFromLayoutProperties.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetOnPropertyFromLayoutProperties.java @@ -23,8 +23,8 @@ import java.util.Properties; import com.google.common.base.Strings; import org.apache.isis.applib.annotation.LabelPosition; import org.apache.isis.core.metamodel.facetapi.FacetHolder; -import org.apache.isis.core.metamodel.facets.propparam.labelat.LabelAtFacet; -import org.apache.isis.core.metamodel.facets.propparam.labelat.LabelAtFacetAbstract; +import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacet; +import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacetAbstract; public class LabelAtFacetOnPropertyFromLayoutProperties extends LabelAtFacetAbstract { http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetForPropertyLayoutAnnotation.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetForPropertyLayoutAnnotation.java index 3191115..0e6582d 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetForPropertyLayoutAnnotation.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetForPropertyLayoutAnnotation.java @@ -21,8 +21,8 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout; import org.apache.isis.applib.annotation.PropertyLayout; import org.apache.isis.core.metamodel.facetapi.FacetHolder; -import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet; -import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacetAbstract; +import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFacet; +import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFacetAbstract; public class MultiLineFacetForPropertyLayoutAnnotation extends MultiLineFacetAbstract { http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetOnPropertyFromLayoutProperties.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetOnPropertyFromLayoutProperties.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetOnPropertyFromLayoutProperties.java index d49b092..3508afc 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetOnPropertyFromLayoutProperties.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetOnPropertyFromLayoutProperties.java @@ -22,8 +22,8 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout; import java.util.Properties; import com.google.common.base.Strings; import org.apache.isis.core.metamodel.facetapi.FacetHolder; -import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet; -import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacetAbstract; +import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFacet; +import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFacetAbstract; public class MultiLineFacetOnPropertyFromLayoutProperties extends MultiLineFacetAbstract { http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java index 0641093..97b70ac 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java @@ -31,10 +31,10 @@ import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet; import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet; import org.apache.isis.core.metamodel.facets.all.named.NamedFacet; import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet; -import org.apache.isis.core.metamodel.facets.objpropparam.typicallen.TypicalLengthFacet; -import org.apache.isis.core.metamodel.facets.propparam.labelat.LabelAtFacet; -import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet; -import org.apache.isis.core.metamodel.facets.propparam.renderedadjusted.RenderedAdjustedFacet; +import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet; +import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacet; +import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFacet; +import org.apache.isis.core.metamodel.facets.objectvalue.renderedadjusted.RenderedAdjustedFacet; public class PropertyLayoutFacetFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory { http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyLayoutAnnotation.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyLayoutAnnotation.java index d3e2104..bb3f0fb 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyLayoutAnnotation.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyLayoutAnnotation.java @@ -21,8 +21,8 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout; import org.apache.isis.applib.annotation.PropertyLayout; import org.apache.isis.core.metamodel.facetapi.FacetHolder; -import org.apache.isis.core.metamodel.facets.propparam.renderedadjusted.RenderedAdjustedFacet; -import org.apache.isis.core.metamodel.facets.propparam.renderedadjusted.RenderedAdjustedFacetAbstract; +import org.apache.isis.core.metamodel.facets.objectvalue.renderedadjusted.RenderedAdjustedFacet; +import org.apache.isis.core.metamodel.facets.objectvalue.renderedadjusted.RenderedAdjustedFacetAbstract; public class RenderedAdjustedFacetForPropertyLayoutAnnotation extends RenderedAdjustedFacetAbstract { http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetOnPropertyFromLayoutProperties.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetOnPropertyFromLayoutProperties.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetOnPropertyFromLayoutProperties.java index e9755c9..65e79af 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetOnPropertyFromLayoutProperties.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetOnPropertyFromLayoutProperties.java @@ -22,8 +22,8 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout; import java.util.Properties; import com.google.common.base.Strings; import org.apache.isis.core.metamodel.facetapi.FacetHolder; -import org.apache.isis.core.metamodel.facets.propparam.renderedadjusted.RenderedAdjustedFacet; -import org.apache.isis.core.metamodel.facets.propparam.renderedadjusted.RenderedAdjustedFacetAbstract; +import org.apache.isis.core.metamodel.facets.objectvalue.renderedadjusted.RenderedAdjustedFacet; +import org.apache.isis.core.metamodel.facets.objectvalue.renderedadjusted.RenderedAdjustedFacetAbstract; public class RenderedAdjustedFacetOnPropertyFromLayoutProperties extends RenderedAdjustedFacetAbstract { http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetForPropertyLayoutAnnotation.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetForPropertyLayoutAnnotation.java index 4a109ad..8d50e35 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetForPropertyLayoutAnnotation.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetForPropertyLayoutAnnotation.java @@ -21,8 +21,8 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout; import org.apache.isis.applib.annotation.PropertyLayout; import org.apache.isis.core.metamodel.facetapi.FacetHolder; -import org.apache.isis.core.metamodel.facets.objpropparam.typicallen.TypicalLengthFacet; -import org.apache.isis.core.metamodel.facets.objpropparam.typicallen.TypicalLengthFacetAbstract; +import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet; +import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacetAbstract; public class TypicalLengthFacetForPropertyLayoutAnnotation extends TypicalLengthFacetAbstract { http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetOnPropertyFromLayoutProperties.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetOnPropertyFromLayoutProperties.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetOnPropertyFromLayoutProperties.java index b3cad29..a1b58eb 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetOnPropertyFromLayoutProperties.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetOnPropertyFromLayoutProperties.java @@ -22,8 +22,8 @@ package org.apache.isis.core.metamodel.facets.properties.propertylayout; import java.util.Properties; import com.google.common.base.Strings; import org.apache.isis.core.metamodel.facetapi.FacetHolder; -import org.apache.isis.core.metamodel.facets.objpropparam.typicallen.TypicalLengthFacet; -import org.apache.isis.core.metamodel.facets.objpropparam.typicallen.TypicalLengthFacetAbstract; +import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet; +import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacetAbstract; public class TypicalLengthFacetOnPropertyFromLayoutProperties extends TypicalLengthFacetAbstract { http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/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 326daa3..3db6213 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 @@ -27,10 +27,14 @@ 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.renderedadjusted.RenderedAdjustedFacet; +import org.apache.isis.core.metamodel.facets.objectvalue.renderedadjusted.RenderedAdjustedFacet; import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite; import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation; +/** + * @deprecated + */ +@Deprecated public class RenderedAsDayBeforeAnnotationOnPropertyFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware { private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(RenderedAsDayBefore.class); http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/renderedasdaybefore/annotation/RenderedAsDayBeforeFacetAnnotationOnProperty.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/renderedasdaybefore/annotation/RenderedAsDayBeforeFacetAnnotationOnProperty.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/renderedasdaybefore/annotation/RenderedAsDayBeforeFacetAnnotationOnProperty.java index 1719112..3ee46f1 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/renderedasdaybefore/annotation/RenderedAsDayBeforeFacetAnnotationOnProperty.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/renderedasdaybefore/annotation/RenderedAsDayBeforeFacetAnnotationOnProperty.java @@ -20,8 +20,12 @@ package org.apache.isis.core.metamodel.facets.properties.renderedasdaybefore.annotation; import org.apache.isis.core.metamodel.facetapi.FacetHolder; -import org.apache.isis.core.metamodel.facets.propparam.renderedadjusted.RenderedAdjustedFacetAbstract; +import org.apache.isis.core.metamodel.facets.objectvalue.renderedadjusted.RenderedAdjustedFacetAbstract; +/** + * @deprecated + */ +@Deprecated public class RenderedAsDayBeforeFacetAnnotationOnProperty extends RenderedAdjustedFacetAbstract { private static final int ADJUST_BY = -1; http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthFacetOnPropertyAnnotation.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthFacetOnPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthFacetOnPropertyAnnotation.java index 95ace41..18cea73 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthFacetOnPropertyAnnotation.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthFacetOnPropertyAnnotation.java @@ -20,8 +20,12 @@ package org.apache.isis.core.metamodel.facets.properties.typicallen.annotation; import org.apache.isis.core.metamodel.facetapi.FacetHolder; -import org.apache.isis.core.metamodel.facets.objpropparam.typicallen.TypicalLengthFacetAbstract; +import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacetAbstract; +/** + * @deprecated + */ +@Deprecated public class TypicalLengthFacetOnPropertyAnnotation extends TypicalLengthFacetAbstract { private final int value; http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthFacetOnPropertyFromProperties.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthFacetOnPropertyFromProperties.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthFacetOnPropertyFromProperties.java index 4952b99..f991c2a 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthFacetOnPropertyFromProperties.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthFacetOnPropertyFromProperties.java @@ -22,7 +22,7 @@ package org.apache.isis.core.metamodel.facets.properties.typicallen.annotation; import java.util.Properties; import org.apache.isis.core.metamodel.facetapi.FacetHolder; -import org.apache.isis.core.metamodel.facets.objpropparam.typicallen.TypicalLengthFacetAbstract; +import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacetAbstract; public class TypicalLengthFacetOnPropertyFromProperties extends TypicalLengthFacetAbstract { http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/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 e4df95d..4b837ef 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 @@ -30,7 +30,7 @@ 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.objpropparam.typicallen.TypicalLengthFacet; +import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet; import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite; import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation; http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyDerivedFromType.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyDerivedFromType.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyDerivedFromType.java index e4db64a..676dfca 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyDerivedFromType.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyDerivedFromType.java @@ -20,9 +20,9 @@ package org.apache.isis.core.metamodel.facets.properties.typicallen.fromtype; import org.apache.isis.core.metamodel.facetapi.FacetHolder; -import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet; -import org.apache.isis.core.metamodel.facets.objpropparam.typicallen.TypicalLengthFacet; -import org.apache.isis.core.metamodel.facets.objpropparam.typicallen.TypicalLengthFacetAbstract; +import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFacet; +import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet; +import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacetAbstract; public class TypicalLengthFacetOnPropertyDerivedFromType extends TypicalLengthFacetAbstract { http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyDerivedFromTypeFacetFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyDerivedFromTypeFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyDerivedFromTypeFacetFactory.java index cab1cca..97c0ca4 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyDerivedFromTypeFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyDerivedFromTypeFacetFactory.java @@ -24,7 +24,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetUtil; import org.apache.isis.core.metamodel.facetapi.FeatureType; import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract; import org.apache.isis.core.metamodel.facets.FacetedMethod; -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; public class TypicalLengthFacetOnPropertyDerivedFromTypeFacetFactory extends FacetFactoryAbstract { http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/PropertyValidateFacetAbstract.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/PropertyValidateFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/PropertyValidateFacetAbstract.java index dfe7e8f..54f6cc4 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/PropertyValidateFacetAbstract.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/PropertyValidateFacetAbstract.java @@ -24,7 +24,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.facetapi.FacetAbstract; 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.interactions.PropertyModifyContext; import org.apache.isis.core.metamodel.interactions.ValidityContext; http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/choices/ChoicesFacet.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/choices/ChoicesFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/choices/ChoicesFacet.java deleted file mode 100644 index 335d9fc..0000000 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/choices/ChoicesFacet.java +++ /dev/null @@ -1,46 +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.propparam.choices; - -import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.core.metamodel.facetapi.Facet; -import org.apache.isis.core.metamodel.spec.ObjectSpecification; - -public interface ChoicesFacet extends Facet { - - /** - * Gets a set of choices for this object. - */ - public Object[] getChoices(ObjectAdapter adapter); - - - - public static class Util { - - private Util() { - } - - public static boolean hasChoices(final ObjectSpecification specification) { - return specification.getFacet(ChoicesFacet.class) != null; - } - - } - -} http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/choices/ChoicesFacetAbstract.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/choices/ChoicesFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/choices/ChoicesFacetAbstract.java deleted file mode 100644 index 3c0e293..0000000 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/choices/ChoicesFacetAbstract.java +++ /dev/null @@ -1,36 +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.propparam.choices; - -import org.apache.isis.core.metamodel.facetapi.Facet; -import org.apache.isis.core.metamodel.facetapi.FacetAbstract; -import org.apache.isis.core.metamodel.facetapi.FacetHolder; - -public abstract class ChoicesFacetAbstract extends FacetAbstract implements ChoicesFacet { - - public static Class<? extends Facet> type() { - return ChoicesFacet.class; - } - - public ChoicesFacetAbstract(final FacetHolder holder) { - super(type(), holder, Derivation.NOT_DERIVED); - } - -} http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/labelat/LabelAtFacet.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/labelat/LabelAtFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/labelat/LabelAtFacet.java deleted file mode 100644 index 457f71b..0000000 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/labelat/LabelAtFacet.java +++ /dev/null @@ -1,36 +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.propparam.labelat; - -import org.apache.isis.applib.annotation.LabelPosition; -import org.apache.isis.core.metamodel.facetapi.Facet; - -/** - * Corresponds to either {@literal @}{@link org.apache.isis.applib.annotation.PropertyLayout#labelPosition()} (for a property) or - *{@literal @}{@link org.apache.isis.applib.annotation.ParameterLayout#labelPosition()} (for an action parameter). - */ -public interface LabelAtFacet extends Facet { - - /** - * The positioning of a property or action parameter's label. - */ - public LabelPosition label(); - -} http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/labelat/LabelAtFacetAbstract.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/labelat/LabelAtFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/labelat/LabelAtFacetAbstract.java deleted file mode 100644 index 94b476a..0000000 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/labelat/LabelAtFacetAbstract.java +++ /dev/null @@ -1,50 +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.propparam.labelat; - -import org.apache.isis.applib.annotation.LabelPosition; -import org.apache.isis.core.metamodel.facetapi.Facet; -import org.apache.isis.core.metamodel.facetapi.FacetHolder; -import org.apache.isis.core.metamodel.facets.MultipleValueFacetAbstract; - -public abstract class LabelAtFacetAbstract extends MultipleValueFacetAbstract implements LabelAtFacet { - - public static Class<? extends Facet> type() { - return LabelAtFacet.class; - } - - private final LabelPosition value; - - public LabelAtFacetAbstract(final LabelPosition value, final FacetHolder holder) { - super(type(), holder); - this.value = value; - } - - @Override - public LabelPosition label() { - return value; - } - - @Override - protected String toStringValues() { - return "position=" + value; - } - -} http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/labelat/LabelAtFacetInferredFromMultiLineFacet.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/labelat/LabelAtFacetInferredFromMultiLineFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/labelat/LabelAtFacetInferredFromMultiLineFacet.java deleted file mode 100644 index 227990e..0000000 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/labelat/LabelAtFacetInferredFromMultiLineFacet.java +++ /dev/null @@ -1,38 +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.propparam.labelat; - -import org.apache.isis.applib.annotation.LabelPosition; -import org.apache.isis.core.metamodel.facetapi.FacetHolder; - -/** - * If multi-line then position the label at the top. - * - * <p> - * This can still be overridden using the {@link org.apache.isis.applib.annotation.PropertyLayout} annotation / layout.json. - * </p> - */ -public class LabelAtFacetInferredFromMultiLineFacet extends LabelAtFacetAbstract { - - public LabelAtFacetInferredFromMultiLineFacet(final FacetHolder holder) { - super(LabelPosition.TOP, holder); - } - -} http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/mandatory/MandatoryFacet.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/mandatory/MandatoryFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/mandatory/MandatoryFacet.java deleted file mode 100644 index fd13f15..0000000 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/mandatory/MandatoryFacet.java +++ /dev/null @@ -1,58 +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.propparam.mandatory; - -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.MarkerFacet; -import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor; - -/** - * Whether a property or a parameter is mandatory (not optional). - * - * <p> - * For a mandatory property, the object cannot be saved/updated without the - * value being provided. For a mandatory parameter, the action cannot be invoked - * without the value being provided. - * - * <p> - * In the standard Apache Isis Programming Model, specify mandatory by - * <i>omitting</i> the <tt>@Optional</tt> annotation. - */ -public interface MandatoryFacet extends MarkerFacet, ValidatingInteractionAdvisor { - - /** - * Whether this value is required but has not been provided (and is - * therefore invalid). - * - * <p> - * If the value has been provided, <i>or</i> if the property or parameter is - * not required, then will return <tt>false</tt>. - */ - boolean isRequiredButNull(ObjectAdapter adapter); - - /** - * Indicates that the implementation is overridding the usual semantics, in - * other words that the {@link FacetHolder} to which this {@link Facet} is - * attached is <i>not</i> mandatory. - */ - public boolean isInvertedSemantics(); -} http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/mandatory/MandatoryFacetAbstract.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/mandatory/MandatoryFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/mandatory/MandatoryFacetAbstract.java deleted file mode 100644 index ee2ccea..0000000 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/mandatory/MandatoryFacetAbstract.java +++ /dev/null @@ -1,97 +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.propparam.mandatory; - -import org.apache.isis.applib.events.ValidityEvent; -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.MarkerFacetAbstract; -import org.apache.isis.core.metamodel.facets.all.named.NamedFacet; -import org.apache.isis.core.metamodel.interactions.ActionArgumentContext; -import org.apache.isis.core.metamodel.interactions.PropertyModifyContext; -import org.apache.isis.core.metamodel.interactions.ProposedHolder; -import org.apache.isis.core.metamodel.interactions.ValidityContext; - -public abstract class MandatoryFacetAbstract extends MarkerFacetAbstract implements MandatoryFacet { - - public static Class<? extends Facet> type() { - return MandatoryFacet.class; - } - - public enum Semantics { - REQUIRED, - OPTIONAL; - - public static Semantics of(boolean required) { - return required ? REQUIRED: OPTIONAL; - } - } - - private Semantics semantics; - - public MandatoryFacetAbstract(final FacetHolder holder, final Semantics semantics) { - super(type(), holder); - this.semantics = semantics; - } - - /** - * If not specified or, if a string, then zero length. - */ - @Override - public final boolean isRequiredButNull(final ObjectAdapter adapter) { - if(!isInvertedSemantics()) { - final Object object = ObjectAdapter.Util.unwrap(adapter); - if (object == null) { - return true; - } - // special case string handling. - final String str = ObjectAdapter.Util.unwrapAsString(adapter); - return str != null && str.length() == 0; - } else { - return false; - } - } - - @Override - public boolean isInvertedSemantics() { - return this.semantics == Semantics.OPTIONAL; - } - - @Override - public String invalidates(final ValidityContext<? extends ValidityEvent> context) { - if (!(context instanceof PropertyModifyContext) && !(context instanceof ActionArgumentContext)) { - return null; - } - if (!(context instanceof ProposedHolder)) { - // shouldn't happen, since both the above should hold a proposed - // value/argument - return null; - } - final ProposedHolder proposedHolder = (ProposedHolder) context; - final boolean required = isRequiredButNull(proposedHolder.getProposed()); - if (!required) { - return null; - } - final NamedFacet namedFacet = getFacetHolder().getFacet(NamedFacet.class); - final String name = namedFacet != null? namedFacet.value(): null; - return name != null? "'" + name + "' is mandatory":"Mandatory"; - } -} http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/mandatory/MandatoryFacetDefault.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/mandatory/MandatoryFacetDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/mandatory/MandatoryFacetDefault.java deleted file mode 100644 index 5b041f3..0000000 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/mandatory/MandatoryFacetDefault.java +++ /dev/null @@ -1,43 +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.propparam.mandatory; - -import org.apache.isis.core.metamodel.facetapi.FacetHolder; - -/** - * Whether a property or a parameter is mandatory (not optional). - * - * <p> - * For a mandatory property, the object cannot be saved/updated without the - * value being provided. For a mandatory parameter, the action cannot be invoked - * without the value being provided. - * - * <p> - * In the standard Apache Isis Programming Model, specify mandatory by - * <i>omitting</i> the <tt>@Optional</tt> annotation. - */ -public class MandatoryFacetDefault extends MandatoryFacetAbstract { - - public MandatoryFacetDefault(final FacetHolder holder) { - super(holder, Semantics.REQUIRED); - } - - -} http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/maxlen/MaxLengthFacet.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/maxlen/MaxLengthFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/maxlen/MaxLengthFacet.java deleted file mode 100644 index 4bbff60..0000000 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/maxlen/MaxLengthFacet.java +++ /dev/null @@ -1,41 +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.propparam.maxlen; - -import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.core.metamodel.facets.SingleIntValueFacet; -import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor; - -/** - * Whether the (string) property or a parameter's length must not exceed a - * certain length. - * - * <p> - * In the standard Apache Isis Programming Model, corresponds to the - * <tt>@MaxLength</tt> annotation. - */ -public interface MaxLengthFacet extends SingleIntValueFacet, ValidatingInteractionAdvisor { - - /** - * Whether the provided string exceeds the maximum length. - */ - public boolean exceeds(ObjectAdapter adapter); - -} http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/maxlen/MaxLengthFacetAbstract.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/maxlen/MaxLengthFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/maxlen/MaxLengthFacetAbstract.java deleted file mode 100644 index 5b81201..0000000 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/maxlen/MaxLengthFacetAbstract.java +++ /dev/null @@ -1,74 +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.propparam.maxlen; - -import org.apache.isis.applib.events.ValidityEvent; -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.SingleIntValueFacetAbstract; -import org.apache.isis.core.metamodel.interactions.ProposedHolder; -import org.apache.isis.core.metamodel.interactions.ValidityContext; -import org.apache.isis.core.metamodel.spec.ObjectAdapterUtils; - -public abstract class MaxLengthFacetAbstract extends SingleIntValueFacetAbstract implements MaxLengthFacet { - - public static Class<? extends Facet> type() { - return MaxLengthFacet.class; - } - - public MaxLengthFacetAbstract(final int value, final FacetHolder holder) { - super(type(), holder, value); - } - - /** - * Whether the provided argument exceeds the {@link #value() maximum length} - * . - */ - @Override - public boolean exceeds(final ObjectAdapter adapter) { - final String str = ObjectAdapterUtils.unwrapObjectAsString(adapter); - if (str == null) { - return false; - } - final int maxLength = value(); - return maxLength != 0 && str.length() > maxLength; - } - - @Override - public String invalidates(final ValidityContext<? extends ValidityEvent> context) { - if (!(context instanceof ProposedHolder)) { - return null; - } - final ProposedHolder proposedHolder = (ProposedHolder) context; - final ObjectAdapter proposedArgument = proposedHolder.getProposed(); - if (!exceeds(proposedArgument)) { - return null; - } - return "The value proposed exceeds the maximum length of " + value(); - } - - @Override - protected String toStringValues() { - final int val = value(); - return val == 0 ? "unlimited" : String.valueOf(val); - } - -} http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/multiline/MultiLineFacet.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/multiline/MultiLineFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/multiline/MultiLineFacet.java deleted file mode 100644 index 4c07176..0000000 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/multiline/MultiLineFacet.java +++ /dev/null @@ -1,51 +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.propparam.multiline; - -import org.apache.isis.core.metamodel.facets.MultipleValueFacet; - -/** - * Whether the (string) property or parameter should be rendered over multiple - * lines. - * - * <p> - * In the standard Apache Isis Programming Model, corresponds to the - * <tt>@MultiLine</tt> annotation. - */ -public interface MultiLineFacet extends MultipleValueFacet { - - /** - * How many lines to use. - */ - public int numberOfLines(); - - /** - * Whether carriage returns should be used to split over multiple lines or - * not. - * - * <p> - * If set to <tt>true</tt>, then user must use carriage returns to split. If - * set to <tt>false</tt>, then the viewer should automatically wrap when - * spills over the length of one line. - */ - @Deprecated - public boolean preventWrapping(); - -} http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/multiline/MultiLineFacetAbstract.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/multiline/MultiLineFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/multiline/MultiLineFacetAbstract.java deleted file mode 100644 index e3371a6..0000000 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/multiline/MultiLineFacetAbstract.java +++ /dev/null @@ -1,56 +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.propparam.multiline; - -import org.apache.isis.core.metamodel.facetapi.Facet; -import org.apache.isis.core.metamodel.facetapi.FacetHolder; -import org.apache.isis.core.metamodel.facets.MultipleValueFacetAbstract; - -public abstract class MultiLineFacetAbstract extends MultipleValueFacetAbstract implements MultiLineFacet { - - public static Class<? extends Facet> type() { - return MultiLineFacet.class; - } - - private final int numberOfLines; - private final boolean preventWrapping; - - public MultiLineFacetAbstract(final int numberOfLines, final boolean preventWrapping, final FacetHolder holder) { - super(type(), holder); - this.numberOfLines = numberOfLines; - this.preventWrapping = preventWrapping; - } - - @Override - public int numberOfLines() { - return numberOfLines; - } - - @Override - public boolean preventWrapping() { - return preventWrapping; - } - - @Override - protected String toStringValues() { - return "lines=" + numberOfLines + "," + (preventWrapping ? "prevent-wrapping" : "allow-wrapping"); - } - -} http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/mustsatisfyspec/MustSatisfySpecificationFacet.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/mustsatisfyspec/MustSatisfySpecificationFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/mustsatisfyspec/MustSatisfySpecificationFacet.java deleted file mode 100644 index d03aa27..0000000 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/mustsatisfyspec/MustSatisfySpecificationFacet.java +++ /dev/null @@ -1,27 +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.propparam.mustsatisfyspec; - -import org.apache.isis.core.metamodel.facetapi.Facet; -import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor; - -public interface MustSatisfySpecificationFacet extends Facet, ValidatingInteractionAdvisor { - -} http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java deleted file mode 100644 index f80303c..0000000 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java +++ /dev/null @@ -1,87 +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.propparam.mustsatisfyspec; - -import java.util.List; -import org.apache.isis.applib.events.ValidityEvent; -import org.apache.isis.applib.spec.Specification; -import org.apache.isis.applib.util.ReasonBuffer; -import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.core.metamodel.facetapi.Facet; -import org.apache.isis.core.metamodel.facetapi.FacetAbstract; -import org.apache.isis.core.metamodel.facetapi.FacetHolder; -import org.apache.isis.core.metamodel.interactions.ProposedHolder; -import org.apache.isis.core.metamodel.interactions.ValidityContext; - -public abstract class MustSatisfySpecificationFacetAbstract extends FacetAbstract implements MustSatisfySpecificationFacet { - - public static Class<? extends Facet> type() { - return MustSatisfySpecificationFacet.class; - } - - private final List<Specification> specifications; - - /** - * For testing. - */ - public List<Specification> getSpecifications() { - return specifications; - } - - public MustSatisfySpecificationFacetAbstract(final List<Specification> specifications, final FacetHolder holder) { - super(type(), holder, Derivation.NOT_DERIVED); - this.specifications = specifications; - } - - @Override - public String invalidates(final ValidityContext<? extends ValidityEvent> validityContext) { - if (!(validityContext instanceof ProposedHolder)) { - return null; - } - final ProposedHolder proposedHolder = (ProposedHolder) validityContext; - final ObjectAdapter proposedAdapter = proposedHolder.getProposed(); - if(proposedAdapter == null) { - return null; - } - final Object proposedObject = proposedAdapter.getObject(); - final ReasonBuffer buf = new ReasonBuffer(); - for (final Specification specification : specifications) { - buf.append(specification.satisfies(proposedObject)); - } - return buf.getReason(); - } - - /** - * For benefit of subclasses. - */ - protected static Specification newSpecificationElseNull(final Class<?> value) { - if (!(Specification.class.isAssignableFrom(value))) { - return null; - } - try { - return (Specification) value.newInstance(); - } catch (final InstantiationException e) { - return null; - } catch (final IllegalAccessException e) { - return null; - } - } - -} http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/renderedadjusted/RenderedAdjustedFacet.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/renderedadjusted/RenderedAdjustedFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/renderedadjusted/RenderedAdjustedFacet.java deleted file mode 100644 index ce4e24a..0000000 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/renderedadjusted/RenderedAdjustedFacet.java +++ /dev/null @@ -1,39 +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.propparam.renderedadjusted; - -import org.apache.isis.core.metamodel.facets.SingleIntValueFacet; - -/** - * The amount to adjust a date by when rendered. - * - * <p> - * Intended to be used by the viewer as a rendering hint. - * - * <p> - * In the standard Apache Isis Programming Model, corresponds to the - * <tt>@RenderedAdjusted</tt> annotation. - */ -public interface RenderedAdjustedFacet extends SingleIntValueFacet { - - @Override - public int value(); - -} http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/renderedadjusted/RenderedAdjustedFacetAbstract.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/renderedadjusted/RenderedAdjustedFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/renderedadjusted/RenderedAdjustedFacetAbstract.java deleted file mode 100644 index f7b3734..0000000 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/renderedadjusted/RenderedAdjustedFacetAbstract.java +++ /dev/null @@ -1,50 +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.propparam.renderedadjusted; - -import org.apache.isis.core.metamodel.facetapi.Facet; -import org.apache.isis.core.metamodel.facetapi.FacetAbstract; -import org.apache.isis.core.metamodel.facetapi.FacetHolder; - -public abstract class RenderedAdjustedFacetAbstract extends FacetAbstract implements RenderedAdjustedFacet { - - public static Class<? extends Facet> type() { - return RenderedAdjustedFacet.class; - } - - private final int adjustBy; - - public RenderedAdjustedFacetAbstract(int adjustBy, final FacetHolder holder) { - super(type(), holder, Derivation.NOT_DERIVED); - this.adjustBy = adjustBy; - } - - @Override - public int value() { - return adjustBy; - } - - @Override - protected String toStringValues() { - final int val = value(); - return val == -1 ? "default" : String.valueOf(val); - } - -} http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java index 602e87f..eef3db6 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java @@ -49,8 +49,8 @@ import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet; import org.apache.isis.core.metamodel.facets.members.render.RenderFacet; import org.apache.isis.core.metamodel.facets.object.membergroups.MemberGroupLayoutFacet; import org.apache.isis.core.metamodel.facets.object.paged.PagedFacet; -import org.apache.isis.core.metamodel.facets.objpropparam.typicallen.TypicalLengthFacet; -import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet; +import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet; +import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFacet; import org.apache.isis.core.metamodel.layout.memberorderfacet.MemberOrderFacetComparator; import org.apache.isis.core.metamodel.layoutmetadata.ActionLayoutFacetRepr; import org.apache.isis.core.metamodel.layoutmetadata.ActionRepr; http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java index f0837cb..d12a333 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java @@ -45,7 +45,7 @@ import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.facetapi.MultiTypedFacet; import org.apache.isis.core.metamodel.facets.TypedHolder; import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet; -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.all.named.NamedFacet; import org.apache.isis.core.metamodel.facets.param.autocomplete.ActionParameterAutoCompleteFacet; import org.apache.isis.core.metamodel.facets.param.choices.ActionParameterChoicesFacet; http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java index 05cf127..626b362 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java @@ -24,10 +24,10 @@ import org.apache.isis.core.metamodel.adapter.MutableProposedHolder; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.facetapi.FeatureType; import org.apache.isis.core.metamodel.facets.TypedHolder; -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.Instance; import org.apache.isis.core.metamodel.spec.ObjectSpecification; import org.apache.isis.core.metamodel.spec.feature.OneToOneActionParameter; http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java index 548e2d5..41b6d6a 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java @@ -23,7 +23,7 @@ import org.apache.isis.core.commons.exceptions.NotYetImplementedException; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.facetapi.FeatureType; import org.apache.isis.core.metamodel.facets.FacetedMethod; -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.propcoll.notpersisted.NotPersistedFacet; import org.apache.isis.core.metamodel.facets.properties.choices.PropertyChoicesFacet; import org.apache.isis.core.metamodel.spec.ObjectSpecification; http://git-wip-us.apache.org/repos/asf/isis/blob/34423fd5/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java index 7859577..912cb48 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java @@ -37,7 +37,7 @@ import org.apache.isis.core.metamodel.consent.InteractionResult; import org.apache.isis.core.metamodel.facetapi.FeatureType; import org.apache.isis.core.metamodel.facets.FacetedMethod; import org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet; -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.properties.autocomplete.PropertyAutoCompleteFacet; import org.apache.isis.core.metamodel.facets.properties.choices.PropertyChoicesFacet; import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefaultFacet;
