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 10:27:01 UTC
svn commit: r1059826 [8/8] - in /incubator/isis/trunk:
alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/auto/
alternatives/progmodel/groovy/metamodel/src/main/java/org/apache/isis/progmodel/groovy/metamo...
Modified: incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/ProgrammingModelFacetsJava5.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/ProgrammingModelFacetsJava5.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/ProgrammingModelFacetsJava5.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/ProgrammingModelFacetsJava5.java Mon Jan 17 09:26:54 2011
@@ -29,40 +29,49 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.progmodel.ProgrammingModelAbstract;
import org.apache.isis.core.progmodel.facets.FallbackFacetFactory;
import org.apache.isis.core.progmodel.facets.actcoll.typeof.TypeOfAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.actions.ActionMethodsFacetFactory;
-import org.apache.isis.core.progmodel.facets.actions.IteratorFilteringFacetFactory;
-import org.apache.isis.core.progmodel.facets.actions.SyntheticMethodFilteringFacetFactory;
-import org.apache.isis.core.progmodel.facets.actions.debug.DebugAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.actions.executed.ExecutedAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.actions.executed.ExecutedViaNamingConventionFacetFactory;
-import org.apache.isis.core.progmodel.facets.actions.exploration.ExplorationAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.actions.notcontributed.NotContributedAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.actions.notinservicemenu.NotInServiceMenuAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.actions.prototype.PrototypeAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.collections.CollectionFacetFactory;
-import org.apache.isis.core.progmodel.facets.collections.CollectionFieldMethodsFacetFactory;
+import org.apache.isis.core.progmodel.facets.actions.debug.annotation.DebugAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.actions.executed.annotation.ExecutedAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.actions.executed.prefix.ExecutedViaNamingConventionFacetFactory;
+import org.apache.isis.core.progmodel.facets.actions.exploration.annotation.ExplorationAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.actions.invoke.ActionInvocationFacetFactory;
+import org.apache.isis.core.progmodel.facets.actions.notcontributed.annotation.NotContributedAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.actions.notinservicemenu.annotation.NotInServiceMenuAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.actions.prototype.annotation.PrototypeAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.actions.validate.method.ActionValidationFacetViaValidateMethodFacetFactory;
+import org.apache.isis.core.progmodel.facets.collections.accessor.CollectionAccessorFacetFactory;
import org.apache.isis.core.progmodel.facets.collections.aggregated.AggregatedIfCollectionFacetFactory;
-import org.apache.isis.core.progmodel.facets.disable.DisabledAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.hide.HiddenAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.ignore.RemoveIgnoreAnnotationMethodsFacetFactory;
-import org.apache.isis.core.progmodel.facets.naming.describedas.DescribedAsAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.naming.named.NamedAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.object.aggregated.AggregatedAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.object.bounded.BoundedAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.object.bounded.BoundedMarkerInterfaceFacetFactory;
-import org.apache.isis.core.progmodel.facets.object.callbacks.CreatedCallbackFacetFactory;
-import org.apache.isis.core.progmodel.facets.object.callbacks.LoadCallbackFacetFactory;
-import org.apache.isis.core.progmodel.facets.object.callbacks.PersistCallbackFacetFactory;
-import org.apache.isis.core.progmodel.facets.object.callbacks.RemoveCallbackFacetFactory;
-import org.apache.isis.core.progmodel.facets.object.callbacks.SaveCallbackFacetFactory;
-import org.apache.isis.core.progmodel.facets.object.callbacks.UpdateCallbackFacetFactory;
-import org.apache.isis.core.progmodel.facets.object.defaults.DefaultedAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.object.dirty.DirtyMethodsFacetFactory;
-import org.apache.isis.core.progmodel.facets.object.encodeable.EncodableAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.object.facets.FacetsAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.object.ident.icon.IconMethodFacetFactory;
-import org.apache.isis.core.progmodel.facets.object.ident.plural.PluralAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.object.ident.plural.PluralMethodFacetFactory;
+import org.apache.isis.core.progmodel.facets.collections.clear.CollectionClearFacetFactory;
+import org.apache.isis.core.progmodel.facets.collections.collection.CollectionFacetFactory;
+import org.apache.isis.core.progmodel.facets.collections.modify.CollectionAddRemoveAndValidateFacetFactory;
+import org.apache.isis.core.progmodel.facets.defaults.DefaultedAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.describedas.annotation.DescribedAsAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.encodeable.EncodableAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.ignore.annotation.RemoveIgnoreAnnotationMethodsFacetFactory;
+import org.apache.isis.core.progmodel.facets.members.describedas.staticmethod.DescribedAsFacetViaDescriptionMethodFacetFactory;
+import org.apache.isis.core.progmodel.facets.members.disable.annotation.DisabledAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.members.disable.forsession.DisabledFacetViaDisableForSessionMethodFacetFactory;
+import org.apache.isis.core.progmodel.facets.members.disable.method.DisabledFacetViaDisableMethodFacetFactory;
+import org.apache.isis.core.progmodel.facets.members.disable.staticmethod.DisabledFacetViaProtectMethodFacetFactory;
+import org.apache.isis.core.progmodel.facets.members.hide.annotation.HiddenAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.members.hide.forsession.HiddenFacetViaHideForSessionMethodFacetFactory;
+import org.apache.isis.core.progmodel.facets.members.hide.method.HiddenFacetViaHideMethodFacetFactory;
+import org.apache.isis.core.progmodel.facets.members.hide.staticmethod.HiddenFacetViaAlwaysHideMethodFacetFactory;
+import org.apache.isis.core.progmodel.facets.members.name.staticmethod.NamedFacetViaNameMethodFacetFactory;
+import org.apache.isis.core.progmodel.facets.named.annotation.NamedAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.IteratorFilteringFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.SyntheticMethodFilteringFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.aggregated.annotation.AggregatedAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.bounded.annotation.BoundedAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.bounded.markerifc.BoundedMarkerInterfaceFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.callbacks.create.CreatedCallbackFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.callbacks.load.LoadCallbackFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.callbacks.persist.PersistCallbackFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.callbacks.persist.PersistCallbackViaSaveMethodFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.callbacks.remove.RemoveCallbackFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.callbacks.update.UpdateCallbackFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.dirty.method.DirtyMethodsFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.facets.annotation.FacetsAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.icon.method.IconMethodFacetFactory;
import org.apache.isis.core.progmodel.facets.object.ident.singular.SingularMethodFacetFactory;
import org.apache.isis.core.progmodel.facets.object.ident.title.TitleMethodFacetFactory;
import org.apache.isis.core.progmodel.facets.object.immutable.ImmutableAnnotationFacetFactory;
@@ -70,59 +79,71 @@ import org.apache.isis.core.progmodel.fa
import org.apache.isis.core.progmodel.facets.object.notpersistable.NotPersistableAnnotationFacetFactory;
import org.apache.isis.core.progmodel.facets.object.notpersistable.NotPersistableMarkerInterfacesFacetFactory;
import org.apache.isis.core.progmodel.facets.object.parseable.ParseableFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.plural.annotation.PluralAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.plural.staticmethod.PluralMethodFacetFactory;
import org.apache.isis.core.progmodel.facets.object.validate.ValidateObjectViaValidateMethodFacetFactory;
import org.apache.isis.core.progmodel.facets.object.validprops.ObjectValidPropertiesFacetFactory;
import org.apache.isis.core.progmodel.facets.object.value.ValueFacetFactory;
import org.apache.isis.core.progmodel.facets.ordering.actionorder.ActionOrderAnnotationFacetFactory;
import org.apache.isis.core.progmodel.facets.ordering.fieldorder.FieldOrderAnnotationFacetFactory;
import org.apache.isis.core.progmodel.facets.ordering.memberorder.MemberOrderAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.param.choices.method.ActionChoicesFacetFactory;
+import org.apache.isis.core.progmodel.facets.param.choices.methodnum.ActionParameterChoicesFacetFactory;
+import org.apache.isis.core.progmodel.facets.param.defaults.method.ActionDefaultsFacetFactory;
+import org.apache.isis.core.progmodel.facets.param.defaults.methodnum.ActionParameterDefaultsFacetFactory;
import org.apache.isis.core.progmodel.facets.propcoll.notpersisted.NotPersistedAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.properties.PropertyMethodsFacetFactory;
+import org.apache.isis.core.progmodel.facets.properties.accessor.PropertyAccessorFacetFactory;
+import org.apache.isis.core.progmodel.facets.properties.choices.PropertyChoicesFacetFactory;
+import org.apache.isis.core.progmodel.facets.properties.defaults.PropertyDefaultFacetFactory;
+import org.apache.isis.core.progmodel.facets.properties.mandatory.PropertyOptionalFacetFactory;
+import org.apache.isis.core.progmodel.facets.properties.modify.PropertyModifyFacetFactory;
+import org.apache.isis.core.progmodel.facets.properties.modify.PropertySetAndClearFacetFactory;
import org.apache.isis.core.progmodel.facets.properties.validate.PropertyValidateDefaultFacetFactory;
+import org.apache.isis.core.progmodel.facets.properties.validate.PropertyValidateFacetFactory;
import org.apache.isis.core.progmodel.facets.propparam.enums.EnumFacetFactory;
import org.apache.isis.core.progmodel.facets.propparam.enums.PropertyAndParameterChoicesFacetDerivedFromChoicesFacetFacetFactory;
-import org.apache.isis.core.progmodel.facets.propparam.multiline.MultiLineAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.multiline.annotation.MultiLineAnnotationFacetFactory;
import org.apache.isis.core.progmodel.facets.propparam.specification.MustSatisfySpecificationFacetFactory;
-import org.apache.isis.core.progmodel.facets.propparam.typicallength.TypicalLengthAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.propparam.typicallength.TypicalLengthDerivedFromTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.propparam.validate.mandatory.MandatoryDefaultFacetFactory;
-import org.apache.isis.core.progmodel.facets.propparam.validate.mandatory.OptionalAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.propparam.validate.mask.MaskAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.propparam.validate.maxlength.MaxLengthAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.propparam.validate.regex.RegExAnnotationFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.BigDecimalValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.BigIntegerValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.BooleanPrimitiveValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.BooleanWrapperValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.BytePrimitiveValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.ByteWrapperValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.CharPrimitiveValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.CharWrapperValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.ColorValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.DateTimeValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.DateValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.DoublePrimitiveValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.DoubleWrapperValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.FloatPrimitiveValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.FloatWrapperValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.ImageValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.IntPrimitiveValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.IntWrapperValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.JavaAwtImageValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.JavaSqlDateValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.JavaSqlTimeStampValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.JavaSqlTimeValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.JavaUtilDateValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.LongPrimitiveValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.LongWrapperValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.MoneyValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.PasswordValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.PercentageValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.ShortPrimitiveValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.ShortWrapperValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.StringValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.TimeStampValueTypeFacetFactory;
-import org.apache.isis.core.progmodel.facets.value.TimeValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.typicallength.annotation.TypicalLengthAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.typicallength.derived.TypicalLengthDerivedFromTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.validate.mandatory.annotation.OptionalAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.validate.mandatory.dflt.MandatoryDefaultFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.validate.mask.annotation.MaskAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.validate.maxlength.annotation.MaxLengthAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.validate.regex.annotation.RegExAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.bigdecimal.BigDecimalValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.biginteger.BigIntegerValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.booleans.BooleanPrimitiveValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.booleans.BooleanWrapperValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.bytes.BytePrimitiveValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.bytes.ByteWrapperValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.chars.CharPrimitiveValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.chars.CharWrapperValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.color.ColorValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.date.DateValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.datesql.JavaSqlDateValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.datetime.DateTimeValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.dateutil.JavaUtilDateValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.floats.FloatPrimitiveValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.floats.FloatWrapperValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.image.ImageValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.imageawt.JavaAwtImageValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.integer.IntPrimitiveValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.integer.IntWrapperValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.longs.DoublePrimitiveValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.longs.DoubleWrapperValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.longs.LongPrimitiveValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.longs.LongWrapperValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.money.MoneyValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.password.PasswordValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.percentage.PercentageValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.shortint.ShortPrimitiveValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.shortint.ShortWrapperValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.string.StringValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.time.TimeValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.timesql.JavaSqlTimeValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.timestamp.TimeStampValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.timestampsql.JavaSqlTimeStampValueTypeFacetFactory;
public class ProgrammingModelFacetsJava5 extends ProgrammingModelAbstract {
@@ -146,14 +167,43 @@ public class ProgrammingModelFacetsJava5
addFactory(MandatoryDefaultFacetFactory.class);
addFactory(PropertyValidateDefaultFacetFactory.class);
- addFactory(ActionMethodsFacetFactory.class);
- addFactory(CollectionFieldMethodsFacetFactory.class);
- addFactory(PropertyMethodsFacetFactory.class);
+ // properties
+ addFactory(PropertyAccessorFacetFactory.class);
+ addFactory(PropertySetAndClearFacetFactory.class);
+ addFactory(PropertyModifyFacetFactory.class); // must come after PropertySetAndClearFacetFactory
+ addFactory(PropertyValidateFacetFactory.class);
+ addFactory(PropertyChoicesFacetFactory.class);
+ addFactory(PropertyDefaultFacetFactory.class);
+ addFactory(PropertyOptionalFacetFactory.class);
+
+ // collections
+ addFactory(CollectionAccessorFacetFactory.class);
+ addFactory(CollectionClearFacetFactory.class);
+ addFactory(CollectionAddRemoveAndValidateFacetFactory.class);
+
+ // actions
+ addFactory(ActionInvocationFacetFactory.class);
+ addFactory(ActionValidationFacetViaValidateMethodFacetFactory.class);
+ addFactory(ActionChoicesFacetFactory.class);
+ addFactory(ActionParameterChoicesFacetFactory.class);
+ addFactory(ActionDefaultsFacetFactory.class);
+ addFactory(ActionParameterDefaultsFacetFactory.class);
+
+ // members in general
+ addFactory(NamedFacetViaNameMethodFacetFactory.class);
+ addFactory(DescribedAsFacetViaDescriptionMethodFacetFactory.class);
+ addFactory(DisabledFacetViaDisableForSessionMethodFacetFactory.class);
+ addFactory(DisabledFacetViaDisableMethodFacetFactory.class);
+ addFactory(DisabledFacetViaProtectMethodFacetFactory.class);
+ addFactory(HiddenFacetViaHideForSessionMethodFacetFactory.class);
+ addFactory(HiddenFacetViaAlwaysHideMethodFacetFactory.class);
+ addFactory(HiddenFacetViaHideMethodFacetFactory.class);
+
addFactory(IconMethodFacetFactory.class);
addFactory(CreatedCallbackFacetFactory.class);
addFactory(LoadCallbackFacetFactory.class);
- addFactory(SaveCallbackFacetFactory.class);
+ addFactory(PersistCallbackViaSaveMethodFacetFactory.class);
addFactory(PersistCallbackFacetFactory.class);
addFactory(UpdateCallbackFacetFactory.class);
addFactory(RemoveCallbackFacetFactory.class);
Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java (original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java Mon Jan 17 09:26:54 2011
@@ -21,15 +21,13 @@
package org.apache.isis.metamodel.examples.facets.namefile;
import java.io.IOException;
-import java.lang.reflect.Method;
import java.util.List;
-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.IdentifiedHolder;
-import org.apache.isis.core.metamodel.facetapi.MethodRemover;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
public class NameFileFacetFactory implements FacetFactory {
@@ -55,8 +53,8 @@ public class NameFileFacetFactory implem
* Simply attaches a {@link NameFileFacet}.
*/
@Override
- public boolean process(final Class<?> cls, final MethodRemover methodRemover, final FacetHolder holder) {
- return FacetUtil.addFacet(create(cls, holder));
+ public void process(ProcessClassContext processClassContaxt) {
+ FacetUtil.addFacet(create(processClassContaxt.getCls(), processClassContaxt.getFacetHolder()));
}
private NameFileFacet create(final Class<?> cls, FacetHolder holder) {
@@ -68,14 +66,14 @@ public class NameFileFacetFactory implem
* Simply attaches a {@link NameFileFacet}.
*/
@Override
- public boolean process(final Class<?> cls, final Method method, final MethodRemover methodRemover, final FacetHolder holder) {
- if (!(holder instanceof IdentifiedHolder)) {
- return false;
+ public void process(ProcessMethodContext processMethodContext) {
+ if (!(processMethodContext.getFacetHolder() instanceof IdentifiedHolder)) {
+ return;
}
- IdentifiedHolder identifiedHolder = (IdentifiedHolder) holder;
- Class<?> declaringClass = method.getDeclaringClass();
+ IdentifiedHolder identifiedHolder = processMethodContext.getFacetHolder();
+ Class<?> declaringClass = processMethodContext.getMethod().getDeclaringClass();
String memberName = identifiedHolder.getIdentifier().getMemberName();
- return FacetUtil.addFacet(create(declaringClass, memberName, holder));
+ FacetUtil.addFacet(create(declaringClass, memberName, processMethodContext.getFacetHolder()));
}
private NameFileFacet create(final Class<?> declaringClass, final String memberName, FacetHolder holder) {
@@ -85,9 +83,8 @@ public class NameFileFacetFactory implem
@Override
- public boolean processParams(final Method method, final int paramNum, final FacetHolder holder) {
+ public void processParams(ProcessParameterContext processParameterContext) {
// nothing to do
- return false;
}
Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileProgModelFacets.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileProgModelFacets.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileProgModelFacets.java (original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileProgModelFacets.java Mon Jan 17 09:26:54 2011
@@ -20,7 +20,7 @@
package org.apache.isis.metamodel.examples.facets.namefile;
-import org.apache.isis.core.metamodel.facetapi.FacetFactory;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.defaults.progmodel.ProgrammingModelFacetsJava5;
Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryProcessTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryProcessTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryProcessTest.java (original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryProcessTest.java Mon Jan 17 09:26:54 2011
@@ -20,23 +20,26 @@
package org.apache.isis.metamodel.examples.facets.namefile;
-import java.lang.reflect.Method;
-
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.jmock.lib.legacy.ClassImposteriser;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import static org.apache.isis.core.commons.matchers.IsisMatchers.anInstanceOf;
+
+import java.lang.reflect.Method;
+
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.jmock.lib.legacy.ClassImposteriser;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
import org.apache.isis.core.metamodel.facetapi.MethodRemover;
-
-import static org.apache.isis.core.commons.matchers.IsisMatchers.anInstanceOf;
+import org.apache.isis.core.metamodel.facets.FacetedMethod;
+import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
+import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
@@ -51,7 +54,7 @@ public class NameFileFacetFactoryProcess
private NameFileFacetFactory facetFactory;
private MethodRemover mockMethodRemover;
- private IdentifiedHolder mockFacetHolder;
+ private FacetedMethod mockFacetHolder;
private Class<DomainObjectWithNameFileEntry> domainObjectWithNameFileEntryClass;
private Method domainObjectWithNameFileEntryMethod;
@@ -63,7 +66,7 @@ public class NameFileFacetFactoryProcess
public void setUp() throws Exception {
facetFactory = new NameFileFacetFactory();
mockMethodRemover = mockery.mock(MethodRemover.class);
- mockFacetHolder = mockery.mock(IdentifiedHolder.class);
+ mockFacetHolder = mockery.mock(FacetedMethod.class);
domainObjectWithNameFileEntryClass = DomainObjectWithNameFileEntry.class;
domainObjectWithNameFileEntryMethod = domainObjectWithNameFileEntryClass.getMethod("getLastName");
@@ -85,7 +88,7 @@ public class NameFileFacetFactoryProcess
one(mockFacetHolder).addFacet(with(anInstanceOf(NameFileFacet.class)));
}});
- facetFactory.process(domainObjectWithNameFileEntryClass, mockMethodRemover, mockFacetHolder);
+ facetFactory.process(new ProcessClassContext(domainObjectWithNameFileEntryClass, mockMethodRemover, mockFacetHolder));
}
@Test
@@ -94,7 +97,7 @@ public class NameFileFacetFactoryProcess
never(mockFacetHolder).addFacet(with(anInstanceOf(NameFileFacet.class)));
}});
- facetFactory.process(domainObjectWithoutNameFileEntryClass, mockMethodRemover, mockFacetHolder);
+ facetFactory.process(new ProcessClassContext(domainObjectWithoutNameFileEntryClass, mockMethodRemover, mockFacetHolder));
}
@Test
@@ -106,7 +109,7 @@ public class NameFileFacetFactoryProcess
one(mockFacetHolder).addFacet(with(anInstanceOf(NameFileFacet.class)));
}});
- facetFactory.process(domainObjectWithNameFileEntryClass, domainObjectWithNameFileEntryMethod, mockMethodRemover, mockFacetHolder);
+ facetFactory.process(new ProcessMethodContext(domainObjectWithNameFileEntryClass, domainObjectWithNameFileEntryMethod, mockMethodRemover, mockFacetHolder));
}
@Test
@@ -118,7 +121,7 @@ public class NameFileFacetFactoryProcess
never(mockFacetHolder).addFacet(with(anInstanceOf(Facet.class)));
}});
- facetFactory.process(domainObjectWithoutNameFileEntryClass, domainObjectWithoutNameFileEntryMethod, mockMethodRemover, mockFacetHolder);
+ facetFactory.process(new ProcessMethodContext(domainObjectWithoutNameFileEntryClass, domainObjectWithoutNameFileEntryMethod, mockMethodRemover, mockFacetHolder));
}
}
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Contains.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Contains.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Contains.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Contains.java Mon Jan 17 09:26:54 2011
@@ -5,7 +5,7 @@ import java.util.Date;
import org.apache.isis.core.commons.lang.StringUtils;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.progmodel.facets.value.DateValueFacet;
+import org.apache.isis.core.progmodel.facets.value.date.DateValueFacet;
import org.apache.isis.viewer.bdd.common.CellBinding;
import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException;
import org.apache.isis.viewer.bdd.common.ScenarioCell;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarGrid.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarGrid.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarGrid.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarGrid.java Mon Jan 17 09:26:54 2011
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.core.progmodel.facets.value.DateValueFacet;
+import org.apache.isis.core.progmodel.facets.value.date.DateValueFacet;
import org.apache.isis.viewer.dnd.drawing.Canvas;
import org.apache.isis.viewer.dnd.drawing.Location;
import org.apache.isis.viewer.dnd.drawing.Size;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarSpecification.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarSpecification.java Mon Jan 17 09:26:54 2011
@@ -23,7 +23,7 @@ package org.apache.isis.viewer.dnd.calen
import java.util.List;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.progmodel.facets.value.DateValueFacet;
+import org.apache.isis.core.progmodel.facets.value.date.DateValueFacet;
import org.apache.isis.viewer.dnd.view.Axes;
import org.apache.isis.viewer.dnd.view.CompositeViewSpecification;
import org.apache.isis.viewer.dnd.view.Content;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/CheckboxField.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/CheckboxField.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/CheckboxField.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/CheckboxField.java Mon Jan 17 09:26:54 2011
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.dnd.field
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.progmodel.facets.value.BooleanValueFacet;
+import org.apache.isis.core.progmodel.facets.value.booleans.BooleanValueFacet;
import org.apache.isis.viewer.dnd.drawing.Canvas;
import org.apache.isis.viewer.dnd.drawing.Color;
import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/ColorField.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/ColorField.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/ColorField.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/ColorField.java Mon Jan 17 09:26:54 2011
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.dnd.field
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
import org.apache.isis.core.metamodel.facets.object.parseable.InvalidEntryException;
-import org.apache.isis.core.progmodel.facets.value.ColorValueFacet;
+import org.apache.isis.core.progmodel.facets.value.color.ColorValueFacet;
import org.apache.isis.viewer.dnd.drawing.Canvas;
import org.apache.isis.viewer.dnd.drawing.Color;
import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/DateFieldSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/DateFieldSpecification.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/DateFieldSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/DateFieldSpecification.java Mon Jan 17 09:26:54 2011
@@ -20,7 +20,7 @@
package org.apache.isis.viewer.dnd.field;
-import org.apache.isis.core.progmodel.facets.value.DateValueFacet;
+import org.apache.isis.core.progmodel.facets.value.date.DateValueFacet;
import org.apache.isis.viewer.dnd.view.Axes;
import org.apache.isis.viewer.dnd.view.Content;
import org.apache.isis.viewer.dnd.view.View;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/ImageField.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/ImageField.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/ImageField.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/ImageField.java Mon Jan 17 09:26:54 2011
@@ -32,7 +32,7 @@ import java.io.File;
import org.apache.log4j.Logger;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.progmodel.facets.value.ImageValueFacet;
+import org.apache.isis.core.progmodel.facets.value.image.ImageValueFacet;
import org.apache.isis.viewer.dnd.drawing.Canvas;
import org.apache.isis.viewer.dnd.drawing.Color;
import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/PasswordFieldSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/PasswordFieldSpecification.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/PasswordFieldSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/PasswordFieldSpecification.java Mon Jan 17 09:26:54 2011
@@ -20,7 +20,7 @@
package org.apache.isis.viewer.dnd.field;
-import org.apache.isis.core.progmodel.facets.value.PasswordValueFacet;
+import org.apache.isis.core.progmodel.facets.value.password.PasswordValueFacet;
import org.apache.isis.viewer.dnd.view.Axes;
import org.apache.isis.viewer.dnd.view.Content;
import org.apache.isis.viewer.dnd.view.View;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/SimpleDatePicker.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/SimpleDatePicker.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/SimpleDatePicker.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/SimpleDatePicker.java Mon Jan 17 09:26:54 2011
@@ -25,7 +25,7 @@ import java.util.Calendar;
import java.util.Date;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.progmodel.facets.value.DateValueFacet;
+import org.apache.isis.core.progmodel.facets.value.date.DateValueFacet;
import org.apache.isis.viewer.dnd.drawing.Canvas;
import org.apache.isis.viewer.dnd.drawing.Color;
import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/histogram/NumberAdapters.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/histogram/NumberAdapters.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/histogram/NumberAdapters.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/histogram/NumberAdapters.java Mon Jan 17 09:26:54 2011
@@ -23,10 +23,10 @@ package org.apache.isis.viewer.dnd.histo
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.core.progmodel.facets.value.DoubleFloatingPointValueFacet;
-import org.apache.isis.core.progmodel.facets.value.FloatingPointValueFacet;
-import org.apache.isis.core.progmodel.facets.value.IntegerValueFacet;
-import org.apache.isis.core.progmodel.facets.value.MoneyValueFacet;
+import org.apache.isis.core.progmodel.facets.value.floats.FloatingPointValueFacet;
+import org.apache.isis.core.progmodel.facets.value.integer.IntegerValueFacet;
+import org.apache.isis.core.progmodel.facets.value.longs.DoubleFloatingPointValueFacet;
+import org.apache.isis.core.progmodel.facets.value.money.MoneyValueFacet;
public class NumberAdapters {
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TableCellBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TableCellBuilder.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TableCellBuilder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TableCellBuilder.java Mon Jan 17 09:26:54 2011
@@ -29,8 +29,8 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.progmodel.facets.value.BooleanValueFacet;
-import org.apache.isis.core.progmodel.facets.value.ImageValueFacet;
+import org.apache.isis.core.progmodel.facets.value.booleans.BooleanValueFacet;
+import org.apache.isis.core.progmodel.facets.value.image.ImageValueFacet;
import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.viewer.dnd.field.CheckboxField;
import org.apache.isis.viewer.dnd.view.Axes;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/LinuxDatePicker.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/LinuxDatePicker.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/LinuxDatePicker.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/LinuxDatePicker.java Mon Jan 17 09:26:54 2011
@@ -23,7 +23,7 @@ import java.util.Calendar;
import java.util.Date;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.progmodel.facets.value.DateValueFacet;
+import org.apache.isis.core.progmodel.facets.value.date.DateValueFacet;
import org.apache.isis.viewer.dnd.drawing.Canvas;
import org.apache.isis.viewer.dnd.drawing.Color;
import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlComponentFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlComponentFactory.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlComponentFactory.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlComponentFactory.java Mon Jan 17 09:26:54 2011
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet;
import org.apache.isis.core.metamodel.spec.ActionType;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.core.progmodel.facets.value.BooleanValueFacet;
+import org.apache.isis.core.progmodel.facets.value.booleans.BooleanValueFacet;
import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.viewer.html.component.Block;
import org.apache.isis.viewer.html.component.Component;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/Task.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/Task.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/Task.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/Task.java Mon Jan 17 09:26:54 2011
@@ -27,7 +27,7 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.progmodel.facets.value.PasswordValueFacet;
+import org.apache.isis.core.progmodel.facets.value.password.PasswordValueFacet;
import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.viewer.html.component.Page;
import org.apache.isis.viewer.html.context.Context;
Modified: incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ObjectActionNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ObjectActionNoop.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ObjectActionNoop.java (original)
+++ incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ObjectActionNoop.java Mon Jan 17 09:26:54 2011
@@ -87,6 +87,11 @@ public class ObjectActionNoop implements
}
@Override
+ public boolean containsDoOpFacet(final Class<? extends Facet> facetType) {
+ return false;
+ }
+
+ @Override
public <T extends Facet> T getFacet(final Class<T> cls) {
return null;
}
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberDisabledTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberDisabledTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberDisabledTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberDisabledTest.java Mon Jan 17 09:26:54 2011
@@ -27,8 +27,8 @@ import static org.junit.Assert.fail;
import java.util.List;
-import org.apache.isis.core.progmodel.facets.disable.DisableForContextFacetViaMethod;
-import org.apache.isis.core.progmodel.facets.disable.DisabledFacetAnnotation;
+import org.apache.isis.core.progmodel.facets.members.disable.annotation.DisabledFacetAnnotation;
+import org.apache.isis.core.progmodel.facets.members.disable.method.DisableForContextFacetViaMethod;
import org.apache.isis.progmodel.wrapper.applib.DisabledException;
import org.apache.isis.viewer.junit.sample.domain.Order;
import org.junit.Test;
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberHiddenTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberHiddenTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberHiddenTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberHiddenTest.java Mon Jan 17 09:26:54 2011
@@ -25,9 +25,9 @@ import static org.hamcrest.CoreMatchers.
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
-import org.apache.isis.core.progmodel.facets.hide.HiddenFacetAnnotation;
-import org.apache.isis.core.progmodel.facets.hide.HideForContextFacetViaMethod;
-import org.apache.isis.core.progmodel.facets.hide.HideForSessionFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.members.hide.annotation.HiddenFacetAnnotation;
+import org.apache.isis.core.progmodel.facets.members.hide.forsession.HideForSessionFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.members.hide.method.HideForContextFacetViaMethod;
import org.apache.isis.progmodel.wrapper.applib.HiddenException;
import org.apache.isis.viewer.junit.sample.domain.Country;
import org.junit.Test;
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberInvalidTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberInvalidTest.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberInvalidTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberInvalidTest.java Mon Jan 17 09:26:54 2011
@@ -25,13 +25,13 @@ import static org.hamcrest.CoreMatchers.
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
-import org.apache.isis.core.progmodel.facets.actions.validate.ActionValidationFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.actions.validate.method.ActionValidationFacetViaMethod;
import org.apache.isis.core.progmodel.facets.collections.validate.CollectionValidateAddToFacetViaMethod;
import org.apache.isis.core.progmodel.facets.collections.validate.CollectionValidateRemoveFromFacetViaMethod;
import org.apache.isis.core.progmodel.facets.properties.validate.PropertyValidateFacetViaMethod;
import org.apache.isis.core.progmodel.facets.propparam.validate.mandatory.MandatoryFacetDefault;
-import org.apache.isis.core.progmodel.facets.propparam.validate.maxlength.MaxLengthFacetAnnotation;
-import org.apache.isis.core.progmodel.facets.propparam.validate.regex.RegExFacetAnnotation;
+import org.apache.isis.core.progmodel.facets.propparam.validate.maxlength.annotation.MaxLengthFacetAnnotation;
+import org.apache.isis.core.progmodel.facets.propparam.validate.regex.annotation.RegExFacetAnnotation;
import org.apache.isis.progmodel.wrapper.applib.InvalidException;
import org.apache.isis.viewer.junit.sample.domain.Country;
import org.junit.Test;
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/FieldValue.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/FieldValue.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/FieldValue.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/FieldValue.java Mon Jan 17 09:26:54 2011
@@ -24,7 +24,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.core.progmodel.facets.value.BooleanValueFacet;
+import org.apache.isis.core.progmodel.facets.value.booleans.BooleanValueFacet;
import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
import org.apache.isis.viewer.scimpi.dispatcher.ForbiddenException;
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/GetField.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/GetField.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/GetField.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/GetField.java Mon Jan 17 09:26:54 2011
@@ -27,7 +27,7 @@ import java.util.Date;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.core.progmodel.facets.value.DateValueFacet;
+import org.apache.isis.core.progmodel.facets.value.date.DateValueFacet;
import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
import org.apache.isis.viewer.scimpi.dispatcher.ForbiddenException;
Modified: incubator/isis/trunk/viewer/wicket/metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionAnnotationFacetFactory.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/viewer/wicket/metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionAnnotationFacetFactory.java Mon Jan 17 09:26:54 2011
@@ -21,12 +21,10 @@
package org.apache.isis.viewer.wicket.metamodel.wizardpagedesc;
-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.AnnotationBasedFacetFactoryAbstract;
import org.apache.isis.viewer.wicket.applib.WizardPageDescription;
@@ -38,16 +36,14 @@ public class WizardPageDescriptionAnnota
}
@Override
- public boolean process(Class<?> cls, final Method method, final MethodRemover methodRemover, final FacetHolder holder) {
+ public void process(ProcessMethodContext processMethodContext) {
// look for annotation on the property
- final WizardPageDescription annotation = getAnnotation(method, WizardPageDescription.class);
- WizardPageDescriptionFacet facet = create(annotation, holder);
+ final WizardPageDescription annotation = getAnnotation(processMethodContext.getMethod(), WizardPageDescription.class);
+ WizardPageDescriptionFacet facet = create(annotation, processMethodContext.getFacetHolder());
if (facet != null) {
- return FacetUtil.addFacet(facet);
+ FacetUtil.addFacet(facet);
}
-
- return false;
}
private WizardPageDescriptionFacet create(final WizardPageDescription annotation, final FacetHolder holder) {
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java Mon Jan 17 09:26:54 2011
@@ -23,7 +23,7 @@ package org.apache.isis.viewer.wicket.ui
import java.awt.Graphics2D;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.progmodel.facets.value.ImageValueFacet;
+import org.apache.isis.core.progmodel.facets.value.image.ImageValueFacet;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.wicket.markup.html.basic.Label;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanelFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanelFactory.java?rev=1059826&r1=1059825&r2=1059826&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanelFactory.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanelFactory.java Mon Jan 17 09:26:54 2011
@@ -21,7 +21,7 @@
package org.apache.isis.viewer.wicket.ui.components.scalars.image;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.progmodel.facets.value.ImageValueFacet;
+import org.apache.isis.core.progmodel.facets.value.image.ImageValueFacet;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.isis.viewer.wicket.ui.ComponentType;