isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1096928 [2/16] - in /incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel: facetdecorators/help/ facetdecorators/help/file/ facetdecorators/help/file/internal/ facetdecorators/i18n/ facetdecorators/i18n/internal...
Date Tue, 26 Apr 2011 22:03:55 GMT
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/I18nManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/I18nManager.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/I18nManager.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/I18nManager.java Tue Apr 26 22:03:43 2011
@@ -33,7 +33,7 @@ import org.apache.isis.core.commons.comp
 public interface I18nManager extends ApplicationScopedComponent {
 
     /**
-     * Get the localized name for the specified identified action/property. 
+     * Get the localized name for the specified identified action/property.
      * 
      * <p>
      * Returns null if no name available.
@@ -49,7 +49,7 @@ public interface I18nManager extends App
     String getDescription(Identifier identifier);
 
     /**
-     * Get the localized help text for the specified identified action/property. 
+     * Get the localized help text for the specified identified action/property.
      * 
      * <p>
      * Returns null if no help text available.

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/internal/DescribedAsFacetWrapI18n.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/internal/DescribedAsFacetWrapI18n.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/internal/DescribedAsFacetWrapI18n.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/internal/DescribedAsFacetWrapI18n.java Tue Apr 26 22:03:43 2011
@@ -17,18 +17,15 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facetdecorators.i18n.internal;
 
-package org.apache.isis.core.progmodel.facetdecorators.i18n.internal;
-
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.describedas.DescribedAsFacetAbstract;
-
-
-public class DescribedAsFacetWrapI18n extends DescribedAsFacetAbstract {
-
-    public DescribedAsFacetWrapI18n(final String value, final FacetHolder holder) {
-        super(value, holder);
-    }
-
-}
-
+
+public class DescribedAsFacetWrapI18n extends DescribedAsFacetAbstract {
+
+    public DescribedAsFacetWrapI18n(final String value, final FacetHolder holder) {
+        super(value, holder);
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/internal/HelpFacetWrapI18n.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/internal/HelpFacetWrapI18n.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/internal/HelpFacetWrapI18n.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/internal/HelpFacetWrapI18n.java Tue Apr 26 22:03:43 2011
@@ -17,18 +17,15 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facetdecorators.i18n.internal;
 
-package org.apache.isis.core.progmodel.facetdecorators.i18n.internal;
-
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.help.HelpFacetAbstract;
-
-
-public class HelpFacetWrapI18n extends HelpFacetAbstract {
-
-    public HelpFacetWrapI18n(final String value, final FacetHolder holder) {
-        super(value, holder);
-    }
-
-}
-
+
+public class HelpFacetWrapI18n extends HelpFacetAbstract {
+
+    public HelpFacetWrapI18n(final String value, final FacetHolder holder) {
+        super(value, holder);
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/internal/NamedFacetWrapI18n.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/internal/NamedFacetWrapI18n.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/internal/NamedFacetWrapI18n.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/internal/NamedFacetWrapI18n.java Tue Apr 26 22:03:43 2011
@@ -17,18 +17,15 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facetdecorators.i18n.internal;
 
-package org.apache.isis.core.progmodel.facetdecorators.i18n.internal;
-
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.named.NamedFacetAbstract;
-
-
-public class NamedFacetWrapI18n extends NamedFacetAbstract {
-
-    public NamedFacetWrapI18n(final String value, final FacetHolder holder) {
-        super(value, holder);
-    }
-
-}
-
+
+public class NamedFacetWrapI18n extends NamedFacetAbstract {
+
+    public NamedFacetWrapI18n(final String value, final FacetHolder holder) {
+        super(value, holder);
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/resourcebundle/I18nDecoratorUsingResourceBundleInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/resourcebundle/I18nDecoratorUsingResourceBundleInstaller.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/resourcebundle/I18nDecoratorUsingResourceBundleInstaller.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/resourcebundle/I18nDecoratorUsingResourceBundleInstaller.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facetdecorators.i18n.resourcebundle;
 
-package org.apache.isis.core.progmodel.facetdecorators.i18n.resourcebundle;
-
 import java.util.Arrays;
 import java.util.List;
 
@@ -28,24 +27,22 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.specloader.FacetDecoratorInstaller;
 import org.apache.isis.core.progmodel.facetdecorators.i18n.I18nFacetDecorator;
 import org.apache.isis.core.progmodel.facetdecorators.i18n.resourcebundle.internal.I18nManagerUsingResourceBundle;
-
-
-public class I18nDecoratorUsingResourceBundleInstaller extends InstallerAbstract implements FacetDecoratorInstaller {
-
-    public I18nDecoratorUsingResourceBundleInstaller() {
-		super(FacetDecoratorInstaller.TYPE, "resource-i18n");
-	}
-    
-	@Override
-    public List<FacetDecorator> createDecorators() {
-        final I18nManagerUsingResourceBundle manager = new I18nManagerUsingResourceBundle(getConfiguration());
-        manager.init();
-        return Arrays.<FacetDecorator>asList(new I18nFacetDecorator(manager));
-    }
-	
-	@Override
-	public List<Class<?>> getTypes() {
-		return listOf(List.class); // ie, of List<FacetDecorator>
-	}
-}
-
+
+public class I18nDecoratorUsingResourceBundleInstaller extends InstallerAbstract implements FacetDecoratorInstaller {
+
+    public I18nDecoratorUsingResourceBundleInstaller() {
+        super(FacetDecoratorInstaller.TYPE, "resource-i18n");
+    }
+
+    @Override
+    public List<FacetDecorator> createDecorators() {
+        final I18nManagerUsingResourceBundle manager = new I18nManagerUsingResourceBundle(getConfiguration());
+        manager.init();
+        return Arrays.<FacetDecorator> asList(new I18nFacetDecorator(manager));
+    }
+
+    @Override
+    public List<Class<?>> getTypes() {
+        return listOf(List.class); // ie, of List<FacetDecorator>
+    }
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/resourcebundle/internal/I18nManagerUsingResourceBundle.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/resourcebundle/internal/I18nManagerUsingResourceBundle.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/resourcebundle/internal/I18nManagerUsingResourceBundle.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/resourcebundle/internal/I18nManagerUsingResourceBundle.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.core.progmodel.facetdecorators.i18n.resourcebundle.internal;
 
 import java.util.List;
@@ -45,7 +44,7 @@ public class I18nManagerUsingResourceBun
     private static final String MEMBER_TYPE_COLLECTION = "collection";
     private static final String MEMBER_TYPE_ACTION = "action";
     private static final String MEMBER_TYPE_PARAMETER = "parameter";
-    
+
     private static final String TEXT_TYPE_NAME = "name";
     private static final String TEXT_TYPE_DESCRIPTION = "description";
     private static final String TEXT_TYPE_HELP = "help";
@@ -53,13 +52,13 @@ public class I18nManagerUsingResourceBun
     private ResourceBundle bundle;
 
     @SuppressWarnings("unused")
-    private IsisConfiguration configuration;
+    private final IsisConfiguration configuration;
 
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
     // Contructor, init, shutdown
-    ////////////////////////////////////////////////////////////////
-    
-    public I18nManagerUsingResourceBundle(IsisConfiguration configuration) {
+    // //////////////////////////////////////////////////////////////
+
+    public I18nManagerUsingResourceBundle(final IsisConfiguration configuration) {
         this.configuration = configuration;
     }
 
@@ -74,12 +73,12 @@ public class I18nManagerUsingResourceBun
     }
 
     @Override
-    public void shutdown() {}
+    public void shutdown() {
+    }
 
-    
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
     // Members
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
 
     @Override
     public String getName(final Identifier identifier) {
@@ -99,26 +98,25 @@ public class I18nManagerUsingResourceBun
     private String internalizedTextForClassMember(final Identifier identifier, final String textType) {
         if (bundle == null) {
             return null;
-        } 
+        }
         final List<String> key = buildMemberTypeKey(identifier, textType);
         return lookupTextFromBundle(key);
     }
 
     private static List<String> buildMemberTypeKey(final Identifier identifier, final String textType) {
-    	final List<String> keys = Lists.newArrayList();
-        
-		if (identifier.isPropertyOrCollection()) {
-			keys.add(buildMemberTypeKey(identifier, textType, MEMBER_TYPE_PROPERTY));
-			keys.add(buildMemberTypeKey(identifier, textType, MEMBER_TYPE_COLLECTION));
-		} else {
-			keys.add(buildMemberTypeKey(identifier, textType, MEMBER_TYPE_ACTION));
-		}
-		return keys;
+        final List<String> keys = Lists.newArrayList();
+
+        if (identifier.isPropertyOrCollection()) {
+            keys.add(buildMemberTypeKey(identifier, textType, MEMBER_TYPE_PROPERTY));
+            keys.add(buildMemberTypeKey(identifier, textType, MEMBER_TYPE_COLLECTION));
+        } else {
+            keys.add(buildMemberTypeKey(identifier, textType, MEMBER_TYPE_ACTION));
+        }
+        return keys;
     }
 
-	private static String buildMemberTypeKey(final Identifier identifier,
-			final String textType, final String memberType) {
-		final StringBuilder sb = new StringBuilder();
+    private static String buildMemberTypeKey(final Identifier identifier, final String textType, final String memberType) {
+        final StringBuilder sb = new StringBuilder();
         sb.append(identifier.getClassName()).append(".");
         sb.append(memberType);
         final String memberName = identifier.getMemberName();
@@ -127,11 +125,11 @@ public class I18nManagerUsingResourceBun
         }
         sb.append(".").append(textType);
         return sb.toString();
-	}
+    }
 
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
     // Parameters
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
 
     @Override
     public List<String> getParameterNames(final Identifier identifier) {
@@ -141,11 +139,12 @@ public class I18nManagerUsingResourceBun
     private List<String> internalizedTextForParameter(final Identifier identifier, final String textType) {
         if (bundle == null) {
             return null;
-        } 
+        }
         final List<String> internalizedText = Lists.newArrayList();
         final List<String> memberParameterNames = identifier.getMemberParameterNames();
-        int paramNum=0;
-        for (@SuppressWarnings("unused") String dummy : memberParameterNames) {
+        int paramNum = 0;
+        for (@SuppressWarnings("unused")
+        final String dummy : memberParameterNames) {
             final String key = buildParameterTypeKey(identifier, textType, paramNum);
             internalizedText.add(lookupTextFromBundle(key));
             paramNum++;
@@ -153,34 +152,31 @@ public class I18nManagerUsingResourceBun
         return internalizedText;
     }
 
-    private static String buildParameterTypeKey(final Identifier identifier, final String textType, int paramNum) {
-        return identifier.getClassName() + "." + MEMBER_TYPE_ACTION + "." + identifier.getMemberName() + "." + MEMBER_TYPE_PARAMETER
-                + (paramNum + 1) + "." + textType;
+    private static String buildParameterTypeKey(final Identifier identifier, final String textType, final int paramNum) {
+        return identifier.getClassName() + "." + MEMBER_TYPE_ACTION + "." + identifier.getMemberName() + "."
+            + MEMBER_TYPE_PARAMETER + (paramNum + 1) + "." + textType;
     }
 
-
-    
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
     // Helpers
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
 
     private String lookupTextFromBundle(final List<String> keys) {
-    	for(String key: keys) {
-    		String text = lookupTextFromBundle(key);
-    		if (text != null) {
-    			return text;
-    		}
-    	}
-    	return null;
+        for (final String key : keys) {
+            final String text = lookupTextFromBundle(key);
+            if (text != null) {
+                return text;
+            }
+        }
+        return null;
     }
 
-	private String lookupTextFromBundle(final String key) {
-		try {
+    private String lookupTextFromBundle(final String key) {
+        try {
             return bundle.getString(key);
         } catch (final MissingResourceException e) {
             return null;
         }
-	}
-    
-}
+    }
 
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/CollectionUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/CollectionUtils.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/CollectionUtils.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/CollectionUtils.java Tue Apr 26 22:03:43 2011
@@ -17,28 +17,28 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets;
 
-package org.apache.isis.core.progmodel.facets;
-
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-
-
-public final class CollectionUtils {
-    private CollectionUtils() {}
-
-    public static Object[] getCollectionAsObjectArray(final Object option, final ObjectSpecification spec, AdapterMap adapterMap) {
-        final ObjectAdapter collection = adapterMap.adapterFor(option);
-        final CollectionFacet facet = CollectionFacetUtils.getCollectionFacetFromSpec(collection);
-    	final Object[] optionArray = new Object[facet.size(collection)];
-    	int j = 0;
-        for(ObjectAdapter nextElement: facet.iterable(collection)) {
-			optionArray[j++] = nextElement.getObject();
-        }
-        return optionArray;
-    }
-
-}
+
+public final class CollectionUtils {
+    private CollectionUtils() {
+    }
+
+    public static Object[] getCollectionAsObjectArray(final Object option, final ObjectSpecification spec,
+        final AdapterMap adapterMap) {
+        final ObjectAdapter collection = adapterMap.adapterFor(option);
+        final CollectionFacet facet = CollectionFacetUtils.getCollectionFacetFromSpec(collection);
+        final Object[] optionArray = new Object[facet.size(collection)];
+        int j = 0;
+        for (final ObjectAdapter nextElement : facet.iterable(collection)) {
+            optionArray[j++] = nextElement.getObject();
+        }
+        return optionArray;
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/MethodFinderUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/MethodFinderUtils.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/MethodFinderUtils.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/MethodFinderUtils.java Tue Apr 26 22:03:43 2011
@@ -23,36 +23,31 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.methodutils.MethodScope;
 
 public final class MethodFinderUtils {
-    
-    private MethodFinderUtils(){}
 
-    public static Method findMethodWithOrWithoutParameters(
-            final Class<?> type,
-            final MethodScope classMethod,
-            final String name,
-            final Class<?> returnType,
-            final Class<?>[] paramTypes) {
+    private MethodFinderUtils() {
+    }
+
+    public static Method findMethodWithOrWithoutParameters(final Class<?> type, final MethodScope classMethod,
+        final String name, final Class<?> returnType, final Class<?>[] paramTypes) {
         Method method = MethodFinderUtils.findMethod(type, classMethod, name, returnType, paramTypes);
         if (method == null) {
-            method = MethodFinderUtils.findMethod(type, classMethod, name, returnType, MethodPrefixBasedFacetFactoryAbstract.NO_PARAMETERS_TYPES);
+            method =
+                MethodFinderUtils.findMethod(type, classMethod, name, returnType,
+                    MethodPrefixBasedFacetFactoryAbstract.NO_PARAMETERS_TYPES);
         }
         return method;
     }
 
     /**
-     * Returns a specific public methods that: have the specified prefix; have the specified return type, or
-     * void, if canBeVoid is true; and has the specified number of parameters. If the returnType is specified
-     * as null then the return type is ignored.
+     * Returns a specific public methods that: have the specified prefix; have the specified return type, or void, if
+     * canBeVoid is true; and has the specified number of parameters. If the returnType is specified as null then the
+     * return type is ignored.
      * 
      * @param paramTypes
      *            the set of parameters the method should have, if null then is ignored
      */
-    public static Method findMethod(
-            final Class<?> type,
-            final MethodScope methodScope,
-            final String name,
-            final Class<?> returnType,
-            final Class<?>[] paramTypes) {
+    public static Method findMethod(final Class<?> type, final MethodScope methodScope, final String name,
+        final Class<?> returnType, final Class<?>[] paramTypes) {
         Method method;
         try {
             method = type.getMethod(name, paramTypes);
@@ -61,75 +56,72 @@ public final class MethodFinderUtils {
         } catch (final NoSuchMethodException e) {
             return null;
         }
-    
+
         final int modifiers = method.getModifiers();
-    
+
         // check for public modifier
         if (!Modifier.isPublic(modifiers)) {
             return null;
         }
-    
+
         // check for scope modifier
         if (!methodScope.matchesScopeOf(method)) {
             return null;
         }
-    
+
         // check for name
         if (!method.getName().equals(name)) {
             return null;
         }
-    
+
         // check for return type
         if (returnType != null && returnType != method.getReturnType()) {
             return null;
         }
-    
+
         // check params (if required)
         if (paramTypes != null) {
             final Class<?>[] parameterTypes = method.getParameterTypes();
             if (paramTypes.length != parameterTypes.length) {
                 return null;
             }
-    
+
             for (int c = 0; c < paramTypes.length; c++) {
                 if ((paramTypes[c] != null) && (paramTypes[c] != parameterTypes[c])) {
                     return null;
                 }
             }
         }
-    
+
         return method;
     }
 
-    protected static boolean doesNotMatchScope(final MethodScope methodScope, Method method) {
+    protected static boolean doesNotMatchScope(final MethodScope methodScope, final Method method) {
         return methodScope.doesNotMatchScope(method);
     }
 
-    public static Method findMethod(
-    		final Class<?> type, 
-    		final MethodScope methodScope, 
-    		final String name, 
-    		final Class<?> returnType) {
+    public static Method findMethod(final Class<?> type, final MethodScope methodScope, final String name,
+        final Class<?> returnType) {
         try {
             final Method[] methods = type.getMethods();
-            for (int i = 0; i < methods.length; i++) {
-                final Method method = methods[i];
+            for (final Method method2 : methods) {
+                final Method method = method2;
                 final int modifiers = method.getModifiers();
                 // check for public modifier
                 if (!Modifier.isPublic(modifiers)) {
                     continue;
                 }
-    
+
                 // check correct scope (static vs instance)
-                if(!methodScope.matchesScopeOf(method)) {
+                if (!methodScope.matchesScopeOf(method)) {
                     continue;
                 }
-    
+
                 // check for name
                 if (!method.getName().equals(name)) {
                     continue;
                 }
-    
+
                 // check for return type
                 if (returnType != null && returnType != method.getReturnType()) {
                     continue;
@@ -162,5 +154,4 @@ public final class MethodFinderUtils {
         return true;
     }
 
-
 }

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/MethodPrefixBasedFacetFactoryAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/MethodPrefixBasedFacetFactoryAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/MethodPrefixBasedFacetFactoryAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets;
 
-package org.apache.isis.core.progmodel.facets;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -27,24 +26,23 @@ import java.util.List;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactory;
-
-
-public abstract class MethodPrefixBasedFacetFactoryAbstract extends FacetFactoryAbstract implements MethodPrefixBasedFacetFactory {
-
-    private final List<String> prefixes;
+
+public abstract class MethodPrefixBasedFacetFactoryAbstract extends FacetFactoryAbstract implements
+    MethodPrefixBasedFacetFactory {
+
+    private final List<String> prefixes;
 
     protected static final Object[] NO_PARAMETERS = new Object[0];
     protected static final Class<?>[] NO_PARAMETERS_TYPES = new Class<?>[0];
 
-
-    public MethodPrefixBasedFacetFactoryAbstract(final List<FeatureType> featureTypes, final String... prefixes) {
-        super(featureTypes);
-        this.prefixes = Collections.unmodifiableList(Arrays.asList(prefixes));
-    }
-
+    public MethodPrefixBasedFacetFactoryAbstract(final List<FeatureType> featureTypes, final String... prefixes) {
+        super(featureTypes);
+        this.prefixes = Collections.unmodifiableList(Arrays.asList(prefixes));
+    }
+
     @Override
-    public List<String> getPrefixes() {
-        return prefixes;
-    }
-
-}
+    public List<String> getPrefixes() {
+        return prefixes;
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/MethodPrefixConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/MethodPrefixConstants.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/MethodPrefixConstants.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/MethodPrefixConstants.java Tue Apr 26 22:03:43 2011
@@ -27,14 +27,14 @@ public class MethodPrefixConstants {
     public static final String MODIFY_PREFIX = "modify";
     public static final String ADD_TO_PREFIX = "addTo";
     public static final String REMOVE_FROM_PREFIX = "removeFrom";
-    
+
     public static final String NAME_PREFIX = "name";
     public static final String DESCRIPTION_PREFIX = "description";
     public static final String OPTIONAL_PREFIX = "optional";
-    
+
     public static final String DEFAULT_PREFIX = "default";
     public static final String CHOICES_PREFIX = "choices";
-    
+
     public static final String HIDE_PREFIX = "hide";
     public static final String ALWAYS_HIDE_PREFIX = "alwaysHide";
 
@@ -45,8 +45,9 @@ public class MethodPrefixConstants {
     public static final String VALIDATE_ADD_TO_PREFIX = VALIDATE_PREFIX + ADD_TO_PREFIX;
     public static final String VALIDATE_ADD_TO_PREFIX_2 = VALIDATE_PREFIX + StringUtils.capitalize(ADD_TO_PREFIX);
     public static final String VALIDATE_REMOVE_FROM_PREFIX = VALIDATE_PREFIX + REMOVE_FROM_PREFIX;
-    public static final String VALIDATE_REMOVE_FROM_PREFIX_2 = VALIDATE_PREFIX + StringUtils.capitalize(REMOVE_FROM_PREFIX);
-    
+    public static final String VALIDATE_REMOVE_FROM_PREFIX_2 = VALIDATE_PREFIX
+        + StringUtils.capitalize(REMOVE_FROM_PREFIX);
+
     public static final String FIELD_PREFIX = "field";
     public static final String ACTION_PREFIX = "action";
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets;
 
-package org.apache.isis.core.progmodel.facets;
-
 import java.util.List;
 
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -27,39 +26,36 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.PropertyOrCollectionIdentifyingFacetFactory;
 import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
 import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryAware;
-
-
-public abstract class PropertyOrCollectionIdentifyingFacetFactoryAbstract extends MethodPrefixBasedFacetFactoryAbstract implements
-        PropertyOrCollectionIdentifyingFacetFactory, CollectionTypeRegistryAware {
-
-    private CollectionTypeRegistry collectionTypeRegistry;
-
-    public PropertyOrCollectionIdentifyingFacetFactoryAbstract(
-            final List<FeatureType> featureTypes,
-            final String... prefixes) {
-        super(featureTypes, prefixes);
-    }
-
-    protected boolean isCollectionOrArray(final Class<?> cls) {
-        return getCollectionTypeRepository().isCollectionType(cls) || getCollectionTypeRepository().isArrayType(cls);
-    }
-
-    // /////////////////////////////////////////////////////////////////////////
-    // Injected: CollectionTypeRegistry
-    // /////////////////////////////////////////////////////////////////////////
-
-    protected CollectionTypeRegistry getCollectionTypeRepository() {
-        return collectionTypeRegistry;
-    }
-
-    /**
-     * Injected so can propogate to any {@link #registerFactory(FacetFactory) registered} {@link FacetFactory}
-     * s that are also {@link CollectionTypeRegistryAware}.
-     */
+
+public abstract class PropertyOrCollectionIdentifyingFacetFactoryAbstract extends MethodPrefixBasedFacetFactoryAbstract
+    implements PropertyOrCollectionIdentifyingFacetFactory, CollectionTypeRegistryAware {
+
+    private CollectionTypeRegistry collectionTypeRegistry;
+
+    public PropertyOrCollectionIdentifyingFacetFactoryAbstract(final List<FeatureType> featureTypes,
+        final String... prefixes) {
+        super(featureTypes, prefixes);
+    }
+
+    protected boolean isCollectionOrArray(final Class<?> cls) {
+        return getCollectionTypeRepository().isCollectionType(cls) || getCollectionTypeRepository().isArrayType(cls);
+    }
+
+    // /////////////////////////////////////////////////////////////////////////
+    // Injected: CollectionTypeRegistry
+    // /////////////////////////////////////////////////////////////////////////
+
+    protected CollectionTypeRegistry getCollectionTypeRepository() {
+        return collectionTypeRegistry;
+    }
+
+    /**
+     * Injected so can propogate to any {@link #registerFactory(FacetFactory) registered} {@link FacetFactory} s that
+     * are also {@link CollectionTypeRegistryAware}.
+     */
     @Override
-    public void setCollectionTypeRegistry(final CollectionTypeRegistry collectionTypeRegistry) {
-        this.collectionTypeRegistry = collectionTypeRegistry;
-    }
-
-}
-
+    public void setCollectionTypeRegistry(final CollectionTypeRegistry collectionTypeRegistry) {
+        this.collectionTypeRegistry = collectionTypeRegistry;
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugFacetAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/DebugFacetAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,23 +17,21 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.actions.debug;
 
-package org.apache.isis.core.progmodel.facets.actions.debug;
-
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.MarkerFacetAbstract;
 import org.apache.isis.core.metamodel.facets.actions.debug.DebugFacet;
-
-
-public abstract class DebugFacetAbstract extends MarkerFacetAbstract implements DebugFacet {
-
-    public static Class<? extends Facet> type() {
-        return DebugFacet.class;
-    }
-
-    public DebugFacetAbstract(final FacetHolder holder) {
-        super(type(), holder);
-    }
-
-}
+
+public abstract class DebugFacetAbstract extends MarkerFacetAbstract implements DebugFacet {
+
+    public static Class<? extends Facet> type() {
+        return DebugFacet.class;
+    }
+
+    public DebugFacetAbstract(final FacetHolder holder) {
+        super(type(), holder);
+    }
+
+}

Modified: incubator/isis/trunk/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/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/annotation/DebugAnnotationFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/annotation/DebugAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/annotation/DebugAnnotationFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,7 @@
  *  under the License.
  */
 
-
-package org.apache.isis.core.progmodel.facets.actions.debug.annotation;
-
+package org.apache.isis.core.progmodel.facets.actions.debug.annotation;
 
 import org.apache.isis.applib.annotation.Debug;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -28,26 +26,24 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.actions.debug.DebugFacet;
 import org.apache.isis.core.progmodel.facets.actions.invoke.ActionInvocationFacetFactory;
-
 
 /**
- * {@link DebugFacet} can also be installed via a naming convention, see
- * {@link ActionInvocationFacetFactory}.
- */
-public class DebugAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
-
-    public DebugAnnotationFacetFactory() {
-        super(FeatureType.ACTIONS_ONLY);
-    }
-
-    @Override
-    public void process(ProcessMethodContext processMethodContext) {
-        final Debug annotation = getAnnotation(processMethodContext.getMethod(), Debug.class);
-        FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
-    }
-
-    private DebugFacet create(final Debug annotation, final FacetHolder holder) {
-        return annotation == null ? null : new DebugFacetAnnotation(holder);
-    }
-
-}
+ * {@link DebugFacet} can also be installed via a naming convention, see {@link ActionInvocationFacetFactory}.
+ */
+public class DebugAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+    public DebugAnnotationFacetFactory() {
+        super(FeatureType.ACTIONS_ONLY);
+    }
+
+    @Override
+    public void process(final ProcessMethodContext processMethodContext) {
+        final Debug annotation = getAnnotation(processMethodContext.getMethod(), Debug.class);
+        FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
+    }
+
+    private DebugFacet create(final Debug annotation, final FacetHolder holder) {
+        return annotation == null ? null : new DebugFacetAnnotation(holder);
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/annotation/DebugFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/annotation/DebugFacetAnnotation.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/annotation/DebugFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/debug/annotation/DebugFacetAnnotation.java Tue Apr 26 22:03:43 2011
@@ -17,18 +17,15 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.actions.debug.annotation;
 
-package org.apache.isis.core.progmodel.facets.actions.debug.annotation;
-
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.progmodel.facets.actions.debug.DebugFacetAbstract;
-
-
-public class DebugFacetAnnotation extends DebugFacetAbstract {
-
-    public DebugFacetAnnotation(final FacetHolder holder) {
-        super(holder);
-    }
-
-}
-
+
+public class DebugFacetAnnotation extends DebugFacetAbstract {
+
+    public DebugFacetAnnotation(final FacetHolder holder) {
+        super(holder);
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/method/ActionDefaultsFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/method/ActionDefaultsFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/method/ActionDefaultsFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/method/ActionDefaultsFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -39,7 +39,6 @@ import org.apache.isis.core.progmodel.fa
  */
 public class ActionDefaultsFacetFactory extends MethodPrefixBasedFacetFactoryAbstract implements AdapterMapAware {
 
-
     private static final String[] PREFIXES = { MethodPrefixConstants.DEFAULT_PREFIX };
 
     private AdapterMap adapterMap;
@@ -56,25 +55,22 @@ public class ActionDefaultsFacetFactory 
     // ///////////////////////////////////////////////////////
 
     @Override
-    public void process(ProcessMethodContext processMethodContext) {
+    public void process(final ProcessMethodContext processMethodContext) {
 
         attachActionDefaultsFacetIfParameterDefaultsMethodIsFound(processMethodContext);
     }
 
-
     private static void attachActionDefaultsFacetIfParameterDefaultsMethodIsFound(
         final ProcessMethodContext processMethodContext) {
 
-        Method defaultsMethod =
-                findDefaultsMethodReturning(processMethodContext, Object[].class);
+        Method defaultsMethod = findDefaultsMethodReturning(processMethodContext, Object[].class);
         if (defaultsMethod == null) {
-            defaultsMethod =
-                findDefaultsMethodReturning(processMethodContext, List.class);
+            defaultsMethod = findDefaultsMethodReturning(processMethodContext, List.class);
         }
         if (defaultsMethod == null) {
             return;
         }
-        
+
         processMethodContext.removeMethod(defaultsMethod);
 
         final FacetHolder facetedMethod = processMethodContext.getFacetHolder();
@@ -82,13 +78,14 @@ public class ActionDefaultsFacetFactory 
         FacetUtil.addFacet(facet);
     }
 
-    private static Method findDefaultsMethodReturning(final ProcessMethodContext processMethodContext, final Class<?> returnType) {
+    private static Method findDefaultsMethodReturning(final ProcessMethodContext processMethodContext,
+        final Class<?> returnType) {
 
         final Method actionMethod = processMethodContext.getMethod();
         final String capitalizedName = NameUtils.capitalizeName(actionMethod.getName());
-        String name = MethodPrefixConstants.DEFAULT_PREFIX + capitalizedName;
+        final String name = MethodPrefixConstants.DEFAULT_PREFIX + capitalizedName;
 
-        Class<?> cls = processMethodContext.getCls();
+        final Class<?> cls = processMethodContext.getCls();
         return MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, name, returnType, new Class[0]);
     }
 
@@ -97,7 +94,7 @@ public class ActionDefaultsFacetFactory 
     // ///////////////////////////////////////////////////////////////
 
     @Override
-    public void setAdapterMap(AdapterMap adapterMap) {
+    public void setAdapterMap(final AdapterMap adapterMap) {
         this.adapterMap = adapterMap;
     }
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/method/ActionDefaultsFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/method/ActionDefaultsFacetViaMethod.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/method/ActionDefaultsFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/defaults/method/ActionDefaultsFacetViaMethod.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.core.progmodel.facets.actions.defaults.method;
 
 import java.lang.reflect.Method;
@@ -33,17 +32,14 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
 import org.apache.isis.core.progmodel.facets.actions.invoke.ActionInvocationFacetViaMethod;
 
-
 public class ActionDefaultsFacetViaMethod extends ActionDefaultsFacetAbstract implements ImperativeFacet {
 
     private final Method defaultMethod;
-    
+
     @SuppressWarnings("unused")
-	private final Method actionMethod;
+    private final Method actionMethod;
 
-    public ActionDefaultsFacetViaMethod(
-    		final Method defaultMethod, 
-    		final FacetHolder holder) {
+    public ActionDefaultsFacetViaMethod(final Method defaultMethod, final FacetHolder holder) {
         super(holder, false);
         this.defaultMethod = defaultMethod;
         this.actionMethod = determineActionMethod(holder);
@@ -53,7 +49,8 @@ public class ActionDefaultsFacetViaMetho
         Method method2;
         final Facet actionInvocationFacet = holder.getFacet(ActionInvocationFacet.class);
         if (actionInvocationFacet instanceof ActionInvocationFacetViaMethod) {
-            final ActionInvocationFacetViaMethod facetViaMethod = (ActionInvocationFacetViaMethod) actionInvocationFacet;
+            final ActionInvocationFacetViaMethod facetViaMethod =
+                (ActionInvocationFacetViaMethod) actionInvocationFacet;
             method2 = facetViaMethod.getMethods().get(0);
         } else {
             method2 = null;
@@ -62,23 +59,22 @@ public class ActionDefaultsFacetViaMetho
     }
 
     /**
-     * Returns a singleton list of the {@link Method} provided in the constructor. 
+     * Returns a singleton list of the {@link Method} provided in the constructor.
      */
     @Override
     public List<Method> getMethods() {
-    	return Collections.singletonList(defaultMethod);
+        return Collections.singletonList(defaultMethod);
     }
 
     @Override
     public boolean impliesResolve() {
-    	return true;
+        return true;
     }
-    
+
     @Override
     public boolean impliesObjectChanged() {
-    	return false;
+        return false;
     }
-    
 
     @Override
     public Object[] getDefaults(final ObjectAdapter owningAdapter) {
@@ -90,6 +86,4 @@ public class ActionDefaultsFacetViaMetho
         return "method=" + defaultMethod;
     }
 
-
 }
-

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/annotation/ExecutedAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/annotation/ExecutedAnnotationFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/annotation/ExecutedAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/annotation/ExecutedAnnotationFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,7 @@
  *  under the License.
  */
 
-
-package org.apache.isis.core.progmodel.facets.actions.executed.annotation;
-
+package org.apache.isis.core.progmodel.facets.actions.executed.annotation;
 
 import org.apache.isis.applib.annotation.Executed;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -28,39 +26,37 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.actions.executed.ExecutedFacet;
 import org.apache.isis.core.progmodel.facets.actions.invoke.ActionInvocationFacetFactory;
-
-
-/**
+
+/**
  * Creates an {@link ExecutedFacet} based on the presence of an {@link Executed} annotation.
  * 
- * <p>
- * {@link ExecutedFacet} can also be installed via a naming convention, see
- * {@link ActionInvocationFacetFactory}.
+ * <p>
+ * {@link ExecutedFacet} can also be installed via a naming convention, see {@link ActionInvocationFacetFactory}.
  */
-public class ExecutedAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
-
-    public ExecutedAnnotationFacetFactory() {
-        super(FeatureType.ACTIONS_ONLY);
-    }
-
-    @Override
-    public void process(ProcessMethodContext processMethodContext) {
-        final Executed annotation = getAnnotation(processMethodContext.getMethod(), Executed.class);
-        FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
-    }
-
-    private ExecutedFacet create(final Executed annotation, final FacetHolder holder) {
-        return annotation == null ? null : new ExecutedFacetAnnotation(decodeWhere(annotation.value()), holder);
-    }
-
-    protected ExecutedFacet.Where decodeWhere(final Executed.Where where) {
-        if (where == Executed.Where.LOCALLY) {
-            return ExecutedFacet.Where.LOCALLY;
-        }
-        if (where == Executed.Where.REMOTELY) {
-            return ExecutedFacet.Where.REMOTELY;
-        }
-        return null;
-    }
-
-}
+public class ExecutedAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+    public ExecutedAnnotationFacetFactory() {
+        super(FeatureType.ACTIONS_ONLY);
+    }
+
+    @Override
+    public void process(final ProcessMethodContext processMethodContext) {
+        final Executed annotation = getAnnotation(processMethodContext.getMethod(), Executed.class);
+        FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
+    }
+
+    private ExecutedFacet create(final Executed annotation, final FacetHolder holder) {
+        return annotation == null ? null : new ExecutedFacetAnnotation(decodeWhere(annotation.value()), holder);
+    }
+
+    protected ExecutedFacet.Where decodeWhere(final Executed.Where where) {
+        if (where == Executed.Where.LOCALLY) {
+            return ExecutedFacet.Where.LOCALLY;
+        }
+        if (where == Executed.Where.REMOTELY) {
+            return ExecutedFacet.Where.REMOTELY;
+        }
+        return null;
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/annotation/ExecutedFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/annotation/ExecutedFacetAnnotation.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/annotation/ExecutedFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/annotation/ExecutedFacetAnnotation.java Tue Apr 26 22:03:43 2011
@@ -17,18 +17,15 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.actions.executed.annotation;
 
-package org.apache.isis.core.progmodel.facets.actions.executed.annotation;
-
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.actions.executed.ExecutedFacetAbstract;
-
-
-public class ExecutedFacetAnnotation extends ExecutedFacetAbstract {
-
-    public ExecutedFacetAnnotation(final Where value, final FacetHolder holder) {
-        super(value, holder);
-    }
-
-}
-
+
+public class ExecutedFacetAnnotation extends ExecutedFacetAbstract {
+
+    public ExecutedFacetAnnotation(final Where value, final FacetHolder holder) {
+        super(value, holder);
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/prefix/ExecutedViaNamingConventionFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/prefix/ExecutedViaNamingConventionFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/prefix/ExecutedViaNamingConventionFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/executed/prefix/ExecutedViaNamingConventionFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.actions.executed.prefix;
 
-package org.apache.isis.core.progmodel.facets.actions.executed.prefix;
-
 import java.lang.reflect.Method;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -30,37 +29,37 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.named.NamedFacetInferred;
 import org.apache.isis.core.progmodel.facets.actions.invoke.ActionInvocationFacetFactory;
 import org.apache.isis.core.progmodel.facets.actions.invoke.ExecutedFacetViaNamingConvention;
-
-
-/**
- * Creates an {@link ExecutedFacet} based on the prefix of the action's name.
- * 
- * <p>
- * TODO: think that this prefix is handled by the {@link ActionInvocationFacetFactory}.
- */
-public class ExecutedViaNamingConventionFacetFactory extends FacetFactoryAbstract {
-
-    private static final String LOCAL_PREFIX = "Local";
-
-    public ExecutedViaNamingConventionFacetFactory() {
-        super(FeatureType.ACTIONS_ONLY);
-    }
-
-    @Override
-    public void process(ProcessMethodContext processMethodContext) {
-        final String fullMethodName = processMethodContext.getMethod().getName();
-        final String capitalizedName = fullMethodName.substring(0, 1).toUpperCase() + fullMethodName.substring(1);
-
-        if (!capitalizedName.startsWith(LOCAL_PREFIX)) {
-            return;
-        }
-
-        FacetUtil.addFacets(new Facet[] { new ExecutedFacetViaNamingConvention(ExecutedFacet.Where.LOCALLY, processMethodContext.getFacetHolder()),
-                new NamedFacetInferred(capitalizedName.substring(5), processMethodContext.getFacetHolder()) });
-    }
-
-    public boolean recognizes(final Method method) {
-        return method.getName().startsWith(LOCAL_PREFIX);
-    }
-
-}
+
+/**
+ * Creates an {@link ExecutedFacet} based on the prefix of the action's name.
+ * 
+ * <p>
+ * TODO: think that this prefix is handled by the {@link ActionInvocationFacetFactory}.
+ */
+public class ExecutedViaNamingConventionFacetFactory extends FacetFactoryAbstract {
+
+    private static final String LOCAL_PREFIX = "Local";
+
+    public ExecutedViaNamingConventionFacetFactory() {
+        super(FeatureType.ACTIONS_ONLY);
+    }
+
+    @Override
+    public void process(final ProcessMethodContext processMethodContext) {
+        final String fullMethodName = processMethodContext.getMethod().getName();
+        final String capitalizedName = fullMethodName.substring(0, 1).toUpperCase() + fullMethodName.substring(1);
+
+        if (!capitalizedName.startsWith(LOCAL_PREFIX)) {
+            return;
+        }
+
+        FacetUtil.addFacets(new Facet[] {
+            new ExecutedFacetViaNamingConvention(ExecutedFacet.Where.LOCALLY, processMethodContext.getFacetHolder()),
+            new NamedFacetInferred(capitalizedName.substring(5), processMethodContext.getFacetHolder()) });
+    }
+
+    public boolean recognizes(final Method method) {
+        return method.getName().startsWith(LOCAL_PREFIX);
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationFacetAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/ExplorationFacetAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,23 +17,21 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.actions.exploration;
 
-package org.apache.isis.core.progmodel.facets.actions.exploration;
-
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.MarkerFacetAbstract;
 import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacet;
-
-
-public abstract class ExplorationFacetAbstract extends MarkerFacetAbstract implements ExplorationFacet {
-
-    public static Class<? extends Facet> type() {
-        return ExplorationFacet.class;
-    }
-
-    public ExplorationFacetAbstract(final FacetHolder holder) {
-        super(type(), holder);
-    }
-
-}
+
+public abstract class ExplorationFacetAbstract extends MarkerFacetAbstract implements ExplorationFacet {
+
+    public static Class<? extends Facet> type() {
+        return ExplorationFacet.class;
+    }
+
+    public ExplorationFacetAbstract(final FacetHolder holder) {
+        super(type(), holder);
+    }
+
+}

Modified: incubator/isis/trunk/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/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/annotation/ExplorationAnnotationFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/annotation/ExplorationAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/annotation/ExplorationAnnotationFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,7 @@
  *  under the License.
  */
 
-
-package org.apache.isis.core.progmodel.facets.actions.exploration.annotation;
-
+package org.apache.isis.core.progmodel.facets.actions.exploration.annotation;
 
 import org.apache.isis.applib.annotation.Exploration;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -28,26 +26,24 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacet;
 import org.apache.isis.core.progmodel.facets.actions.invoke.ActionInvocationFacetFactory;
-
-
+
 /**
- * {@link ExplorationFacet} can also be installed via a naming convention, see
- * {@link ActionInvocationFacetFactory}.
+ * {@link ExplorationFacet} can also be installed via a naming convention, see {@link ActionInvocationFacetFactory}.
  */
-public class ExplorationAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
-
-    public ExplorationAnnotationFacetFactory() {
-        super(FeatureType.ACTIONS_ONLY);
-    }
-
-    @Override
-    public void process(ProcessMethodContext processMethodContext) {
-        final Exploration annotation = getAnnotation(processMethodContext.getMethod(), Exploration.class);
-        FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
-    }
-
-    private ExplorationFacet create(final Exploration annotation, final FacetHolder holder) {
-        return annotation == null ? null : new ExplorationFacetAnnotation(holder);
-    }
-
-}
+public class ExplorationAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+    public ExplorationAnnotationFacetFactory() {
+        super(FeatureType.ACTIONS_ONLY);
+    }
+
+    @Override
+    public void process(final ProcessMethodContext processMethodContext) {
+        final Exploration annotation = getAnnotation(processMethodContext.getMethod(), Exploration.class);
+        FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
+    }
+
+    private ExplorationFacet create(final Exploration annotation, final FacetHolder holder) {
+        return annotation == null ? null : new ExplorationFacetAnnotation(holder);
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/annotation/ExplorationFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/annotation/ExplorationFacetAnnotation.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/annotation/ExplorationFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/exploration/annotation/ExplorationFacetAnnotation.java Tue Apr 26 22:03:43 2011
@@ -17,18 +17,15 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.actions.exploration.annotation;
 
-package org.apache.isis.core.progmodel.facets.actions.exploration.annotation;
-
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.progmodel.facets.actions.exploration.ExplorationFacetAbstract;
-
-
-public class ExplorationFacetAnnotation extends ExplorationFacetAbstract {
-
-    public ExplorationFacetAnnotation(final FacetHolder holder) {
-        super(holder);
-    }
-
-}
-
+
+public class ExplorationFacetAnnotation extends ExplorationFacetAbstract {
+
+    public ExplorationFacetAnnotation(final FacetHolder holder) {
+        super(holder);
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -40,13 +40,11 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.progmodel.facets.MethodPrefixBasedFacetFactoryAbstract;
 
 /**
- * Sets up {@link ActionInvocationFacet}, along with a number of supporting facets
- * that are based on the action's name.
+ * Sets up {@link ActionInvocationFacet}, along with a number of supporting facets that are based on the action's name.
  * 
  * <p>
- * The supporting methods are: {@link ExecutedFacet}, {@link ExplorationFacet} and
- * {@link DebugFacet}.  In addition a {@link NamedFacet} is inferred from the name
- * (taking into account the above well-known prefixes).
+ * The supporting methods are: {@link ExecutedFacet}, {@link ExplorationFacet} and {@link DebugFacet}. In addition a
+ * {@link NamedFacet} is inferred from the name (taking into account the above well-known prefixes).
  */
 public class ActionInvocationFacetFactory extends MethodPrefixBasedFacetFactoryAbstract implements AdapterMapAware {
 
@@ -70,9 +68,9 @@ public class ActionInvocationFacetFactor
     // ///////////////////////////////////////////////////////
 
     @Override
-    public void process(ProcessMethodContext processMethodContext) {
+    public void process(final ProcessMethodContext processMethodContext) {
 
-        // InvocationFacet 
+        // InvocationFacet
         attachInvocationFacet(processMethodContext);
 
         // DebugFacet, ExplorationFacet, ExecutedFacet
@@ -86,7 +84,7 @@ public class ActionInvocationFacetFactor
 
     }
 
-    private void attachInvocationFacet(ProcessMethodContext processMethodContext) {
+    private void attachInvocationFacet(final ProcessMethodContext processMethodContext) {
 
         final Method actionMethod = processMethodContext.getMethod();
 
@@ -97,11 +95,12 @@ public class ActionInvocationFacetFactor
                 return;
             }
 
-            Class<?> cls = processMethodContext.getCls();
+            final Class<?> cls = processMethodContext.getCls();
             final ObjectSpecification typeSpec = getSpecificationLookup().loadSpecification(cls);
             final FacetHolder holder = processMethodContext.getFacetHolder();
-            
-            FacetUtil.addFacet(new ActionInvocationFacetViaMethod(actionMethod, typeSpec, returnSpec, holder, getAdapterMap()));
+
+            FacetUtil.addFacet(new ActionInvocationFacetViaMethod(actionMethod, typeSpec, returnSpec, holder,
+                getAdapterMap()));
         } finally {
             processMethodContext.removeMethod(actionMethod);
         }
@@ -111,9 +110,9 @@ public class ActionInvocationFacetFactor
      * Adds the {@link ExecutedFacet} (indicating where the action should be executed, either {@link Where#LOCALLY
      * locally} or {@link Where#REMOTELY remotely}.
      */
-    private void attachExecutedFacetIfActionMethodNamePrefixed(ProcessMethodContext processMethodContext) {
+    private void attachExecutedFacetIfActionMethodNamePrefixed(final ProcessMethodContext processMethodContext) {
         final Method actionMethod = processMethodContext.getMethod();
-        Where where = Where.lookup(actionMethod);
+        final Where where = Where.lookup(actionMethod);
         if (where == null) {
             return;
         }
@@ -121,7 +120,7 @@ public class ActionInvocationFacetFactor
         FacetUtil.addFacet(new ExecutedFacetViaNamingConvention(where, facetedMethod));
     }
 
-    private void attachDebugFacetIfActionMethodNamePrefixed(ProcessMethodContext processMethodContext) {
+    private void attachDebugFacetIfActionMethodNamePrefixed(final ProcessMethodContext processMethodContext) {
 
         final Method actionMethod = processMethodContext.getMethod();
         final String capitalizedName = NameUtils.capitalizeName(actionMethod.getName());
@@ -132,7 +131,7 @@ public class ActionInvocationFacetFactor
         FacetUtil.addFacet(new DebugFacetViaNamingConvention(facetedMethod));
     }
 
-    private void attachExplorationFacetIfActionMethodNamePrefixed(ProcessMethodContext processMethodContext) {
+    private void attachExplorationFacetIfActionMethodNamePrefixed(final ProcessMethodContext processMethodContext) {
 
         final Method actionMethod = processMethodContext.getMethod();
         final String capitalizedName = NameUtils.capitalizeName(actionMethod.getName());
@@ -143,7 +142,6 @@ public class ActionInvocationFacetFactor
         FacetUtil.addFacet(new ExplorationFacetViaNamingConvention(facetedMethod));
     }
 
-
     /**
      * Must be called after added the debug, exploration etc facets.
      * 
@@ -173,7 +171,7 @@ public class ActionInvocationFacetFactor
     // ///////////////////////////////////////////////////////////////
 
     @Override
-    public void setAdapterMap(AdapterMap adapterMap) {
+    public void setAdapterMap(final AdapterMap adapterMap) {
         this.adapterMap = adapterMap;
     }
 
@@ -181,5 +179,4 @@ public class ActionInvocationFacetFactor
         return adapterMap;
     }
 
-
 }

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetViaMethod.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetViaMethod.java Tue Apr 26 22:03:43 2011
@@ -24,8 +24,6 @@ import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.log4j.Logger;
-
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
 import org.apache.isis.core.metamodel.adapter.util.InvokeUtils;
@@ -36,6 +34,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.specloader.ReflectiveActionException;
+import org.apache.log4j.Logger;
 
 public class ActionInvocationFacetViaMethod extends ActionInvocationFacetAbstract implements ImperativeFacet {
 
@@ -47,7 +46,6 @@ public class ActionInvocationFacetViaMet
     private final ObjectSpecification returnType;
 
     private final AdapterMap adapterMap;
-    
 
     public ActionInvocationFacetViaMethod(final Method method, final ObjectSpecification onType,
         final ObjectSpecification returnType, final FacetHolder holder, final AdapterMap adapterManager) {
@@ -91,7 +89,7 @@ public class ActionInvocationFacetViaMet
 
             final Object object = unwrap(inObject);
             final Object result = method.invoke(object, executionParameters);
-            if(LOG.isDebugEnabled()) {
+            if (LOG.isDebugEnabled()) {
                 LOG.debug(" action result " + result);
             }
             if (result == null) {
@@ -100,7 +98,8 @@ public class ActionInvocationFacetViaMet
 
             final ObjectAdapter resultAdapter = getAdapterMap().adapterFor(result);
             final TypeOfFacet typeOfFacet = getFacetHolder().getFacet(TypeOfFacet.class);
-            resultAdapter.setElementSpecificationProvider(ElementSpecificationProviderFromTypeOfFacet.createFrom(typeOfFacet));
+            resultAdapter.setElementSpecificationProvider(ElementSpecificationProviderFromTypeOfFacet
+                .createFrom(typeOfFacet));
             return resultAdapter;
 
         } catch (final IllegalArgumentException e) {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/DebugFacetViaNamingConvention.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/DebugFacetViaNamingConvention.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/DebugFacetViaNamingConvention.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/DebugFacetViaNamingConvention.java Tue Apr 26 22:03:43 2011
@@ -17,18 +17,15 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.actions.invoke;
 
-package org.apache.isis.core.progmodel.facets.actions.invoke;
-
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.progmodel.facets.actions.debug.DebugFacetAbstract;
-
-
-public class DebugFacetViaNamingConvention extends DebugFacetAbstract {
-
-    public DebugFacetViaNamingConvention(final FacetHolder holder) {
-        super(holder);
-    }
-
-}
-
+
+public class DebugFacetViaNamingConvention extends DebugFacetAbstract {
+
+    public DebugFacetViaNamingConvention(final FacetHolder holder) {
+        super(holder);
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ExecutedFacetViaNamingConvention.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ExecutedFacetViaNamingConvention.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ExecutedFacetViaNamingConvention.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ExecutedFacetViaNamingConvention.java Tue Apr 26 22:03:43 2011
@@ -17,18 +17,15 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.actions.invoke;
 
-package org.apache.isis.core.progmodel.facets.actions.invoke;
-
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.actions.executed.ExecutedFacetAbstract;
-
-
-public class ExecutedFacetViaNamingConvention extends ExecutedFacetAbstract {
-
-    public ExecutedFacetViaNamingConvention(final Where value, final FacetHolder holder) {
-        super(value, holder);
-    }
-
-}
-
+
+public class ExecutedFacetViaNamingConvention extends ExecutedFacetAbstract {
+
+    public ExecutedFacetViaNamingConvention(final Where value, final FacetHolder holder) {
+        super(value, holder);
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ExplorationFacetViaNamingConvention.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ExplorationFacetViaNamingConvention.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ExplorationFacetViaNamingConvention.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ExplorationFacetViaNamingConvention.java Tue Apr 26 22:03:43 2011
@@ -17,18 +17,15 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.actions.invoke;
 
-package org.apache.isis.core.progmodel.facets.actions.invoke;
-
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.progmodel.facets.actions.exploration.ExplorationFacetAbstract;
-
-
-public class ExplorationFacetViaNamingConvention extends ExplorationFacetAbstract {
-
-    public ExplorationFacetViaNamingConvention(final FacetHolder holder) {
-        super(holder);
-    }
-
-}
-
+
+public class ExplorationFacetViaNamingConvention extends ExplorationFacetAbstract {
+
+    public ExplorationFacetViaNamingConvention(final FacetHolder holder) {
+        super(holder);
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedFacetAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/NotContributedFacetAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,22 +17,20 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.actions.notcontributed;
 
-package org.apache.isis.core.progmodel.facets.actions.notcontributed;
-
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.MarkerFacetAbstract;
-
-
-public abstract class NotContributedFacetAbstract extends MarkerFacetAbstract implements NotContributedFacet {
-
-    public static Class<? extends Facet> type() {
-        return NotContributedFacet.class;
-    }
-
-    public NotContributedFacetAbstract(final FacetHolder holder) {
-        super(type(), holder);
-    }
-
-}
+
+public abstract class NotContributedFacetAbstract extends MarkerFacetAbstract implements NotContributedFacet {
+
+    public static Class<? extends Facet> type() {
+        return NotContributedFacet.class;
+    }
+
+    public NotContributedFacetAbstract(final FacetHolder holder) {
+        super(type(), holder);
+    }
+
+}

Modified: incubator/isis/trunk/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/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/annotation/NotContributedAnnotationFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/annotation/NotContributedAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/annotation/NotContributedAnnotationFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,7 @@
  *  under the License.
  */
 
-
-package org.apache.isis.core.progmodel.facets.actions.notcontributed.annotation;
-
+package org.apache.isis.core.progmodel.facets.actions.notcontributed.annotation;
 
 import org.apache.isis.applib.annotation.NotContributed;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -27,22 +25,21 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
 import org.apache.isis.core.progmodel.facets.actions.notcontributed.NotContributedFacet;
-
-
-public class NotContributedAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
-
-    public NotContributedAnnotationFacetFactory() {
-        super(FeatureType.ACTIONS_ONLY);
-    }
-
-    @Override
-    public void process(ProcessMethodContext processMethodContext) {
-        final NotContributed annotation = getAnnotation(processMethodContext.getMethod(), NotContributed.class);
-        FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
-    }
-
-    private NotContributedFacet create(final NotContributed annotation, final FacetHolder holder) {
-        return annotation == null ? null : new NotContributedFacetAnnotation(holder);
-    }
-
-}
+
+public class NotContributedAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+    public NotContributedAnnotationFacetFactory() {
+        super(FeatureType.ACTIONS_ONLY);
+    }
+
+    @Override
+    public void process(final ProcessMethodContext processMethodContext) {
+        final NotContributed annotation = getAnnotation(processMethodContext.getMethod(), NotContributed.class);
+        FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
+    }
+
+    private NotContributedFacet create(final NotContributed annotation, final FacetHolder holder) {
+        return annotation == null ? null : new NotContributedFacetAnnotation(holder);
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotation.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotation.java Tue Apr 26 22:03:43 2011
@@ -17,18 +17,15 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.actions.notcontributed.annotation;
 
-package org.apache.isis.core.progmodel.facets.actions.notcontributed.annotation;
-
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.progmodel.facets.actions.notcontributed.NotContributedFacetAbstract;
-
-
-public class NotContributedFacetAnnotation extends NotContributedFacetAbstract {
-
-    public NotContributedFacetAnnotation(final FacetHolder holder) {
-        super(holder);
-    }
-
-}
-
+
+public class NotContributedFacetAnnotation extends NotContributedFacetAbstract {
+
+    public NotContributedFacetAnnotation(final FacetHolder holder) {
+        super(holder);
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notinservicemenu/NotInServiceMenuFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notinservicemenu/NotInServiceMenuFacetAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notinservicemenu/NotInServiceMenuFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notinservicemenu/NotInServiceMenuFacetAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,22 +17,20 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.actions.notinservicemenu;
 
-package org.apache.isis.core.progmodel.facets.actions.notinservicemenu;
-
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.MarkerFacetAbstract;
-
-
-public abstract class NotInServiceMenuFacetAbstract extends MarkerFacetAbstract implements NotInServiceMenuFacet {
-
-    public static Class<? extends Facet> type() {
-        return NotInServiceMenuFacet.class;
-    }
-
-    public NotInServiceMenuFacetAbstract(final FacetHolder holder) {
-        super(type(), holder);
-    }
-
-}
+
+public abstract class NotInServiceMenuFacetAbstract extends MarkerFacetAbstract implements NotInServiceMenuFacet {
+
+    public static Class<? extends Facet> type() {
+        return NotInServiceMenuFacet.class;
+    }
+
+    public NotInServiceMenuFacetAbstract(final FacetHolder holder) {
+        super(type(), holder);
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notinservicemenu/NotInServiceMenuFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notinservicemenu/NotInServiceMenuFacetAnnotation.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notinservicemenu/NotInServiceMenuFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notinservicemenu/NotInServiceMenuFacetAnnotation.java Tue Apr 26 22:03:43 2011
@@ -17,17 +17,14 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.actions.notinservicemenu;
 
-package org.apache.isis.core.progmodel.facets.actions.notinservicemenu;
-
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
-
-public class NotInServiceMenuFacetAnnotation extends NotInServiceMenuFacetAbstract {
-
-    public NotInServiceMenuFacetAnnotation(final FacetHolder holder) {
-        super(holder);
-    }
-
-}
-
+
+public class NotInServiceMenuFacetAnnotation extends NotInServiceMenuFacetAbstract {
+
+    public NotInServiceMenuFacetAnnotation(final FacetHolder holder) {
+        super(holder);
+    }
+
+}

Modified: incubator/isis/trunk/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/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notinservicemenu/annotation/NotInServiceMenuAnnotationFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notinservicemenu/annotation/NotInServiceMenuAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/notinservicemenu/annotation/NotInServiceMenuAnnotationFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,7 @@
  *  under the License.
  */
 
-
-package org.apache.isis.core.progmodel.facets.actions.notinservicemenu.annotation;
-
+package org.apache.isis.core.progmodel.facets.actions.notinservicemenu.annotation;
 
 import org.apache.isis.applib.annotation.NotInServiceMenu;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -28,22 +26,21 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
 import org.apache.isis.core.progmodel.facets.actions.notinservicemenu.NotInServiceMenuFacet;
 import org.apache.isis.core.progmodel.facets.actions.notinservicemenu.NotInServiceMenuFacetAnnotation;
-
-
-public class NotInServiceMenuAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
-
-    public NotInServiceMenuAnnotationFacetFactory() {
-        super(FeatureType.ACTIONS_ONLY);
-    }
-
-    @Override
-    public void process(ProcessMethodContext processMethodContext) {
-        final NotInServiceMenu annotation = getAnnotation(processMethodContext.getMethod(), NotInServiceMenu.class);
-        FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
-    }
-
-    private NotInServiceMenuFacet create(final NotInServiceMenu annotation, final FacetHolder holder) {
-        return annotation == null ? null : new NotInServiceMenuFacetAnnotation(holder);
-    }
-
-}
+
+public class NotInServiceMenuAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+    public NotInServiceMenuAnnotationFacetFactory() {
+        super(FeatureType.ACTIONS_ONLY);
+    }
+
+    @Override
+    public void process(final ProcessMethodContext processMethodContext) {
+        final NotInServiceMenu annotation = getAnnotation(processMethodContext.getMethod(), NotInServiceMenu.class);
+        FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
+    }
+
+    private NotInServiceMenuFacet create(final NotInServiceMenu annotation, final FacetHolder holder) {
+        return annotation == null ? null : new NotInServiceMenuFacetAnnotation(holder);
+    }
+
+}



Mime
View raw message