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 2011/01/17 09:48:56 UTC
svn commit: r1059813 [8/10] - in
/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets:
./ actcoll/typeof/ actions/ actions/choices/ actions/debug/
actions/debug/annotation/ actions/defaults/ actions/describedas/ acti...
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/PropertyValidateDefaultFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/PropertyValidateDefaultFacetFactory.java?rev=1059813&r1=1059812&r2=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/PropertyValidateDefaultFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/PropertyValidateDefaultFacetFactory.java Mon Jan 17 08:48:40 2011
@@ -20,14 +20,12 @@
package org.apache.isis.core.progmodel.facets.properties.validate;
-import java.lang.reflect.Method;
-import org.apache.isis.core.metamodel.facetapi.FacetFactory;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MethodRemover;
-import org.apache.isis.core.metamodel.spec.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.specloader.facetprocessor.FacetProcessor;
@@ -46,13 +44,13 @@ public class PropertyValidateDefaultFace
}
@Override
- public boolean process(Class<?> cls, final Method method, final MethodRemover methodRemover, final FacetHolder holder) {
- return FacetUtil.addFacet(create(holder));
+ public void process(ProcessMethodContext processMethodContext) {
+ FacetUtil.addFacet(create(processMethodContext.getFacetHolder()));
}
@Override
- public boolean processParams(final Method method, final int paramNum, final FacetHolder holder) {
- return FacetUtil.addFacet(create(holder));
+ public void processParams(ProcessParameterContext processParameterContext) {
+ FacetUtil.addFacet(create(processParameterContext.getFacetHolder()));
}
private PropertyValidateFacet create(final FacetHolder holder) {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/PropertyValidateFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/PropertyValidateFacet.java?rev=1059813&r1=1059812&r2=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/PropertyValidateFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/PropertyValidateFacet.java Mon Jan 17 08:48:40 2011
@@ -22,8 +22,8 @@ package org.apache.isis.core.progmodel.f
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacet;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacetAbstract;
import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor;
-import org.apache.isis.core.progmodel.facets.properties.modify.PropertySetterFacetAbstract;
/**
* The mechanism by which the proposed value of a property can be validated, called immediately before
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java?rev=1059813&r1=1059812&r2=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java Mon Jan 17 08:48:40 2011
@@ -25,7 +25,7 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.TypedHolder;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLookup;
-import org.apache.isis.core.progmodel.facets.actions.choices.ActionParameterChoicesFacetAbstract;
+import org.apache.isis.core.progmodel.facets.param.choices.ActionParameterChoicesFacetAbstract;
public class ActionParameterChoicesFacetDerivedFromChoicesFacet extends ActionParameterChoicesFacetAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/EnumFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/EnumFacetFactory.java?rev=1059813&r1=1059812&r2=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/EnumFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/EnumFacetFactory.java Mon Jan 17 08:48:40 2011
@@ -22,7 +22,6 @@ package org.apache.isis.core.progmodel.f
import org.apache.isis.core.commons.lang.CastUtils;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
-import org.apache.isis.core.metamodel.facetapi.MethodRemover;
import org.apache.isis.core.progmodel.facets.value.ValueUsingValueSemanticsProviderFacetFactory;
public class EnumFacetFactory<T extends Enum<T>> extends ValueUsingValueSemanticsProviderFacetFactory<T> {
@@ -32,15 +31,17 @@ public class EnumFacetFactory<T extends
}
@Override
- public boolean process(Class<?> cls, MethodRemover methodRemover, FacetHolder holder) {
+ public void process(ProcessClassContext processClassContext) {
+ final Class<?> cls = processClassContext.getCls();
+ final FacetHolder holder = processClassContext.getFacetHolder();
+
if (!cls.isEnum()) {
- return false;
+ return;
}
addFacets(new EnumValueSemanticsProvider<T>(holder, asT(cls), getConfiguration(), getContext()));
FacetUtil.addFacet(new ChoicesFacetEnum(holder, cls.getEnumConstants()));
- return true;
}
protected Class<T> asT(Class<?> cls) {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/PropertyAndParameterChoicesFacetDerivedFromChoicesFacetFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/PropertyAndParameterChoicesFacetDerivedFromChoicesFacetFacetFactory.java?rev=1059813&r1=1059812&r2=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/PropertyAndParameterChoicesFacetDerivedFromChoicesFacetFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/PropertyAndParameterChoicesFacetDerivedFromChoicesFacetFacetFactory.java Mon Jan 17 08:48:40 2011
@@ -20,15 +20,12 @@
package org.apache.isis.core.progmodel.facets.propparam.enums;
-import java.lang.reflect.Method;
import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
import org.apache.isis.core.metamodel.adapter.map.AdapterMapAware;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MethodRemover;
-import org.apache.isis.core.metamodel.spec.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
public class PropertyAndParameterChoicesFacetDerivedFromChoicesFacetFacetFactory extends
FacetFactoryAbstract implements AdapterMapAware {
@@ -40,29 +37,26 @@ public class PropertyAndParameterChoices
}
@Override
- public boolean process(Class<?> cls, Method method,
- MethodRemover methodRemover, FacetHolder holder) {
+ public void process(ProcessMethodContext processMethodContext) {
- Class<?> returnType = method.getReturnType();
+ Class<?> returnType = processMethodContext.getMethod().getReturnType();
if (!returnType.isEnum()) {
- return false;
+ return;
}
- FacetUtil.addFacet(new PropertyChoicesFacetDerivedFromChoicesFacet(holder, getSpecificationLookup()));
- return true;
+ FacetUtil.addFacet(new PropertyChoicesFacetDerivedFromChoicesFacet(processMethodContext.getFacetHolder(), getSpecificationLookup()));
}
@Override
- public boolean processParams(Method method, int paramNum, FacetHolder holder) {
- Class<?> paramType = method.getParameterTypes()[paramNum];
+ public void processParams(ProcessParameterContext processParameterContext) {
+ Class<?> paramType = processParameterContext.getMethod().getParameterTypes()[processParameterContext.getParamNum()];
if (!paramType.isEnum()) {
- return false;
+ return;
}
- FacetUtil.addFacet(new ActionParameterChoicesFacetDerivedFromChoicesFacet(holder, getSpecificationLookup(), getAdapterMap()));
- return true;
+ FacetUtil.addFacet(new ActionParameterChoicesFacetDerivedFromChoicesFacet(processParameterContext.getFacetHolder(), getSpecificationLookup(), getAdapterMap()));
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java?rev=1059813&r1=1059812&r2=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java Mon Jan 17 08:48:40 2011
@@ -22,7 +22,7 @@ package org.apache.isis.core.progmodel.f
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetedmethod.FacetedMethod;
+import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLookup;
import org.apache.isis.core.progmodel.facets.properties.choices.PropertyChoicesFacetAbstract;
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/multiline/annotation/MultiLineAnnotationFacetFactory.java (from r1056813, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/multiline/MultiLineAnnotationFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/multiline/annotation/MultiLineAnnotationFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/multiline/annotation/MultiLineAnnotationFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/multiline/MultiLineAnnotationFacetFactory.java&r1=1056813&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/multiline/MultiLineAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/multiline/annotation/MultiLineAnnotationFacetFactory.java Mon Jan 17 08:48:40 2011
@@ -18,16 +18,14 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.multiline;
+package org.apache.isis.core.progmodel.facets.propparam.multiline.annotation;
import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.MultiLine;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MethodRemover;
import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet;
@@ -42,39 +40,39 @@ public class MultiLineAnnotationFacetFac
* In readiness for supporting <tt>@Value</tt> in the future.
*/
@Override
- public boolean process(final Class<?> cls, final MethodRemover methodRemover, final FacetHolder holder) {
- final MultiLine annotation = getAnnotation(cls, MultiLine.class);
- return FacetUtil.addFacet(create(annotation, holder));
+ public void process(ProcessClassContext processClassContaxt) {
+ final MultiLine annotation = getAnnotation(processClassContaxt.getCls(), MultiLine.class);
+ FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
}
@Override
- public boolean process(Class<?> cls, final Method method, final MethodRemover methodRemover, final FacetHolder holder) {
- final Class<?> returnType = method.getReturnType();
+ public void process(ProcessMethodContext processMethodContext) {
+ final Class<?> returnType = processMethodContext.getMethod().getReturnType();
if (!isString(returnType)) {
- return false;
+ return;
}
- final MultiLine annotation = getAnnotation(method, MultiLine.class);
- return FacetUtil.addFacet(create(annotation, holder));
+ final MultiLine annotation = getAnnotation(processMethodContext.getMethod(), MultiLine.class);
+ FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
}
@Override
- public boolean processParams(final Method method, final int paramNum, final FacetHolder holder) {
- final Class<?>[] parameterTypes = method.getParameterTypes();
- if (paramNum >= parameterTypes.length) {
+ public void processParams(ProcessParameterContext processParameterContext) {
+ final Class<?>[] parameterTypes = processParameterContext.getMethod().getParameterTypes();
+ if (processParameterContext.getParamNum() >= parameterTypes.length) {
// ignore
- return false;
+ return;
}
- if (!isString(parameterTypes[paramNum])) {
- return false;
+ if (!isString(parameterTypes[processParameterContext.getParamNum()])) {
+ return;
}
- final Annotation[] parameterAnnotations = getParameterAnnotations(method)[paramNum];
+ final Annotation[] parameterAnnotations = getParameterAnnotations(processParameterContext.getMethod())[processParameterContext.getParamNum()];
for (int j = 0; j < parameterAnnotations.length; j++) {
if (parameterAnnotations[j] instanceof MultiLine) {
final MultiLine annotation = (MultiLine) parameterAnnotations[j];
- return FacetUtil.addFacet(create(annotation, holder));
+ FacetUtil.addFacet(create(annotation, processParameterContext.getFacetHolder()));
+ return;
}
}
- return false;
}
private MultiLineFacet create(final MultiLine annotation, final FacetHolder holder) {
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/multiline/annotation/MultiLineFacetAnnotation.java (from r1056813, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/multiline/MultiLineFacetAnnotation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/multiline/annotation/MultiLineFacetAnnotation.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/multiline/annotation/MultiLineFacetAnnotation.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/multiline/MultiLineFacetAnnotation.java&r1=1056813&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/multiline/MultiLineFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/multiline/annotation/MultiLineFacetAnnotation.java Mon Jan 17 08:48:40 2011
@@ -18,9 +18,10 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.multiline;
+package org.apache.isis.core.progmodel.facets.propparam.multiline.annotation;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.progmodel.facets.propparam.multiline.MultiLineFacetAbstract;
public class MultiLineFacetAnnotation extends MultiLineFacetAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactory.java?rev=1059813&r1=1059812&r2=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactory.java Mon Jan 17 08:48:40 2011
@@ -29,7 +29,6 @@ import org.apache.isis.applib.spec.Speci
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MethodRemover;
import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
public class MustSatisfySpecificationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
@@ -39,19 +38,17 @@ public class MustSatisfySpecificationFac
}
@Override
- public boolean process(Class<?> clazz, MethodRemover methodRemover,
- FacetHolder holder) {
- return FacetUtil.addFacet(create(clazz, holder));
+ public void process(ProcessClassContext processClassContaxt) {
+ FacetUtil.addFacet(create(processClassContaxt.getCls(), processClassContaxt.getFacetHolder()));
}
private MustSatisfySpecificationFacet create(Class<?> clazz, FacetHolder holder) {
return create(getAnnotation(clazz, MustSatisfy.class), holder);
}
-
@Override
- public boolean process(Class<?> cls, Method method, MethodRemover methodRemover, FacetHolder holder) {
- return FacetUtil.addFacet(create(method, holder));
+ public void process(ProcessMethodContext processMethodContext) {
+ FacetUtil.addFacet(create(processMethodContext.getMethod(), processMethodContext.getFacetHolder()));
}
private MustSatisfySpecificationFacet create(Method method, FacetHolder holder) {
@@ -60,16 +57,16 @@ public class MustSatisfySpecificationFac
@Override
- public boolean processParams(Method method, int paramNum, FacetHolder holder) {
- final java.lang.annotation.Annotation[] parameterAnnotations = getParameterAnnotations(method)[paramNum];
+ public void processParams(ProcessParameterContext processParameterContext) {
+ final java.lang.annotation.Annotation[] parameterAnnotations = getParameterAnnotations(processParameterContext.getMethod())[processParameterContext.getParamNum()];
for (int j = 0; j < parameterAnnotations.length; j++) {
if (parameterAnnotations[j] instanceof MustSatisfy) {
final MustSatisfy annotation = (MustSatisfy) parameterAnnotations[j];
- return FacetUtil.addFacet(create(annotation, holder));
+ FacetUtil.addFacet(create(annotation, processParameterContext.getFacetHolder()));
+ return;
}
}
- return false;
}
private MustSatisfySpecificationFacet create(final MustSatisfy annotation, final FacetHolder holder) {
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/annotation/TypicalLengthAnnotationFacetFactory.java (from r1056813, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/annotation/TypicalLengthAnnotationFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/annotation/TypicalLengthAnnotationFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactory.java&r1=1056813&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/annotation/TypicalLengthAnnotationFacetFactory.java Mon Jan 17 08:48:40 2011
@@ -18,16 +18,14 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.typicallength;
+package org.apache.isis.core.progmodel.facets.propparam.typicallength.annotation;
import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.TypicalLength;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MethodRemover;
import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.propparam.typicallength.TypicalLengthFacet;
@@ -39,29 +37,29 @@ public class TypicalLengthAnnotationFace
}
@Override
- public boolean process(final Class<?> cls, final MethodRemover methodRemover, final FacetHolder holder) {
- final TypicalLength annotation = getAnnotation(cls, TypicalLength.class);
- return FacetUtil.addFacet(create(annotation, holder));
+ public void process(ProcessClassContext processClassContaxt) {
+ final TypicalLength annotation = getAnnotation(processClassContaxt.getCls(), TypicalLength.class);
+ FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
}
@Override
- public boolean process(Class<?> cls, final Method method, final MethodRemover methodRemover, final FacetHolder holder) {
- final TypicalLength annotation = getAnnotation(method, TypicalLength.class);
- final TypicalLengthFacet facet = create(annotation, holder);
+ public void process(ProcessMethodContext processMethodContext) {
+ final TypicalLength annotation = getAnnotation(processMethodContext.getMethod(), TypicalLength.class);
+ final TypicalLengthFacet facet = create(annotation, processMethodContext.getFacetHolder());
- return FacetUtil.addFacet(facet);
+ FacetUtil.addFacet(facet);
}
@Override
- public boolean processParams(final Method method, final int paramNum, final FacetHolder holder) {
- final Annotation[] parameterAnnotations = getParameterAnnotations(method)[paramNum];
+ public void processParams(ProcessParameterContext processParameterContext) {
+ final Annotation[] parameterAnnotations = getParameterAnnotations(processParameterContext.getMethod())[processParameterContext.getParamNum()];
for (int j = 0; j < parameterAnnotations.length; j++) {
if (parameterAnnotations[j] instanceof TypicalLength) {
final TypicalLength annotation = (TypicalLength) parameterAnnotations[j];
- return FacetUtil.addFacet(create(annotation, holder));
+ FacetUtil.addFacet(create(annotation, processParameterContext.getFacetHolder()));
+ return;
}
}
- return false;
}
private TypicalLengthFacet create(final TypicalLength annotation, final FacetHolder holder) {
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/annotation/TypicalLengthFacetAnnotation.java (from r1056813, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthFacetAnnotation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/annotation/TypicalLengthFacetAnnotation.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/annotation/TypicalLengthFacetAnnotation.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthFacetAnnotation.java&r1=1056813&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/annotation/TypicalLengthFacetAnnotation.java Mon Jan 17 08:48:40 2011
@@ -18,9 +18,10 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.typicallength;
+package org.apache.isis.core.progmodel.facets.propparam.typicallength.annotation;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.progmodel.facets.propparam.typicallength.TypicalLengthFacetAbstract;
public class TypicalLengthFacetAnnotation extends TypicalLengthFacetAbstract {
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/derived/TypicalLengthDerivedFromTypeFacetFactory.java (from r1056813, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthDerivedFromTypeFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/derived/TypicalLengthDerivedFromTypeFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/derived/TypicalLengthDerivedFromTypeFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthDerivedFromTypeFacetFactory.java&r1=1056813&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthDerivedFromTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/derived/TypicalLengthDerivedFromTypeFacetFactory.java Mon Jan 17 08:48:40 2011
@@ -18,16 +18,14 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.typicallength;
+package org.apache.isis.core.progmodel.facets.propparam.typicallength.derived;
-import java.lang.reflect.Method;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MethodRemover;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.propparam.typicallength.TypicalLengthFacet;
-import org.apache.isis.core.metamodel.spec.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -38,23 +36,22 @@ public class TypicalLengthDerivedFromTyp
}
@Override
- public boolean process(Class<?> cls, final Method method, final MethodRemover methodRemover, final FacetHolder holder) {
- final Class<?> type = method.getReturnType();
- return addFacetDerivedFromTypeIfPresent(holder, type);
+ public void process(ProcessMethodContext processMethodContext) {
+ final Class<?> type = processMethodContext.getMethod().getReturnType();
+ addFacetDerivedFromTypeIfPresent(processMethodContext.getFacetHolder(), type);
}
@Override
- public boolean processParams(final Method method, final int paramNum, final FacetHolder holder) {
- final Class<?> type = method.getParameterTypes()[paramNum];
- return addFacetDerivedFromTypeIfPresent(holder, type);
+ public void processParams(ProcessParameterContext processParameterContext) {
+ final Class<?> type = processParameterContext.getMethod().getParameterTypes()[processParameterContext.getParamNum()];
+ addFacetDerivedFromTypeIfPresent(processParameterContext.getFacetHolder(), type);
}
- private boolean addFacetDerivedFromTypeIfPresent(final FacetHolder holder, final Class<?> type) {
+ private void addFacetDerivedFromTypeIfPresent(final FacetHolder holder, final Class<?> type) {
final TypicalLengthFacet facet = getTypicalLengthFacet(type);
if (facet != null) {
- return FacetUtil.addFacet(new TypicalLengthFacetDerivedFromType(facet, holder));
+ FacetUtil.addFacet(new TypicalLengthFacetDerivedFromType(facet, holder));
}
- return false;
}
private TypicalLengthFacet getTypicalLengthFacet(final Class<?> type) {
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/derived/TypicalLengthFacetDerivedFromType.java (from r1056813, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthFacetDerivedFromType.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/derived/TypicalLengthFacetDerivedFromType.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/derived/TypicalLengthFacetDerivedFromType.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthFacetDerivedFromType.java&r1=1056813&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthFacetDerivedFromType.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/derived/TypicalLengthFacetDerivedFromType.java Mon Jan 17 08:48:40 2011
@@ -18,11 +18,12 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.typicallength;
+package org.apache.isis.core.progmodel.facets.propparam.typicallength.derived;
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.typicallength.TypicalLengthFacet;
+import org.apache.isis.core.progmodel.facets.propparam.typicallength.TypicalLengthFacetAbstract;
public class TypicalLengthFacetDerivedFromType extends TypicalLengthFacetAbstract {
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/parser/TypicalLengthFacetUsingParser.java (from r1056813, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthFacetUsingParser.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/parser/TypicalLengthFacetUsingParser.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/parser/TypicalLengthFacetUsingParser.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthFacetUsingParser.java&r1=1056813&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthFacetUsingParser.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/parser/TypicalLengthFacetUsingParser.java Mon Jan 17 08:48:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.typicallength;
+package org.apache.isis.core.progmodel.facets.propparam.typicallength.parser;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/annotation/MandatoryFacetInvertedByOptional.java (from r1056813, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/OptionalFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/annotation/MandatoryFacetInvertedByOptional.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/annotation/MandatoryFacetInvertedByOptional.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/OptionalFacet.java&r1=1056813&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/OptionalFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/annotation/MandatoryFacetInvertedByOptional.java Mon Jan 17 08:48:40 2011
@@ -18,10 +18,11 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.validate.mandatory;
+package org.apache.isis.core.progmodel.facets.propparam.validate.mandatory.annotation;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.progmodel.facets.propparam.validate.mandatory.MandatoryFacetAbstract;
/**
@@ -31,9 +32,9 @@ import org.apache.isis.core.metamodel.fa
* This implementation indicates that the {@link FacetHolder} is <i>not</i> mandatory, as per
* {@link #isInvertedSemantics()}.
*/
-public class OptionalFacet extends MandatoryFacetAbstract {
+public class MandatoryFacetInvertedByOptional extends MandatoryFacetAbstract {
- public OptionalFacet(final FacetHolder holder) {
+ public MandatoryFacetInvertedByOptional(final FacetHolder holder) {
super(holder);
}
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/annotation/OptionalAnnotationFacetFactory.java (from r1056813, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/OptionalAnnotationFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/annotation/OptionalAnnotationFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/annotation/OptionalAnnotationFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/OptionalAnnotationFacetFactory.java&r1=1056813&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/OptionalAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/annotation/OptionalAnnotationFacetFactory.java Mon Jan 17 08:48:40 2011
@@ -18,16 +18,14 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.validate.mandatory;
+package org.apache.isis.core.progmodel.facets.propparam.validate.mandatory.annotation;
import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.Optional;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MethodRemover;
import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.propparam.validate.mandatory.MandatoryFacet;
@@ -39,40 +37,40 @@ public class OptionalAnnotationFacetFact
}
@Override
- public boolean process(Class<?> cls, final Method method, final MethodRemover methodRemover, final FacetHolder holder) {
- final Class<?> returnType = method.getReturnType();
+ public void process(ProcessMethodContext processMethodContext) {
+ final Class<?> returnType = processMethodContext.getMethod().getReturnType();
if (returnType.isPrimitive()) {
- return false;
+ return;
}
- if (!isAnnotationPresent(method, Optional.class)) {
- return false;
+ if (!isAnnotationPresent(processMethodContext.getMethod(), Optional.class)) {
+ return;
}
- final Optional annotation = getAnnotation(method, Optional.class);
- return FacetUtil.addFacet(create(annotation, holder));
+ final Optional annotation = getAnnotation(processMethodContext.getMethod(), Optional.class);
+ FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
}
@Override
- public boolean processParams(final Method method, final int paramNum, final FacetHolder holder) {
- final Class<?>[] parameterTypes = method.getParameterTypes();
- if (paramNum >= parameterTypes.length) {
+ public void processParams(ProcessParameterContext processParameterContext) {
+ final Class<?>[] parameterTypes = processParameterContext.getMethod().getParameterTypes();
+ if (processParameterContext.getParamNum() >= parameterTypes.length) {
// ignore
- return false;
+ return;
}
- if (parameterTypes[paramNum].isPrimitive()) {
- return false;
+ if (parameterTypes[processParameterContext.getParamNum()].isPrimitive()) {
+ return;
}
- final Annotation[] parameterAnnotations = getParameterAnnotations(method)[paramNum];
+ final Annotation[] parameterAnnotations = getParameterAnnotations(processParameterContext.getMethod())[processParameterContext.getParamNum()];
for (int j = 0; j < parameterAnnotations.length; j++) {
if (parameterAnnotations[j] instanceof Optional) {
- return FacetUtil.addFacet(new OptionalFacet(holder));
+ FacetUtil.addFacet(new MandatoryFacetInvertedByOptional(processParameterContext.getFacetHolder()));
+ return;
}
}
- return false;
}
private MandatoryFacet create(final Optional annotation, final FacetHolder holder) {
- return annotation != null ? new OptionalFacet(holder) : null;
+ return annotation != null ? new MandatoryFacetInvertedByOptional(holder) : null;
}
}
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/dflt/MandatoryDefaultFacetFactory.java (from r1056813, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/MandatoryDefaultFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/dflt/MandatoryDefaultFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/dflt/MandatoryDefaultFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/MandatoryDefaultFacetFactory.java&r1=1056813&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/MandatoryDefaultFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mandatory/dflt/MandatoryDefaultFacetFactory.java Mon Jan 17 08:48:40 2011
@@ -18,18 +18,17 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.validate.mandatory;
+package org.apache.isis.core.progmodel.facets.propparam.validate.mandatory.dflt;
-import java.lang.reflect.Method;
-import org.apache.isis.core.metamodel.facetapi.FacetFactory;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MethodRemover;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.propparam.validate.mandatory.MandatoryFacet;
-import org.apache.isis.core.metamodel.spec.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.specloader.facetprocessor.FacetProcessor;
+import org.apache.isis.core.progmodel.facets.propparam.validate.mandatory.MandatoryFacetDefault;
/**
@@ -47,13 +46,13 @@ public class MandatoryDefaultFacetFactor
}
@Override
- public boolean process(Class<?> cls, final Method method, final MethodRemover methodRemover, final FacetHolder holder) {
- return FacetUtil.addFacet(create(holder));
+ public void process(ProcessMethodContext processMethodContext) {
+ FacetUtil.addFacet(create(processMethodContext.getFacetHolder()));
}
@Override
- public boolean processParams(final Method method, final int paramNum, final FacetHolder holder) {
- return FacetUtil.addFacet(create(holder));
+ public void processParams(ProcessParameterContext processParameterContext) {
+ FacetUtil.addFacet(create(processParameterContext.getFacetHolder()));
}
private MandatoryFacet create(final FacetHolder holder) {
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/annotation/MaskAnnotationFacetFactory.java (from r1056813, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskAnnotationFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/annotation/MaskAnnotationFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/annotation/MaskAnnotationFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskAnnotationFacetFactory.java&r1=1056813&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/annotation/MaskAnnotationFacetFactory.java Mon Jan 17 08:48:40 2011
@@ -18,18 +18,18 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.validate.mask;
+package org.apache.isis.core.progmodel.facets.propparam.validate.mask.annotation;
-import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.Mask;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MethodRemover;
import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.object.ident.title.TitleFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.progmodel.facets.propparam.validate.mask.MaskFacet;
+import org.apache.isis.core.progmodel.facets.propparam.validate.mask.TitleFacetBasedOnMask;
public class MaskAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
@@ -42,37 +42,37 @@ public class MaskAnnotationFacetFactory
* In readiness for supporting <tt>@Value</tt> in the future.
*/
@Override
- public boolean process(final Class<?> cls, final MethodRemover methodRemover, final FacetHolder holder) {
- final Mask annotation = getAnnotation(cls, Mask.class);
- return FacetUtil.addFacet(createMaskFacet(annotation, holder));
+ public void process(ProcessClassContext processClassContaxt) {
+ final Mask annotation = getAnnotation(processClassContaxt.getCls(), Mask.class);
+ FacetUtil.addFacet(createMaskFacet(annotation, processClassContaxt.getFacetHolder()));
}
@Override
- public boolean process(Class<?> cls, final Method method, final MethodRemover methodRemover, final FacetHolder holder) {
- if (method.getReturnType() == void.class) {
- return false;
+ public void process(ProcessMethodContext processMethodContext) {
+ if (processMethodContext.getMethod().getReturnType() == void.class) {
+ return;
}
- final Mask annotation = getAnnotation(method, Mask.class);
- return addMaskFacetAndCorrespondingTitleFacet(holder, annotation, method.getReturnType());
+ final Mask annotation = getAnnotation(processMethodContext.getMethod(), Mask.class);
+ addMaskFacetAndCorrespondingTitleFacet(processMethodContext.getFacetHolder(), annotation, processMethodContext.getMethod().getReturnType());
}
@Override
- public boolean processParams(final Method method, final int paramNum, final FacetHolder holder) {
- final Class<?>[] parameterTypes = method.getParameterTypes();
- if (paramNum >= parameterTypes.length) {
+ public void processParams(ProcessParameterContext processParameterContext) {
+ final Class<?>[] parameterTypes = processParameterContext.getMethod().getParameterTypes();
+ if (processParameterContext.getParamNum() >= parameterTypes.length) {
// ignore
- return false;
+ return;
}
- final java.lang.annotation.Annotation[] parameterAnnotations = getParameterAnnotations(method)[paramNum];
+ final java.lang.annotation.Annotation[] parameterAnnotations = getParameterAnnotations(processParameterContext.getMethod())[processParameterContext.getParamNum()];
for (int i = 0; i < parameterAnnotations.length; i++) {
if (parameterAnnotations[i] instanceof Mask) {
final Mask annotation = (Mask) parameterAnnotations[i];
- return addMaskFacetAndCorrespondingTitleFacet(holder, annotation, parameterTypes[i]);
+ addMaskFacetAndCorrespondingTitleFacet(processParameterContext.getFacetHolder(), annotation, parameterTypes[i]);
+ return;
}
}
- return false;
}
private MaskFacet createMaskFacet(final Mask annotation, final FacetHolder holder) {
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/annotation/MaskFacetAnnotation.java (from r1056813, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskFacetAnnotation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/annotation/MaskFacetAnnotation.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/annotation/MaskFacetAnnotation.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskFacetAnnotation.java&r1=1056813&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/annotation/MaskFacetAnnotation.java Mon Jan 17 08:48:40 2011
@@ -18,10 +18,12 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.validate.mask;
+package org.apache.isis.core.progmodel.facets.propparam.validate.mask.annotation;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.progmodel.facets.propparam.validate.mask.MaskEvaluator;
+import org.apache.isis.core.progmodel.facets.propparam.validate.mask.MaskFacetAbstract;
public class MaskFacetAnnotation extends MaskFacetAbstract {
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/maxlength/annotation/MaxLengthAnnotationFacetFactory.java (from r1056813, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/maxlength/MaxLengthAnnotationFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/maxlength/annotation/MaxLengthAnnotationFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/maxlength/annotation/MaxLengthAnnotationFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/maxlength/MaxLengthAnnotationFacetFactory.java&r1=1056813&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/maxlength/MaxLengthAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/maxlength/annotation/MaxLengthAnnotationFacetFactory.java Mon Jan 17 08:48:40 2011
@@ -18,15 +18,13 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.validate.maxlength;
+package org.apache.isis.core.progmodel.facets.propparam.validate.maxlength.annotation;
-import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.MaxLength;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MethodRemover;
import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.propparam.validate.maxlength.MaxLengthFacet;
@@ -41,28 +39,28 @@ public class MaxLengthAnnotationFacetFac
* In readiness for supporting <tt>@Value</tt> in the future.
*/
@Override
- public boolean process(final Class<?> cls, final MethodRemover methodRemover, final FacetHolder holder) {
- final MaxLength annotation = getAnnotation(cls, MaxLength.class);
- return FacetUtil.addFacet(create(annotation, holder));
+ public void process(ProcessClassContext processClassContaxt) {
+ final MaxLength annotation = getAnnotation(processClassContaxt.getCls(), MaxLength.class);
+ FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
}
@Override
- public boolean process(Class<?> cls, final Method method, final MethodRemover methodRemover, final FacetHolder holder) {
- final MaxLength annotation = getAnnotation(method, MaxLength.class);
- return FacetUtil.addFacet(create(annotation, holder));
+ public void process(ProcessMethodContext processMethodContext) {
+ final MaxLength annotation = getAnnotation(processMethodContext.getMethod(), MaxLength.class);
+ FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
}
@Override
- public boolean processParams(final Method method, final int paramNum, final FacetHolder holder) {
- final java.lang.annotation.Annotation[] parameterAnnotations = getParameterAnnotations(method)[paramNum];
+ public void processParams(ProcessParameterContext processParameterContext) {
+ final java.lang.annotation.Annotation[] parameterAnnotations = getParameterAnnotations(processParameterContext.getMethod())[processParameterContext.getParamNum()];
for (int j = 0; j < parameterAnnotations.length; j++) {
if (parameterAnnotations[j] instanceof MaxLength) {
final MaxLength annotation = (MaxLength) parameterAnnotations[j];
- return FacetUtil.addFacet(create(annotation, holder));
+ FacetUtil.addFacet(create(annotation, processParameterContext.getFacetHolder()));
+ return;
}
}
- return false;
}
private MaxLengthFacet create(final MaxLength annotation, final FacetHolder holder) {
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/maxlength/annotation/MaxLengthFacetAnnotation.java (from r1056813, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/maxlength/MaxLengthFacetAnnotation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/maxlength/annotation/MaxLengthFacetAnnotation.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/maxlength/annotation/MaxLengthFacetAnnotation.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/maxlength/MaxLengthFacetAnnotation.java&r1=1056813&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/maxlength/MaxLengthFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/maxlength/annotation/MaxLengthFacetAnnotation.java Mon Jan 17 08:48:40 2011
@@ -18,9 +18,10 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.validate.maxlength;
+package org.apache.isis.core.progmodel.facets.propparam.validate.maxlength.annotation;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.progmodel.facets.propparam.validate.maxlength.MaxLengthFacetAbstract;
public class MaxLengthFacetAnnotation extends MaxLengthFacetAbstract {
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/annotation/RegExAnnotationFacetFactory.java (from r1056813, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/RegExAnnotationFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/annotation/RegExAnnotationFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/annotation/RegExAnnotationFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/RegExAnnotationFacetFactory.java&r1=1056813&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/RegExAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/annotation/RegExAnnotationFacetFactory.java Mon Jan 17 08:48:40 2011
@@ -18,18 +18,18 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.validate.regex;
+package org.apache.isis.core.progmodel.facets.propparam.validate.regex.annotation;
import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.RegEx;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MethodRemover;
import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.object.ident.title.TitleFacet;
+import org.apache.isis.core.progmodel.facets.propparam.validate.regex.RegExFacet;
+import org.apache.isis.core.progmodel.facets.propparam.validate.regex.TitleFacetFormattedByRegex;
public class RegExAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
@@ -39,51 +39,51 @@ public class RegExAnnotationFacetFactory
}
@Override
- public boolean process(final Class<?> cls, final MethodRemover methodRemover, final FacetHolder holder) {
- final RegEx annotation = getAnnotation(cls, RegEx.class);
- return FacetUtil.addFacet(createRegexFacet(annotation, holder));
+ public void process(ProcessClassContext processClassContaxt) {
+ final RegEx annotation = getAnnotation(processClassContaxt.getCls(), RegEx.class);
+ FacetUtil.addFacet(createRegexFacet(annotation, processClassContaxt.getFacetHolder()));
}
@Override
- public boolean process(Class<?> cls, final Method method, final MethodRemover methodRemover, final FacetHolder holder) {
- final Class<?> returnType = method.getReturnType();
+ public void process(ProcessMethodContext processMethodContext) {
+ final Class<?> returnType = processMethodContext.getMethod().getReturnType();
if (!isString(returnType)) {
- return false;
+ return;
}
- final RegEx annotation = getAnnotation(method, RegEx.class);
- return addRegexFacetAndCorrespondingTitleFacet(holder, annotation);
+ final RegEx annotation = getAnnotation(processMethodContext.getMethod(), RegEx.class);
+ addRegexFacetAndCorrespondingTitleFacet(processMethodContext.getFacetHolder(), annotation);
}
@Override
- public boolean processParams(final Method method, final int paramNum, final FacetHolder holder) {
- final Class<?>[] parameterTypes = method.getParameterTypes();
- if (paramNum >= parameterTypes.length) {
+ public void processParams(ProcessParameterContext processParameterContext) {
+ final Class<?>[] parameterTypes = processParameterContext.getMethod().getParameterTypes();
+ if (processParameterContext.getParamNum() >= parameterTypes.length) {
// ignore
- return false;
+ return;
}
- if (!isString(parameterTypes[paramNum])) {
- return false;
+ if (!isString(parameterTypes[processParameterContext.getParamNum()])) {
+ return;
}
- final Annotation[] parameterAnnotations = getParameterAnnotations(method)[paramNum];
+ final Annotation[] parameterAnnotations = getParameterAnnotations(processParameterContext.getMethod())[processParameterContext.getParamNum()];
for (int j = 0; j < parameterAnnotations.length; j++) {
if (parameterAnnotations[j] instanceof RegEx) {
final RegEx annotation = (RegEx) parameterAnnotations[j];
- return addRegexFacetAndCorrespondingTitleFacet(holder, annotation);
+ addRegexFacetAndCorrespondingTitleFacet(processParameterContext.getFacetHolder(), annotation);
+ return;
}
}
- return false;
}
- private boolean addRegexFacetAndCorrespondingTitleFacet(final FacetHolder holder, final RegEx annotation) {
+ private void addRegexFacetAndCorrespondingTitleFacet(final FacetHolder holder, final RegEx annotation) {
final RegExFacet regexFacet = createRegexFacet(annotation, holder);
if (regexFacet == null) {
- return false;
+ return;
}
FacetUtil.addFacet(regexFacet);
final TitleFacet titleFacet = createTitleFacet(regexFacet);
- return FacetUtil.addFacet(titleFacet);
+ FacetUtil.addFacet(titleFacet);
}
private RegExFacet createRegexFacet(final RegEx annotation, final FacetHolder holder) {
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/annotation/RegExFacetAnnotation.java (from r1056813, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/RegExFacetAnnotation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/annotation/RegExFacetAnnotation.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/annotation/RegExFacetAnnotation.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/RegExFacetAnnotation.java&r1=1056813&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/RegExFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/regex/annotation/RegExFacetAnnotation.java Mon Jan 17 08:48:40 2011
@@ -18,11 +18,12 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.validate.regex;
+package org.apache.isis.core.progmodel.facets.propparam.validate.regex.annotation;
import java.util.regex.Pattern;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.progmodel.facets.propparam.validate.regex.RegExFacetAbstract;
public class RegExFacetAnnotation extends RegExFacetAbstract {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/ValueSemanticsProviderAbstractTemporal.java?rev=1059813&r1=1059812&r2=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/ValueSemanticsProviderAbstractTemporal.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/ValueSemanticsProviderAbstractTemporal.java Mon Jan 17 08:48:40 2011
@@ -40,6 +40,7 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
+import org.apache.isis.core.progmodel.facets.value.date.DateValueFacet;
public abstract class ValueSemanticsProviderAbstractTemporal<T> extends ValueSemanticsProviderAndFacetAbstract<T> implements DateValueFacet {
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/ValueUsingValueSemanticsProviderFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/ValueUsingValueSemanticsProviderFacetFactory.java?rev=1059813&r1=1059812&r2=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/ValueUsingValueSemanticsProviderFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/ValueUsingValueSemanticsProviderFacetFactory.java Mon Jan 17 08:48:40 2011
@@ -29,9 +29,9 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.facetapi.Facet;
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.runtimecontext.DependencyInjector;
import org.apache.isis.core.metamodel.runtimecontext.DependencyInjectorAware;
-import org.apache.isis.core.metamodel.spec.FacetFactoryAbstract;
import org.apache.isis.core.progmodel.facets.object.value.ValueFacetUsingSemanticsProvider;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueFacet.java (from r1056813, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BigDecimalValueFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueFacet.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BigDecimalValueFacet.java&r1=1056813&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BigDecimalValueFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueFacet.java Mon Jan 17 08:48:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.progmodel.facets.value;
+package org.apache.isis.core.progmodel.facets.value.bigdecimal;
import org.apache.isis.core.metamodel.facetapi.Facet;
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java (from r1056832, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BigDecimalValueSemanticsProvider.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BigDecimalValueSemanticsProvider.java&r1=1056832&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BigDecimalValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java Mon Jan 17 08:48:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.progmodel.facets.value;
+package org.apache.isis.core.progmodel.facets.value.bigdecimal;
import java.math.BigDecimal;
import java.text.DecimalFormat;
@@ -33,6 +33,7 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
+import org.apache.isis.core.progmodel.facets.value.ValueSemanticsProviderAndFacetAbstract;
public class BigDecimalValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<BigDecimal> implements BigDecimalValueFacet {
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueTypeFacetFactory.java (from r1056813, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BigDecimalValueTypeFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueTypeFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueTypeFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BigDecimalValueTypeFacetFactory.java&r1=1056813&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BigDecimalValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/bigdecimal/BigDecimalValueTypeFacetFactory.java Mon Jan 17 08:48:40 2011
@@ -18,12 +18,12 @@
*/
-package org.apache.isis.core.progmodel.facets.value;
+package org.apache.isis.core.progmodel.facets.value.bigdecimal;
import java.math.BigDecimal;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.MethodRemover;
+import org.apache.isis.core.progmodel.facets.value.ValueUsingValueSemanticsProviderFacetFactory;
public class BigDecimalValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<BigDecimal> {
@@ -34,12 +34,14 @@ public class BigDecimalValueTypeFacetFac
}
@Override
- public boolean process(final Class<?> type, final MethodRemover methodRemover, final FacetHolder holder) {
+ public void process(ProcessClassContext processClassContext) {
+ final Class<?> type = processClassContext.getCls();
+ final FacetHolder holder = processClassContext.getFacetHolder();
if (type != BigDecimal.class) {
- return false;
+ return;
}
addFacets(new BigDecimalValueSemanticsProvider(holder, getConfiguration(), getContext()));
- return true;
+ return;
}
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueFacet.java (from r1056813, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BigIntegerValueFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueFacet.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BigIntegerValueFacet.java&r1=1056813&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BigIntegerValueFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueFacet.java Mon Jan 17 08:48:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.progmodel.facets.value;
+package org.apache.isis.core.progmodel.facets.value.biginteger;
import org.apache.isis.core.metamodel.facetapi.Facet;
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java (from r1056832, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BigIntegerValueSemanticsProvider.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BigIntegerValueSemanticsProvider.java&r1=1056832&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BigIntegerValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java Mon Jan 17 08:48:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.progmodel.facets.value;
+package org.apache.isis.core.progmodel.facets.value.biginteger;
import java.math.BigInteger;
import java.text.DecimalFormat;
@@ -31,6 +31,7 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
+import org.apache.isis.core.progmodel.facets.value.ValueSemanticsProviderAndFacetAbstract;
public class BigIntegerValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<BigInteger> implements BigIntegerValueFacet {
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueTypeFacetFactory.java (from r1056813, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BigIntegerValueTypeFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueTypeFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueTypeFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BigIntegerValueTypeFacetFactory.java&r1=1056813&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BigIntegerValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/biginteger/BigIntegerValueTypeFacetFactory.java Mon Jan 17 08:48:40 2011
@@ -18,12 +18,12 @@
*/
-package org.apache.isis.core.progmodel.facets.value;
+package org.apache.isis.core.progmodel.facets.value.biginteger;
import java.math.BigInteger;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.MethodRemover;
+import org.apache.isis.core.progmodel.facets.value.ValueUsingValueSemanticsProviderFacetFactory;
public class BigIntegerValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<BigInteger> {
@@ -33,12 +33,13 @@ public class BigIntegerValueTypeFacetFac
}
@Override
- public boolean process(final Class<?> type, final MethodRemover methodRemover, final FacetHolder holder) {
+ public void process(ProcessClassContext processClassContext) {
+ final Class<?> type = processClassContext.getCls();
+ final FacetHolder holder = processClassContext.getFacetHolder();
if (type != BigInteger.class) {
- return false;
+ return;
}
addFacets(new BigIntegerValueSemanticsProvider(holder, getConfiguration(), getContext()));
- return true;
}
}
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanPrimitiveValueSemanticsProvider.java (from r1056832, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BooleanPrimitiveValueSemanticsProvider.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanPrimitiveValueSemanticsProvider.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanPrimitiveValueSemanticsProvider.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BooleanPrimitiveValueSemanticsProvider.java&r1=1056832&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BooleanPrimitiveValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanPrimitiveValueSemanticsProvider.java Mon Jan 17 08:48:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.progmodel.facets.value;
+package org.apache.isis.core.progmodel.facets.value.booleans;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanPrimitiveValueTypeFacetFactory.java (from r1056813, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BooleanPrimitiveValueTypeFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanPrimitiveValueTypeFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanPrimitiveValueTypeFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BooleanPrimitiveValueTypeFacetFactory.java&r1=1056813&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BooleanPrimitiveValueTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanPrimitiveValueTypeFacetFactory.java Mon Jan 17 08:48:40 2011
@@ -18,10 +18,10 @@
*/
-package org.apache.isis.core.progmodel.facets.value;
+package org.apache.isis.core.progmodel.facets.value.booleans;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.MethodRemover;
+import org.apache.isis.core.progmodel.facets.value.ValueUsingValueSemanticsProviderFacetFactory;
public class BooleanPrimitiveValueTypeFacetFactory extends ValueUsingValueSemanticsProviderFacetFactory<Boolean> {
@@ -31,12 +31,14 @@ public class BooleanPrimitiveValueTypeFa
}
@Override
- public boolean process(final Class<?> type, final MethodRemover methodRemover, final FacetHolder holder) {
+ public void process(ProcessClassContext processClassContext) {
+ final Class<?> type = processClassContext.getCls();
+ final FacetHolder holder = processClassContext.getFacetHolder();
+
if (type != boolean.class) {
- return false;
+ return;
}
addFacets(new BooleanPrimitiveValueSemanticsProvider(holder, getConfiguration(), getContext()));
- return true;
}
}
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanValueFacet.java (from r1056813, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BooleanValueFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanValueFacet.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanValueFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BooleanValueFacet.java&r1=1056813&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BooleanValueFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanValueFacet.java Mon Jan 17 08:48:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.progmodel.facets.value;
+package org.apache.isis.core.progmodel.facets.value.booleans;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java (from r1056832, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BooleanValueSemanticsProviderAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BooleanValueSemanticsProviderAbstract.java&r1=1056832&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BooleanValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java Mon Jan 17 08:48:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.progmodel.facets.value;
+package org.apache.isis.core.progmodel.facets.value.booleans;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.exceptions.IsisException;
@@ -28,6 +28,7 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
+import org.apache.isis.core.progmodel.facets.value.ValueSemanticsProviderAndFacetAbstract;
public abstract class BooleanValueSemanticsProviderAbstract extends ValueSemanticsProviderAndFacetAbstract<Boolean> implements BooleanValueFacet {
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanWrapperValueSemanticsProvider.java (from r1056832, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BooleanWrapperValueSemanticsProvider.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanWrapperValueSemanticsProvider.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanWrapperValueSemanticsProvider.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BooleanWrapperValueSemanticsProvider.java&r1=1056832&r2=1059813&rev=1059813&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/BooleanWrapperValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/booleans/BooleanWrapperValueSemanticsProvider.java Mon Jan 17 08:48:40 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.progmodel.facets.value;
+package org.apache.isis.core.progmodel.facets.value.booleans;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;