incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1234457 [1/2] - in /incubator/isis/trunk/framework/progmodels: dflt/src/main/java/org/apache/isis/progmodels/dflt/ dflt/src/test/java/org/apache/isis/progmodels/dflt/ groovy/applib/src/main/java/org/apache/isis/progmodel/groovy/applib/ gro...
Date Sun, 22 Jan 2012 07:38:05 GMT
Author: danhaywood
Date: Sun Jan 22 07:38:03 2012
New Revision: 1234457

URL: http://svn.apache.org/viewvc?rev=1234457&view=rev
Log:
ISIS-165: code cleanup for progmodel

Modified:
    incubator/isis/trunk/framework/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java
    incubator/isis/trunk/framework/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
    incubator/isis/trunk/framework/progmodels/dflt/src/test/java/org/apache/isis/progmodels/dflt/JavaReflectorTestAbstract.java
    incubator/isis/trunk/framework/progmodels/groovy/applib/src/main/java/org/apache/isis/progmodel/groovy/applib/DomainObjectBuilder.java
    incubator/isis/trunk/framework/progmodels/groovy/metamodel/src/main/java/org/apache/isis/progmodel/groovy/metamodel/RemoveGroovyMethodsFacetFactory.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/DisabledException.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/HiddenException.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/InteractionException.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/InvalidException.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/WrapperFactory.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/WrapperObject.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/listeners/InteractionAdapter.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/listeners/InteractionListener.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/AbstractCollectionInvocationHandler.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibClassProxyFactory.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibProxy.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CollectionInvocationHandler.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DelegatingInvocationHandlerDefault.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/IClassInstantiatorCE.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/InteractionEventDispatcherTypeSafe.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/InvocationHandlerMethodInterceptor.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/JavaProxyFactory.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/MapInvocationHandler.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/Proxy.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/WrapperFactoryDefault.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/util/Constants.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/WrappedFactoryDefaultTest_wrappedObject.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/WrappedFactoryDefaultTest_wrappedObject_transient.java
    incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/dom/employee/Employee.java

Modified: incubator/isis/trunk/framework/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java?rev=1234457&r1=1234456&r2=1234457&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java (original)
+++ incubator/isis/trunk/framework/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java Sun Jan 22 07:38:03 2012
@@ -80,7 +80,9 @@ public class JavaReflectorInstaller exte
     // /////////////////////////////////////////////////////
 
     /**
-     * Should call {@link #addFacetDecoratorInstaller(ReflectorDecoratorInstaller)} prior to calling this.
+     * Should call
+     * {@link #addFacetDecoratorInstaller(ReflectorDecoratorInstaller)} prior to
+     * calling this.
      */
     @Override
     public ObjectReflectorDefault createReflector() {
@@ -92,30 +94,29 @@ public class JavaReflectorInstaller exte
         final Set<FacetDecorator> facetDecorators = createFacetDecorators(getConfiguration());
         final MetaModelValidator metaModelValidator = createMetaModelValidator(getConfiguration());
 
-        final ObjectReflectorDefault reflector =
-            doCreateReflector(getConfiguration(), classSubstitutor, collectionTypeRegistry, specificationTraverser,
-                memberLayoutArranger, programmingModel, facetDecorators, metaModelValidator);
+        final ObjectReflectorDefault reflector = doCreateReflector(getConfiguration(), classSubstitutor, collectionTypeRegistry, specificationTraverser, memberLayoutArranger, programmingModel, facetDecorators, metaModelValidator);
 
         return reflector;
     }
 
     /**
-     * Hook method to allow subclasses to specify a different implementation of {@link ClassSubstitutor}.
+     * Hook method to allow subclasses to specify a different implementation of
+     * {@link ClassSubstitutor}.
      * 
      * <p>
-     * By default, looks up implementation from provided {@link IsisConfiguration} using
-     * {@link ReflectorConstants#CLASS_SUBSTITUTOR_CLASS_NAME_LIST}. If not specified, then defaults to
+     * By default, looks up implementation from provided
+     * {@link IsisConfiguration} using
+     * {@link ReflectorConstants#CLASS_SUBSTITUTOR_CLASS_NAME_LIST}. If not
+     * specified, then defaults to
      * {@value ReflectorConstants#CLASS_SUBSTITUTOR_CLASS_NAME_DEFAULT}.
      * 
      * <p>
      * 
      */
     protected ClassSubstitutor createClassSubstitutor(final IsisConfiguration configuration) {
-        final String[] configuredClassNames =
-            configuration.getList(ReflectorConstants.CLASS_SUBSTITUTOR_CLASS_NAME_LIST);
+        final String[] configuredClassNames = configuration.getList(ReflectorConstants.CLASS_SUBSTITUTOR_CLASS_NAME_LIST);
         if (configuredClassNames == null || configuredClassNames.length == 0) {
-            return InstanceUtil.createInstance(ReflectorConstants.CLASS_SUBSTITUTOR_CLASS_NAME_DEFAULT,
-                ClassSubstitutor.class);
+            return InstanceUtil.createInstance(ReflectorConstants.CLASS_SUBSTITUTOR_CLASS_NAME_DEFAULT, ClassSubstitutor.class);
         }
         final List<ClassSubstitutor> substitutors = Lists.newArrayList();
         for (final String className : configuredClassNames) {
@@ -126,52 +127,56 @@ public class JavaReflectorInstaller exte
     }
 
     /**
-     * Hook method to allow subclasses to specify a different implementation of {@link SpecificationTraverser}.
+     * Hook method to allow subclasses to specify a different implementation of
+     * {@link SpecificationTraverser}.
      * 
      * <p>
-     * By default, looks up implementation from provided {@link IsisConfiguration} using
-     * {@link ReflectorConstants#SPECIFICATION_TRAVERSER_CLASS_NAME}. If not specified, then defaults to
+     * By default, looks up implementation from provided
+     * {@link IsisConfiguration} using
+     * {@link ReflectorConstants#SPECIFICATION_TRAVERSER_CLASS_NAME}. If not
+     * specified, then defaults to
      * {@value ReflectorConstants#SPECIFICATION_TRAVERSER_CLASS_NAME_DEFAULT}.
      */
     protected SpecificationTraverser createSpecificationTraverser(final IsisConfiguration configuration) {
-        final String specificationTraverserClassName =
-            configuration.getString(ReflectorConstants.SPECIFICATION_TRAVERSER_CLASS_NAME,
-                ReflectorConstants.SPECIFICATION_TRAVERSER_CLASS_NAME_DEFAULT);
-        final SpecificationTraverser specificationTraverser =
-            InstanceUtil.createInstance(specificationTraverserClassName, SpecificationTraverser.class);
+        final String specificationTraverserClassName = configuration.getString(ReflectorConstants.SPECIFICATION_TRAVERSER_CLASS_NAME, ReflectorConstants.SPECIFICATION_TRAVERSER_CLASS_NAME_DEFAULT);
+        final SpecificationTraverser specificationTraverser = InstanceUtil.createInstance(specificationTraverserClassName, SpecificationTraverser.class);
         return specificationTraverser;
     }
 
     /**
-     * Hook method to allow subclasses to specify a different implementation of {@link MemberLayoutArranger}.
+     * Hook method to allow subclasses to specify a different implementation of
+     * {@link MemberLayoutArranger}.
      * 
      * <p>
-     * By default, looks up implementation from provided {@link IsisConfiguration} using
-     * {@link ReflectorConstants#MEMBER_LAYOUT_ARRANGER_CLASS_NAME}. If not specified, then defaults to
+     * By default, looks up implementation from provided
+     * {@link IsisConfiguration} using
+     * {@link ReflectorConstants#MEMBER_LAYOUT_ARRANGER_CLASS_NAME}. If not
+     * specified, then defaults to
      * {@value ReflectorConstants#MEMBER_LAYOUT_ARRANGER_CLASS_NAME_DEFAULT}.
      */
     protected MemberLayoutArranger createMemberLayoutArranger(final IsisConfiguration configuration) {
-        final String memberLayoutArrangerClassName =
-            configuration.getString(ReflectorConstants.MEMBER_LAYOUT_ARRANGER_CLASS_NAME,
-                ReflectorConstants.MEMBER_LAYOUT_ARRANGER_CLASS_NAME_DEFAULT);
-        final MemberLayoutArranger memberLayoutArranger =
-            InstanceUtil.createInstance(memberLayoutArrangerClassName, MemberLayoutArranger.class);
+        final String memberLayoutArrangerClassName = configuration.getString(ReflectorConstants.MEMBER_LAYOUT_ARRANGER_CLASS_NAME, ReflectorConstants.MEMBER_LAYOUT_ARRANGER_CLASS_NAME_DEFAULT);
+        final MemberLayoutArranger memberLayoutArranger = InstanceUtil.createInstance(memberLayoutArrangerClassName, MemberLayoutArranger.class);
         return memberLayoutArranger;
     }
 
     /**
-     * Hook method to allow subclasses to specify a different implementations (that is, sets of {@link ProgrammingModel}
-     * .
+     * Hook method to allow subclasses to specify a different implementations
+     * (that is, sets of {@link ProgrammingModel} .
      * 
      * <p>
-     * By default, looks up implementation from provided {@link IsisConfiguration} using
-     * {@link ReflectorConstants#PROGRAMMING_MODEL_FACETS_CLASS_NAME}. If not specified, then defaults to
+     * By default, looks up implementation from provided
+     * {@link IsisConfiguration} using
+     * {@link ReflectorConstants#PROGRAMMING_MODEL_FACETS_CLASS_NAME}. If not
+     * specified, then defaults to
      * {@value ReflectorConstants#PROGRAMMING_MODEL_FACETS_CLASS_NAME_DEFAULT}.
      * 
      * <p>
-     * The list of facets can be adjusted using {@link ReflectorConstants#FACET_FACTORY_INCLUDE_CLASS_NAME_LIST} to
+     * The list of facets can be adjusted using
+     * {@link ReflectorConstants#FACET_FACTORY_INCLUDE_CLASS_NAME_LIST} to
      * specify additional {@link FacetFactory factories} to include, and
-     * {@link ReflectorConstants#FACET_FACTORY_EXCLUDE_CLASS_NAME_LIST} to exclude.
+     * {@link ReflectorConstants#FACET_FACTORY_EXCLUDE_CLASS_NAME_LIST} to
+     * exclude.
      */
     protected ProgrammingModel createProgrammingModelFacets(final IsisConfiguration configuration) {
         final ProgrammingModel programmingModel = lookupAndCreateProgrammingModelFacets(configuration);
@@ -181,52 +186,50 @@ public class JavaReflectorInstaller exte
     }
 
     private ProgrammingModel lookupAndCreateProgrammingModelFacets(final IsisConfiguration configuration) {
-        final String progModelFacetsClassName =
-            configuration.getString(ReflectorConstants.PROGRAMMING_MODEL_FACETS_CLASS_NAME,
-                ReflectorConstants.PROGRAMMING_MODEL_FACETS_CLASS_NAME_DEFAULT);
-        final ProgrammingModel programmingModel =
-            InstanceUtil.createInstance(progModelFacetsClassName, ProgrammingModel.class);
+        final String progModelFacetsClassName = configuration.getString(ReflectorConstants.PROGRAMMING_MODEL_FACETS_CLASS_NAME, ReflectorConstants.PROGRAMMING_MODEL_FACETS_CLASS_NAME_DEFAULT);
+        final ProgrammingModel programmingModel = InstanceUtil.createInstance(progModelFacetsClassName, ProgrammingModel.class);
         return programmingModel;
     }
 
     /**
-     * Factored out of {@link #createProgrammingModelFacets(IsisConfiguration)} so that subclasses that choose to
-     * override can still support customization of their {@link ProgrammingModel} in a similar way.
+     * Factored out of {@link #createProgrammingModelFacets(IsisConfiguration)}
+     * so that subclasses that choose to override can still support
+     * customization of their {@link ProgrammingModel} in a similar way.
      */
     protected void includeFacetFactories(final IsisConfiguration configuration, final ProgrammingModel programmingModel) {
-        final String[] facetFactoriesIncludeClassNames =
-            configuration.getList(ReflectorConstants.FACET_FACTORY_INCLUDE_CLASS_NAME_LIST);
+        final String[] facetFactoriesIncludeClassNames = configuration.getList(ReflectorConstants.FACET_FACTORY_INCLUDE_CLASS_NAME_LIST);
         if (facetFactoriesIncludeClassNames != null) {
             for (final String facetFactoryClassName : facetFactoriesIncludeClassNames) {
-                final Class<? extends FacetFactory> facetFactory =
-                    InstanceUtil.loadClass(facetFactoryClassName, FacetFactory.class);
+                final Class<? extends FacetFactory> facetFactory = InstanceUtil.loadClass(facetFactoryClassName, FacetFactory.class);
                 programmingModel.addFactory(facetFactory);
             }
         }
     }
 
     /**
-     * Factored out of {@link #createProgrammingModelFacets(IsisConfiguration)} so that subclasses that choose to
-     * override can still support customization of their {@link ProgrammingModel} in a similar way.
+     * Factored out of {@link #createProgrammingModelFacets(IsisConfiguration)}
+     * so that subclasses that choose to override can still support
+     * customization of their {@link ProgrammingModel} in a similar way.
      */
     protected void excludeFacetFactories(final IsisConfiguration configuration, final ProgrammingModel programmingModel) {
-        final String[] facetFactoriesExcludeClassNames =
-            configuration.getList(ReflectorConstants.FACET_FACTORY_EXCLUDE_CLASS_NAME_LIST);
+        final String[] facetFactoriesExcludeClassNames = configuration.getList(ReflectorConstants.FACET_FACTORY_EXCLUDE_CLASS_NAME_LIST);
         for (final String facetFactoryClassName : facetFactoriesExcludeClassNames) {
-            final Class<? extends FacetFactory> facetFactory =
-                InstanceUtil.loadClass(facetFactoryClassName, FacetFactory.class);
+            final Class<? extends FacetFactory> facetFactory = InstanceUtil.loadClass(facetFactoryClassName, FacetFactory.class);
             programmingModel.removeFactory(facetFactory);
         }
     }
 
     /**
-     * Hook method to allow subclasses to specify a different sets of {@link FacetDecorator}s.
+     * Hook method to allow subclasses to specify a different sets of
+     * {@link FacetDecorator}s.
      * 
      * <p>
-     * By default, returns the {@link FacetDecorator}s that are specified in the {@link IsisConfiguration} (using
-     * {@link ReflectorConstants#FACET_DECORATOR_CLASS_NAMES}) along with any {@link FacetDecorator}s explicitly
-     * registered using {@link #addFacetDecoratorInstaller(FacetDecoratorInstaller)}. created using the
-     * {@link FacetDecoratorInstaller}s.
+     * By default, returns the {@link FacetDecorator}s that are specified in the
+     * {@link IsisConfiguration} (using
+     * {@link ReflectorConstants#FACET_DECORATOR_CLASS_NAMES}) along with any
+     * {@link FacetDecorator}s explicitly registered using
+     * {@link #addFacetDecoratorInstaller(FacetDecoratorInstaller)}. created
+     * using the {@link FacetDecoratorInstaller}s.
      */
     protected Set<FacetDecorator> createFacetDecorators(final IsisConfiguration configuration) {
         addFacetDecoratorInstallers(configuration);
@@ -261,46 +264,46 @@ public class JavaReflectorInstaller exte
     }
 
     /**
-     * Hook method to allow subclasses to specify a different implementation of {@link MetaModelValidator}.
+     * Hook method to allow subclasses to specify a different implementation of
+     * {@link MetaModelValidator}.
      * 
      * <p>
-     * By default, looks up implementation from provided {@link IsisConfiguration} using
-     * {@link ReflectorConstants#META_MODEL_VALIDATOR_CLASS_NAME}. If not specified, then defaults to
+     * By default, looks up implementation from provided
+     * {@link IsisConfiguration} using
+     * {@link ReflectorConstants#META_MODEL_VALIDATOR_CLASS_NAME}. If not
+     * specified, then defaults to
      * {@value ReflectorConstants#META_MODEL_VALIDATOR_CLASS_NAME_DEFAULT}.
      */
     protected MetaModelValidator createMetaModelValidator(final IsisConfiguration configuration) {
-        final String metaModelValidatorClassName =
-            configuration.getString(ReflectorConstants.META_MODEL_VALIDATOR_CLASS_NAME,
-                ReflectorConstants.META_MODEL_VALIDATOR_CLASS_NAME_DEFAULT);
-        final MetaModelValidator metaModelValidator =
-            InstanceUtil.createInstance(metaModelValidatorClassName, MetaModelValidator.class);
+        final String metaModelValidatorClassName = configuration.getString(ReflectorConstants.META_MODEL_VALIDATOR_CLASS_NAME, ReflectorConstants.META_MODEL_VALIDATOR_CLASS_NAME_DEFAULT);
+        final MetaModelValidator metaModelValidator = InstanceUtil.createInstance(metaModelValidatorClassName, MetaModelValidator.class);
         return metaModelValidator;
     }
 
     /**
-     * Creates the {@link CollectionTypeRegistry}, hardcoded to be the {@link CollectionTypeRegistryDefault}.
+     * Creates the {@link CollectionTypeRegistry}, hardcoded to be the
+     * {@link CollectionTypeRegistryDefault}.
      * 
      * <p>
-     * Note: the intention is to remove this interface and instead to use a mechanism similar to the <tt>@Value</tt>
-     * annotation to specify which types represent collections. For now, have factored out this method similar to be
-     * similar to the creation methods of other subcomponents such as the
-     * {@link #createClassSubstitutor(IsisConfiguration) ClassSubstitutor}. Note however that this method is
-     * <tt>final</tt> so that it cannot be overridden.
+     * Note: the intention is to remove this interface and instead to use a
+     * mechanism similar to the <tt>@Value</tt> annotation to specify which
+     * types represent collections. For now, have factored out this method
+     * similar to be similar to the creation methods of other subcomponents such
+     * as the {@link #createClassSubstitutor(IsisConfiguration)
+     * ClassSubstitutor}. Note however that this method is <tt>final</tt> so
+     * that it cannot be overridden.
      */
     protected final CollectionTypeRegistry createCollectionTypeRegistry(final IsisConfiguration configuration) {
         return new CollectionTypeRegistryDefault();
     }
 
     /**
-     * Hook method to allow for other implementations (still based on {@link ObjectReflectorDefault}).
+     * Hook method to allow for other implementations (still based on
+     * {@link ObjectReflectorDefault}).
      */
-    protected ObjectReflectorDefault doCreateReflector(final IsisConfiguration configuration,
-        final ClassSubstitutor classSubstitutor, final CollectionTypeRegistry collectionTypeRegistry,
-        final SpecificationTraverser specificationTraverser, final MemberLayoutArranger memberLayoutArranger,
-        final ProgrammingModel programmingModel, final Set<FacetDecorator> facetDecorators,
-        final MetaModelValidator metaModelValidator) {
-        return new ObjectReflectorDefault(configuration, classSubstitutor, collectionTypeRegistry,
-            specificationTraverser, memberLayoutArranger, programmingModel, facetDecorators, metaModelValidator);
+    protected ObjectReflectorDefault doCreateReflector(final IsisConfiguration configuration, final ClassSubstitutor classSubstitutor, final CollectionTypeRegistry collectionTypeRegistry, final SpecificationTraverser specificationTraverser, final MemberLayoutArranger memberLayoutArranger,
+            final ProgrammingModel programmingModel, final Set<FacetDecorator> facetDecorators, final MetaModelValidator metaModelValidator) {
+        return new ObjectReflectorDefault(configuration, classSubstitutor, collectionTypeRegistry, specificationTraverser, memberLayoutArranger, programmingModel, facetDecorators, metaModelValidator);
     }
 
     // /////////////////////////////////////////////////////
@@ -320,8 +323,8 @@ public class JavaReflectorInstaller exte
     // /////////////////////////////////////////////////////
 
     /**
-     * Adds in {@link FacetDecoratorInstaller}; if <tt>null</tt> or if already added then request will be silently
-     * ignored.
+     * Adds in {@link FacetDecoratorInstaller}; if <tt>null</tt> or if already
+     * added then request will be silently ignored.
      */
     @Override
     public void addFacetDecoratorInstaller(final FacetDecoratorInstaller decoratorInstaller) {

Modified: incubator/isis/trunk/framework/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java?rev=1234457&r1=1234456&r2=1234457&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java (original)
+++ incubator/isis/trunk/framework/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java Sun Jan 22 07:38:03 2012
@@ -183,7 +183,8 @@ public class ProgrammingModelFacetsJava5
 
     public ProgrammingModelFacetsJava5() {
 
-        // must be first, so any Facets created can be replaced by other FacetFactorys later.
+        // must be first, so any Facets created can be replaced by other
+        // FacetFactorys later.
         addFactory(FallbackFacetFactory.class);
 
         addFactory(IteratorFilteringFacetFactory.class);
@@ -197,7 +198,8 @@ public class ProgrammingModelFacetsJava5
         addFactory(RemoveGetClassMethodFacetFactory.class);
         addFactory(RemoveIgnoreAnnotationMethodsFacetFactory.class);
 
-        // must be before any other FacetFactories that install MandatoryFacet.class facets
+        // must be before any other FacetFactories that install
+        // MandatoryFacet.class facets
         addFactory(MandatoryDefaultForPropertiesFacetFactory.class);
         addFactory(MandatoryDefaultForParametersFacetFactory.class);
 
@@ -211,7 +213,8 @@ public class ProgrammingModelFacetsJava5
         // properties
         addFactory(PropertyAccessorFacetFactory.class);
         addFactory(PropertySetAndClearFacetFactory.class);
-        addFactory(PropertyModifyFacetFactory.class); // must come after PropertySetAndClearFacetFactory
+        addFactory(PropertyModifyFacetFactory.class); // must come after
+                                                      // PropertySetAndClearFacetFactory
         addFactory(PropertyValidateFacetFactory.class);
         addFactory(PropertyChoicesFacetFactory.class);
         addFactory(PropertyDefaultFacetFactory.class);

Modified: incubator/isis/trunk/framework/progmodels/dflt/src/test/java/org/apache/isis/progmodels/dflt/JavaReflectorTestAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/dflt/src/test/java/org/apache/isis/progmodels/dflt/JavaReflectorTestAbstract.java?rev=1234457&r1=1234456&r2=1234457&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/dflt/src/test/java/org/apache/isis/progmodels/dflt/JavaReflectorTestAbstract.java (original)
+++ incubator/isis/trunk/framework/progmodels/dflt/src/test/java/org/apache/isis/progmodels/dflt/JavaReflectorTestAbstract.java Sun Jan 22 07:38:03 2012
@@ -96,21 +96,19 @@ public abstract class JavaReflectorTestA
             }
         });
 
-        final ObjectReflectorDefault reflector =
-            new ObjectReflectorDefault(configuration, new TestClassSubstitutor(), new CollectionTypeRegistryDefault(),
-                new SpecificationTraverserDefault(), new MemberLayoutArrangerDefault(),
-                new ProgrammingModelFacetsJava5(), new HashSet<FacetDecorator>(), new MetaModelValidatorDefault());
+        final ObjectReflectorDefault reflector = new ObjectReflectorDefault(configuration, new TestClassSubstitutor(), new CollectionTypeRegistryDefault(), new SpecificationTraverserDefault(), new MemberLayoutArrangerDefault(), new ProgrammingModelFacetsJava5(), new HashSet<FacetDecorator>(),
+                new MetaModelValidatorDefault());
         reflector.setRuntimeContext(new RuntimeContextFromSession());
         reflector.init();
 
-        // not sure if this is needed since we have now moved Reflector out to global scope,
+        // not sure if this is needed since we have now moved Reflector out to
+        // global scope,
         // not specific to an ExecutionContext.
-        final IsisSessionFactory executionContextFactory =
-            new IsisSessionFactoryDefault(DeploymentType.EXPLORATION, configuration, mockTemplateImageLoader,
-                reflector, mockAuthenticationManager, mockAuthorizationManager, mockUserProfileLoader,
-                mockPersistenceSessionFactory, servicesList);
+        final IsisSessionFactory executionContextFactory = new IsisSessionFactoryDefault(DeploymentType.EXPLORATION, configuration, mockTemplateImageLoader, reflector, mockAuthenticationManager, mockAuthorizationManager, mockUserProfileLoader, mockPersistenceSessionFactory, servicesList);
         IsisContextStatic.createRelaxedInstance(executionContextFactory);
-        IsisContextStatic.getInstance().getSessionInstance(); // cause an Execution Context to load
+        IsisContextStatic.getInstance().getSessionInstance(); // cause an
+                                                              // Execution
+                                                              // Context to load
 
         specification = loadSpecification(reflector);
     }

Modified: incubator/isis/trunk/framework/progmodels/groovy/applib/src/main/java/org/apache/isis/progmodel/groovy/applib/DomainObjectBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/groovy/applib/src/main/java/org/apache/isis/progmodel/groovy/applib/DomainObjectBuilder.java?rev=1234457&r1=1234456&r2=1234457&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/groovy/applib/src/main/java/org/apache/isis/progmodel/groovy/applib/DomainObjectBuilder.java (original)
+++ incubator/isis/trunk/framework/progmodels/groovy/applib/src/main/java/org/apache/isis/progmodel/groovy/applib/DomainObjectBuilder.java Sun Jan 22 07:38:03 2012
@@ -51,8 +51,7 @@ public class DomainObjectBuilder<T> exte
         final NewInstanceResolver instanceResolver = new DefaultNewInstanceResolver() {
             @SuppressWarnings("unchecked")
             @Override
-            public Object newInstance(final Class cls, final Map attributes) throws InstantiationException,
-                IllegalAccessException {
+            public Object newInstance(final Class cls, final Map attributes) throws InstantiationException, IllegalAccessException {
                 return container.newTransientInstance(cls);
             }
         };

Modified: incubator/isis/trunk/framework/progmodels/groovy/metamodel/src/main/java/org/apache/isis/progmodel/groovy/metamodel/RemoveGroovyMethodsFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/groovy/metamodel/src/main/java/org/apache/isis/progmodel/groovy/metamodel/RemoveGroovyMethodsFacetFactory.java?rev=1234457&r1=1234456&r2=1234457&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/groovy/metamodel/src/main/java/org/apache/isis/progmodel/groovy/metamodel/RemoveGroovyMethodsFacetFactory.java (original)
+++ incubator/isis/trunk/framework/progmodels/groovy/metamodel/src/main/java/org/apache/isis/progmodel/groovy/metamodel/RemoveGroovyMethodsFacetFactory.java Sun Jan 22 07:38:03 2012
@@ -83,16 +83,14 @@ public class RemoveGroovyMethodsFacetFac
 
     @Override
     public void process(final ProcessClassContext processClassContext) {
-        MethodSpec.specFor("invokeMethod").param(String.class, Object.class).ret(Object.class)
-            .remove(processClassContext);
+        MethodSpec.specFor("invokeMethod").param(String.class, Object.class).ret(Object.class).remove(processClassContext);
         MethodSpec.specFor("getMetaClass").ret(groovy.lang.MetaClass.class).remove(processClassContext);
         MethodSpec.specFor("setMetaClass").param(groovy.lang.MetaClass.class).remove(processClassContext);
         MethodSpec.specFor("getProperty").param(String.class).ret(Object.class).remove(processClassContext);
 
         final int depth = determineDepth();
         for (int i = 1; i < depth; i++) {
-            MethodSpec.specFor("this$dist$invoke$%d", i).param(String.class, Object.class).ret(Object.class)
-                .remove(processClassContext);
+            MethodSpec.specFor("this$dist$invoke$%d", i).param(String.class, Object.class).ret(Object.class).remove(processClassContext);
             MethodSpec.specFor("this$dist$set$%d", i).param(String.class, Object.class).remove(processClassContext);
             MethodSpec.specFor("this$dist$get$%d", i).param(String.class).ret(Object.class).remove(processClassContext);
         }

Modified: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/DisabledException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/DisabledException.java?rev=1234457&r1=1234456&r2=1234457&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/DisabledException.java (original)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/DisabledException.java Sun Jan 22 07:38:03 2012
@@ -23,7 +23,8 @@ import org.apache.isis.applib.events.Int
 import org.apache.isis.applib.events.UsabilityEvent;
 
 /**
- * Superclass of exceptions which indicate an attempt to interact with a class member that is disabled.
+ * Superclass of exceptions which indicate an attempt to interact with a class
+ * member that is disabled.
  */
 public class DisabledException extends InteractionException {
 

Modified: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/HiddenException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/HiddenException.java?rev=1234457&r1=1234456&r2=1234457&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/HiddenException.java (original)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/HiddenException.java Sun Jan 22 07:38:03 2012
@@ -23,8 +23,8 @@ import org.apache.isis.applib.events.Int
 import org.apache.isis.applib.events.VisibilityEvent;
 
 /**
- * Superclass of exceptions which indicate an attempt to interact with a class member that is in some way hidden or
- * invisible.
+ * Superclass of exceptions which indicate an attempt to interact with a class
+ * member that is in some way hidden or invisible.
  */
 public class HiddenException extends InteractionException {
 

Modified: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/InteractionException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/InteractionException.java?rev=1234457&r1=1234456&r2=1234457&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/InteractionException.java (original)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/InteractionException.java Sun Jan 22 07:38:03 2012
@@ -35,12 +35,14 @@ public abstract class InteractionExcepti
     }
 
     /**
-     * The {@link InteractionEvent event} passed into the {@link #InteractionException(InteractionEvent) constructor}.
+     * The {@link InteractionEvent event} passed into the
+     * {@link #InteractionException(InteractionEvent) constructor}.
      * 
      * <p>
-     * Not part of the API, but made available so that subclasses can expose as the appropriate subtype of
-     * {@link InteractionEvent}. This would have been more obvious to see if {@link InteractionException} was generic,
-     * but generic subclasses of {@link Throwable} are (apparently) not allowed.
+     * Not part of the API, but made available so that subclasses can expose as
+     * the appropriate subtype of {@link InteractionEvent}. This would have been
+     * more obvious to see if {@link InteractionException} was generic, but
+     * generic subclasses of {@link Throwable} are (apparently) not allowed.
      * 
      * @return
      */
@@ -49,7 +51,8 @@ public abstract class InteractionExcepti
     }
 
     /**
-     * Convenience method that returns the {@link InteractionEvent#getAdvisorClass() advisor class} of the wrapped
+     * Convenience method that returns the
+     * {@link InteractionEvent#getAdvisorClass() advisor class} of the wrapped
      * {@link #getInteractionEvent() interaction event}.
      * 
      * @return
@@ -59,7 +62,8 @@ public abstract class InteractionExcepti
     }
 
     /**
-     * Convenience method that returns the {@link InteractionEvent#getIdentifier() identifier} of the wrapped
+     * Convenience method that returns the
+     * {@link InteractionEvent#getIdentifier() identifier} of the wrapped
      * {@link #getInteractionEvent() interaction event}.
      * 
      * @return

Modified: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/InvalidException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/InvalidException.java?rev=1234457&r1=1234456&r2=1234457&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/InvalidException.java (original)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/InvalidException.java Sun Jan 22 07:38:03 2012
@@ -23,7 +23,8 @@ import org.apache.isis.applib.events.Int
 import org.apache.isis.applib.events.ValidityEvent;
 
 /**
- * Superclass of exceptions which indicate an attempt to interact with an object or member in a way that is invalid.
+ * Superclass of exceptions which indicate an attempt to interact with an object
+ * or member in a way that is invalid.
  * 
  * <p>
  * 

Modified: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/WrapperFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/WrapperFactory.java?rev=1234457&r1=1234456&r2=1234457&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/WrapperFactory.java (original)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/WrapperFactory.java Sun Jan 22 07:38:03 2012
@@ -26,12 +26,13 @@ import org.apache.isis.applib.events.Int
 import org.apache.isis.progmodel.wrapper.applib.listeners.InteractionListener;
 
 /**
- * Provides the ability to &quot;wrap&quot; of a domain object such that it can be interacted with while enforcing the
- * hide/disable/validate rules implies by the Isis programming model.
+ * Provides the ability to &quot;wrap&quot; of a domain object such that it can
+ * be interacted with while enforcing the hide/disable/validate rules implies by
+ * the Isis programming model.
  * 
  * <p>
- * The &quot;wrap&quot; is a CGLib proxy that wraps the underlying domain object. The wrapper can then be interacted
- * with as follows:
+ * The &quot;wrap&quot; is a CGLib proxy that wraps the underlying domain
+ * object. The wrapper can then be interacted with as follows:
  * <ul>
  * <li>a <tt>get</tt> method for properties or collections</li>
  * <li>a <tt>set</tt> method for properties</li>
@@ -40,10 +41,12 @@ import org.apache.isis.progmodel.wrapper
  * </ul>
  * 
  * <p>
- * Calling any of the above methods may result in a (subclass of) {@link InteractionException} if the object disallows
- * it. For example, if a property is annotated with {@link Hidden} then a {@link HiddenException} will be thrown.
- * Similarly if an action has a <tt>validate</tt> method and the supplied arguments are invalid then a
- * {@link InvalidException} will be thrown.
+ * Calling any of the above methods may result in a (subclass of)
+ * {@link InteractionException} if the object disallows it. For example, if a
+ * property is annotated with {@link Hidden} then a {@link HiddenException} will
+ * be thrown. Similarly if an action has a <tt>validate</tt> method and the
+ * supplied arguments are invalid then a {@link InvalidException} will be
+ * thrown.
  * 
  * <p>
  * In addition, the following methods may also be called:
@@ -58,7 +61,8 @@ import org.apache.isis.progmodel.wrapper
 public interface WrapperFactory {
 
     /**
-     * Whether interactions with the wrapper are actually passed onto the underlying domain object.
+     * Whether interactions with the wrapper are actually passed onto the
+     * underlying domain object.
      * 
      * @see WrapperFactory#wrap(Object, ExecutionMode)
      */
@@ -70,19 +74,20 @@ public interface WrapperFactory {
      * Provides the &quot;wrapper&quot; of the underlying domain object.
      * 
      * <p>
-     * If the object has (see {@link #isWrapper(Object)} already been wrapped), then should just return the object back
-     * unchanged.
+     * If the object has (see {@link #isWrapper(Object)} already been wrapped),
+     * then should just return the object back unchanged.
      * 
      * @see #addInteractionListener(InteractionListener)
      */
     <T> T wrap(T domainObject);
 
     /**
-     * Same as {@link #wrap(Object)}, except the actual execution occurs only if the <tt>execute</tt> parameter
-     * indicates.
+     * Same as {@link #wrap(Object)}, except the actual execution occurs only if
+     * the <tt>execute</tt> parameter indicates.
      * 
      * <p>
-     * Otherwise, will do all the validations (raise exceptions as required etc.), but doesn't modify the model.
+     * Otherwise, will do all the validations (raise exceptions as required
+     * etc.), but doesn't modify the model.
      */
     <T> T wrap(T domainObject, ExecutionMode mode);
 
@@ -103,12 +108,14 @@ public interface WrapperFactory {
     List<InteractionListener> getListeners();
 
     /**
-     * Registers an {@link InteractionListener}, to be notified of interactions on all wrappers.
+     * Registers an {@link InteractionListener}, to be notified of interactions
+     * on all wrappers.
      * 
      * <p>
-     * This is retrospective: the listener will be notified of interactions even on wrappers created before the listener
-     * was installed. (From an implementation perspective this is because the wrappers delegate back to the container to
-     * fire the events).
+     * This is retrospective: the listener will be notified of interactions even
+     * on wrappers created before the listener was installed. (From an
+     * implementation perspective this is because the wrappers delegate back to
+     * the container to fire the events).
      * 
      * @param listener
      * @return
@@ -116,12 +123,14 @@ public interface WrapperFactory {
     public boolean addInteractionListener(InteractionListener listener);
 
     /**
-     * Remove an {@link InteractionListener}, to no longer be notified of interactions on wrappers.
+     * Remove an {@link InteractionListener}, to no longer be notified of
+     * interactions on wrappers.
      * 
      * <p>
-     * This is retrospective: the listener will no longer be notified of any interactions created on any wrappers, not
-     * just on those wrappers created subsequently. (From an implementation perspective this is because the wrappers
-     * delegate back to the container to fire the events).
+     * This is retrospective: the listener will no longer be notified of any
+     * interactions created on any wrappers, not just on those wrappers created
+     * subsequently. (From an implementation perspective this is because the
+     * wrappers delegate back to the container to fire the events).
      * 
      * @param listener
      * @return

Modified: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/WrapperObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/WrapperObject.java?rev=1234457&r1=1234456&r2=1234457&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/WrapperObject.java (original)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/WrapperObject.java Sun Jan 22 07:38:03 2012
@@ -19,15 +19,16 @@
 
 package org.apache.isis.progmodel.wrapper.applib;
 
-
 /**
- * Implemented by all objects that have been viewed as per {@link WrapperFactory#wrap(Object)}.
+ * Implemented by all objects that have been viewed as per
+ * {@link WrapperFactory#wrap(Object)}.
  */
 public interface WrapperObject {
 
     /**
-     * Programmatic equivalent of invoking save for a transient object (that is, like hitting the <i>save</i> button
-     * that the DnD viewer automatically renders.
+     * Programmatic equivalent of invoking save for a transient object (that is,
+     * like hitting the <i>save</i> button that the DnD viewer automatically
+     * renders.
      */
     void save();
 
@@ -35,12 +36,13 @@ public interface WrapperObject {
      * Provide access to the underlying, wrapped object.
      * 
      * <p>
-     * Used to unwrap objects used as arguments to actions (otherwise, end up creating a <tt>ObjectSpecification</tt> for
-     * the CGLib-enhanced class, not the original class).
+     * Used to unwrap objects used as arguments to actions (otherwise, end up
+     * creating a <tt>ObjectSpecification</tt> for the CGLib-enhanced class, not
+     * the original class).
      * 
      * <p>
-     * <b>NOTE: there is a string-literal reference to this name <tt>DomainObjectInvocationHandler</tt>, so it should
-     * not be changed.</b>.
+     * <b>NOTE: there is a string-literal reference to this name
+     * <tt>DomainObjectInvocationHandler</tt>, so it should not be changed.</b>.
      */
     Object wrapped();
 

Modified: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/listeners/InteractionAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/listeners/InteractionAdapter.java?rev=1234457&r1=1234456&r2=1234457&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/listeners/InteractionAdapter.java (original)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/listeners/InteractionAdapter.java Sun Jan 22 07:38:03 2012
@@ -37,8 +37,8 @@ import org.apache.isis.applib.events.Pro
 import org.apache.isis.applib.events.PropertyVisibilityEvent;
 
 /**
- * Provides no-op implementations of each of the methods within {@link InteractionListener}, to simplify the creation of
- * new listeners.
+ * Provides no-op implementations of each of the methods within
+ * {@link InteractionListener}, to simplify the creation of new listeners.
  */
 public class InteractionAdapter implements InteractionListener {
 

Modified: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/listeners/InteractionListener.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/listeners/InteractionListener.java?rev=1234457&r1=1234456&r2=1234457&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/listeners/InteractionListener.java (original)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/listeners/InteractionListener.java Sun Jan 22 07:38:03 2012
@@ -70,8 +70,9 @@ public interface InteractionListener {
      * A property was read.
      * 
      * <p>
-     * Unlike most other events, a {@link PropertyAccessEvent} will never have been vetoed (that is,
-     * {@link PropertyAccessEvent#isVeto()} will always be <tt>false</tt>).
+     * Unlike most other events, a {@link PropertyAccessEvent} will never have
+     * been vetoed (that is, {@link PropertyAccessEvent#isVeto()} will always be
+     * <tt>false</tt>).
      * 
      * @param ev
      */
@@ -81,7 +82,8 @@ public interface InteractionListener {
      * A property was modified (or an attempt to modify it was made)
      * 
      * <p>
-     * Use {@link PropertyModifyEvent#getProposed()} to determine whether the property was being set or cleared.
+     * Use {@link PropertyModifyEvent#getProposed()} to determine whether the
+     * property was being set or cleared.
      * 
      * @param ev
      */
@@ -91,7 +93,8 @@ public interface InteractionListener {
      * A check was made to determine if a collection was visible.
      * 
      * <p>
-     * Will be fired prior to {@link #collectionUsable(CollectionUsabilityEvent)}.
+     * Will be fired prior to
+     * {@link #collectionUsable(CollectionUsabilityEvent)}.
      * 
      * @param ev
      */
@@ -101,8 +104,10 @@ public interface InteractionListener {
      * A check was made to determine if a collection was usable.
      * 
      * <p>
-     * Will be fired prior to either {@link #collectionAccessed(CollectionAccessEvent)} or
-     * {@link #collectionAddedTo(CollectionAddToEvent)} or {@link #collectionRemovedFrom(CollectionRemoveFromEvent)}.
+     * Will be fired prior to either
+     * {@link #collectionAccessed(CollectionAccessEvent)} or
+     * {@link #collectionAddedTo(CollectionAddToEvent)} or
+     * {@link #collectionRemovedFrom(CollectionRemoveFromEvent)}.
      * 
      * @param ev
      */
@@ -112,8 +117,9 @@ public interface InteractionListener {
      * A collection was read.
      * 
      * <p>
-     * Unlike most other events, a {@link CollectionAccessEvent} will never have been vetoed (that is,
-     * {@link CollectionAccessEvent#isVeto()} will always be <tt>false</tt>).
+     * Unlike most other events, a {@link CollectionAccessEvent} will never have
+     * been vetoed (that is, {@link CollectionAccessEvent#isVeto()} will always
+     * be <tt>false</tt>).
      * 
      * @param ev
      */
@@ -127,7 +133,8 @@ public interface InteractionListener {
     void collectionAddedTo(CollectionAddToEvent ev);
 
     /**
-     * An object was removed from the collection (or an attempt to remove it was made).
+     * An object was removed from the collection (or an attempt to remove it was
+     * made).
      * 
      * @param ev
      */
@@ -167,7 +174,8 @@ public interface InteractionListener {
     void actionUsable(ActionUsabilityEvent ev);
 
     /**
-     * A check was made as to whether an argument proposed for an action was valid.
+     * A check was made as to whether an argument proposed for an action was
+     * valid.
      * 
      * <p>
      * Will be fired prior to {@link #actionInvoked(ActionInvocationEvent)}.

Modified: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/AbstractCollectionInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/AbstractCollectionInvocationHandler.java?rev=1234457&r1=1234456&r2=1234457&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/AbstractCollectionInvocationHandler.java (original)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/AbstractCollectionInvocationHandler.java Sun Jan 22 07:38:03 2012
@@ -35,8 +35,7 @@ abstract class AbstractCollectionInvocat
     private final OneToManyAssociation oneToManyAssociation;
     private final T domainObject;
 
-    public AbstractCollectionInvocationHandler(final C collectionOrMapToProxy, final String collectionName,
-        final DomainObjectInvocationHandler<T> handler, final OneToManyAssociation otma) {
+    public AbstractCollectionInvocationHandler(final C collectionOrMapToProxy, final String collectionName, final DomainObjectInvocationHandler<T> handler, final OneToManyAssociation otma) {
         super(collectionOrMapToProxy, handler.getHeadlessViewer(), handler.getExecutionMode());
         this.collectionName = collectionName;
         this.oneToManyAssociation = otma;
@@ -75,16 +74,13 @@ abstract class AbstractCollectionInvocat
 
             resolveIfRequired(domainObject);
 
-            final InteractionEvent ev =
-                new CollectionMethodEvent(getDelegate(), getCollection().getIdentifier(), getDomainObject(),
-                    method.getName(), args, returnValueObj);
+            final InteractionEvent ev = new CollectionMethodEvent(getDelegate(), getCollection().getIdentifier(), getDomainObject(), method.getName(), args, returnValueObj);
             notifyListeners(ev);
             return returnValueObj;
         }
 
         if (vetoedMethods.contains(method)) {
-            throw new UnsupportedOperationException(String.format("Method '%s' may not be called directly.",
-                method.getName()));
+            throw new UnsupportedOperationException(String.format("Method '%s' may not be called directly.", method.getName()));
         }
 
         return returnValueObj;

Modified: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibClassProxyFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibClassProxyFactory.java?rev=1234457&r1=1234456&r2=1234457&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibClassProxyFactory.java (original)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibClassProxyFactory.java Sun Jan 22 07:38:03 2012
@@ -63,19 +63,21 @@ public class CgLibClassProxyFactory<T> i
             factory = (Factory) ClassInstantiatorFactoryCE.getInstantiator().newInstance(enhancedClass);
         } catch (final InstantiationException e) {
             // ///CLOVER:OFF
-            throw new RuntimeException("Fail to instantiate mock for " + toProxyClass + " on "
-                + ClassInstantiatorFactoryCE.getJVM() + " JVM");
+            throw new RuntimeException("Fail to instantiate mock for " + toProxyClass + " on " + ClassInstantiatorFactoryCE.getJVM() + " JVM");
             // ///CLOVER:ON
         }
 
-        // the below comment was from EasyMock code; don't think applies so commented out.
+        // the below comment was from EasyMock code; don't think applies so
+        // commented out.
 
         // // This call is required. Cglib has some "magic code" making sure a
-        // // callback is used by only one instance of a given class. So only the
+        // // callback is used by only one instance of a given class. So only
+        // the
         // // instance created right after registering the callback will get it.
         // // However, this is done in the construtor which I'm bypassing to
         // // allow class instantiation without calling a constructor.
-        // // Fortunatly, the "magic code" is also called in getCallback which is
+        // // Fortunatly, the "magic code" is also called in getCallback which
+        // is
         // // why I'm calling it here mock.getCallback(0);
         // factory.getCallback(0);
 

Modified: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibProxy.java?rev=1234457&r1=1234456&r2=1234457&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibProxy.java (original)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibProxy.java Sun Jan 22 07:38:03 2012
@@ -55,16 +55,14 @@ public class CgLibProxy<T> {
             interfaces.remove(Factory.class); // if there.
             interfaces.add(WrapperObject.class);
 
-            return (T) Enhancer.create(origSuperclass, interfaces.toArray(new Class[] {}),
-                new InvocationHandlerMethodInterceptor(handler));
+            return (T) Enhancer.create(origSuperclass, interfaces.toArray(new Class[] {}), new InvocationHandlerMethodInterceptor(handler));
         }
 
         final Class<T> clazz = (Class<T>) toProxy.getClass();
 
         T proxy = null;
         try {
-            final IProxyFactory<T> proxyFactory =
-                clazz.isInterface() ? new JavaProxyFactory<T>() : new CgLibClassProxyFactory<T>();
+            final IProxyFactory<T> proxyFactory = clazz.isInterface() ? new JavaProxyFactory<T>() : new CgLibClassProxyFactory<T>();
             proxy = proxyFactory.createProxy(clazz, handler);
         } catch (final RuntimeExceptionWrapper e) {
             throw (RuntimeException) e.getRuntimeException().fillInStackTrace();

Modified: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CollectionInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CollectionInvocationHandler.java?rev=1234457&r1=1234456&r2=1234457&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CollectionInvocationHandler.java (original)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CollectionInvocationHandler.java Sun Jan 22 07:38:03 2012
@@ -28,8 +28,7 @@ import org.apache.isis.core.metamodel.sp
 
 class CollectionInvocationHandler<T, R> extends AbstractCollectionInvocationHandler<T, R> {
 
-    public CollectionInvocationHandler(final R collectionToProxy, final String collectionName,
-        final DomainObjectInvocationHandler<T> handler, final OneToManyAssociation otma) {
+    public CollectionInvocationHandler(final R collectionToProxy, final String collectionName, final DomainObjectInvocationHandler<T> handler, final OneToManyAssociation otma) {
         super(collectionToProxy, collectionName, handler, otma);
 
         try {

Modified: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DelegatingInvocationHandlerDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DelegatingInvocationHandlerDefault.java?rev=1234457&r1=1234456&r2=1234457&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DelegatingInvocationHandlerDefault.java (original)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DelegatingInvocationHandlerDefault.java Sun Jan 22 07:38:03 2012
@@ -44,8 +44,7 @@ public class DelegatingInvocationHandler
 
     private boolean resolveObjectChangedEnabled;
 
-    public DelegatingInvocationHandlerDefault(final T delegate, final WrapperFactory headlessViewer,
-        final ExecutionMode executionMode) {
+    public DelegatingInvocationHandlerDefault(final T delegate, final WrapperFactory headlessViewer, final ExecutionMode executionMode) {
         if (delegate == null) {
             throw new IllegalArgumentException("delegate must not be null");
         }
@@ -110,8 +109,7 @@ public class DelegatingInvocationHandler
         return executionMode;
     }
 
-    protected Object delegate(final Method method, final Object[] args) throws IllegalArgumentException,
-        IllegalAccessException, InvocationTargetException {
+    protected Object delegate(final Method method, final Object[] args) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException {
 
         return method.invoke(getDelegate(), args);
     }



Mime
View raw message