incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1383836 [1/3] - in /incubator/isis/trunk/framework: core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ core/progmodel/src/main/java/org/apache/isis/core/p...
Date Wed, 12 Sep 2012 08:15:15 GMT
Author: danhaywood
Date: Wed Sep 12 08:15:12 2012
New Revision: 1383836

URL: http://svn.apache.org/viewvc?rev=1383836&view=rev
Log:
ISIS-261: removing obsolete code

* Enumeration interface, EnumerationAbstract
* AnnotationBasedFacetFactory

Removed:
    incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/AnnotationBasedFacetFactoryAbstract.java
    incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Enumeration.java
    incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/EnumerationAbstract.java
    incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/EnumerationAbstractTest.java
Modified:
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/annotation/DebugAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/annotation/ExplorationAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/annotation/NotContributedAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notinservicemenu/annotation/NotInServiceMenuAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/prototype/annotation/PrototypeAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/semantics/ActionSemanticsAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/semantics/ActionSemanticsFallbackFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/semantics/IdempotentAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/semantics/QueryOnlyAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/typeof/annotation/TypeOfAnnotationForActionsFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/disabled/fromimmutable/DisabledFacetForCollectionDerivedFromImmutableTypeFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/notpersisted/annotation/NotPersistedAnnotationForCollectionFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/typeof/TypeOfAnnotationForCollectionsFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/commonlyused/CommonlyUsedAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/annotation/DescribedAsAnnotationOnMemberFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disabled/annotation/DisabledAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hidden/annotation/HiddenAnnotationForMemberFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/named/annotation/NamedAnnotationOnMemberFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/order/MemberOrderAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/annotation/AggregatedAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/bounded/annotation/BoundedAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/annotation/DefaultedAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/describedas/annotation/DescribedAsAnnotationOnTypeFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/facets/annotation/FacetsAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/hidden/HiddenAnnotationForTypeFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/annotation/RemoveProgrammaticOrIgnoreAnnotationMethodsFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/annotation/ImmutableAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/annotation/MaskAnnotationForTypeFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthAnnotationForTypeFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/multiline/annotation/MultiLineAnnotationOnTypeFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/named/annotation/NamedAnnotationOnTypeFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectSpecIdAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeDerivedFromClassNameFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderactions/ActionOrderAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderfields/FieldOrderAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/plural/annotation/PluralAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/regex/annotation/RegExFacetAnnotationForTypeFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/typicallen/annotation/TypicalLengthAnnotationOnTypeFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validperspec/MustSatisfySpecificationOnTypeFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/value/annotation/ValueFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/viewmodel/annotation/ViewModelAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/paged/PagedAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/defaults/fromtype/ParameterDefaultDerivedFromTypeFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/describedas/annotation/DescribedAsAnnotationOnParameterFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/mandatory/annotation/OptionalAnnotationForParameterFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/multiline/annotation/MultiLineAnnotationOnParameterFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/named/annotation/NamedAnnotationOnParameterFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/typicallen/annotation/TypicalLengthAnnotationOnParameterFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/validate/maskannot/MaskAnnotationForParameterFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/validate/maxlenannot/MaxLengthAnnotationForParameterFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/validate/perspec/MustSatisfySpecificationOnParameterFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/validate/regexannot/RegExFacetAnnotationForParameterFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/defaults/fromtype/PropertyDefaultDerivedFromTypeFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/disabled/fromimmutable/DisabledFacetForPropertyDerivedFromImmutableTypeFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/mandatory/annotation/OptionalAnnotationForPropertyFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/multiline/annotation/MultiLineAnnotationOnPropertyFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/notpersisted/annotation/NotPersistedAnnotationForPropertyFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/typicallen/annotation/TypicalLengthAnnotationOnPropertyFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/maskannot/MaskAnnotationForPropertyFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/maxlenannot/MaxLengthAnnotationForPropertyFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/perspec/MustSatisfySpecificationOnPropertyFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/regexannot/RegExFacetAnnotationForPropertyFacetFactory.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/auditable/AuditableAnnotationFacetFactory.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/auditable/AuditableMarkerInterfaceFacetFactory.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/embeddedonly/JdoEmbeddedOnlyAnnotationFacetFactory.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableAnnotationFacetFactory.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionAnnotationFacetFactory.java

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/annotation/DebugAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/annotation/DebugAnnotationFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/annotation/DebugAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/annotation/DebugAnnotationFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,7 +23,8 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.actions.debug.DebugFacet;
 import org.apache.isis.core.progmodel.facets.actions.invoke.ActionInvocationFacetFactory;
 
@@ -31,7 +32,7 @@ import org.apache.isis.core.progmodel.fa
  * {@link DebugFacet} can also be installed via a naming convention, see
  * {@link ActionInvocationFacetFactory}.
  */
-public class DebugAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class DebugAnnotationFacetFactory extends FacetFactoryAbstract {
 
     public DebugAnnotationFacetFactory() {
         super(FeatureType.ACTIONS_ONLY);
@@ -39,7 +40,7 @@ public class DebugAnnotationFacetFactory
 
     @Override
     public void process(final ProcessMethodContext processMethodContext) {
-        final Debug annotation = getAnnotation(processMethodContext.getMethod(), Debug.class);
+        final Debug annotation = Annotations.getAnnotation(processMethodContext.getMethod(), Debug.class);
         FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/annotation/ExplorationAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/annotation/ExplorationAnnotationFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/annotation/ExplorationAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/annotation/ExplorationAnnotationFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,7 +23,8 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacet;
 import org.apache.isis.core.progmodel.facets.actions.invoke.ActionInvocationFacetFactory;
 
@@ -31,7 +32,7 @@ import org.apache.isis.core.progmodel.fa
  * {@link ExplorationFacet} can also be installed via a naming convention, see
  * {@link ActionInvocationFacetFactory}.
  */
-public class ExplorationAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class ExplorationAnnotationFacetFactory extends FacetFactoryAbstract {
 
     public ExplorationAnnotationFacetFactory() {
         super(FeatureType.ACTIONS_ONLY);
@@ -39,7 +40,7 @@ public class ExplorationAnnotationFacetF
 
     @Override
     public void process(final ProcessMethodContext processMethodContext) {
-        final Exploration annotation = getAnnotation(processMethodContext.getMethod(), Exploration.class);
+        final Exploration annotation = Annotations.getAnnotation(processMethodContext.getMethod(), Exploration.class);
         FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/annotation/NotContributedAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/annotation/NotContributedAnnotationFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/annotation/NotContributedAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/annotation/NotContributedAnnotationFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,10 +23,11 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.progmodel.facets.actions.notcontributed.NotContributedFacet;
 
-public class NotContributedAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class NotContributedAnnotationFacetFactory extends FacetFactoryAbstract {
 
     public NotContributedAnnotationFacetFactory() {
         super(FeatureType.ACTIONS_ONLY);
@@ -34,7 +35,7 @@ public class NotContributedAnnotationFac
 
     @Override
     public void process(final ProcessMethodContext processMethodContext) {
-        final NotContributed annotation = getAnnotation(processMethodContext.getMethod(), NotContributed.class);
+        final NotContributed annotation = Annotations.getAnnotation(processMethodContext.getMethod(), NotContributed.class);
         FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notinservicemenu/annotation/NotInServiceMenuAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notinservicemenu/annotation/NotInServiceMenuAnnotationFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notinservicemenu/annotation/NotInServiceMenuAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notinservicemenu/annotation/NotInServiceMenuAnnotationFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,10 +23,11 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.progmodel.facets.actions.notinservicemenu.NotInServiceMenuFacet;
 
-public class NotInServiceMenuAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class NotInServiceMenuAnnotationFacetFactory extends FacetFactoryAbstract {
 
     public NotInServiceMenuAnnotationFacetFactory() {
         super(FeatureType.ACTIONS_ONLY);
@@ -34,7 +35,7 @@ public class NotInServiceMenuAnnotationF
 
     @Override
     public void process(final ProcessMethodContext processMethodContext) {
-        final NotInServiceMenu annotation = getAnnotation(processMethodContext.getMethod(), NotInServiceMenu.class);
+        final NotInServiceMenu annotation = Annotations.getAnnotation(processMethodContext.getMethod(), NotInServiceMenu.class);
         FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/prototype/annotation/PrototypeAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/prototype/annotation/PrototypeAnnotationFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/prototype/annotation/PrototypeAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/prototype/annotation/PrototypeAnnotationFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,10 +23,11 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
 
-public class PrototypeAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class PrototypeAnnotationFacetFactory extends FacetFactoryAbstract {
 
     public PrototypeAnnotationFacetFactory() {
         super(FeatureType.ACTIONS_ONLY);
@@ -34,7 +35,7 @@ public class PrototypeAnnotationFacetFac
 
     @Override
     public void process(final ProcessMethodContext processMethodContext) {
-        final Prototype annotation = getAnnotation(processMethodContext.getMethod(), Prototype.class);
+        final Prototype annotation = Annotations.getAnnotation(processMethodContext.getMethod(), Prototype.class);
         FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/semantics/ActionSemanticsAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/semantics/ActionSemanticsAnnotationFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/semantics/ActionSemanticsAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/semantics/ActionSemanticsAnnotationFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,10 +23,11 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
 
-public class ActionSemanticsAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class ActionSemanticsAnnotationFacetFactory extends FacetFactoryAbstract {
 
     public ActionSemanticsAnnotationFacetFactory() {
         super(FeatureType.ACTIONS_ONLY);
@@ -34,7 +35,7 @@ public class ActionSemanticsAnnotationFa
 
     @Override
     public void process(final ProcessMethodContext processMethodContext) {
-        final ActionSemantics annotation = getAnnotation(processMethodContext.getMethod(), ActionSemantics.class);
+        final ActionSemantics annotation = Annotations.getAnnotation(processMethodContext.getMethod(), ActionSemantics.class);
         FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/semantics/ActionSemanticsFallbackFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/semantics/ActionSemanticsFallbackFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/semantics/ActionSemanticsFallbackFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/semantics/ActionSemanticsFallbackFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -21,11 +21,11 @@ package org.apache.isis.core.progmodel.f
 
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.FacetedMethod;
 import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
 
-public class ActionSemanticsFallbackFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class ActionSemanticsFallbackFacetFactory extends FacetFactoryAbstract {
 
     public ActionSemanticsFallbackFacetFactory() {
         super(FeatureType.ACTIONS_ONLY);

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/semantics/IdempotentAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/semantics/IdempotentAnnotationFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/semantics/IdempotentAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/semantics/IdempotentAnnotationFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,10 +23,11 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
 
-public class IdempotentAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class IdempotentAnnotationFacetFactory extends FacetFactoryAbstract {
 
     public IdempotentAnnotationFacetFactory() {
         super(FeatureType.ACTIONS_ONLY);
@@ -34,7 +35,7 @@ public class IdempotentAnnotationFacetFa
 
     @Override
     public void process(final ProcessMethodContext processMethodContext) {
-        final Idempotent annotation = getAnnotation(processMethodContext.getMethod(), Idempotent.class);
+        final Idempotent annotation = Annotations.getAnnotation(processMethodContext.getMethod(), Idempotent.class);
         FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/semantics/QueryOnlyAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/semantics/QueryOnlyAnnotationFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/semantics/QueryOnlyAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/semantics/QueryOnlyAnnotationFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -22,10 +22,11 @@ package org.apache.isis.core.progmodel.f
 import org.apache.isis.applib.annotation.QueryOnly;
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.FacetedMethod;
 
-public class QueryOnlyAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class QueryOnlyAnnotationFacetFactory extends FacetFactoryAbstract {
 
     public QueryOnlyAnnotationFacetFactory() {
         super(FeatureType.ACTIONS_ONLY);
@@ -33,7 +34,7 @@ public class QueryOnlyAnnotationFacetFac
 
     @Override
     public void process(final ProcessMethodContext processMethodContext) {
-        final QueryOnly annotation = getAnnotation(processMethodContext.getMethod(), QueryOnly.class);
+        final QueryOnly annotation = Annotations.getAnnotation(processMethodContext.getMethod(), QueryOnly.class);
         if (annotation == null) {
             return;
         }

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/typeof/annotation/TypeOfAnnotationForActionsFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/typeof/annotation/TypeOfAnnotationForActionsFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/typeof/annotation/TypeOfAnnotationForActionsFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/typeof/annotation/TypeOfAnnotationForActionsFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -26,13 +26,14 @@ import java.lang.reflect.TypeVariable;
 import org.apache.isis.applib.annotation.TypeOf;
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.typeof.TypeOfFacetInferredFromArray;
 import org.apache.isis.core.metamodel.facets.typeof.TypeOfFacetInferredFromGenerics;
 import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
 import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryAware;
 
-public class TypeOfAnnotationForActionsFacetFactory extends AnnotationBasedFacetFactoryAbstract implements CollectionTypeRegistryAware {
+public class TypeOfAnnotationForActionsFacetFactory extends FacetFactoryAbstract implements CollectionTypeRegistryAware {
     private CollectionTypeRegistry collectionTypeRegistry;
 
     public TypeOfAnnotationForActionsFacetFactory() {
@@ -42,7 +43,7 @@ public class TypeOfAnnotationForActionsF
     @Override
     public void process(final ProcessMethodContext processMethodContext) {
 
-        final TypeOf annotation = getAnnotation(processMethodContext.getMethod(), TypeOf.class);
+        final TypeOf annotation = Annotations.getAnnotation(processMethodContext.getMethod(), TypeOf.class);
 
         final Class<?> methodReturnType = processMethodContext.getMethod().getReturnType();
         if (!collectionTypeRegistry.isCollectionType(methodReturnType) && !collectionTypeRegistry.isArrayType(methodReturnType)) {

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/disabled/fromimmutable/DisabledFacetForCollectionDerivedFromImmutableTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/disabled/fromimmutable/DisabledFacetForCollectionDerivedFromImmutableTypeFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/disabled/fromimmutable/DisabledFacetForCollectionDerivedFromImmutableTypeFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/disabled/fromimmutable/DisabledFacetForCollectionDerivedFromImmutableTypeFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -21,8 +21,8 @@ package org.apache.isis.core.progmodel.f
 
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.FacetedMethod;
 import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.sp
  * because a type is immutable, doesn't imply that the property can't change the
  * instance that it refers to?
  */
-public class DisabledFacetForCollectionDerivedFromImmutableTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class DisabledFacetForCollectionDerivedFromImmutableTypeFacetFactory extends FacetFactoryAbstract {
 
     public DisabledFacetForCollectionDerivedFromImmutableTypeFacetFactory() {
         super(FeatureType.COLLECTIONS_ONLY);

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/notpersisted/annotation/NotPersistedAnnotationForCollectionFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/notpersisted/annotation/NotPersistedAnnotationForCollectionFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/notpersisted/annotation/NotPersistedAnnotationForCollectionFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/notpersisted/annotation/NotPersistedAnnotationForCollectionFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,10 +23,11 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.notpersisted.NotPersistedFacet;
 
-public class NotPersistedAnnotationForCollectionFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class NotPersistedAnnotationForCollectionFacetFactory extends FacetFactoryAbstract {
 
     public NotPersistedAnnotationForCollectionFacetFactory() {
         super(FeatureType.COLLECTIONS_ONLY);
@@ -34,7 +35,7 @@ public class NotPersistedAnnotationForCo
 
     @Override
     public void process(final ProcessMethodContext processMethodContext) {
-        final NotPersisted annotation = getAnnotation(processMethodContext.getMethod(), NotPersisted.class);
+        final NotPersisted annotation = Annotations.getAnnotation(processMethodContext.getMethod(), NotPersisted.class);
         FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/typeof/TypeOfAnnotationForCollectionsFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/typeof/TypeOfAnnotationForCollectionsFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/typeof/TypeOfAnnotationForCollectionsFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/typeof/TypeOfAnnotationForCollectionsFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -26,13 +26,14 @@ import java.lang.reflect.TypeVariable;
 import org.apache.isis.applib.annotation.TypeOf;
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.typeof.TypeOfFacetInferredFromArray;
 import org.apache.isis.core.metamodel.facets.typeof.TypeOfFacetInferredFromGenerics;
 import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
 import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryAware;
 
-public class TypeOfAnnotationForCollectionsFacetFactory extends AnnotationBasedFacetFactoryAbstract implements CollectionTypeRegistryAware {
+public class TypeOfAnnotationForCollectionsFacetFactory extends FacetFactoryAbstract implements CollectionTypeRegistryAware {
     private CollectionTypeRegistry collectionTypeRegistry;
 
     public TypeOfAnnotationForCollectionsFacetFactory() {
@@ -42,7 +43,7 @@ public class TypeOfAnnotationForCollecti
     @Override
     public void process(final ProcessMethodContext processMethodContext) {
 
-        final TypeOf annotation = getAnnotation(processMethodContext.getMethod(), TypeOf.class);
+        final TypeOf annotation = Annotations.getAnnotation(processMethodContext.getMethod(), TypeOf.class);
 
         final Class<?> methodReturnType = processMethodContext.getMethod().getReturnType();
         if (!collectionTypeRegistry.isCollectionType(methodReturnType) && !collectionTypeRegistry.isArrayType(methodReturnType)) {

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/commonlyused/CommonlyUsedAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/commonlyused/CommonlyUsedAnnotationFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/commonlyused/CommonlyUsedAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/commonlyused/CommonlyUsedAnnotationFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,10 +23,11 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.members.commonlyused.CommonlyUsedFacet;
 
-public class CommonlyUsedAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class CommonlyUsedAnnotationFacetFactory extends FacetFactoryAbstract {
 
     public CommonlyUsedAnnotationFacetFactory() {
         super(FeatureType.MEMBERS);
@@ -34,7 +35,7 @@ public class CommonlyUsedAnnotationFacet
 
     @Override
     public void process(final ProcessMethodContext processMethodContext) {
-        final CommonlyUsed annotation = getAnnotation(processMethodContext.getMethod(), CommonlyUsed.class);
+        final CommonlyUsed annotation = Annotations.getAnnotation(processMethodContext.getMethod(), CommonlyUsed.class);
         FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/annotation/DescribedAsAnnotationOnMemberFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/annotation/DescribedAsAnnotationOnMemberFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/annotation/DescribedAsAnnotationOnMemberFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/annotation/DescribedAsAnnotationOnMemberFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,11 +23,12 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.describedas.DescribedAsFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
-public class DescribedAsAnnotationOnMemberFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class DescribedAsAnnotationOnMemberFacetFactory extends FacetFactoryAbstract {
 
     public DescribedAsAnnotationOnMemberFacetFactory() {
         super(FeatureType.MEMBERS);
@@ -37,7 +38,7 @@ public class DescribedAsAnnotationOnMemb
     public void process(final ProcessMethodContext processMethodContext) {
 
         // look for annotation on the property
-        final DescribedAs annotation = getAnnotation(processMethodContext.getMethod(), DescribedAs.class);
+        final DescribedAs annotation = Annotations.getAnnotation(processMethodContext.getMethod(), DescribedAs.class);
         DescribedAsFacet facet = create(annotation, processMethodContext.getFacetHolder());
         if (facet != null) {
             FacetUtil.addFacet(facet);

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disabled/annotation/DisabledAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disabled/annotation/DisabledAnnotationFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disabled/annotation/DisabledAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disabled/annotation/DisabledAnnotationFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,10 +23,11 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.progmodel.facets.members.disabled.DisabledFacet;
 
-public class DisabledAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class DisabledAnnotationFacetFactory extends FacetFactoryAbstract {
 
     public DisabledAnnotationFacetFactory() {
         super(FeatureType.MEMBERS);
@@ -34,7 +35,7 @@ public class DisabledAnnotationFacetFact
 
     @Override
     public void process(final ProcessMethodContext processMethodContext) {
-        final Disabled annotation = getAnnotation(processMethodContext.getMethod(), Disabled.class);
+        final Disabled annotation = Annotations.getAnnotation(processMethodContext.getMethod(), Disabled.class);
         FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hidden/annotation/HiddenAnnotationForMemberFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hidden/annotation/HiddenAnnotationForMemberFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hidden/annotation/HiddenAnnotationForMemberFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hidden/annotation/HiddenAnnotationForMemberFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,10 +23,11 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
 
-public class HiddenAnnotationForMemberFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class HiddenAnnotationForMemberFacetFactory extends FacetFactoryAbstract {
 
     public HiddenAnnotationForMemberFacetFactory() {
         super(FeatureType.MEMBERS);
@@ -34,7 +35,7 @@ public class HiddenAnnotationForMemberFa
 
     @Override
     public void process(final ProcessMethodContext processMethodContext) {
-        final Hidden annotation = getAnnotation(processMethodContext.getMethod(), Hidden.class);
+        final Hidden annotation = Annotations.getAnnotation(processMethodContext.getMethod(), Hidden.class);
         FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/named/annotation/NamedAnnotationOnMemberFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/named/annotation/NamedAnnotationOnMemberFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/named/annotation/NamedAnnotationOnMemberFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/named/annotation/NamedAnnotationOnMemberFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,10 +23,11 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.named.NamedFacet;
 
-public class NamedAnnotationOnMemberFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class NamedAnnotationOnMemberFacetFactory extends FacetFactoryAbstract {
 
     public NamedAnnotationOnMemberFacetFactory() {
         super(FeatureType.MEMBERS);
@@ -34,7 +35,7 @@ public class NamedAnnotationOnMemberFace
 
     @Override
     public void process(final ProcessMethodContext processMethodContext) {
-        final Named annotation = getAnnotation(processMethodContext.getMethod(), Named.class);
+        final Named annotation = Annotations.getAnnotation(processMethodContext.getMethod(), Named.class);
         FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/order/MemberOrderAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/order/MemberOrderAnnotationFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/order/MemberOrderAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/order/MemberOrderAnnotationFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,10 +23,11 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
 
-public class MemberOrderAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class MemberOrderAnnotationFacetFactory extends FacetFactoryAbstract {
 
     public MemberOrderAnnotationFacetFactory() {
         super(FeatureType.MEMBERS);
@@ -35,7 +36,7 @@ public class MemberOrderAnnotationFacetF
     @Override
     public void process(final ProcessMethodContext processMethodContext) {
         final Class<MemberOrder> annotationClass = MemberOrder.class;
-        final MemberOrder annotation = getAnnotation(processMethodContext.getMethod(), annotationClass);
+        final MemberOrder annotation = Annotations.getAnnotation(processMethodContext.getMethod(), annotationClass);
         FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/annotation/AggregatedAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/annotation/AggregatedAnnotationFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/annotation/AggregatedAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/annotation/AggregatedAnnotationFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,10 +23,11 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.object.aggregated.ParentedFacet;
 
-public class AggregatedAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class AggregatedAnnotationFacetFactory extends FacetFactoryAbstract {
 
     public AggregatedAnnotationFacetFactory() {
         super(FeatureType.OBJECTS_ONLY);
@@ -34,7 +35,7 @@ public class AggregatedAnnotationFacetFa
 
     @Override
     public void process(final ProcessClassContext processClassContext) {
-        final Aggregated annotation = getAnnotation(processClassContext.getCls(), Aggregated.class);
+        final Aggregated annotation = Annotations.getAnnotation(processClassContext.getCls(), Aggregated.class);
         FacetUtil.addFacet(create(annotation, processClassContext.getFacetHolder()));
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/bounded/annotation/BoundedAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/bounded/annotation/BoundedAnnotationFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/bounded/annotation/BoundedAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/bounded/annotation/BoundedAnnotationFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,10 +23,11 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.object.bounded.BoundedFacet;
 
-public class BoundedAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class BoundedAnnotationFacetFactory extends FacetFactoryAbstract {
 
     public BoundedAnnotationFacetFactory() {
         super(FeatureType.OBJECTS_ONLY);
@@ -34,7 +35,7 @@ public class BoundedAnnotationFacetFacto
 
     @Override
     public void process(final ProcessClassContext processClassContaxt) {
-        final Bounded annotation = getAnnotation(processClassContaxt.getCls(), Bounded.class);
+        final Bounded annotation = Annotations.getAnnotation(processClassContaxt.getCls(), Bounded.class);
         FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/annotation/DefaultedAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/annotation/DefaultedAnnotationFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/annotation/DefaultedAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/annotation/DefaultedAnnotationFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -26,13 +26,14 @@ import org.apache.isis.core.commons.lang
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
 import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
 import org.apache.isis.core.progmodel.facets.object.defaults.DefaultedFacetAbstract;
 import org.apache.isis.core.progmodel.facets.object.defaults.DefaultsProviderUtil;
 
-public class DefaultedAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract implements IsisConfigurationAware, ServicesInjectorAware {
+public class DefaultedAnnotationFacetFactory extends FacetFactoryAbstract implements IsisConfigurationAware, ServicesInjectorAware {
 
     private IsisConfiguration configuration;
     private ServicesInjector servicesInjector;
@@ -47,7 +48,7 @@ public class DefaultedAnnotationFacetFac
     }
 
     private DefaultedFacetAbstract create(final Class<?> cls, final FacetHolder holder) {
-        final Defaulted annotation = getAnnotation(cls, Defaulted.class);
+        final Defaulted annotation = Annotations.getAnnotation(cls, Defaulted.class);
 
         // create from annotation, if present
         if (annotation != null) {

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/describedas/annotation/DescribedAsAnnotationOnTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/describedas/annotation/DescribedAsAnnotationOnTypeFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/describedas/annotation/DescribedAsAnnotationOnTypeFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/describedas/annotation/DescribedAsAnnotationOnTypeFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,10 +23,11 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.describedas.DescribedAsFacet;
 
-public class DescribedAsAnnotationOnTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class DescribedAsAnnotationOnTypeFacetFactory extends FacetFactoryAbstract {
 
     public DescribedAsAnnotationOnTypeFacetFactory() {
         super(FeatureType.OBJECTS_ONLY);
@@ -34,7 +35,7 @@ public class DescribedAsAnnotationOnType
 
     @Override
     public void process(final ProcessClassContext processClassContaxt) {
-        final DescribedAs annotation = getAnnotation(processClassContaxt.getCls(), DescribedAs.class);
+        final DescribedAs annotation = Annotations.getAnnotation(processClassContaxt.getCls(), DescribedAs.class);
         FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableAnnotationFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableAnnotationFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -28,12 +28,13 @@ import org.apache.isis.core.metamodel.ad
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
 import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
 import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
 
-public class EncodableAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract implements IsisConfigurationAware, ServicesInjectorAware, AdapterManagerAware {
+public class EncodableAnnotationFacetFactory extends FacetFactoryAbstract implements IsisConfigurationAware, ServicesInjectorAware, AdapterManagerAware {
 
     private IsisConfiguration configuration;
 
@@ -55,7 +56,7 @@ public class EncodableAnnotationFacetFac
     private EncodableFacet create(final Class<?> cls, final FacetHolder holder) {
 
         // create from annotation, if present
-        final Encodable annotation = getAnnotation(cls, Encodable.class);
+        final Encodable annotation = Annotations.getAnnotation(cls, Encodable.class);
         if (annotation != null) {
             final EncodableFacetAnnotation facet = new EncodableFacetAnnotation(cls, getIsisConfiguration(), holder, adapterManager, servicesInjector);
             if (facet.isValid()) {

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/facets/annotation/FacetsAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/facets/annotation/FacetsAnnotationFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/facets/annotation/FacetsAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/facets/annotation/FacetsAnnotationFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,10 +23,11 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.facets.FacetsFacet;
 
-public class FacetsAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class FacetsAnnotationFacetFactory extends FacetFactoryAbstract {
 
     public FacetsAnnotationFacetFactory() {
         super(FeatureType.OBJECTS_ONLY);
@@ -34,7 +35,7 @@ public class FacetsAnnotationFacetFactor
 
     @Override
     public void process(final ProcessClassContext processClassContaxt) {
-        final Facets annotation = getAnnotation(processClassContaxt.getCls(), Facets.class);
+        final Facets annotation = Annotations.getAnnotation(processClassContaxt.getCls(), Facets.class);
         FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/hidden/HiddenAnnotationForTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/hidden/HiddenAnnotationForTypeFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/hidden/HiddenAnnotationForTypeFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/hidden/HiddenAnnotationForTypeFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,10 +23,11 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
 
-public class HiddenAnnotationForTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class HiddenAnnotationForTypeFacetFactory extends FacetFactoryAbstract {
 
     public HiddenAnnotationForTypeFacetFactory() {
         super(FeatureType.OBJECTS_ONLY);
@@ -34,7 +35,7 @@ public class HiddenAnnotationForTypeFace
 
     @Override
     public void process(final ProcessClassContext processClassContext) {
-        final Hidden annotation = getAnnotation(processClassContext.getCls(), Hidden.class);
+        final Hidden annotation = Annotations.getAnnotation(processClassContext.getCls(), Hidden.class);
         FacetUtil.addFacet(create(annotation, processClassContext.getFacetHolder()));
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/annotation/RemoveProgrammaticOrIgnoreAnnotationMethodsFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/annotation/RemoveProgrammaticOrIgnoreAnnotationMethodsFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/annotation/RemoveProgrammaticOrIgnoreAnnotationMethodsFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/ignore/annotation/RemoveProgrammaticOrIgnoreAnnotationMethodsFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -26,9 +26,10 @@ import org.apache.isis.applib.annotation
 import org.apache.isis.applib.annotation.Programmatic;
 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.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 
-public class RemoveProgrammaticOrIgnoreAnnotationMethodsFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class RemoveProgrammaticOrIgnoreAnnotationMethodsFacetFactory extends FacetFactoryAbstract {
 
     public RemoveProgrammaticOrIgnoreAnnotationMethodsFacetFactory() {
         super(FeatureType.OBJECTS_ONLY);
@@ -53,7 +54,7 @@ public class RemoveProgrammaticOrIgnoreA
     }
 
     private static <T extends Annotation> void removeAnnotatedMethods(final MethodRemover methodRemover, final Method method, Class<T> annotationClass) {
-        if (!isAnnotationPresent(method, annotationClass)) {
+        if (!Annotations.isAnnotationPresent(method, annotationClass)) {
             return;
         } 
         methodRemover.removeMethod(method);

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/annotation/ImmutableAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/annotation/ImmutableAnnotationFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/annotation/ImmutableAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/annotation/ImmutableAnnotationFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,12 +23,13 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.FacetedMethod;
 import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
-public class ImmutableAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class ImmutableAnnotationFacetFactory extends FacetFactoryAbstract {
 
     public ImmutableAnnotationFacetFactory() {
         super(FeatureType.EVERYTHING_BUT_PARAMETERS);
@@ -36,7 +37,7 @@ public class ImmutableAnnotationFacetFac
 
     @Override
     public void process(final ProcessClassContext processClassContaxt) {
-        final Immutable annotation = getAnnotation(processClassContaxt.getCls(), Immutable.class);
+        final Immutable annotation = Annotations.getAnnotation(processClassContaxt.getCls(), Immutable.class);
         FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/annotation/MaskAnnotationForTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/annotation/MaskAnnotationForTypeFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/annotation/MaskAnnotationForTypeFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/annotation/MaskAnnotationForTypeFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,10 +23,11 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.progmodel.facets.object.mask.MaskFacet;
 
-public class MaskAnnotationForTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class MaskAnnotationForTypeFacetFactory extends FacetFactoryAbstract {
 
     public MaskAnnotationForTypeFacetFactory() {
         super(FeatureType.OBJECTS_ONLY);
@@ -37,7 +38,7 @@ public class MaskAnnotationForTypeFacetF
      */
     @Override
     public void process(final ProcessClassContext processClassContaxt) {
-        final Mask annotation = getAnnotation(processClassContaxt.getCls(), Mask.class);
+        final Mask annotation = Annotations.getAnnotation(processClassContaxt.getCls(), Mask.class);
         FacetUtil.addFacet(createMaskFacet(annotation, processClassContaxt.getFacetHolder()));
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthAnnotationForTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthAnnotationForTypeFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthAnnotationForTypeFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthAnnotationForTypeFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,10 +23,11 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.maxlen.MaxLengthFacet;
 
-public class MaxLengthAnnotationForTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class MaxLengthAnnotationForTypeFacetFactory extends FacetFactoryAbstract {
 
     public MaxLengthAnnotationForTypeFacetFactory() {
         super(FeatureType.OBJECTS_ONLY);
@@ -37,7 +38,7 @@ public class MaxLengthAnnotationForTypeF
      */
     @Override
     public void process(final ProcessClassContext processClassContaxt) {
-        final MaxLength annotation = getAnnotation(processClassContaxt.getCls(), MaxLength.class);
+        final MaxLength annotation = Annotations.getAnnotation(processClassContaxt.getCls(), MaxLength.class);
         FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/multiline/annotation/MultiLineAnnotationOnTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/multiline/annotation/MultiLineAnnotationOnTypeFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/multiline/annotation/MultiLineAnnotationOnTypeFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/multiline/annotation/MultiLineAnnotationOnTypeFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,10 +23,11 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.multiline.MultiLineFacet;
 
-public class MultiLineAnnotationOnTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class MultiLineAnnotationOnTypeFacetFactory extends FacetFactoryAbstract {
 
     public MultiLineAnnotationOnTypeFacetFactory() {
         super(FeatureType.OBJECTS_ONLY);
@@ -37,7 +38,7 @@ public class MultiLineAnnotationOnTypeFa
      */
     @Override
     public void process(final ProcessClassContext processClassContaxt) {
-        final MultiLine annotation = getAnnotation(processClassContaxt.getCls(), MultiLine.class);
+        final MultiLine annotation = Annotations.getAnnotation(processClassContaxt.getCls(), MultiLine.class);
         FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/named/annotation/NamedAnnotationOnTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/named/annotation/NamedAnnotationOnTypeFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/named/annotation/NamedAnnotationOnTypeFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/named/annotation/NamedAnnotationOnTypeFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,10 +23,11 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.named.NamedFacet;
 
-public class NamedAnnotationOnTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class NamedAnnotationOnTypeFacetFactory extends FacetFactoryAbstract {
 
     public NamedAnnotationOnTypeFacetFactory() {
         super(FeatureType.OBJECTS_ONLY);
@@ -34,7 +35,7 @@ public class NamedAnnotationOnTypeFacetF
 
     @Override
     public void process(final ProcessClassContext processClassContaxt) {
-        final Named annotation = getAnnotation(processClassContaxt.getCls(), Named.class);
+        final Named annotation = Annotations.getAnnotation(processClassContaxt.getCls(), Named.class);
         FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableAnnotationFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableAnnotationFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,10 +23,11 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.object.notpersistable.NotPersistableFacet;
 
-public class NotPersistableAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class NotPersistableAnnotationFacetFactory extends FacetFactoryAbstract {
 
     public NotPersistableAnnotationFacetFactory() {
         super(FeatureType.OBJECTS_ONLY);
@@ -34,13 +35,13 @@ public class NotPersistableAnnotationFac
 
     @Override
     public void process(final ProcessClassContext processClassContaxt) {
-        final NotPersistable annotation = getAnnotation(processClassContaxt.getCls(), NotPersistable.class);
+        final NotPersistable annotation = Annotations.getAnnotation(processClassContaxt.getCls(), NotPersistable.class);
         FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
     }
 
     @Override
     public void process(final ProcessMethodContext processMethodContext) {
-        final NotPersistable annotation = getAnnotation(processMethodContext.getMethod(), NotPersistable.class);
+        final NotPersistable annotation = Annotations.getAnnotation(processMethodContext.getMethod(), NotPersistable.class);
         FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
     }
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectSpecIdAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectSpecIdAnnotationFacetFactory.java?rev=1383836&r1=1383835&r2=1383836&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectSpecIdAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectSpecIdAnnotationFacetFactory.java Wed Sep 12 08:15:12 2012
@@ -23,10 +23,11 @@ import org.apache.isis.applib.annotation
 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.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.object.objecttype.ObjectSpecIdFacet;
 
-public class ObjectSpecIdAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class ObjectSpecIdAnnotationFacetFactory extends FacetFactoryAbstract {
 
     public ObjectSpecIdAnnotationFacetFactory() {
         super(FeatureType.OBJECTS_ONLY);
@@ -34,7 +35,7 @@ public class ObjectSpecIdAnnotationFacet
 
     @Override
     public void process(final ProcessClassContext processClassContext) {
-        final ObjectType annotation = getAnnotation(processClassContext.getCls(), ObjectType.class);
+        final ObjectType annotation = Annotations.getAnnotation(processClassContext.getCls(), ObjectType.class);
         FacetUtil.addFacet(create(annotation, processClassContext.getFacetHolder()));
     }
 



Mime
View raw message