You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2011/04/26 20:24:13 UTC

svn commit: r1096837 [6/14] - in /incubator/isis/trunk: core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/map/ core/metamodel/src/main/java/org/apache/isis/core/meta...

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CallbackUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CallbackUtils.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CallbackUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CallbackUtils.java Tue Apr 26 18:24:05 2011
@@ -17,21 +17,21 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.object.callbacks;
 
-package org.apache.isis.core.metamodel.facets.object.callbacks;
-
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.Facet;
-
-public final class CallbackUtils {
-	
-	private CallbackUtils() {}
-
-	public static void callCallback(final ObjectAdapter object, final Class<? extends Facet> cls) {
-	    final CallbackFacet facet = (CallbackFacet) object.getSpecification().getFacet(cls);
-	    if (facet != null) {
-	        facet.invoke(object);
-	    }
-	}
-
-}
+
+public final class CallbackUtils {
+
+    private CallbackUtils() {
+    }
+
+    public static void callCallback(final ObjectAdapter object, final Class<? extends Facet> cls) {
+        final CallbackFacet facet = (CallbackFacet) object.getSpecification().getFacet(cls);
+        if (facet != null) {
+            facet.invoke(object);
+        }
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CreatedCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CreatedCallbackFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CreatedCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CreatedCallbackFacet.java Tue Apr 26 18:24:05 2011
@@ -19,7 +19,6 @@
 
 package org.apache.isis.core.metamodel.facets.object.callbacks;
 
-
 /**
  * Represents the mechanism to inform the object that it has just been created.
  * 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LifeCycleEvent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LifeCycleEvent.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LifeCycleEvent.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LifeCycleEvent.java Tue Apr 26 18:24:05 2011
@@ -17,22 +17,14 @@
  *  under the License.
  */
 
-
 package org.apache.isis.core.metamodel.facets.object.callbacks;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
 
-
 public enum LifeCycleEvent {
-    CREATED(CreatedCallbackFacet.class),
-    DELETED(RemovedCallbackFacet.class),
-    DELETING(RemovingCallbackFacet.class),
-    LOADED(LoadedCallbackFacet.class),
-    LOADING(LoadingCallbackFacet.class),
-    SAVED(PersistedCallbackFacet.class),
-    SAVING(PersistingCallbackFacet.class),
-    UPDATED(UpdatedCallbackFacet.class),
-    UPDATING(UpdatingCallbackFacet.class);
+    CREATED(CreatedCallbackFacet.class), DELETED(RemovedCallbackFacet.class), DELETING(RemovingCallbackFacet.class),
+    LOADED(LoadedCallbackFacet.class), LOADING(LoadingCallbackFacet.class), SAVED(PersistedCallbackFacet.class),
+    SAVING(PersistingCallbackFacet.class), UPDATED(UpdatedCallbackFacet.class), UPDATING(UpdatingCallbackFacet.class);
 
     private final Class<? extends Facet> cls;
 
@@ -45,4 +37,3 @@ public enum LifeCycleEvent {
     }
 
 }
-

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadedCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadedCallbackFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadedCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadedCallbackFacet.java Tue Apr 26 18:24:05 2011
@@ -19,7 +19,6 @@
 
 package org.apache.isis.core.metamodel.facets.object.callbacks;
 
-
 /**
  * Represents the mechanism to inform the object that it has just been loaded from the object store.
  * 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadingCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadingCallbackFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadingCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/LoadingCallbackFacet.java Tue Apr 26 18:24:05 2011
@@ -19,7 +19,6 @@
 
 package org.apache.isis.core.metamodel.facets.object.callbacks;
 
-
 /**
  * Represents the mechanism to inform the object that it is about to be loaded from the object store.
  * 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistedCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistedCallbackFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistedCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistedCallbackFacet.java Tue Apr 26 18:24:05 2011
@@ -19,7 +19,6 @@
 
 package org.apache.isis.core.metamodel.facets.object.callbacks;
 
-
 /**
  * Represents the mechanism to inform the object that it has been persisted to the object store for the first time.
  * 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistingCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistingCallbackFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistingCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/PersistingCallbackFacet.java Tue Apr 26 18:24:05 2011
@@ -19,7 +19,6 @@
 
 package org.apache.isis.core.metamodel.facets.object.callbacks;
 
-
 /**
  * Represents the mechanism to inform the object that it is about to be persisted to the object store for the first
  * time.

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovedCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovedCallbackFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovedCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovedCallbackFacet.java Tue Apr 26 18:24:05 2011
@@ -19,7 +19,6 @@
 
 package org.apache.isis.core.metamodel.facets.object.callbacks;
 
-
 /**
  * Represents the mechanism to inform the object that it has just been deleted.
  * 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovingCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovingCallbackFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovingCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/RemovingCallbackFacet.java Tue Apr 26 18:24:05 2011
@@ -19,7 +19,6 @@
 
 package org.apache.isis.core.metamodel.facets.object.callbacks;
 
-
 /**
  * Represents the mechanism to inform the object that it about to be deleted.
  * 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatedCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatedCallbackFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatedCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatedCallbackFacet.java Tue Apr 26 18:24:05 2011
@@ -19,7 +19,6 @@
 
 package org.apache.isis.core.metamodel.facets.object.callbacks;
 
-
 /**
  * Represents the mechanism to inform the object that it has been updated in the object store.
  * 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatingCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatingCallbackFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatingCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/UpdatingCallbackFacet.java Tue Apr 26 18:24:05 2011
@@ -19,7 +19,6 @@
 
 package org.apache.isis.core.metamodel.facets.object.callbacks;
 
-
 /**
  * Represents the mechanism to inform the object that it is about to be updated in the object store.
  * 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/EncodableFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/EncodableFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/EncodableFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/EncodableFacet.java Tue Apr 26 18:24:05 2011
@@ -17,28 +17,26 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.object.encodeable;
 
-package org.apache.isis.core.metamodel.facets.object.encodeable;
-
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.MultipleValueFacet;
-
-
-/**
- * Indicates that this class can be encoded/decoded as a string.
- */
-public interface EncodableFacet extends MultipleValueFacet {
-
-    /**
-     * Equivalent to {@link EncoderDecoder#fromEncodedString(String)}, though may be implemented through some
-     * other equivalent mechanism.
-     */
-    ObjectAdapter fromEncodedString(String encodedData);
-
-    /**
-     * Equivalent to {@link EncoderDecoder#toEncodedString(Object)}, though may be implemented through some
-     * other equivalent mechanism.
-     */
-    String toEncodedString(ObjectAdapter object);
-}
+
+/**
+ * Indicates that this class can be encoded/decoded as a string.
+ */
+public interface EncodableFacet extends MultipleValueFacet {
+
+    /**
+     * Equivalent to {@link EncoderDecoder#fromEncodedString(String)}, though may be implemented through some other
+     * equivalent mechanism.
+     */
+    ObjectAdapter fromEncodedString(String encodedData);
+
+    /**
+     * Equivalent to {@link EncoderDecoder#toEncodedString(Object)}, though may be implemented through some other
+     * equivalent mechanism.
+     */
+    String toEncodedString(ObjectAdapter object);
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/icon/IconFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/icon/IconFacetAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/icon/IconFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/icon/IconFacetAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,22 +17,20 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.object.icon;
 
-package org.apache.isis.core.metamodel.facets.object.icon;
-
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
-
-public abstract class IconFacetAbstract extends FacetAbstract implements IconFacet {
-
-    public static Class<? extends Facet> type() {
-        return IconFacet.class;
-    }
-
-    public IconFacetAbstract(final FacetHolder holder) {
-        super(type(), holder, false);
-    }
-
-}
+
+public abstract class IconFacetAbstract extends FacetAbstract implements IconFacet {
+
+    public static Class<? extends Facet> type() {
+        return IconFacet.class;
+    }
+
+    public IconFacetAbstract(final FacetHolder holder) {
+        super(type(), holder, false);
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacet.java Tue Apr 26 18:24:05 2011
@@ -20,6 +20,7 @@
 package org.apache.isis.core.metamodel.facets.object.immutable;
 
 import org.apache.isis.core.metamodel.facets.SingleWhenValueFacet;
+import org.apache.isis.core.metamodel.facets.ebc.EqualByContentFacet;
 import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
 import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.object.immutable;
 
-package org.apache.isis.core.metamodel.facets.object.immutable;
-
 import org.apache.isis.applib.events.UsabilityEvent;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -27,23 +26,22 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.SingleWhenValueFacetAbstract;
 import org.apache.isis.core.metamodel.facets.When;
 import org.apache.isis.core.metamodel.interactions.UsabilityContext;
-
-
-public abstract class ImmutableFacetAbstract extends SingleWhenValueFacetAbstract implements ImmutableFacet {
-
-    public static Class<? extends Facet> type() {
-        return ImmutableFacet.class;
-    }
-
-    public ImmutableFacetAbstract(final When value, final FacetHolder holder) {
-        super(type(), holder, value);
-    }
-
+
+public abstract class ImmutableFacetAbstract extends SingleWhenValueFacetAbstract implements ImmutableFacet {
+
+    public static Class<? extends Facet> type() {
+        return ImmutableFacet.class;
+    }
+
+    public ImmutableFacetAbstract(final When value, final FacetHolder holder) {
+        super(type(), holder, value);
+    }
+
     @Override
-    public String disables(final UsabilityContext<? extends UsabilityEvent> ic) {
-        final ObjectAdapter target = ic.getTarget();
-        return disabledReason(target);
-    }
+    public String disables(final UsabilityContext<? extends UsabilityEvent> ic) {
+        final ObjectAdapter target = ic.getTarget();
+        return disabledReason(target);
+    }
 
     public String disabledReason(final ObjectAdapter targetAdapter) {
         if (value() == When.ALWAYS) {
@@ -65,5 +63,4 @@ public abstract class ImmutableFacetAbst
         return null;
     }
 
-    
-}
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetUtils.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetUtils.java Tue Apr 26 18:24:05 2011
@@ -17,21 +17,19 @@
  *  under the License.
  */
 
-
 package org.apache.isis.core.metamodel.facets.object.immutable;
 
 import org.apache.isis.core.metamodel.facets.When;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
-
 public class ImmutableFacetUtils {
 
     public static boolean isAlwaysImmutable(final ObjectSpecification specification) {
-    	// this is a workaround for a dubious test
-    	if (specification == null) {
-    		return false;
-    	}
-    	
+        // this is a workaround for a dubious test
+        if (specification == null) {
+            return false;
+        }
+
         final ImmutableFacet immutableFacet = specification.getFacet(ImmutableFacet.class);
         if (immutableFacet == null) {
             return false;
@@ -40,18 +38,18 @@ public class ImmutableFacetUtils {
     }
 
     public static boolean isImmutableOncePersisted(final ObjectSpecification specification) {
-    	// this is a workaround for a dubious test
-    	if (specification == null) {
-    		return false;
-    	}
+        // this is a workaround for a dubious test
+        if (specification == null) {
+            return false;
+        }
 
-    	final ImmutableFacet immutableFacet = specification.getFacet(ImmutableFacet.class);
+        final ImmutableFacet immutableFacet = specification.getFacet(ImmutableFacet.class);
         if (immutableFacet == null) {
             return false;
         }
         return immutableFacet.value() == When.ONCE_PERSISTED;
     }
 
-    private ImmutableFacetUtils() {}
+    private ImmutableFacetUtils() {
+    }
 }
-

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/notpersistable/InitiatedBy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/notpersistable/InitiatedBy.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/notpersistable/InitiatedBy.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/notpersistable/InitiatedBy.java Tue Apr 26 18:24:05 2011
@@ -17,23 +17,20 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.object.notpersistable;
 
-package org.apache.isis.core.metamodel.facets.object.notpersistable;
-
 import org.apache.isis.applib.annotation.NotPersistable;
-import org.apache.isis.applib.annotation.NotPersistable.By;
 import org.apache.isis.applib.marker.NonPersistable;
 import org.apache.isis.applib.marker.ProgramPersistable;
 import org.apache.isis.core.metamodel.facets.EnumerationAbstract;
-
-
-public final class InitiatedBy extends EnumerationAbstract {
-
-    public static InitiatedBy USER = new InitiatedBy(0, "USER", "User");
-    public static InitiatedBy USER_OR_PROGRAM = new InitiatedBy(1, "USER_OR_PROGRAM", "User or Program");
-
-    private InitiatedBy(final int num, final String nameInCode, final String friendlyName) {
-        super(num, nameInCode, friendlyName);
+
+public final class InitiatedBy extends EnumerationAbstract {
+
+    public static InitiatedBy USER = new InitiatedBy(0, "USER", "User");
+    public static InitiatedBy USER_OR_PROGRAM = new InitiatedBy(1, "USER_OR_PROGRAM", "User or Program");
+
+    private InitiatedBy(final int num, final String nameInCode, final String friendlyName) {
+        super(num, nameInCode, friendlyName);
     }
 
     public static InitiatedBy decodeBy(final NotPersistable.By by) {
@@ -54,7 +51,6 @@ public final class InitiatedBy extends E
             initiatedBy = USER_OR_PROGRAM;
         }
         return initiatedBy;
-    }
-
-}
-
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/notpersistable/NotPersistableFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/notpersistable/NotPersistableFacetAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/notpersistable/NotPersistableFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/notpersistable/NotPersistableFacetAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,29 +17,28 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.object.notpersistable;
 
-package org.apache.isis.core.metamodel.facets.object.notpersistable;
-
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.SingleValueFacetAbstract;
-
-
-public abstract class NotPersistableFacetAbstract extends SingleValueFacetAbstract implements NotPersistableFacet {
-
-    public static Class<? extends Facet> type() {
-        return NotPersistableFacet.class;
-    }
-
-    private final InitiatedBy value;
-
-    public NotPersistableFacetAbstract(final InitiatedBy value, final FacetHolder holder) {
-        super(type(), holder);
-        this.value = value;
-    }
-
-    public InitiatedBy value() {
-        return value;
-    }
-
-}
+
+public abstract class NotPersistableFacetAbstract extends SingleValueFacetAbstract implements NotPersistableFacet {
+
+    public static Class<? extends Facet> type() {
+        return NotPersistableFacet.class;
+    }
+
+    private final InitiatedBy value;
+
+    public NotPersistableFacetAbstract(final InitiatedBy value, final FacetHolder holder) {
+        super(type(), holder);
+        this.value = value;
+    }
+
+    @Override
+    public InitiatedBy value() {
+        return value;
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/InvalidEntryException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/InvalidEntryException.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/InvalidEntryException.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/InvalidEntryException.java Tue Apr 26 18:24:05 2011
@@ -17,15 +17,13 @@
  *  under the License.
  */
 
-
 package org.apache.isis.core.metamodel.facets.object.parseable;
 
 import org.apache.isis.core.commons.exceptions.IsisApplicationException;
 
-
 /**
- * Indicates that a value entry is not valid. Note the entry may still parse correctly, but is does fulfil
- * other other entry requirements.
+ * Indicates that a value entry is not valid. Note the entry may still parse correctly, but is does fulfil other other
+ * entry requirements.
  */
 public class InvalidEntryException extends IsisApplicationException {
     private static final long serialVersionUID = 1L;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacet.java Tue Apr 26 18:24:05 2011
@@ -17,39 +17,37 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.object.parseable;
 
-package org.apache.isis.core.metamodel.facets.object.parseable;
-
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.MultipleValueFacet;
 import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
-
-
-/**
- * Indicates that this class can parse an entry string.
- */
-public interface ParseableFacet extends MultipleValueFacet {
-
-    /**
-     * Parses a text entry made by a user and sets the domain object's value.
-     * 
-     * <p>
-     * Equivalent to <tt>Parser#parseTextEntry(Object, String)</tt>, though may be implemented through some
-     * other mechanism.
-     * 
-     * @throws InvalidEntryException
-     * @throws TextEntryParseException
-     */
-    ObjectAdapter parseTextEntry(ObjectAdapter original, String text);
-
-    /**
-     * A title for the object that is valid but which may be easier to edit than the title provided by a
-     * {@link TitleFacet}.
-     * 
-     * <p>
-     * The idea here is that the viewer can display a parseable title for an existing object when, for
-     * example, the user initially clicks in the field. So, a date might be rendered via a {@link TitleFacet}
-     * as <tt>May 2, 2007</tt>, but its parseable form might be <tt>20070502</tt>.
-     */
-    public String parseableTitle(ObjectAdapter obj);
-}
+
+/**
+ * Indicates that this class can parse an entry string.
+ */
+public interface ParseableFacet extends MultipleValueFacet {
+
+    /**
+     * Parses a text entry made by a user and sets the domain object's value.
+     * 
+     * <p>
+     * Equivalent to <tt>Parser#parseTextEntry(Object, String)</tt>, though may be implemented through some other
+     * mechanism.
+     * 
+     * @throws InvalidEntryException
+     * @throws TextEntryParseException
+     */
+    ObjectAdapter parseTextEntry(ObjectAdapter original, String text);
+
+    /**
+     * A title for the object that is valid but which may be easier to edit than the title provided by a
+     * {@link TitleFacet}.
+     * 
+     * <p>
+     * The idea here is that the viewer can display a parseable title for an existing object when, for example, the user
+     * initially clicks in the field. So, a date might be rendered via a {@link TitleFacet} as <tt>May 2, 2007</tt>, but
+     * its parseable form might be <tt>20070502</tt>.
+     */
+    public String parseableTitle(ObjectAdapter obj);
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/TextEntryParseException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/TextEntryParseException.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/TextEntryParseException.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/TextEntryParseException.java Tue Apr 26 18:24:05 2011
@@ -17,12 +17,10 @@
  *  under the License.
  */
 
-
 package org.apache.isis.core.metamodel.facets.object.parseable;
 
 import org.apache.isis.core.commons.exceptions.IsisApplicationException;
 
-
 /**
  * Indicates that a text entry could not be satisfactorily parsed into a useful value by the value adapter.
  */

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/PluralFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/PluralFacetAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/PluralFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/PluralFacetAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,22 +17,20 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.object.plural;
 
-package org.apache.isis.core.metamodel.facets.object.plural;
-
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.SingleStringValueFacetAbstract;
-
-
-public abstract class PluralFacetAbstract extends SingleStringValueFacetAbstract implements PluralFacet {
-
-    public static Class<? extends Facet> type() {
-        return PluralFacet.class;
-    }
-
-    public PluralFacetAbstract(final String value, final FacetHolder holder) {
-        super(type(), holder, value);
-    }
-
-}
+
+public abstract class PluralFacetAbstract extends SingleStringValueFacetAbstract implements PluralFacet {
+
+    public static Class<? extends Facet> type() {
+        return PluralFacet.class;
+    }
+
+    public PluralFacetAbstract(final String value, final FacetHolder holder) {
+        super(type(), holder, value);
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/PluralFacetInferred.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/PluralFacetInferred.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/PluralFacetInferred.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/PluralFacetInferred.java Tue Apr 26 18:24:05 2011
@@ -17,17 +17,14 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.object.plural;
 
-package org.apache.isis.core.metamodel.facets.object.plural;
-
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
-
-public class PluralFacetInferred extends PluralFacetAbstract {
-
-    public PluralFacetInferred(final String value, final FacetHolder holder) {
-        super(value, holder);
-    }
-
-}
-
+
+public class PluralFacetInferred extends PluralFacetAbstract {
+
+    public PluralFacetInferred(final String value, final FacetHolder holder) {
+        super(value, holder);
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/TitleFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/TitleFacetAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/TitleFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/TitleFacetAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,21 +17,19 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.object.title;
 
-package org.apache.isis.core.metamodel.facets.object.title;
-
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
-
-public abstract class TitleFacetAbstract extends FacetAbstract implements TitleFacet {
-
-    public static Class<? extends Facet> type() {
-        return TitleFacet.class;
-    }
-
-    public TitleFacetAbstract(final FacetHolder holder) {
-        super(type(), holder, false);
-    }
-}
+
+public abstract class TitleFacetAbstract extends FacetAbstract implements TitleFacet {
+
+    public static Class<? extends Facet> type() {
+        return TitleFacet.class;
+    }
+
+    public TitleFacetAbstract(final FacetHolder holder) {
+        super(type(), holder, false);
+    }
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/businesskey/BusinessKeyFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/businesskey/BusinessKeyFacetAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/businesskey/BusinessKeyFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/businesskey/BusinessKeyFacetAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,22 +17,20 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.properties.businesskey;
 
-package org.apache.isis.core.metamodel.facets.properties.businesskey;
-
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.SingleStringValueFacetAbstract;
-
-
-public abstract class BusinessKeyFacetAbstract extends SingleStringValueFacetAbstract implements BusinessKeyFacet {
-
-    public static Class<? extends Facet> type() {
-        return BusinessKeyFacet.class;
-    }
-
-    public BusinessKeyFacetAbstract(final String value, final FacetHolder holder) {
-        super(type(), holder, value);
-    }
-
-}
+
+public abstract class BusinessKeyFacetAbstract extends SingleStringValueFacetAbstract implements BusinessKeyFacet {
+
+    public static Class<? extends Facet> type() {
+        return BusinessKeyFacet.class;
+    }
+
+    public BusinessKeyFacetAbstract(final String value, final FacetHolder holder) {
+        super(type(), holder, value);
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/modify/PropertyClearFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/modify/PropertyClearFacetAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/modify/PropertyClearFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/modify/PropertyClearFacetAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,21 +17,19 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.properties.modify;
 
-package org.apache.isis.core.metamodel.facets.properties.modify;
-
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
-
-public abstract class PropertyClearFacetAbstract extends FacetAbstract implements PropertyClearFacet {
-
-    public static Class<? extends Facet> type() {
-        return PropertyClearFacet.class;
-    }
-
-    public PropertyClearFacetAbstract(final FacetHolder holder) {
-        super(type(), holder, false);
-    }
-}
+
+public abstract class PropertyClearFacetAbstract extends FacetAbstract implements PropertyClearFacet {
+
+    public static Class<? extends Facet> type() {
+        return PropertyClearFacet.class;
+    }
+
+    public PropertyClearFacetAbstract(final FacetHolder holder) {
+        super(type(), holder, false);
+    }
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/modify/PropertySetterFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/modify/PropertySetterFacetAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/modify/PropertySetterFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/modify/PropertySetterFacetAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,21 +17,19 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.properties.modify;
 
-package org.apache.isis.core.metamodel.facets.properties.modify;
-
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
-
-public abstract class PropertySetterFacetAbstract extends FacetAbstract implements PropertySetterFacet {
-
-    public static Class<? extends Facet> type() {
-        return PropertySetterFacet.class;
-    }
-
-    public PropertySetterFacetAbstract(final FacetHolder holder) {
-        super(type(), holder, false);
-    }
-}
+
+public abstract class PropertySetterFacetAbstract extends FacetAbstract implements PropertySetterFacet {
+
+    public static Class<? extends Facet> type() {
+        return PropertySetterFacet.class;
+    }
+
+    public PropertySetterFacetAbstract(final FacetHolder holder) {
+        super(type(), holder, false);
+    }
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/searchable/SearchableFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/searchable/SearchableFacetAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/searchable/SearchableFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/searchable/SearchableFacetAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,35 +17,35 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.properties.searchable;
 
-package org.apache.isis.core.metamodel.facets.properties.searchable;
-
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.MultipleValueFacetAbstract;
-
-
-public abstract class SearchableFacetAbstract extends MultipleValueFacetAbstract implements SearchableFacet {
-
-    public static Class<? extends Facet> type() {
-        return SearchableFacet.class;
-    }
-
-    private final Class<?> repository;
-    private final boolean queryByExample;
-
-    public SearchableFacetAbstract(final Class<?> repository, final boolean queryByExample, final FacetHolder holder) {
-        super(type(), holder);
-        this.repository = repository;
-        this.queryByExample = queryByExample;
-    }
-
-    public Class<?> repository() {
-        return repository;
-    }
-
-    public boolean queryByExample() {
-        return queryByExample;
-    }
-
-}
+
+public abstract class SearchableFacetAbstract extends MultipleValueFacetAbstract implements SearchableFacet {
+
+    public static Class<? extends Facet> type() {
+        return SearchableFacet.class;
+    }
+
+    private final Class<?> repository;
+    private final boolean queryByExample;
+
+    public SearchableFacetAbstract(final Class<?> repository, final boolean queryByExample, final FacetHolder holder) {
+        super(type(), holder);
+        this.repository = repository;
+        this.queryByExample = queryByExample;
+    }
+
+    @Override
+    public Class<?> repository() {
+        return repository;
+    }
+
+    @Override
+    public boolean queryByExample() {
+        return queryByExample;
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/maxlength/MaxLengthFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/maxlength/MaxLengthFacetAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/maxlength/MaxLengthFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/maxlength/MaxLengthFacetAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.propparam.maxlength;
 
-package org.apache.isis.core.metamodel.facets.propparam.maxlength;
-
 import org.apache.isis.applib.events.ValidityEvent;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -28,50 +27,47 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.interactions.ProposedHolder;
 import org.apache.isis.core.metamodel.interactions.ValidityContext;
 import org.apache.isis.core.metamodel.spec.ObjectAdapterUtils;
-
-
-public abstract class MaxLengthFacetAbstract extends SingleIntValueFacetAbstract implements MaxLengthFacet {
-
-    public static Class<? extends Facet> type() {
-        return MaxLengthFacet.class;
-    }
-
-    public MaxLengthFacetAbstract(final int value, final FacetHolder holder) {
-        super(type(), holder, value);
-    }
-
-    /**
-     * Whether the provided argument exceeds the {@link #value() maximum length}.
-     */
+
+public abstract class MaxLengthFacetAbstract extends SingleIntValueFacetAbstract implements MaxLengthFacet {
+
+    public static Class<? extends Facet> type() {
+        return MaxLengthFacet.class;
+    }
+
+    public MaxLengthFacetAbstract(final int value, final FacetHolder holder) {
+        super(type(), holder, value);
+    }
+
+    /**
+     * Whether the provided argument exceeds the {@link #value() maximum length}.
+     */
     @Override
-    public boolean exceeds(final ObjectAdapter adapter) {
-        final String str = ObjectAdapterUtils.unwrapString(adapter);
-        if (str == null) {
-            return false;
-        }
-        final int maxLength = value();
-        return maxLength != 0 && str.length() > maxLength;
-    }
-
+    public boolean exceeds(final ObjectAdapter adapter) {
+        final String str = ObjectAdapterUtils.unwrapString(adapter);
+        if (str == null) {
+            return false;
+        }
+        final int maxLength = value();
+        return maxLength != 0 && str.length() > maxLength;
+    }
+
+    @Override
+    public String invalidates(final ValidityContext<? extends ValidityEvent> context) {
+        if (!(context instanceof ProposedHolder)) {
+            return null;
+        }
+        final ProposedHolder proposedHolder = (ProposedHolder) context;
+        final ObjectAdapter proposedArgument = proposedHolder.getProposed();
+        if (!exceeds(proposedArgument)) {
+            return null;
+        }
+        return "Proposed value '" + proposedArgument.titleString() + "' exceeds the maximum length of " + value();
+    }
+
     @Override
-    public String invalidates(final ValidityContext<? extends ValidityEvent> context) {
-        if (!(context instanceof ProposedHolder)) {
-            return null;
-        }
-        final ProposedHolder proposedHolder = (ProposedHolder) context;
-        final ObjectAdapter proposedArgument = proposedHolder.getProposed();
-        if (!exceeds(proposedArgument)) {
-            return null;
-        }
-        return "Proposed value '" + proposedArgument.titleString() + "' exceeds the maximum length of " + value();
-    }
-
-    @Override
-    protected String toStringValues() {
-        final int val = value();
-        return val == 0 ? "unlimited" : String.valueOf(val);
+    protected String toStringValues() {
+        final int val = value();
+        return val == 0 ? "unlimited" : String.valueOf(val);
     }
-    
 
-
-}
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typeof/ElementSpecificationProviderFromTypeOfFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typeof/ElementSpecificationProviderFromTypeOfFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typeof/ElementSpecificationProviderFromTypeOfFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typeof/ElementSpecificationProviderFromTypeOfFacet.java Tue Apr 26 18:24:05 2011
@@ -20,9 +20,9 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 public class ElementSpecificationProviderFromTypeOfFacet implements ElementSpecificationProvider {
-    
+
     public static ElementSpecificationProvider createFrom(final TypeOfFacet typeOfFacet) {
-        if(typeOfFacet==null) {
+        if (typeOfFacet == null) {
             return null;
         }
         final ObjectSpecification spec = typeOfFacet.valueSpec();
@@ -31,10 +31,10 @@ public class ElementSpecificationProvide
 
     private final ObjectSpecification spec;
 
-    public ElementSpecificationProviderFromTypeOfFacet(ObjectSpecification spec) {
+    public ElementSpecificationProviderFromTypeOfFacet(final ObjectSpecification spec) {
         this.spec = spec;
     }
-    
+
     @Override
     public ObjectSpecification getElementType() {
         return spec;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typeof/TypeOfFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typeof/TypeOfFacetAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typeof/TypeOfFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typeof/TypeOfFacetAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,30 +17,26 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.typeof;
 
-package org.apache.isis.core.metamodel.facets.typeof;
-
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.SingleClassValueFacetAbstract;
 import org.apache.isis.core.metamodel.spec.SpecificationLookup;
-
-
-public abstract class TypeOfFacetAbstract extends SingleClassValueFacetAbstract implements TypeOfFacet {
-
-    public static Class<? extends Facet> type() {
-        return TypeOfFacet.class;
-    }
-
-    public TypeOfFacetAbstract(
-            final Class<?> type,
-            final FacetHolder holder,
-            final SpecificationLookup specificationLookup) {
-        super(type(), holder, type, specificationLookup);
-    }
-
-    @Override
-    public String toString() {
-        return getClass().getSimpleName() + " [type=" + value() + "]";
-    }
-}
+
+public abstract class TypeOfFacetAbstract extends SingleClassValueFacetAbstract implements TypeOfFacet {
+
+    public static Class<? extends Facet> type() {
+        return TypeOfFacet.class;
+    }
+
+    public TypeOfFacetAbstract(final Class<?> type, final FacetHolder holder,
+        final SpecificationLookup specificationLookup) {
+        super(type(), holder, type, specificationLookup);
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + " [type=" + value() + "]";
+    }
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typeof/TypeOfFacetDefaultToObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typeof/TypeOfFacetDefaultToObject.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typeof/TypeOfFacetDefaultToObject.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typeof/TypeOfFacetDefaultToObject.java Tue Apr 26 18:24:05 2011
@@ -17,21 +17,15 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.typeof;
 
-package org.apache.isis.core.metamodel.facets.typeof;
-
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.spec.SpecificationLookup;
-
-
-public class TypeOfFacetDefaultToObject extends TypeOfFacetAbstract {
-
-    public TypeOfFacetDefaultToObject(
-            final FacetHolder holder, 
-            final SpecificationLookup specificationLookup) {
-        super(Object.class, holder, specificationLookup);
-    }
-    
-
-}
-
+
+public class TypeOfFacetDefaultToObject extends TypeOfFacetAbstract {
+
+    public TypeOfFacetDefaultToObject(final FacetHolder holder, final SpecificationLookup specificationLookup) {
+        super(Object.class, holder, specificationLookup);
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typeof/TypeOfFacetInferredFromArray.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typeof/TypeOfFacetInferredFromArray.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typeof/TypeOfFacetInferredFromArray.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typeof/TypeOfFacetInferredFromArray.java Tue Apr 26 18:24:05 2011
@@ -17,22 +17,16 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.typeof;
 
-package org.apache.isis.core.metamodel.facets.typeof;
-
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.spec.SpecificationLookup;
-
-
-public class TypeOfFacetInferredFromArray extends TypeOfFacetAbstract {
-
-    public TypeOfFacetInferredFromArray(
-            final Class<?> type, 
-            final FacetHolder holder, 
-            final SpecificationLookup specificationLookup) {
-        super(type, holder, specificationLookup);
-    }
-
-
-}
-
+
+public class TypeOfFacetInferredFromArray extends TypeOfFacetAbstract {
+
+    public TypeOfFacetInferredFromArray(final Class<?> type, final FacetHolder holder,
+        final SpecificationLookup specificationLookup) {
+        super(type, holder, specificationLookup);
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typeof/TypeOfFacetInferredFromGenerics.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typeof/TypeOfFacetInferredFromGenerics.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typeof/TypeOfFacetInferredFromGenerics.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typeof/TypeOfFacetInferredFromGenerics.java Tue Apr 26 18:24:05 2011
@@ -17,21 +17,16 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.typeof;
 
-package org.apache.isis.core.metamodel.facets.typeof;
-
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.spec.SpecificationLookup;
-
-
-public class TypeOfFacetInferredFromGenerics extends TypeOfFacetAbstract {
-
-    public TypeOfFacetInferredFromGenerics(
-            final Class<?> type, 
-            final FacetHolder holder, 
-            final SpecificationLookup specificationLookup) {
-        super(type, holder, specificationLookup);
-    }
-
-}
-
+
+public class TypeOfFacetInferredFromGenerics extends TypeOfFacetAbstract {
+
+    public TypeOfFacetInferredFromGenerics(final Class<?> type, final FacetHolder holder,
+        final SpecificationLookup specificationLookup) {
+        super(type, holder, specificationLookup);
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallength/TypicalLengthFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallength/TypicalLengthFacetAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallength/TypicalLengthFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallength/TypicalLengthFacetAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,30 +17,29 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.typicallength;
 
-package org.apache.isis.core.metamodel.facets.typicallength;
-
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
-
-public abstract class TypicalLengthFacetAbstract extends FacetAbstract implements TypicalLengthFacet {
-
-    public static Class<? extends Facet> type() {
-        return TypicalLengthFacet.class;
-    }
-
-    public TypicalLengthFacetAbstract(final FacetHolder holder, boolean derived) {
-        super(type(), holder, false);
-    }
-
-    public abstract int value();
-    
-    @Override
-    protected String toStringValues() {
-        final int val = value();
-        return val == 0 ? "default" : String.valueOf(val);
-    }
-
-}
+
+public abstract class TypicalLengthFacetAbstract extends FacetAbstract implements TypicalLengthFacet {
+
+    public static Class<? extends Facet> type() {
+        return TypicalLengthFacet.class;
+    }
+
+    public TypicalLengthFacetAbstract(final FacetHolder holder, final boolean derived) {
+        super(type(), holder, false);
+    }
+
+    @Override
+    public abstract int value();
+
+    @Override
+    protected String toStringValues() {
+        final int val = value();
+        return val == 0 ? "default" : String.valueOf(val);
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java Tue Apr 26 18:24:05 2011
@@ -17,30 +17,23 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.interactions;
 
-package org.apache.isis.core.metamodel.interactions;
-
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.AccessEvent;
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.InteractionContextType;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-
-
-/**
- * See {@link InteractionContext} for overview; analogous to {@link AccessEvent}.
- */
-public abstract class AccessContext<T extends AccessEvent> extends InteractionContext<T> {
-
-    public AccessContext(
-            final InteractionContextType interactionType,
-            final AuthenticationSession session,
-            final InteractionInvocationMethod invocationMethod,
-            final Identifier identifier,
-            final ObjectAdapter target) {
-        super(interactionType, session, invocationMethod, identifier, target);
-    }
-
-}
-
+
+/**
+ * See {@link InteractionContext} for overview; analogous to {@link AccessEvent}.
+ */
+public abstract class AccessContext<T extends AccessEvent> extends InteractionContext<T> {
+
+    public AccessContext(final InteractionContextType interactionType, final AuthenticationSession session,
+        final InteractionInvocationMethod invocationMethod, final Identifier identifier, final ObjectAdapter target) {
+        super(interactionType, session, invocationMethod, identifier, target);
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgumentContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgumentContext.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgumentContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgumentContext.java Tue Apr 26 18:24:05 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.interactions;
 
-package org.apache.isis.core.metamodel.interactions;
-
 import static org.apache.isis.core.metamodel.adapter.util.AdapterUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
@@ -28,46 +27,42 @@ import org.apache.isis.core.commons.auth
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.InteractionContextType;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-
-
-/**
- * See {@link InteractionContext} for overview; analogous to {@link ActionArgumentEvent}.
- */
-public class ActionArgumentContext extends ValidityContext<ActionArgumentEvent> implements ProposedHolder {
-
-    private final ObjectAdapter[] args;
-    private final int position;
-    private final ObjectAdapter proposed;
-
-    public ActionArgumentContext(
-            final AuthenticationSession session,
-            final InteractionInvocationMethod invocationMethod,
-            final ObjectAdapter target,
-            final Identifier id,
-            final ObjectAdapter[] args,
-            final int position) {
-        super(InteractionContextType.ACTION_PROPOSED_ARGUMENT, session, invocationMethod, id, target);
-
-        this.args = args;
-        this.position = position;
-        this.proposed = args[position];
-    }
-
-    public ObjectAdapter[] getArgs() {
-        return args;
-    }
-
-    public int getPosition() {
-        return position;
-    }
-
-    public ObjectAdapter getProposed() {
-        return proposed;
-    }
-
-    @Override
-    public ActionArgumentEvent createInteractionEvent() {
-        return new ActionArgumentEvent(unwrap(getTarget()), getIdentifier(), unwrap(getArgs()), getPosition());
-    }
-
-}
+
+/**
+ * See {@link InteractionContext} for overview; analogous to {@link ActionArgumentEvent}.
+ */
+public class ActionArgumentContext extends ValidityContext<ActionArgumentEvent> implements ProposedHolder {
+
+    private final ObjectAdapter[] args;
+    private final int position;
+    private final ObjectAdapter proposed;
+
+    public ActionArgumentContext(final AuthenticationSession session,
+        final InteractionInvocationMethod invocationMethod, final ObjectAdapter target, final Identifier id,
+        final ObjectAdapter[] args, final int position) {
+        super(InteractionContextType.ACTION_PROPOSED_ARGUMENT, session, invocationMethod, id, target);
+
+        this.args = args;
+        this.position = position;
+        this.proposed = args[position];
+    }
+
+    public ObjectAdapter[] getArgs() {
+        return args;
+    }
+
+    public int getPosition() {
+        return position;
+    }
+
+    @Override
+    public ObjectAdapter getProposed() {
+        return proposed;
+    }
+
+    @Override
+    public ActionArgumentEvent createInteractionEvent() {
+        return new ActionArgumentEvent(unwrap(getTarget()), getIdentifier(), unwrap(getArgs()), getPosition());
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionInvocationContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionInvocationContext.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionInvocationContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionInvocationContext.java Tue Apr 26 18:24:05 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.interactions;
 
-package org.apache.isis.core.metamodel.interactions;
-
 import static org.apache.isis.core.metamodel.adapter.util.AdapterUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
@@ -28,32 +27,28 @@ import org.apache.isis.core.commons.auth
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.InteractionContextType;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-
-
-/**
- * See {@link InteractionContext} for overview; analogous to {@link ActionInvocationEvent}.
- */
-public class ActionInvocationContext extends ValidityContext<ActionInvocationEvent> {
-
-    private final ObjectAdapter[] args;
-
-    public ActionInvocationContext(
-            final AuthenticationSession session,
-            final InteractionInvocationMethod invocationMethod,
-            final ObjectAdapter target,
-            final Identifier id,
-            final ObjectAdapter[] args) {
-        super(InteractionContextType.ACTION_INVOKE, session, invocationMethod, id, target);
-        this.args = args;
-    }
-
-    public ObjectAdapter[] getArgs() {
-        return args;
-    }
-
-    @Override
-    public ActionInvocationEvent createInteractionEvent() {
-        return new ActionInvocationEvent(unwrap(getTarget()), getIdentifier(), unwrap(getArgs()));
-    }
-
-}
+
+/**
+ * See {@link InteractionContext} for overview; analogous to {@link ActionInvocationEvent}.
+ */
+public class ActionInvocationContext extends ValidityContext<ActionInvocationEvent> {
+
+    private final ObjectAdapter[] args;
+
+    public ActionInvocationContext(final AuthenticationSession session,
+        final InteractionInvocationMethod invocationMethod, final ObjectAdapter target, final Identifier id,
+        final ObjectAdapter[] args) {
+        super(InteractionContextType.ACTION_INVOKE, session, invocationMethod, id, target);
+        this.args = args;
+    }
+
+    public ObjectAdapter[] getArgs() {
+        return args;
+    }
+
+    @Override
+    public ActionInvocationEvent createInteractionEvent() {
+        return new ActionInvocationEvent(unwrap(getTarget()), getIdentifier(), unwrap(getArgs()));
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java Tue Apr 26 18:24:05 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.interactions;
 
-package org.apache.isis.core.metamodel.interactions;
-
 import static org.apache.isis.core.metamodel.adapter.util.AdapterUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
@@ -28,24 +27,20 @@ import org.apache.isis.core.commons.auth
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.InteractionContextType;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-
-
-/**
- * See {@link InteractionContext} for overview; analogous to {@link ActionUsabilityEvent}.
- */
-public class ActionUsabilityContext extends UsabilityContext<ActionUsabilityEvent> {
-
-    public ActionUsabilityContext(
-            final AuthenticationSession session,
-            final InteractionInvocationMethod invocationMethod,
-            final ObjectAdapter target,
-            final Identifier id) {
-        super(InteractionContextType.ACTION_USABLE, session, invocationMethod, id, target);
-    }
-
-    @Override
-    public ActionUsabilityEvent createInteractionEvent() {
-        return new ActionUsabilityEvent(unwrap(getTarget()), getIdentifier());
-    }
-
-}
+
+/**
+ * See {@link InteractionContext} for overview; analogous to {@link ActionUsabilityEvent}.
+ */
+public class ActionUsabilityContext extends UsabilityContext<ActionUsabilityEvent> {
+
+    public ActionUsabilityContext(final AuthenticationSession session,
+        final InteractionInvocationMethod invocationMethod, final ObjectAdapter target, final Identifier id) {
+        super(InteractionContextType.ACTION_USABLE, session, invocationMethod, id, target);
+    }
+
+    @Override
+    public ActionUsabilityEvent createInteractionEvent() {
+        return new ActionUsabilityEvent(unwrap(getTarget()), getIdentifier());
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java Tue Apr 26 18:24:05 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.interactions;
 
-package org.apache.isis.core.metamodel.interactions;
-
 import static org.apache.isis.core.metamodel.adapter.util.AdapterUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
@@ -28,24 +27,20 @@ import org.apache.isis.core.commons.auth
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.InteractionContextType;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-
-
-/**
- * See {@link InteractionContext} for overview; analogous to {@link ActionVisibilityEvent}.
- */
-public class ActionVisibilityContext extends VisibilityContext<ActionVisibilityEvent> {
-
-    public ActionVisibilityContext(
-            final AuthenticationSession session,
-            final InteractionInvocationMethod invocationMethod,
-            final ObjectAdapter target,
-            final Identifier identifier) {
-        super(InteractionContextType.ACTION_VISIBLE, session, invocationMethod, identifier, target);
-    }
-
-    @Override
-    public ActionVisibilityEvent createInteractionEvent() {
-        return new ActionVisibilityEvent(unwrap(getTarget()), getIdentifier());
-    }
-
-}
+
+/**
+ * See {@link InteractionContext} for overview; analogous to {@link ActionVisibilityEvent}.
+ */
+public class ActionVisibilityContext extends VisibilityContext<ActionVisibilityEvent> {
+
+    public ActionVisibilityContext(final AuthenticationSession session,
+        final InteractionInvocationMethod invocationMethod, final ObjectAdapter target, final Identifier identifier) {
+        super(InteractionContextType.ACTION_VISIBLE, session, invocationMethod, identifier, target);
+    }
+
+    @Override
+    public ActionVisibilityEvent createInteractionEvent() {
+        return new ActionVisibilityEvent(unwrap(getTarget()), getIdentifier());
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java Tue Apr 26 18:24:05 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.interactions;
 
-package org.apache.isis.core.metamodel.interactions;
-
 import static org.apache.isis.core.metamodel.adapter.util.AdapterUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
@@ -28,24 +27,20 @@ import org.apache.isis.core.commons.auth
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.InteractionContextType;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-
-
-/**
- * See {@link InteractionContext} for overview; analogous to {@link CollectionAccessEvent}.
- */
-public class CollectionAccessContext extends AccessContext<CollectionAccessEvent> {
-
-    public CollectionAccessContext(
-            final AuthenticationSession session,
-            final InteractionInvocationMethod invocationMethod,
-            final ObjectAdapter target,
-            final Identifier identifier) {
-        super(InteractionContextType.COLLECTION_READ, session, invocationMethod, identifier, target);
-    }
-
-    @Override
-    public CollectionAccessEvent createInteractionEvent() {
-        return new CollectionAccessEvent(unwrap(getTarget()), getIdentifier());
-    }
-
-}
+
+/**
+ * See {@link InteractionContext} for overview; analogous to {@link CollectionAccessEvent}.
+ */
+public class CollectionAccessContext extends AccessContext<CollectionAccessEvent> {
+
+    public CollectionAccessContext(final AuthenticationSession session,
+        final InteractionInvocationMethod invocationMethod, final ObjectAdapter target, final Identifier identifier) {
+        super(InteractionContextType.COLLECTION_READ, session, invocationMethod, identifier, target);
+    }
+
+    @Override
+    public CollectionAccessEvent createInteractionEvent() {
+        return new CollectionAccessEvent(unwrap(getTarget()), getIdentifier());
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java Tue Apr 26 18:24:05 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.interactions;
 
-package org.apache.isis.core.metamodel.interactions;
-
 import static org.apache.isis.core.metamodel.adapter.util.AdapterUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
@@ -28,33 +27,29 @@ import org.apache.isis.core.commons.auth
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.InteractionContextType;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-
-
-/**
- * See {@link InteractionContext} for overview; analogous to {@link CollectionAddToEvent}.
- */
-public class CollectionAddToContext extends ValidityContext<CollectionAddToEvent> {
-
-    private final ObjectAdapter proposed;
-
-    public CollectionAddToContext(
-            final AuthenticationSession session,
-            final InteractionInvocationMethod invocationMethod,
-            final ObjectAdapter target,
-            final Identifier id,
-            final ObjectAdapter proposed) {
-        super(InteractionContextType.COLLECTION_ADD_TO, session, invocationMethod, id, target);
-
-        this.proposed = proposed;
-    }
-
-    public ObjectAdapter getProposed() {
-        return proposed;
-    }
-
-    @Override
-    public CollectionAddToEvent createInteractionEvent() {
-        return new CollectionAddToEvent(unwrap(getTarget()), getIdentifier(), unwrap(getProposed()));
-    }
-
-}
+
+/**
+ * See {@link InteractionContext} for overview; analogous to {@link CollectionAddToEvent}.
+ */
+public class CollectionAddToContext extends ValidityContext<CollectionAddToEvent> {
+
+    private final ObjectAdapter proposed;
+
+    public CollectionAddToContext(final AuthenticationSession session,
+        final InteractionInvocationMethod invocationMethod, final ObjectAdapter target, final Identifier id,
+        final ObjectAdapter proposed) {
+        super(InteractionContextType.COLLECTION_ADD_TO, session, invocationMethod, id, target);
+
+        this.proposed = proposed;
+    }
+
+    public ObjectAdapter getProposed() {
+        return proposed;
+    }
+
+    @Override
+    public CollectionAddToEvent createInteractionEvent() {
+        return new CollectionAddToEvent(unwrap(getTarget()), getIdentifier(), unwrap(getProposed()));
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java Tue Apr 26 18:24:05 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.interactions;
 
-package org.apache.isis.core.metamodel.interactions;
-
 import static org.apache.isis.core.metamodel.adapter.util.AdapterUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
@@ -28,33 +27,29 @@ import org.apache.isis.core.commons.auth
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.InteractionContextType;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-
-
-/**
- * See {@link InteractionContext} for overview; analogous to {@link CollectionRemoveFromEvent}.
- */
-public class CollectionRemoveFromContext extends ValidityContext<CollectionRemoveFromEvent> {
-
-    private final ObjectAdapter proposed;
-
-    public CollectionRemoveFromContext(
-            final AuthenticationSession session,
-            final InteractionInvocationMethod invocationMethod,
-            final ObjectAdapter target,
-            final Identifier identifier,
-            final ObjectAdapter proposed) {
-        super(InteractionContextType.COLLECTION_REMOVE_FROM, session, invocationMethod, identifier, target);
-
-        this.proposed = proposed;
-    }
-
-    public ObjectAdapter getProposed() {
-        return proposed;
-    }
-
-    @Override
-    public CollectionRemoveFromEvent createInteractionEvent() {
-        return new CollectionRemoveFromEvent(unwrap(getTarget()), getIdentifier(), unwrap(getProposed()));
-    }
-
-}
+
+/**
+ * See {@link InteractionContext} for overview; analogous to {@link CollectionRemoveFromEvent}.
+ */
+public class CollectionRemoveFromContext extends ValidityContext<CollectionRemoveFromEvent> {
+
+    private final ObjectAdapter proposed;
+
+    public CollectionRemoveFromContext(final AuthenticationSession session,
+        final InteractionInvocationMethod invocationMethod, final ObjectAdapter target, final Identifier identifier,
+        final ObjectAdapter proposed) {
+        super(InteractionContextType.COLLECTION_REMOVE_FROM, session, invocationMethod, identifier, target);
+
+        this.proposed = proposed;
+    }
+
+    public ObjectAdapter getProposed() {
+        return proposed;
+    }
+
+    @Override
+    public CollectionRemoveFromEvent createInteractionEvent() {
+        return new CollectionRemoveFromEvent(unwrap(getTarget()), getIdentifier(), unwrap(getProposed()));
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java Tue Apr 26 18:24:05 2011
@@ -17,33 +17,28 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.interactions;
 
-package org.apache.isis.core.metamodel.interactions;
-
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.CollectionUsabilityEvent;
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.InteractionContextType;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-
-
-/**
- * See {@link InteractionContext} for overview; analogous to {@link CollectionUsabilityEvent}.
- */
-public class CollectionUsabilityContext extends UsabilityContext<CollectionUsabilityEvent> {
-
-    public CollectionUsabilityContext(
-            final AuthenticationSession session,
-            final InteractionInvocationMethod invocationMethod,
-            final ObjectAdapter target,
-            final Identifier identifier) {
-        super(InteractionContextType.COLLECTION_USABLE, session, invocationMethod, identifier, target);
-    }
-
-    @Override
-    public CollectionUsabilityEvent createInteractionEvent() {
-        return new CollectionUsabilityEvent(getTarget().getObject(), getIdentifier());
-    }
-
-}
+
+/**
+ * See {@link InteractionContext} for overview; analogous to {@link CollectionUsabilityEvent}.
+ */
+public class CollectionUsabilityContext extends UsabilityContext<CollectionUsabilityEvent> {
+
+    public CollectionUsabilityContext(final AuthenticationSession session,
+        final InteractionInvocationMethod invocationMethod, final ObjectAdapter target, final Identifier identifier) {
+        super(InteractionContextType.COLLECTION_USABLE, session, invocationMethod, identifier, target);
+    }
+
+    @Override
+    public CollectionUsabilityEvent createInteractionEvent() {
+        return new CollectionUsabilityEvent(getTarget().getObject(), getIdentifier());
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java Tue Apr 26 18:24:05 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.interactions;
 
-package org.apache.isis.core.metamodel.interactions;
-
 import static org.apache.isis.core.metamodel.adapter.util.AdapterUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
@@ -28,24 +27,20 @@ import org.apache.isis.core.commons.auth
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.InteractionContextType;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-
-
-/**
- * See {@link InteractionContext} for overview; analogous to {@link CollectionVisibilityEvent}.
- */
-public class CollectionVisibilityContext extends VisibilityContext<CollectionVisibilityEvent> {
-
-    public CollectionVisibilityContext(
-            final AuthenticationSession session,
-            final InteractionInvocationMethod invocationMethod,
-            final ObjectAdapter target,
-            final Identifier identifier) {
-        super(InteractionContextType.COLLECTION_VISIBLE, session, invocationMethod, identifier, target);
-    }
-
-    @Override
-    public CollectionVisibilityEvent createInteractionEvent() {
-        return new CollectionVisibilityEvent(unwrap(getTarget()), getIdentifier());
-    }
-
-}
+
+/**
+ * See {@link InteractionContext} for overview; analogous to {@link CollectionVisibilityEvent}.
+ */
+public class CollectionVisibilityContext extends VisibilityContext<CollectionVisibilityEvent> {
+
+    public CollectionVisibilityContext(final AuthenticationSession session,
+        final InteractionInvocationMethod invocationMethod, final ObjectAdapter target, final Identifier identifier) {
+        super(InteractionContextType.COLLECTION_VISIBLE, session, invocationMethod, identifier, target);
+    }
+
+    @Override
+    public CollectionVisibilityEvent createInteractionEvent() {
+        return new CollectionVisibilityEvent(unwrap(getTarget()), getIdentifier());
+    }
+
+}