incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1096928 [5/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/facets/members/disable/staticmethod/DisabledFacetAlways.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/staticmethod/DisabledFacetAlways.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/staticmethod/DisabledFacetAlways.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/staticmethod/DisabledFacetAlways.java Tue Apr 26 22:03:43 2011
@@ -17,27 +17,25 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.members.disable.staticmethod;
 
-package org.apache.isis.core.progmodel.facets.members.disable.staticmethod;
-
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.When;
 import org.apache.isis.core.progmodel.facets.members.disable.DisabledFacetAbstract;
-
-
-public class DisabledFacetAlways extends DisabledFacetAbstract {
-
-    public DisabledFacetAlways(final FacetHolder holder) {
-        super(When.ALWAYS, holder);
-    }
-
-    /**
-     * Always returns <i>Always disabled</i>.
-     */
-    public String disabledReason(final ObjectAdapter target) {
-        return "Always disabled";
-    }
-
-}
-
+
+public class DisabledFacetAlways extends DisabledFacetAbstract {
+
+    public DisabledFacetAlways(final FacetHolder holder) {
+        super(When.ALWAYS, holder);
+    }
+
+    /**
+     * Always returns <i>Always disabled</i>.
+     */
+    @Override
+    public String disabledReason(final ObjectAdapter target) {
+        return "Always disabled";
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/staticmethod/DisabledFacetViaProtectMethodFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/staticmethod/DisabledFacetViaProtectMethodFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/staticmethod/DisabledFacetViaProtectMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/staticmethod/DisabledFacetViaProtectMethodFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -49,16 +49,15 @@ public class DisabledFacetViaProtectMeth
     // ///////////////////////////////////////////////////////
 
     @Override
-    public void process(ProcessMethodContext processMethodContext) {
+    public void process(final ProcessMethodContext processMethodContext) {
         attachDisabledFacetIfProtectMethodIsFound(processMethodContext);
     }
 
-
     public static void attachDisabledFacetIfProtectMethodIsFound(final ProcessMethodContext processMethodContext) {
 
         final Class<?>[] paramTypes = new Class[] {};
 
-        Class<?> type = processMethodContext.getCls();
+        final Class<?> type = processMethodContext.getCls();
         final Method method = processMethodContext.getMethod();
 
         final String capitalizedName = NameUtils.javaBaseNameStripAccessorPrefixIfRequired(method.getName());
@@ -72,7 +71,7 @@ public class DisabledFacetViaProtectMeth
 
         processMethodContext.removeMethod(protectMethod);
 
-        Boolean protectMethodReturnValue = invokeProtectMethod(protectMethod);
+        final Boolean protectMethodReturnValue = invokeProtectMethod(protectMethod);
         if (!protectMethodReturnValue.booleanValue()) {
             return;
         }
@@ -85,10 +84,10 @@ public class DisabledFacetViaProtectMeth
         Boolean protectMethodReturnValue = null;
         try {
             protectMethodReturnValue = (Boolean) InvokeUtils.invokeStatic(protectMethod);
-        } catch (ClassCastException ex) {
+        } catch (final ClassCastException ex) {
             // ignore
         }
-        if(protectMethodReturnValue == null) {
+        if (protectMethodReturnValue == null) {
             throw new MetaModelException("method " + protectMethod + "must return a boolean");
         }
         return protectMethodReturnValue;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HiddenFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HiddenFacetAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HiddenFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HiddenFacetAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.members.hide;
 
-package org.apache.isis.core.progmodel.facets.members.hide;
-
 import org.apache.isis.applib.events.VisibilityEvent;
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -27,20 +26,20 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.When;
 import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
 import org.apache.isis.core.metamodel.interactions.VisibilityContext;
-
-
-public abstract class HiddenFacetAbstract extends SingleWhenValueFacetAbstract implements HiddenFacet {
-
-    public static Class<? extends Facet> type() {
-        return HiddenFacet.class;
-    }
-
-    public HiddenFacetAbstract(final When value, final FacetHolder holder) {
-        super(type(), holder, value);
-    }
-
-    public String hides(final VisibilityContext<? extends VisibilityEvent> ic) {
-        return hiddenReason(ic.getTarget());
-    }
-
-}
+
+public abstract class HiddenFacetAbstract extends SingleWhenValueFacetAbstract implements HiddenFacet {
+
+    public static Class<? extends Facet> type() {
+        return HiddenFacet.class;
+    }
+
+    public HiddenFacetAbstract(final When value, final FacetHolder holder) {
+        super(type(), holder, value);
+    }
+
+    @Override
+    public String hides(final VisibilityContext<? extends VisibilityEvent> ic) {
+        return hiddenReason(ic.getTarget());
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HiddenFacetImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HiddenFacetImpl.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HiddenFacetImpl.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HiddenFacetImpl.java Tue Apr 26 22:03:43 2011
@@ -17,39 +17,37 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.members.hide;
 
-package org.apache.isis.core.progmodel.facets.members.hide;
-
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.When;
-
-
-public class HiddenFacetImpl extends HiddenFacetAbstract {
-
-    public HiddenFacetImpl(final When value, final FacetHolder holder) {
-        super(value, holder);
-    }
-
-    public String hiddenReason(final ObjectAdapter targetAdapter) {
-        if (value() == When.ALWAYS) {
-            return "Always hidden";
-        } else if (value() == When.NEVER) {
-            return null;
-        }
-
-        // remaining tests depend on target in question.
-        if (targetAdapter == null) {
-            return null;
-        }
-
-        if (value() == When.UNTIL_PERSISTED) {
-            return targetAdapter.isTransient() ? "Hidden until persisted" : null;
-        } else if (value() == When.ONCE_PERSISTED) {
-            return targetAdapter.isPersistent() ? "Hidden once persisted" : null;
-        }
-        return null;
-    }
-
-}
-
+
+public class HiddenFacetImpl extends HiddenFacetAbstract {
+
+    public HiddenFacetImpl(final When value, final FacetHolder holder) {
+        super(value, holder);
+    }
+
+    @Override
+    public String hiddenReason(final ObjectAdapter targetAdapter) {
+        if (value() == When.ALWAYS) {
+            return "Always hidden";
+        } else if (value() == When.NEVER) {
+            return null;
+        }
+
+        // remaining tests depend on target in question.
+        if (targetAdapter == null) {
+            return null;
+        }
+
+        if (value() == When.UNTIL_PERSISTED) {
+            return targetAdapter.isTransient() ? "Hidden until persisted" : null;
+        } else if (value() == When.ONCE_PERSISTED) {
+            return targetAdapter.isPersistent() ? "Hidden once persisted" : null;
+        }
+        return null;
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HiddenFacetNever.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HiddenFacetNever.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HiddenFacetNever.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HiddenFacetNever.java Tue Apr 26 22:03:43 2011
@@ -17,30 +17,28 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.members.hide;
 
-package org.apache.isis.core.progmodel.facets.members.hide;
-
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.When;
-
-
-public class HiddenFacetNever extends HiddenFacetAbstract {
-
-    public HiddenFacetNever(final FacetHolder holder) {
-        super(When.NEVER, holder);
-    }
-
-    /**
-     * Always returns <tt>null</tt>.
-     */
-    public String hiddenReason(final ObjectAdapter target) {
-        return null;
-    }
-
-    @Override
-    public boolean isNoop() {
-        return true;
-    }
-}
-
+
+public class HiddenFacetNever extends HiddenFacetAbstract {
+
+    public HiddenFacetNever(final FacetHolder holder) {
+        super(When.NEVER, holder);
+    }
+
+    /**
+     * Always returns <tt>null</tt>.
+     */
+    @Override
+    public String hiddenReason(final ObjectAdapter target) {
+        return null;
+    }
+
+    @Override
+    public boolean isNoop() {
+        return true;
+    }
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HideForContextFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HideForContextFacetAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HideForContextFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HideForContextFacetAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.core.progmodel.facets.members.hide;
 
 import org.apache.isis.applib.events.VisibilityEvent;
@@ -26,7 +25,6 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.interactions.VisibilityContext;
 
-
 public abstract class HideForContextFacetAbstract extends FacetAbstract implements HideForContextFacet {
 
     public static Class<? extends Facet> type() {
@@ -37,8 +35,8 @@ public abstract class HideForContextFace
         super(type(), holder, false);
     }
 
+    @Override
     public String hides(final VisibilityContext<? extends VisibilityEvent> ic) {
         return hiddenReason(ic.getTarget());
     }
 }
-

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HideForContextFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HideForContextFacetNone.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HideForContextFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HideForContextFacetNone.java Tue Apr 26 22:03:43 2011
@@ -17,30 +17,28 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.members.hide;
 
-package org.apache.isis.core.progmodel.facets.members.hide;
-
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
-
-public class HideForContextFacetNone extends HideForContextFacetAbstract {
-
-    public HideForContextFacetNone(final FacetHolder holder) {
-        super(holder);
-    }
-
-    /**
-     * Always returns <tt>null</tt>.
-     */
-    public String hiddenReason(final ObjectAdapter object) {
-        return null;
-    }
-
-    @Override
-    public boolean isNoop() {
-        return true;
-    }
-
-}
-
+
+public class HideForContextFacetNone extends HideForContextFacetAbstract {
+
+    public HideForContextFacetNone(final FacetHolder holder) {
+        super(holder);
+    }
+
+    /**
+     * Always returns <tt>null</tt>.
+     */
+    @Override
+    public String hiddenReason(final ObjectAdapter object) {
+        return null;
+    }
+
+    @Override
+    public boolean isNoop() {
+        return true;
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HideForSessionFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HideForSessionFacetNone.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HideForSessionFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HideForSessionFacetNone.java Tue Apr 26 22:03:43 2011
@@ -17,30 +17,28 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.members.hide;
 
-package org.apache.isis.core.progmodel.facets.members.hide;
-
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
-
-public class HideForSessionFacetNone extends HideForSessionFacetAbstract {
-
-    public HideForSessionFacetNone(final FacetHolder holder) {
-        super(holder);
-    }
-
-    /**
-     * Always returns <tt>null</tt>.
-     */
-    public String hiddenReason(final AuthenticationSession session) {
-        return null;
-    }
-
-    @Override
-    public boolean isNoop() {
-        return true;
-    }
-
-}
-
+
+public class HideForSessionFacetNone extends HideForSessionFacetAbstract {
+
+    public HideForSessionFacetNone(final FacetHolder holder) {
+        super(holder);
+    }
+
+    /**
+     * Always returns <tt>null</tt>.
+     */
+    @Override
+    public String hiddenReason(final AuthenticationSession session) {
+        return null;
+    }
+
+    @Override
+    public boolean isNoop() {
+        return true;
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/annotation/HiddenAnnotationForMemberFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/annotation/HiddenAnnotationForMemberFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/annotation/HiddenAnnotationForMemberFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/annotation/HiddenAnnotationForMemberFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,7 @@
  *  under the License.
  */
 
-
-package org.apache.isis.core.progmodel.facets.members.hide.annotation;
-
+package org.apache.isis.core.progmodel.facets.members.hide.annotation;
 
 import org.apache.isis.applib.annotation.Hidden;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -28,23 +26,21 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.When;
 import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
-
-
-public class HiddenAnnotationForMemberFacetFactory extends AnnotationBasedFacetFactoryAbstract {
-
-    public HiddenAnnotationForMemberFacetFactory() {
-        super(FeatureType.MEMBERS);
-    }
-
-    
-    @Override
-    public void process(ProcessMethodContext processMethodContext) {
-        final Hidden annotation = getAnnotation(processMethodContext.getMethod(), Hidden.class);
-        FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
-    }
-
-    private static HiddenFacet create(final Hidden annotation, final FacetHolder holder) {
-        return annotation == null ? null : new HiddenFacetForMemberAnnotation(When.decode(annotation.value()), holder);
-    }
-
-}
+
+public class HiddenAnnotationForMemberFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+    public HiddenAnnotationForMemberFacetFactory() {
+        super(FeatureType.MEMBERS);
+    }
+
+    @Override
+    public void process(final ProcessMethodContext processMethodContext) {
+        final Hidden annotation = getAnnotation(processMethodContext.getMethod(), Hidden.class);
+        FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
+    }
+
+    private static HiddenFacet create(final Hidden annotation, final FacetHolder holder) {
+        return annotation == null ? null : new HiddenFacetForMemberAnnotation(When.decode(annotation.value()), holder);
+    }
+
+}

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

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/forsession/HiddenFacetViaHideForSessionMethodFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/forsession/HiddenFacetViaHideForSessionMethodFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/forsession/HiddenFacetViaHideForSessionMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/forsession/HiddenFacetViaHideForSessionMethodFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -36,7 +36,6 @@ public class HiddenFacetViaHideForSessio
 
     private static final String[] PREFIXES = { MethodPrefixConstants.HIDE_PREFIX };
 
-
     /**
      * Note that the {@link Facet}s registered are the generic ones from noa-architecture (where they exist)
      */
@@ -49,7 +48,7 @@ public class HiddenFacetViaHideForSessio
     // ///////////////////////////////////////////////////////
 
     @Override
-    public void process(ProcessMethodContext processMethodContext) {
+    public void process(final ProcessMethodContext processMethodContext) {
         // hideXxx(UserMemento)
         attachHideFacetIfHideMethodForSessionIsFound(processMethodContext);
 
@@ -60,11 +59,10 @@ public class HiddenFacetViaHideForSessio
         final Method method = processMethodContext.getMethod();
         final String capitalizedName = NameUtils.javaBaseNameStripAccessorPrefixIfRequired(method.getName());
 
-        Class<?> cls = processMethodContext.getCls();
-        Method hideForSessionMethod =
-            MethodFinderUtils.findMethod(cls, MethodScope.CLASS,
-                MethodPrefixConstants.HIDE_PREFIX + capitalizedName, boolean.class,
-                new Class[] { UserMemento.class });
+        final Class<?> cls = processMethodContext.getCls();
+        final Method hideForSessionMethod =
+            MethodFinderUtils.findMethod(cls, MethodScope.CLASS, MethodPrefixConstants.HIDE_PREFIX + capitalizedName,
+                boolean.class, new Class[] { UserMemento.class });
 
         if (hideForSessionMethod == null) {
             return;
@@ -76,5 +74,4 @@ public class HiddenFacetViaHideForSessio
         FacetUtil.addFacet(new HideForSessionFacetViaMethod(hideForSessionMethod, facetedMethod));
     }
 
-
 }

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/forsession/HideForSessionFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/forsession/HideForSessionFacetViaMethod.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/forsession/HideForSessionFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/forsession/HideForSessionFacetViaMethod.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.core.progmodel.facets.members.hide.forsession;
 
 import java.lang.reflect.Method;
@@ -31,36 +30,37 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.ImperativeFacet;
 import org.apache.isis.core.progmodel.facets.members.hide.HideForSessionFacetAbstract;
 
-
 public class HideForSessionFacetViaMethod extends HideForSessionFacetAbstract implements ImperativeFacet {
 
     private final Method method;
 
-    public HideForSessionFacetViaMethod(
-    		final Method method, 
-    		final FacetHolder holder) {
+    public HideForSessionFacetViaMethod(final Method method, final FacetHolder holder) {
         super(holder);
         this.method = method;
     }
 
     /**
-     * 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(method);
+        return Collections.singletonList(method);
     }
 
-	public boolean impliesResolve() {
-		return true;
-	}
+    @Override
+    public boolean impliesResolve() {
+        return true;
+    }
 
-	public boolean impliesObjectChanged() {
-		return false;
-	}
+    @Override
+    public boolean impliesObjectChanged() {
+        return false;
+    }
 
     /**
      * Will only check provided that a {@link AuthenticationSession} has been provided.
      */
+    @Override
     public String hiddenReason(final AuthenticationSession session) {
         if (session == null) {
             return null;
@@ -79,4 +79,3 @@ public class HideForSessionFacetViaMetho
     }
 
 }
-

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/method/HiddenFacetViaHideMethodFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/method/HiddenFacetViaHideMethodFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/method/HiddenFacetViaHideMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/method/HiddenFacetViaHideMethodFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -47,7 +47,7 @@ public class HiddenFacetViaHideMethodFac
     // ///////////////////////////////////////////////////////
 
     @Override
-    public void process(ProcessMethodContext processMethodContext) {
+    public void process(final ProcessMethodContext processMethodContext) {
         attachHideFacetIfHideMethodIsFound(processMethodContext);
     }
 
@@ -56,8 +56,8 @@ public class HiddenFacetViaHideMethodFac
         final Method getMethod = processMethodContext.getMethod();
         final String capitalizedName = NameUtils.javaBaseNameStripAccessorPrefixIfRequired(getMethod.getName());
 
-        Class<?> cls = processMethodContext.getCls();
-        Method hideMethod =
+        final Class<?> cls = processMethodContext.getCls();
+        final Method hideMethod =
             MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, MethodPrefixConstants.HIDE_PREFIX + capitalizedName,
                 boolean.class, new Class[] {});
         if (hideMethod == null) {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/method/HideForContextFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/method/HideForContextFacetViaMethod.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/method/HideForContextFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/method/HideForContextFacetViaMethod.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.core.progmodel.facets.members.hide.method;
 
 import java.lang.reflect.Method;
@@ -30,33 +29,34 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.ImperativeFacet;
 import org.apache.isis.core.progmodel.facets.members.hide.HideForContextFacetAbstract;
 
-
 public class HideForContextFacetViaMethod extends HideForContextFacetAbstract implements ImperativeFacet {
 
     private final Method method;
 
-    public HideForContextFacetViaMethod(
-    		final Method method, 
-    		final FacetHolder holder) {
+    public HideForContextFacetViaMethod(final Method method, final FacetHolder holder) {
         super(holder);
         this.method = method;
     }
 
     /**
-     * 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(method);
+        return Collections.singletonList(method);
     }
 
-	public boolean impliesResolve() {
-		return true;
-	}
+    @Override
+    public boolean impliesResolve() {
+        return true;
+    }
 
-	public boolean impliesObjectChanged() {
-		return false;
-	}
+    @Override
+    public boolean impliesObjectChanged() {
+        return false;
+    }
 
+    @Override
     public String hiddenReason(final ObjectAdapter owningAdapter) {
         if (owningAdapter == null) {
             return null;
@@ -71,4 +71,3 @@ public class HideForContextFacetViaMetho
     }
 
 }
-

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/staticmethod/HiddenFacetAlways.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/staticmethod/HiddenFacetAlways.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/staticmethod/HiddenFacetAlways.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/staticmethod/HiddenFacetAlways.java Tue Apr 26 22:03:43 2011
@@ -17,27 +17,25 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.members.hide.staticmethod;
 
-package org.apache.isis.core.progmodel.facets.members.hide.staticmethod;
-
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.When;
 import org.apache.isis.core.progmodel.facets.members.hide.HiddenFacetAbstract;
-
-
-public class HiddenFacetAlways extends HiddenFacetAbstract {
-
-    public HiddenFacetAlways(final FacetHolder holder) {
-        super(When.ALWAYS, holder);
-    }
-
-    /**
-     * Always returns <i>Always hidden</i>.
-     */
-    public String hiddenReason(final ObjectAdapter target) {
-        return "Always hidden";
-    }
-
-}
-
+
+public class HiddenFacetAlways extends HiddenFacetAbstract {
+
+    public HiddenFacetAlways(final FacetHolder holder) {
+        super(When.ALWAYS, holder);
+    }
+
+    /**
+     * Always returns <i>Always hidden</i>.
+     */
+    @Override
+    public String hiddenReason(final ObjectAdapter target) {
+        return "Always hidden";
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/staticmethod/HiddenFacetViaAlwaysHideMethodFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/staticmethod/HiddenFacetViaAlwaysHideMethodFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/staticmethod/HiddenFacetViaAlwaysHideMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/staticmethod/HiddenFacetViaAlwaysHideMethodFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -49,7 +49,7 @@ public class HiddenFacetViaAlwaysHideMet
     // ///////////////////////////////////////////////////////
 
     @Override
-    public void process(ProcessMethodContext processMethodContext) {
+    public void process(final ProcessMethodContext processMethodContext) {
         // alwaysHideXxx()
         attachHiddenFacetIfAlwaysHideMethodIsFound(processMethodContext);
 
@@ -57,20 +57,20 @@ public class HiddenFacetViaAlwaysHideMet
 
     public static void attachHiddenFacetIfAlwaysHideMethodIsFound(final ProcessMethodContext processMethodContext) {
 
-        Class<?> type = processMethodContext.getCls();
+        final Class<?> type = processMethodContext.getCls();
         final Method method = processMethodContext.getMethod();
 
         final String capitalizedName = NameUtils.javaBaseNameStripAccessorPrefixIfRequired(method.getName());
 
         final Method alwaysHideMethod =
-            MethodFinderUtils.findMethod(type, MethodScope.CLASS,
-                MethodPrefixConstants.ALWAYS_HIDE_PREFIX + capitalizedName, boolean.class, new Class[] {});
+            MethodFinderUtils.findMethod(type, MethodScope.CLASS, MethodPrefixConstants.ALWAYS_HIDE_PREFIX
+                + capitalizedName, boolean.class, new Class[] {});
         if (alwaysHideMethod == null) {
             return;
         }
 
         processMethodContext.removeMethod(alwaysHideMethod);
-        Boolean alwaysHideMethodReturnValue = invokeAlwaysHideMethod(alwaysHideMethod);
+        final Boolean alwaysHideMethodReturnValue = invokeAlwaysHideMethod(alwaysHideMethod);
         if (!alwaysHideMethodReturnValue.booleanValue()) {
             return;
         }
@@ -83,14 +83,13 @@ public class HiddenFacetViaAlwaysHideMet
         Boolean alwaysHideMethodReturnValue = null;
         try {
             alwaysHideMethodReturnValue = (Boolean) InvokeUtils.invokeStatic(alwaysHideMethod);
-        } catch (ClassCastException ex) {
+        } catch (final ClassCastException ex) {
             // ignore
         }
-        if(alwaysHideMethodReturnValue == null) {
+        if (alwaysHideMethodReturnValue == null) {
             throw new MetaModelException("method " + alwaysHideMethod + "must return a boolean");
         }
         return alwaysHideMethodReturnValue;
     }
 
-
 }

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/named/annotation/NamedAnnotationOnMemberFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/named/annotation/NamedAnnotationOnMemberFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/named/annotation/NamedAnnotationOnMemberFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/named/annotation/NamedAnnotationOnMemberFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,31 +17,29 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.members.named.annotation;
 
-package org.apache.isis.core.progmodel.facets.members.named.annotation;
-
 import org.apache.isis.applib.annotation.Named;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.named.NamedFacet;
-
-
-public class NamedAnnotationOnMemberFacetFactory extends AnnotationBasedFacetFactoryAbstract {
-
-    public NamedAnnotationOnMemberFacetFactory() {
-        super(FeatureType.MEMBERS);
-    }
-
-    @Override
-    public void process(ProcessMethodContext processMethodContext) {
-        final Named annotation = getAnnotation(processMethodContext.getMethod(), Named.class);
-        FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
-    }
-
-    private NamedFacet create(final Named annotation, final FacetHolder holder) {
-        return annotation != null ? new NamedFacetAnnotationOnMember(annotation.value(), holder) : null;
-    }
-
-}
+
+public class NamedAnnotationOnMemberFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+    public NamedAnnotationOnMemberFacetFactory() {
+        super(FeatureType.MEMBERS);
+    }
+
+    @Override
+    public void process(final ProcessMethodContext processMethodContext) {
+        final Named annotation = getAnnotation(processMethodContext.getMethod(), Named.class);
+        FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
+    }
+
+    private NamedFacet create(final Named annotation, final FacetHolder holder) {
+        return annotation != null ? new NamedFacetAnnotationOnMember(annotation.value(), holder) : null;
+    }
+
+}

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

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/named/staticmethod/NamedFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/named/staticmethod/NamedFacetViaMethod.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/named/staticmethod/NamedFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/named/staticmethod/NamedFacetViaMethod.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.members.named.staticmethod;
 
-package org.apache.isis.core.progmodel.facets.members.named.staticmethod;
-
 import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.List;
@@ -27,34 +26,32 @@ import java.util.List;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.ImperativeFacet;
 import org.apache.isis.core.metamodel.facets.named.NamedFacetAbstract;
-
-
-public class NamedFacetViaMethod extends NamedFacetAbstract implements ImperativeFacet {
-
-    private final Method method;
-
-    public NamedFacetViaMethod(
-    		final String value, 
-    		final Method method, 
-    		final FacetHolder holder) {
-        super(value, holder);
-        this.method = method;
-    }
-
-    /**
-     * Returns a singleton list of the {@link Method} provided in the constructor. 
-     */
-    public List<Method> getMethods() {
-    	return Collections.singletonList(method);
-    }
-
-	public boolean impliesResolve() {
-		return true;
-	}
-
-	public boolean impliesObjectChanged() {
-		return false;
-	}
-
-}
-
+
+public class NamedFacetViaMethod extends NamedFacetAbstract implements ImperativeFacet {
+
+    private final Method method;
+
+    public NamedFacetViaMethod(final String value, final Method method, final FacetHolder holder) {
+        super(value, holder);
+        this.method = method;
+    }
+
+    /**
+     * Returns a singleton list of the {@link Method} provided in the constructor.
+     */
+    @Override
+    public List<Method> getMethods() {
+        return Collections.singletonList(method);
+    }
+
+    @Override
+    public boolean impliesResolve() {
+        return true;
+    }
+
+    @Override
+    public boolean impliesObjectChanged() {
+        return false;
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/named/staticmethod/NamedFacetViaNameMethodFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/named/staticmethod/NamedFacetViaNameMethodFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/named/staticmethod/NamedFacetViaNameMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/named/staticmethod/NamedFacetViaNameMethodFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -39,7 +39,6 @@ import org.apache.isis.core.progmodel.fa
  */
 public class NamedFacetViaNameMethodFacetFactory extends MethodPrefixBasedFacetFactoryAbstract {
 
-
     private static final String[] PREFIXES = { MethodPrefixConstants.NAME_PREFIX };
 
     /**
@@ -54,7 +53,7 @@ public class NamedFacetViaNameMethodFace
     // ///////////////////////////////////////////////////////
 
     @Override
-    public void process(ProcessMethodContext processMethodContext) {
+    public void process(final ProcessMethodContext processMethodContext) {
 
         // namedXxx()
         attachNamedFacetIfNamedMethodIsFound(processMethodContext);
@@ -65,18 +64,18 @@ public class NamedFacetViaNameMethodFace
         final Method method = processMethodContext.getMethod();
         final String capitalizedName = NameUtils.javaBaseNameStripAccessorPrefixIfRequired(method.getName());
 
-        Class<?> cls = processMethodContext.getCls();
+        final Class<?> cls = processMethodContext.getCls();
         final Method nameMethod =
-            MethodFinderUtils.findMethod(cls, MethodScope.CLASS,
-                MethodPrefixConstants.NAME_PREFIX + capitalizedName, String.class, new Class[0]);
+            MethodFinderUtils.findMethod(cls, MethodScope.CLASS, MethodPrefixConstants.NAME_PREFIX + capitalizedName,
+                String.class, new Class[0]);
 
         if (nameMethod == null) {
             return;
         }
 
         processMethodContext.removeMethod(nameMethod);
-        String name = invokeNameMethod(nameMethod);
-        
+        final String name = invokeNameMethod(nameMethod);
+
         final FacetHolder facetHolder = processMethodContext.getFacetHolder();
         FacetUtil.addFacet(new NamedFacetViaMethod(name, nameMethod, facetHolder));
     }
@@ -85,7 +84,7 @@ public class NamedFacetViaNameMethodFace
         String name = null;
         try {
             name = (String) InvokeUtils.invokeStatic(nameMethod);
-        } catch (ClassCastException e) {
+        } catch (final ClassCastException e) {
             // ignore
         }
         if (name == null) {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/order/MemberOrderAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/order/MemberOrderAnnotationFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/order/MemberOrderAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/order/MemberOrderAnnotationFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,7 @@
  *  under the License.
  */
 
-
-package org.apache.isis.core.progmodel.facets.members.order;
-
+package org.apache.isis.core.progmodel.facets.members.order;
 
 import org.apache.isis.applib.annotation.MemberOrder;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -27,23 +25,23 @@ 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.metamodel.facets.member.ordering.MemberOrderFacet;
-
-
-public class MemberOrderAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
-
-    public MemberOrderAnnotationFacetFactory() {
-        super(FeatureType.MEMBERS);
-    }
-
-    @Override
-    public void process(ProcessMethodContext processMethodContext) {
-        Class<MemberOrder> annotationClass = MemberOrder.class;
-		final MemberOrder annotation = getAnnotation(processMethodContext.getMethod(), annotationClass);
-        FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
-    }
-
-    private MemberOrderFacet create(final MemberOrder annotation, final FacetHolder holder) {
-        return annotation == null ? null : new MemberOrderFacetAnnotation(annotation.name(), annotation.sequence(), holder);
-    }
-
-}
+
+public class MemberOrderAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+    public MemberOrderAnnotationFacetFactory() {
+        super(FeatureType.MEMBERS);
+    }
+
+    @Override
+    public void process(final ProcessMethodContext processMethodContext) {
+        final Class<MemberOrder> annotationClass = MemberOrder.class;
+        final MemberOrder annotation = getAnnotation(processMethodContext.getMethod(), annotationClass);
+        FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
+    }
+
+    private MemberOrderFacet create(final MemberOrder annotation, final FacetHolder holder) {
+        return annotation == null ? null : new MemberOrderFacetAnnotation(annotation.name(), annotation.sequence(),
+            holder);
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/order/MemberOrderFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/order/MemberOrderFacetAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/order/MemberOrderFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/order/MemberOrderFacetAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,36 +17,36 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.members.order;
 
-package org.apache.isis.core.progmodel.facets.members.order;
-
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.MultipleValueFacetAbstract;
 import org.apache.isis.core.metamodel.facets.member.ordering.MemberOrderFacet;
-
-
-public abstract class MemberOrderFacetAbstract extends MultipleValueFacetAbstract implements MemberOrderFacet {
-
-    public static Class<? extends Facet> type() {
-        return MemberOrderFacet.class;
-    }
-
-    private final String name;
-    private final String sequence;
-
-    public MemberOrderFacetAbstract(final String name, final String sequence, final FacetHolder holder) {
-        super(type(), holder);
-        this.name = name;
-        this.sequence = sequence;
-    }
-
-    public String name() {
-        return name;
-    }
-
-    public String sequence() {
-        return sequence;
-    }
-
-}
+
+public abstract class MemberOrderFacetAbstract extends MultipleValueFacetAbstract implements MemberOrderFacet {
+
+    public static Class<? extends Facet> type() {
+        return MemberOrderFacet.class;
+    }
+
+    private final String name;
+    private final String sequence;
+
+    public MemberOrderFacetAbstract(final String name, final String sequence, final FacetHolder holder) {
+        super(type(), holder);
+        this.name = name;
+        this.sequence = sequence;
+    }
+
+    @Override
+    public String name() {
+        return name;
+    }
+
+    @Override
+    public String sequence() {
+        return sequence;
+    }
+
+}

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

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/annotation/AggregatedAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/annotation/AggregatedAnnotationFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/annotation/AggregatedAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/aggregated/annotation/AggregatedAnnotationFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,31 +17,29 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.object.aggregated.annotation;
 
-package org.apache.isis.core.progmodel.facets.object.aggregated.annotation;
-
 import org.apache.isis.applib.annotation.Aggregated;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.object.aggregated.AggregatedFacet;
-
-
-public class AggregatedAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
-
-    public AggregatedAnnotationFacetFactory() {
-        super(FeatureType.OBJECTS_ONLY);
-    }
-
-    @Override
-    public void process(ProcessClassContext processClassContaxt) {
-        final Aggregated annotation = getAnnotation(processClassContaxt.getCls(), Aggregated.class);
-        FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
-    }
-
-    private AggregatedFacet create(final Aggregated annotation, final FacetHolder holder) {
-        return annotation == null ? null : new AggregatedFacetAnnotation(holder);
-    }
-
-}
+
+public class AggregatedAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+    public AggregatedAnnotationFacetFactory() {
+        super(FeatureType.OBJECTS_ONLY);
+    }
+
+    @Override
+    public void process(final ProcessClassContext processClassContaxt) {
+        final Aggregated annotation = getAnnotation(processClassContaxt.getCls(), Aggregated.class);
+        FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
+    }
+
+    private AggregatedFacet create(final Aggregated annotation, final FacetHolder holder) {
+        return annotation == null ? null : new AggregatedFacetAnnotation(holder);
+    }
+
+}

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

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/bounded/BoundedFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/bounded/BoundedFacetAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/bounded/BoundedFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/bounded/BoundedFacetAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.object.bounded;
 
-package org.apache.isis.core.progmodel.facets.object.bounded;
-
 import org.apache.isis.applib.events.UsabilityEvent;
 import org.apache.isis.applib.events.ValidityEvent;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -30,34 +29,35 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.interactions.ObjectValidityContext;
 import org.apache.isis.core.metamodel.interactions.UsabilityContext;
 import org.apache.isis.core.metamodel.interactions.ValidityContext;
-
-
-public abstract class BoundedFacetAbstract extends MarkerFacetAbstract implements BoundedFacet {
-
-    public static Class<? extends Facet> type() {
-        return BoundedFacet.class;
-    }
-
-    public BoundedFacetAbstract(final FacetHolder holder) {
-        super(type(), holder);
-    }
-
-    /**
-     * Hook method for subclasses to override.
-     */
-    public abstract String disabledReason(ObjectAdapter no);
-
-    public String invalidates(final ValidityContext<? extends ValidityEvent> context) {
-        if (!(context instanceof ObjectValidityContext)) {
-            return null;
-        }
-        final ObjectAdapter target = context.getTarget();
-        return disabledReason(target);
-    }
-
-    public String disables(final UsabilityContext<? extends UsabilityEvent> context) {
-        final ObjectAdapter target = context.getTarget();
-        return disabledReason(target);
-    }
-
-}
+
+public abstract class BoundedFacetAbstract extends MarkerFacetAbstract implements BoundedFacet {
+
+    public static Class<? extends Facet> type() {
+        return BoundedFacet.class;
+    }
+
+    public BoundedFacetAbstract(final FacetHolder holder) {
+        super(type(), holder);
+    }
+
+    /**
+     * Hook method for subclasses to override.
+     */
+    public abstract String disabledReason(ObjectAdapter no);
+
+    @Override
+    public String invalidates(final ValidityContext<? extends ValidityEvent> context) {
+        if (!(context instanceof ObjectValidityContext)) {
+            return null;
+        }
+        final ObjectAdapter target = context.getTarget();
+        return disabledReason(target);
+    }
+
+    @Override
+    public String disables(final UsabilityContext<? extends UsabilityEvent> context) {
+        final ObjectAdapter target = context.getTarget();
+        return disabledReason(target);
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/bounded/BoundedFacetImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/bounded/BoundedFacetImpl.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/bounded/BoundedFacetImpl.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/bounded/BoundedFacetImpl.java Tue Apr 26 22:03:43 2011
@@ -17,23 +17,20 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.object.bounded;
 
-package org.apache.isis.core.progmodel.facets.object.bounded;
-
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
-
-public class BoundedFacetImpl extends BoundedFacetAbstract {
-
-    public BoundedFacetImpl(final FacetHolder holder) {
-        super(holder);
-    }
-
-    @Override
-    public String disabledReason(final ObjectAdapter inObject) {
-        return "Bounded";
-    }
-
-}
-
+
+public class BoundedFacetImpl extends BoundedFacetAbstract {
+
+    public BoundedFacetImpl(final FacetHolder holder) {
+        super(holder);
+    }
+
+    @Override
+    public String disabledReason(final ObjectAdapter inObject) {
+        return "Bounded";
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/bounded/annotation/BoundedAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/bounded/annotation/BoundedAnnotationFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/bounded/annotation/BoundedAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/bounded/annotation/BoundedAnnotationFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,31 +17,29 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.object.bounded.annotation;
 
-package org.apache.isis.core.progmodel.facets.object.bounded.annotation;
-
 import org.apache.isis.applib.annotation.Bounded;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.object.bounded.BoundedFacet;
-
-
-public class BoundedAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
-
-    public BoundedAnnotationFacetFactory() {
-        super(FeatureType.OBJECTS_ONLY);
-    }
-
-    @Override
-    public void process(ProcessClassContext processClassContaxt) {
-        final Bounded annotation = getAnnotation(processClassContaxt.getCls(), Bounded.class);
-        FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
-    }
-
-    private BoundedFacet create(final Bounded annotation, final FacetHolder holder) {
-        return annotation == null ? null : new BoundedFacetAnnotation(holder);
-    }
-
-}
+
+public class BoundedAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+    public BoundedAnnotationFacetFactory() {
+        super(FeatureType.OBJECTS_ONLY);
+    }
+
+    @Override
+    public void process(final ProcessClassContext processClassContaxt) {
+        final Bounded annotation = getAnnotation(processClassContaxt.getCls(), Bounded.class);
+        FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
+    }
+
+    private BoundedFacet create(final Bounded annotation, final FacetHolder holder) {
+        return annotation == null ? null : new BoundedFacetAnnotation(holder);
+    }
+
+}

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

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

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/bounded/markerifc/BoundedMarkerInterfaceFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/bounded/markerifc/BoundedMarkerInterfaceFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/bounded/markerifc/BoundedMarkerInterfaceFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/bounded/markerifc/BoundedMarkerInterfaceFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.object.bounded.markerifc;
 
-package org.apache.isis.core.progmodel.facets.object.bounded.markerifc;
-
 import java.lang.reflect.Method;
 
 import org.apache.isis.applib.marker.Bounded;
@@ -28,26 +27,25 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.object.bounded.BoundedFacet;
-
-
-public class BoundedMarkerInterfaceFacetFactory extends FacetFactoryAbstract {
-
-    public BoundedMarkerInterfaceFacetFactory() {
-        super(FeatureType.OBJECTS_ONLY);
-    }
-
-    @Override
-    public void process(ProcessClassContext processClassContaxt) {
-        final boolean implementsMarker = Bounded.class.isAssignableFrom(processClassContaxt.getCls());
-        FacetUtil.addFacet(create(implementsMarker, processClassContaxt.getFacetHolder()));
-    }
-
-    private BoundedFacet create(final boolean implementsMarker, final FacetHolder holder) {
-        return implementsMarker ? new BoundedFacetMarkerInterface(holder) : null;
-    }
-
-    public boolean recognizes(final Method method) {
-        return false;
-    }
-
-}
+
+public class BoundedMarkerInterfaceFacetFactory extends FacetFactoryAbstract {
+
+    public BoundedMarkerInterfaceFacetFactory() {
+        super(FeatureType.OBJECTS_ONLY);
+    }
+
+    @Override
+    public void process(final ProcessClassContext processClassContaxt) {
+        final boolean implementsMarker = Bounded.class.isAssignableFrom(processClassContaxt.getCls());
+        FacetUtil.addFacet(create(implementsMarker, processClassContaxt.getFacetHolder()));
+    }
+
+    private BoundedFacet create(final boolean implementsMarker, final FacetHolder holder) {
+        return implementsMarker ? new BoundedFacetMarkerInterface(holder) : null;
+    }
+
+    public boolean recognizes(final Method method) {
+        return false;
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/CallbackFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/CallbackFacetAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/CallbackFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/CallbackFacetAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.core.progmodel.facets.object.callbacks;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -26,7 +25,6 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.object.callbacks.CallbackFacet;
 
-
 /**
  * Adapter superclass for {@link Facet}s for {@link CallbackFacet}.
  */
@@ -36,7 +34,7 @@ public abstract class CallbackFacetAbstr
         super(facetType, holder, false);
     }
 
+    @Override
     public abstract void invoke(ObjectAdapter object);
 
 }
-

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/create/CreatedCallbackFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/create/CreatedCallbackFacetAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/create/CreatedCallbackFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/create/CreatedCallbackFacetAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.core.progmodel.facets.object.callbacks.create;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -25,7 +24,6 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.object.callbacks.CreatedCallbackFacet;
 import org.apache.isis.core.progmodel.facets.object.callbacks.CallbackFacetAbstract;
 
-
 public abstract class CreatedCallbackFacetAbstract extends CallbackFacetAbstract implements CreatedCallbackFacet {
 
     public static Class<? extends Facet> type() {
@@ -37,4 +35,3 @@ public abstract class CreatedCallbackFac
     }
 
 }
-

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/create/CreatedCallbackFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/create/CreatedCallbackFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/create/CreatedCallbackFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/create/CreatedCallbackFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.object.callbacks.create;
 
-package org.apache.isis.core.progmodel.facets.object.callbacks.create;
-
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
@@ -32,33 +31,34 @@ import org.apache.isis.core.metamodel.me
 import org.apache.isis.core.progmodel.facets.MethodFinderUtils;
 import org.apache.isis.core.progmodel.facets.MethodPrefixBasedFacetFactoryAbstract;
 import org.apache.isis.core.progmodel.facets.MethodPrefixConstants;
-
-
-public class CreatedCallbackFacetFactory extends MethodPrefixBasedFacetFactoryAbstract {
-
-    private static final String[] PREFIXES = { MethodPrefixConstants.CREATED_PREFIX, };
-
-    public CreatedCallbackFacetFactory() {
-        super(FeatureType.OBJECTS_ONLY, PREFIXES);
-    }
-
-    @Override
-    public void process(ProcessClassContext processClassContext) {
+
+public class CreatedCallbackFacetFactory extends MethodPrefixBasedFacetFactoryAbstract {
+
+    private static final String[] PREFIXES = { MethodPrefixConstants.CREATED_PREFIX, };
+
+    public CreatedCallbackFacetFactory() {
+        super(FeatureType.OBJECTS_ONLY, PREFIXES);
+    }
+
+    @Override
+    public void process(final ProcessClassContext processClassContext) {
         final Class<?> cls = processClassContext.getCls();
         final FacetHolder holder = processClassContext.getFacetHolder();
-
-        final List<Facet> facets = new ArrayList<Facet>();
-        final List<Method> methods = new ArrayList<Method>();
-
-        Method method = null;
-        method = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, MethodPrefixConstants.CREATED_PREFIX, void.class, NO_PARAMETERS_TYPES);
-        if (method != null) {
-            methods.add(method);
-            facets.add(new CreatedCallbackFacetViaMethod(method, holder));
-        }
-
-        processClassContext.removeMethods(methods);
-        FacetUtil.addFacets(facets);
-    }
-
-}
+
+        final List<Facet> facets = new ArrayList<Facet>();
+        final List<Method> methods = new ArrayList<Method>();
+
+        Method method = null;
+        method =
+            MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, MethodPrefixConstants.CREATED_PREFIX, void.class,
+                NO_PARAMETERS_TYPES);
+        if (method != null) {
+            methods.add(method);
+            facets.add(new CreatedCallbackFacetViaMethod(method, holder));
+        }
+
+        processClassContext.removeMethods(methods);
+        FacetUtil.addFacets(facets);
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/create/CreatedCallbackFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/create/CreatedCallbackFacetViaMethod.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/create/CreatedCallbackFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/create/CreatedCallbackFacetViaMethod.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.core.progmodel.facets.object.callbacks.create;
 
 import java.lang.reflect.Method;
@@ -30,33 +29,34 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.ImperativeFacet;
 
-
 public class CreatedCallbackFacetViaMethod extends CreatedCallbackFacetAbstract implements ImperativeFacet {
 
     private final List<Method> methods = new ArrayList<Method>();
 
-    public CreatedCallbackFacetViaMethod(
-    		final Method method, 
-    		final FacetHolder holder) {
+    public CreatedCallbackFacetViaMethod(final Method method, final FacetHolder holder) {
         super(holder);
         addMethod(method);
     }
-    
-	public void addMethod(Method method) {
-		methods.add(method);
-	}
 
+    @Override
+    public void addMethod(final Method method) {
+        methods.add(method);
+    }
+
+    @Override
     public List<Method> getMethods() {
-    	return Collections.unmodifiableList(methods);
+        return Collections.unmodifiableList(methods);
     }
 
-	public boolean impliesResolve() {
-		return false;
-	}
+    @Override
+    public boolean impliesResolve() {
+        return false;
+    }
 
-	public boolean impliesObjectChanged() {
-		return false;
-	}
+    @Override
+    public boolean impliesObjectChanged() {
+        return false;
+    }
 
     @Override
     public void invoke(final ObjectAdapter adapter) {
@@ -68,6 +68,4 @@ public class CreatedCallbackFacetViaMeth
         return "methods=" + methods;
     }
 
-
 }
-

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/load/LoadCallbackFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/load/LoadCallbackFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/load/LoadCallbackFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/load/LoadCallbackFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.core.progmodel.facets.object.callbacks.load;
 
-package org.apache.isis.core.progmodel.facets.object.callbacks.load;
-
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
@@ -32,39 +31,43 @@ import org.apache.isis.core.metamodel.me
 import org.apache.isis.core.progmodel.facets.MethodFinderUtils;
 import org.apache.isis.core.progmodel.facets.MethodPrefixBasedFacetFactoryAbstract;
 import org.apache.isis.core.progmodel.facets.MethodPrefixConstants;
-
-
-public class LoadCallbackFacetFactory extends MethodPrefixBasedFacetFactoryAbstract {
-
-    private static final String[] PREFIXES = { MethodPrefixConstants.LOADED_PREFIX, MethodPrefixConstants.LOADING_PREFIX, };
-
-    public LoadCallbackFacetFactory() {
-        super(FeatureType.OBJECTS_ONLY, PREFIXES);
-    }
-
-    @Override
-    public void process(ProcessClassContext processClassContext) {
+
+public class LoadCallbackFacetFactory extends MethodPrefixBasedFacetFactoryAbstract {
+
+    private static final String[] PREFIXES = { MethodPrefixConstants.LOADED_PREFIX,
+        MethodPrefixConstants.LOADING_PREFIX, };
+
+    public LoadCallbackFacetFactory() {
+        super(FeatureType.OBJECTS_ONLY, PREFIXES);
+    }
+
+    @Override
+    public void process(final ProcessClassContext processClassContext) {
         final Class<?> cls = processClassContext.getCls();
         final FacetHolder facetHolder = processClassContext.getFacetHolder();
-
-        final List<Facet> facets = new ArrayList<Facet>();
-        final List<Method> methods = new ArrayList<Method>();
-
-        Method method = null;
-        method = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, MethodPrefixConstants.LOADING_PREFIX, void.class, NO_PARAMETERS_TYPES);
-        if (method != null) {
-            methods.add(method);
-            facets.add(new LoadingCallbackFacetViaMethod(method, facetHolder));
-        }
-
-        method = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, MethodPrefixConstants.LOADED_PREFIX, void.class, NO_PARAMETERS_TYPES);
-        if (method != null) {
-            methods.add(method);
-            facets.add(new LoadedCallbackFacetViaMethod(method, facetHolder));
-        }
-
-        processClassContext.removeMethods(methods);
-        FacetUtil.addFacets(facets);
-    }
-
-}
+
+        final List<Facet> facets = new ArrayList<Facet>();
+        final List<Method> methods = new ArrayList<Method>();
+
+        Method method = null;
+        method =
+            MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, MethodPrefixConstants.LOADING_PREFIX, void.class,
+                NO_PARAMETERS_TYPES);
+        if (method != null) {
+            methods.add(method);
+            facets.add(new LoadingCallbackFacetViaMethod(method, facetHolder));
+        }
+
+        method =
+            MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, MethodPrefixConstants.LOADED_PREFIX, void.class,
+                NO_PARAMETERS_TYPES);
+        if (method != null) {
+            methods.add(method);
+            facets.add(new LoadedCallbackFacetViaMethod(method, facetHolder));
+        }
+
+        processClassContext.removeMethods(methods);
+        FacetUtil.addFacets(facets);
+    }
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/load/LoadedCallbackFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/load/LoadedCallbackFacetAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/load/LoadedCallbackFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/load/LoadedCallbackFacetAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.core.progmodel.facets.object.callbacks.load;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -25,7 +24,6 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.object.callbacks.LoadedCallbackFacet;
 import org.apache.isis.core.progmodel.facets.object.callbacks.CallbackFacetAbstract;
 
-
 public abstract class LoadedCallbackFacetAbstract extends CallbackFacetAbstract implements LoadedCallbackFacet {
 
     public static Class<? extends Facet> type() {
@@ -37,4 +35,3 @@ public abstract class LoadedCallbackFace
     }
 
 }
-

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/load/LoadedCallbackFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/load/LoadedCallbackFacetViaMethod.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/load/LoadedCallbackFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/load/LoadedCallbackFacetViaMethod.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.core.progmodel.facets.object.callbacks.load;
 
 import java.lang.reflect.Method;
@@ -30,7 +29,6 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.ImperativeFacet;
 
-
 public class LoadedCallbackFacetViaMethod extends LoadedCallbackFacetAbstract implements ImperativeFacet {
 
     private final List<Method> methods = new ArrayList<Method>();
@@ -40,25 +38,29 @@ public class LoadedCallbackFacetViaMetho
         addMethod(method);
     }
 
-	public void addMethod(Method method) {
-		methods.add(method);
-	}
+    @Override
+    public void addMethod(final Method method) {
+        methods.add(method);
+    }
 
+    @Override
     public List<Method> getMethods() {
-    	return Collections.unmodifiableList(methods);
+        return Collections.unmodifiableList(methods);
     }
 
-	public boolean impliesResolve() {
-		return false;
-	}
+    @Override
+    public boolean impliesResolve() {
+        return false;
+    }
+
+    @Override
+    public boolean impliesObjectChanged() {
+        return false;
+    }
 
-	public boolean impliesObjectChanged() {
-		return false;
-	}
-	
     @Override
     public void invoke(final ObjectAdapter adapter) {
-    	AdapterInvokeUtils.invoke(methods, adapter);
+        AdapterInvokeUtils.invoke(methods, adapter);
     }
 
     @Override
@@ -67,4 +69,3 @@ public class LoadedCallbackFacetViaMetho
     }
 
 }
-

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/load/LoadingCallbackFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/load/LoadingCallbackFacetAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/load/LoadingCallbackFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/load/LoadingCallbackFacetAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.core.progmodel.facets.object.callbacks.load;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -25,7 +24,6 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.object.callbacks.LoadingCallbackFacet;
 import org.apache.isis.core.progmodel.facets.object.callbacks.CallbackFacetAbstract;
 
-
 public abstract class LoadingCallbackFacetAbstract extends CallbackFacetAbstract implements LoadingCallbackFacet {
 
     public static Class<? extends Facet> type() {
@@ -37,4 +35,3 @@ public abstract class LoadingCallbackFac
     }
 
 }
-



Mime
View raw message