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 2010/11/03 02:24:23 UTC

svn commit: r1030308 [3/8] - in /incubator/isis/trunk: alternatives/remoting/common/src/main/java/org/apache/isis/remoting/facade/impl/ alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/ alternatives/remoting/common/src/test/ja...

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacet.java Wed Nov  3 01:24:18 2010
@@ -17,21 +17,19 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.collections.modify;
 
-package org.apache.isis.metamodel.facets.collections.modify;
-
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
-
-
-/**
- * Remove object to a collection.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to invoking the <tt>removeFromXxx</tt> support
- * method for an action.
- */
-public interface CollectionRemoveFromFacet extends Facet {
-
-    public void remove(ObjectAdapter inObject, ObjectAdapter element);
-}
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.facets.Facet;
+
+/**
+ * Remove object to a collection.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to invoking the <tt>removeFromXxx</tt> support method for
+ * an action.
+ */
+public interface CollectionRemoveFromFacet extends Facet {
+
+    public void remove(ObjectAdapter inObject, ObjectAdapter element);
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacet.java Wed Nov  3 01:24:18 2010
@@ -17,26 +17,23 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.hide;
 
-package org.apache.isis.metamodel.facets.hide;
-
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.SingleWhenValueFacet;
-import org.apache.isis.metamodel.interactions.HidingInteractionAdvisor;
-
-
-/**
- * Hide a property, collection or action.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to annotating the member with
- * <tt>@Hidden</tt>.
- */
-public interface HiddenFacet extends SingleWhenValueFacet, HidingInteractionAdvisor {
-
-    /**
-     * The reason why the (feature of the) target object is currently hidden, or <tt>null</tt> if visible.
-     */
-    public String hiddenReason(ObjectAdapter target);
-
-}
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.facets.SingleWhenValueFacet;
+import org.apache.isis.metamodel.interactions.HidingInteractionAdvisor;
+
+/**
+ * Hide a property, collection or action.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to annotating the member with <tt>@Hidden</tt>.
+ */
+public interface HiddenFacet extends SingleWhenValueFacet, HidingInteractionAdvisor {
+
+    /**
+     * The reason why the (feature of the) target object is currently hidden, or <tt>null</tt> if visible.
+     */
+    public String hiddenReason(ObjectAdapter target);
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/naming/describedas/DescribedAsFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/naming/describedas/DescribedAsFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/naming/describedas/DescribedAsFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/naming/describedas/DescribedAsFacet.java Wed Nov  3 01:24:18 2010
@@ -17,19 +17,16 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.naming.describedas;
 
-package org.apache.isis.metamodel.facets.naming.describedas;
-
-import org.apache.isis.metamodel.facets.SingleStringValueFacet;
-
-
-/**
- * Describes a class, a property, collection, an action or an action parameter.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to annotating the member with
- * <tt>@DescribedAs</tt>.
- */
-public interface DescribedAsFacet extends SingleStringValueFacet {
-
-}
+import org.apache.isis.metamodel.facets.SingleStringValueFacet;
+
+/**
+ * Describes a class, a property, collection, an action or an action parameter.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to annotating the member with <tt>@DescribedAs</tt>.
+ */
+public interface DescribedAsFacet extends SingleStringValueFacet {
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/naming/named/NamedFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/naming/named/NamedFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/naming/named/NamedFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/naming/named/NamedFacet.java Wed Nov  3 01:24:18 2010
@@ -17,18 +17,16 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.naming.named;
 
-package org.apache.isis.metamodel.facets.naming.named;
-
-import org.apache.isis.metamodel.facets.SingleStringValueFacet;
-
-
-/**
- * The name of a class, a property, collection, an action or a parameter.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to annotating the member with <tt>@Named</tt>.
- */
-public interface NamedFacet extends SingleStringValueFacet {
-
-}
+import org.apache.isis.metamodel.facets.SingleStringValueFacet;
+
+/**
+ * The name of a class, a property, collection, an action or a parameter.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to annotating the member with <tt>@Named</tt>.
+ */
+public interface NamedFacet extends SingleStringValueFacet {
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/aggregated/AggregatedFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/aggregated/AggregatedFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/aggregated/AggregatedFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/aggregated/AggregatedFacet.java Wed Nov  3 01:24:18 2010
@@ -17,31 +17,29 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.object.aggregated;
 
-package org.apache.isis.metamodel.facets.object.aggregated;
-
-import org.apache.isis.metamodel.facets.MarkerFacet;
-import org.apache.isis.metamodel.facets.object.immutable.ImmutableFacet;
-
-
-/**
- * Indicates that this class is aggregated, that is, wholly contained within a larger object.
- * 
- * <p>
- * The object may or may not be {@link ImmutableFacet immutable}, and may reference regular entity domain
- * objects or other aggregated objects.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, typically corresponds to applying the <tt>@Aggregated</tt>
- * annotation at the class level.
- * 
- * <p>
- * In terms of an analogy, aggregated is similar to Hibernate's component types (for larger mutable in-line
- * objects) or to Hibernate's user-defined types (for smaller immutable values).
- * 
- * <p>
- * TODO: should also be able to apply to associations, indicating that the reference is aggregating.
- */
-public interface AggregatedFacet extends MarkerFacet {
-
-}
+import org.apache.isis.metamodel.facets.MarkerFacet;
+import org.apache.isis.metamodel.facets.object.immutable.ImmutableFacet;
+
+/**
+ * Indicates that this class is aggregated, that is, wholly contained within a larger object.
+ * 
+ * <p>
+ * The object may or may not be {@link ImmutableFacet immutable}, and may reference regular entity domain objects or
+ * other aggregated objects.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, typically corresponds to applying the <tt>@Aggregated</tt> annotation
+ * at the class level.
+ * 
+ * <p>
+ * In terms of an analogy, aggregated is similar to Hibernate's component types (for larger mutable in-line objects) or
+ * to Hibernate's user-defined types (for smaller immutable values).
+ * 
+ * <p>
+ * TODO: should also be able to apply to associations, indicating that the reference is aggregating.
+ */
+public interface AggregatedFacet extends MarkerFacet {
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/bounded/BoundedFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/bounded/BoundedFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/bounded/BoundedFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/bounded/BoundedFacet.java Wed Nov  3 01:24:18 2010
@@ -17,25 +17,22 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.object.bounded;
 
-package org.apache.isis.metamodel.facets.object.bounded;
-
-import org.apache.isis.metamodel.facets.MarkerFacet;
-import org.apache.isis.metamodel.interactions.DisablingInteractionAdvisor;
-import org.apache.isis.metamodel.interactions.ValidatingInteractionAdvisor;
-
-
-/**
- * Whether the number of instances of this class is bounded.
- * 
- * <p>
- * Typically viewers will interpret this information by displaying all instances of the class in a drop-down
- * list box or similar widget.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to annotating the member with
- * <tt>@Bounded</tt>.
- */
-public interface BoundedFacet extends MarkerFacet, DisablingInteractionAdvisor, ValidatingInteractionAdvisor {
-
-}
+import org.apache.isis.metamodel.facets.MarkerFacet;
+import org.apache.isis.metamodel.interactions.DisablingInteractionAdvisor;
+import org.apache.isis.metamodel.interactions.ValidatingInteractionAdvisor;
+
+/**
+ * Whether the number of instances of this class is bounded.
+ * 
+ * <p>
+ * Typically viewers will interpret this information by displaying all instances of the class in a drop-down list box or
+ * similar widget.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to annotating the member with <tt>@Bounded</tt>.
+ */
+public interface BoundedFacet extends MarkerFacet, DisablingInteractionAdvisor, ValidatingInteractionAdvisor {
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cached/CachedFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cached/CachedFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cached/CachedFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cached/CachedFacet.java Wed Nov  3 01:24:18 2010
@@ -17,26 +17,24 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.object.cached;
 
-package org.apache.isis.metamodel.facets.object.cached;
-
-import org.apache.isis.metamodel.facets.MarkerFacet;
-
-
-/**
- * Whether the instances of this class are cached.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to annotating the member with <tt>@Cached</tt>.
- * 
- * <p>
- * Cached does not necessarily imply immutable. The idea though is that the developer is indicating that the
- * performance cost of obtaining all instances of an instance is low; viewer implementations might be able to
- * exploit this information.
- * 
- * <p>
- * Not yet implemented by any viewer.
- */
-public interface CachedFacet extends MarkerFacet {
-
-}
+import org.apache.isis.metamodel.facets.MarkerFacet;
+
+/**
+ * Whether the instances of this class are cached.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to annotating the member with <tt>@Cached</tt>.
+ * 
+ * <p>
+ * Cached does not necessarily imply immutable. The idea though is that the developer is indicating that the performance
+ * cost of obtaining all instances of an instance is low; viewer implementations might be able to exploit this
+ * information.
+ * 
+ * <p>
+ * Not yet implemented by any viewer.
+ */
+public interface CachedFacet extends MarkerFacet {
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedCallbackFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedCallbackFacet.java Wed Nov  3 01:24:18 2010
@@ -17,17 +17,16 @@
  *  under the License.
  */
 
-
 package org.apache.isis.metamodel.facets.object.callbacks;
 
 /**
  * Represents the mechanism to inform the object that it has just been created.
  * 
  * <p>
- * In the standard [[NAME]] Programming Model, this is represented by a <tt>created</tt> method. The
- * framework calls this once the object has been created via <tt>newTransientInstance</tt> or
- * <tt>newInstance</tt>. The method is <i>not</i> called when the object is subsequently resolved having been
- * persisted; for that see {@link LoadingCallbackFacet} and {@link LoadedCallbackFacet}.
+ * In the standard Apache Isis Programming Model, this is represented by a <tt>created</tt> method. The framework calls
+ * this once the object has been created via <tt>newTransientInstance</tt> or <tt>newInstance</tt>. The method is
+ * <i>not</i> called when the object is subsequently resolved having been persisted; for that see
+ * {@link LoadingCallbackFacet} and {@link LoadedCallbackFacet}.
  * 
  * @see LoadingCallbackFacet
  * @see LoadedCallbackFacet
@@ -35,4 +34,3 @@ package org.apache.isis.metamodel.facets
 public interface CreatedCallbackFacet extends CallbackFacet {
 
 }
-

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadedCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadedCallbackFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadedCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadedCallbackFacet.java Wed Nov  3 01:24:18 2010
@@ -17,14 +17,13 @@
  *  under the License.
  */
 
-
 package org.apache.isis.metamodel.facets.object.callbacks;
 
 /**
  * Represents the mechanism to inform the object that it has just been loaded from the object store.
  * 
  * <p>
- * In the standard [[NAME]] Programming Model, this is represented by a <tt>loaded</tt> method.
+ * In the standard Apache Isis Programming Model, this is represented by a <tt>loaded</tt> method.
  * 
  * <p>
  * 
@@ -34,4 +33,3 @@ package org.apache.isis.metamodel.facets
 public interface LoadedCallbackFacet extends CallbackFacet {
 
 }
-

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadingCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadingCallbackFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadingCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadingCallbackFacet.java Wed Nov  3 01:24:18 2010
@@ -17,14 +17,13 @@
  *  under the License.
  */
 
-
 package org.apache.isis.metamodel.facets.object.callbacks;
 
 /**
  * Represents the mechanism to inform the object that it is about to be loaded from the object store.
  * 
  * <p>
- * In the standard [[NAME]] Programming Model, this is represented by a <tt>loading</tt> method.
+ * In the standard Apache Isis Programming Model, this is represented by a <tt>loading</tt> method.
  * 
  * <p>
  * 
@@ -34,4 +33,3 @@ package org.apache.isis.metamodel.facets
 public interface LoadingCallbackFacet extends CallbackFacet {
 
 }
-

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistedCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistedCallbackFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistedCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistedCallbackFacet.java Wed Nov  3 01:24:18 2010
@@ -17,15 +17,13 @@
  *  under the License.
  */
 
-
 package org.apache.isis.metamodel.facets.object.callbacks;
 
 /**
- * Represents the mechanism to inform the object that it has been persisted to the object store for the first
- * time.
+ * Represents the mechanism to inform the object that it has been persisted to the object store for the first time.
  * 
  * <p>
- * In the standard [[NAME]] Programming Model, this is represented by a <tt>saved</tt> method.
+ * In the standard Apache Isis Programming Model, this is represented by a <tt>saved</tt> method.
  * 
  * <p>
  * 
@@ -34,4 +32,3 @@ package org.apache.isis.metamodel.facets
 public interface PersistedCallbackFacet extends CallbackFacet {
 
 }
-

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistingCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistingCallbackFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistingCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistingCallbackFacet.java Wed Nov  3 01:24:18 2010
@@ -17,16 +17,15 @@
  *  under the License.
  */
 
-
 package org.apache.isis.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.
+ * Represents the mechanism to inform the object that it is about to be persisted to the object store for the first
+ * time.
  * 
  * <p>
- * In the standard [[NAME]] Programming Model, this is represented by a <tt>saving</tt> method. Called
- * only if the object is known to be in a valid state.
+ * In the standard Apache Isis Programming Model, this is represented by a <tt>saving</tt> method. Called only if the
+ * object is known to be in a valid state.
  * 
  * <p>
  * 
@@ -35,4 +34,3 @@ package org.apache.isis.metamodel.facets
 public interface PersistingCallbackFacet extends CallbackFacet {
 
 }
-

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovedCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovedCallbackFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovedCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovedCallbackFacet.java Wed Nov  3 01:24:18 2010
@@ -17,18 +17,16 @@
  *  under the License.
  */
 
-
 package org.apache.isis.metamodel.facets.object.callbacks;
 
 /**
  * Represents the mechanism to inform the object that it has just been deleted.
  * 
  * <p>
- * In the standard [[NAME]] Programming Model, this is represented by a <tt>deleted</tt> method.
+ * In the standard Apache Isis Programming Model, this is represented by a <tt>deleted</tt> method.
  * 
  * @see RemovingCallbackFacet
  */
 public interface RemovedCallbackFacet extends CallbackFacet {
 
 }
-

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovingCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovingCallbackFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovingCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovingCallbackFacet.java Wed Nov  3 01:24:18 2010
@@ -17,14 +17,13 @@
  *  under the License.
  */
 
-
 package org.apache.isis.metamodel.facets.object.callbacks;
 
 /**
  * Represents the mechanism to inform the object that it about to be deleted.
  * 
  * <p>
- * In the standard [[NAME]] Programming Model, this is represented by a <tt>deleting</tt> method.
+ * In the standard Apache Isis Programming Model, this is represented by a <tt>deleting</tt> method.
  * 
  * @see RemovedCallbackFacet
  */
@@ -32,4 +31,3 @@ package org.apache.isis.metamodel.facets
 public interface RemovingCallbackFacet extends CallbackFacet {
 
 }
-

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatedCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatedCallbackFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatedCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatedCallbackFacet.java Wed Nov  3 01:24:18 2010
@@ -17,14 +17,13 @@
  *  under the License.
  */
 
-
 package org.apache.isis.metamodel.facets.object.callbacks;
 
 /**
  * Represents the mechanism to inform the object that it has been updated in the object store.
  * 
  * <p>
- * In the standard [[NAME]] Programming Model, this is represented by a <tt>updated</tt> method.
+ * In the standard Apache Isis Programming Model, this is represented by a <tt>updated</tt> method.
  * 
  * <p>
  * 
@@ -34,4 +33,3 @@ package org.apache.isis.metamodel.facets
 public interface UpdatedCallbackFacet extends CallbackFacet {
 
 }
-

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingCallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingCallbackFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingCallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingCallbackFacet.java Wed Nov  3 01:24:18 2010
@@ -17,14 +17,13 @@
  *  under the License.
  */
 
-
 package org.apache.isis.metamodel.facets.object.callbacks;
 
 /**
  * Represents the mechanism to inform the object that it is about to be updated in the object store.
  * 
  * <p>
- * In the standard [[NAME]] Programming Model, this is represented by a <tt>updating</tt> method.
+ * In the standard Apache Isis Programming Model, this is represented by a <tt>updating</tt> method.
  * 
  * <p>
  * 
@@ -34,4 +33,3 @@ package org.apache.isis.metamodel.facets
 public interface UpdatingCallbackFacet extends CallbackFacet {
 
 }
-

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacet.java Wed Nov  3 01:24:18 2010
@@ -17,25 +17,23 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.object.immutable;
 
-package org.apache.isis.metamodel.facets.object.immutable;
-
 import org.apache.isis.metamodel.facets.SingleWhenValueFacet;
 import org.apache.isis.metamodel.facets.object.value.ValueFacet;
 import org.apache.isis.metamodel.interactions.DisablingInteractionAdvisor;
-
-
-/**
- * Indicates that the instances of this class are immutable and so may not be modified either through the
- * viewer or indeed programmatically.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, typically corresponds to applying the <tt>@Immutable</tt>
- * annotation at the class level.
- * 
- * @see EqualByContentFacet
- * @see ValueFacet
- */
-public interface ImmutableFacet extends SingleWhenValueFacet, DisablingInteractionAdvisor {
-
-}
+
+/**
+ * Indicates that the instances of this class are immutable and so may not be modified either through the viewer or
+ * indeed programmatically.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, typically corresponds to applying the <tt>@Immutable</tt> annotation
+ * at the class level.
+ * 
+ * @see EqualByContentFacet
+ * @see ValueFacet
+ */
+public interface ImmutableFacet extends SingleWhenValueFacet, DisablingInteractionAdvisor {
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/ValueFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/ValueFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/ValueFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/ValueFacet.java Wed Nov  3 01:24:18 2010
@@ -17,21 +17,19 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.object.value;
 
-package org.apache.isis.metamodel.facets.object.value;
-
-import org.apache.isis.metamodel.facets.MarkerFacet;
-import org.apache.isis.metamodel.facets.MultiTypedFacet;
-
-
-/**
- * Indicates that this class has value semantics.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to the <tt>@Value</tt> annotation. However,
- * note that value semantics is just a convenient term for a number of mostly optional semantics all of which
- * are defined elsewhere.
- */
-public interface ValueFacet extends MarkerFacet, MultiTypedFacet {
-
-}
+import org.apache.isis.metamodel.facets.MarkerFacet;
+import org.apache.isis.metamodel.facets.MultiTypedFacet;
+
+/**
+ * Indicates that this class has value semantics.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to the <tt>@Value</tt> annotation. However, note that
+ * value semantics is just a convenient term for a number of mostly optional semantics all of which are defined
+ * elsewhere.
+ */
+public interface ValueFacet extends MarkerFacet, MultiTypedFacet {
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propcoll/access/PropertyAccessorFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propcoll/access/PropertyAccessorFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propcoll/access/PropertyAccessorFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propcoll/access/PropertyAccessorFacet.java Wed Nov  3 01:24:18 2010
@@ -17,24 +17,21 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.propcoll.access;
 
-package org.apache.isis.metamodel.facets.propcoll.access;
-
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.facets.Facet;
-
-
-/**
- * The mechanism by which the value of the property can be accessed.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to invoking the accessor method for a
- * property.
- */
-public interface PropertyAccessorFacet extends Facet {
-
-    /**
-     * Gets the value of this property from this object.
-     */
-    public Object getProperty(ObjectAdapter inObject);
-}
+
+/**
+ * The mechanism by which the value of the property can be accessed.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to invoking the accessor method for a property.
+ */
+public interface PropertyAccessorFacet extends Facet {
+
+    /**
+     * Gets the value of this property from this object.
+     */
+    public Object getProperty(ObjectAdapter inObject);
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propcoll/notpersisted/NotPersistedFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propcoll/notpersisted/NotPersistedFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propcoll/notpersisted/NotPersistedFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propcoll/notpersisted/NotPersistedFacet.java Wed Nov  3 01:24:18 2010
@@ -17,20 +17,18 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.propcoll.notpersisted;
 
-package org.apache.isis.metamodel.facets.propcoll.notpersisted;
-
-import org.apache.isis.metamodel.facets.MarkerFacet;
-import org.apache.isis.metamodel.interactions.DisablingInteractionAdvisor;
-
-
-/**
- * Indicates that a property or a collection shouldn't be persisted.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to annotating the property or collection with
- * the <tt>@NotPersisted</tt> annotation.
- */
-public interface NotPersistedFacet extends MarkerFacet, DisablingInteractionAdvisor {
-
-}
+import org.apache.isis.metamodel.facets.MarkerFacet;
+import org.apache.isis.metamodel.interactions.DisablingInteractionAdvisor;
+
+/**
+ * Indicates that a property or a collection shouldn't be persisted.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to annotating the property or collection with the
+ * <tt>@NotPersisted</tt> annotation.
+ */
+public interface NotPersistedFacet extends MarkerFacet, DisablingInteractionAdvisor {
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/businesskey/BusinessKeyFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/businesskey/BusinessKeyFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/businesskey/BusinessKeyFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/businesskey/BusinessKeyFacet.java Wed Nov  3 01:24:18 2010
@@ -17,22 +17,20 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.properties.businesskey;
 
-package org.apache.isis.metamodel.facets.properties.businesskey;
-
-import org.apache.isis.metamodel.facets.SingleStringValueFacet;
-
-
-/**
- * Indicates that this property is part of the business key.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to annotating the property with the
- * <tt>@BusinessKey</tt> annotation.
- * 
- * <p>
- * TODO: not yet implemented by the framework or any viewer.
- */
-public interface BusinessKeyFacet extends SingleStringValueFacet {
-
-}
+import org.apache.isis.metamodel.facets.SingleStringValueFacet;
+
+/**
+ * Indicates that this property is part of the business key.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to annotating the property with the <tt>@BusinessKey</tt>
+ * annotation.
+ * 
+ * <p>
+ * TODO: not yet implemented by the framework or any viewer.
+ */
+public interface BusinessKeyFacet extends SingleStringValueFacet {
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/choices/PropertyChoicesFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/choices/PropertyChoicesFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/choices/PropertyChoicesFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/choices/PropertyChoicesFacet.java Wed Nov  3 01:24:18 2010
@@ -17,30 +17,28 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.properties.choices;
 
-package org.apache.isis.metamodel.facets.properties.choices;
-
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
-
-
-/**
- * Provides a set of choices for a property.
- * 
- * <p>
- * Viewers would typically represent this as a drop-down list box for the property.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to the <tt>choicesXxx</tt> supporting method
- * for the property with accessor <tt>getXxx</tt>.
- * 
- * <p>
- * Note: an alternative mechanism may be to use the <tt>@Bounded</tt> annotation against the referenced class.
- */
-public interface PropertyChoicesFacet extends Facet {
-
-    /**
-     * Gets the available choices for this property.
-     */
-    public Object[] getChoices(ObjectAdapter adapter);
-}
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.facets.Facet;
+
+/**
+ * Provides a set of choices for a property.
+ * 
+ * <p>
+ * Viewers would typically represent this as a drop-down list box for the property.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to the <tt>choicesXxx</tt> supporting method for the
+ * property with accessor <tt>getXxx</tt>.
+ * 
+ * <p>
+ * Note: an alternative mechanism may be to use the <tt>@Bounded</tt> annotation against the referenced class.
+ */
+public interface PropertyChoicesFacet extends Facet {
+
+    /**
+     * Gets the available choices for this property.
+     */
+    public Object[] getChoices(ObjectAdapter adapter);
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/PropertyDefaultFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/PropertyDefaultFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/PropertyDefaultFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/PropertyDefaultFacet.java Wed Nov  3 01:24:18 2010
@@ -17,30 +17,28 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.properties.defaults;
 
-package org.apache.isis.metamodel.facets.properties.defaults;
-
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.object.callbacks.CreatedCallbackFacet;
-
-
-/**
- * Provides a default value for a property of a newly created object.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to the <tt>defaultXxx</tt> supporting method
- * for the property with accessor <tt>getXxx</tt>.
- * 
- * <p>
- * Note: an alternative mechanism may be to specify the value in the created callback.
- * 
- * @see CreatedCallbackFacet
- */
-public interface PropertyDefaultFacet extends Facet {
-
-    /**
-     * The default value for this property in a newly created object.
-     */
-    public ObjectAdapter getDefault(ObjectAdapter inObject);
-}
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.metamodel.facets.object.callbacks.CreatedCallbackFacet;
+
+/**
+ * Provides a default value for a property of a newly created object.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to the <tt>defaultXxx</tt> supporting method for the
+ * property with accessor <tt>getXxx</tt>.
+ * 
+ * <p>
+ * Note: an alternative mechanism may be to specify the value in the created callback.
+ * 
+ * @see CreatedCallbackFacet
+ */
+public interface PropertyDefaultFacet extends Facet {
+
+    /**
+     * The default value for this property in a newly created object.
+     */
+    public ObjectAdapter getDefault(ObjectAdapter inObject);
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/modify/PropertyClearFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/modify/PropertyClearFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/modify/PropertyClearFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/modify/PropertyClearFacet.java Wed Nov  3 01:24:18 2010
@@ -17,22 +17,20 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.properties.modify;
 
-package org.apache.isis.metamodel.facets.properties.modify;
-
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
-
-
-/**
- * Mechanism for clearing a property of an object (that is, setting it to <tt>null</tt>).
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, typically corresponds to a method named <tt>clearXxx</tt>
- * (for a property <tt>getXxx</tt>). As a fallback the standard model also supports invoking the
- * <tt>setXxx</tt> method with <tt>null</tt>.
- */
-public interface PropertyClearFacet extends Facet {
-
-    public void clearProperty(ObjectAdapter inObject);
-}
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.facets.Facet;
+
+/**
+ * Mechanism for clearing a property of an object (that is, setting it to <tt>null</tt>).
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, typically corresponds to a method named <tt>clearXxx</tt> (for a
+ * property <tt>getXxx</tt>). As a fallback the standard model also supports invoking the <tt>setXxx</tt> method with
+ * <tt>null</tt>.
+ */
+public interface PropertyClearFacet extends Facet {
+
+    public void clearProperty(ObjectAdapter inObject);
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/modify/PropertyInitializationFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/modify/PropertyInitializationFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/modify/PropertyInitializationFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/modify/PropertyInitializationFacet.java Wed Nov  3 01:24:18 2010
@@ -17,32 +17,30 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.properties.modify;
 
-package org.apache.isis.metamodel.facets.properties.modify;
-
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.propcoll.access.PropertyAccessorFacet;
-
-
-/**
- * The mechanism by which the value of the property can be initialised.
- * 
- * <p>
- * This differs from the {@link PropertySetterFacet} in that it is only called when object is set up (after
- * persistence) and not every time a property changes; hence it will not be made part of a transaction.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to invoking the mutator method for a property.
- * 
- * @see PropertyAccessorFacet
- * @see PropertySetterFacet
- * @see PropertyClearFacet
- */
-public interface PropertyInitializationFacet extends Facet {
-
-    /**
-     * Sets the value of this property.
-     */
-    public void initProperty(ObjectAdapter inObject, ObjectAdapter value);
-}
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.metamodel.facets.propcoll.access.PropertyAccessorFacet;
+
+/**
+ * The mechanism by which the value of the property can be initialised.
+ * 
+ * <p>
+ * This differs from the {@link PropertySetterFacet} in that it is only called when object is set up (after persistence)
+ * and not every time a property changes; hence it will not be made part of a transaction.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to invoking the mutator method for a property.
+ * 
+ * @see PropertyAccessorFacet
+ * @see PropertySetterFacet
+ * @see PropertyClearFacet
+ */
+public interface PropertyInitializationFacet extends Facet {
+
+    /**
+     * Sets the value of this property.
+     */
+    public void initProperty(ObjectAdapter inObject, ObjectAdapter value);
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/modify/PropertySetterFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/modify/PropertySetterFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/modify/PropertySetterFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/modify/PropertySetterFacet.java Wed Nov  3 01:24:18 2010
@@ -17,28 +17,26 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.properties.modify;
 
-package org.apache.isis.metamodel.facets.properties.modify;
-
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.propcoll.access.PropertyAccessorFacet;
-
-
-/**
- * The mechanism by which the value of the property can be set.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to invoking the mutator method for a property.
- * 
- * @see PropertyAccessorFacet
- * @see PropertyClearFacet
- * @see PropertyInitializationFacet
- */
-public interface PropertySetterFacet extends Facet {
-
-    /**
-     * Sets the value of this property.
-     */
-    public void setProperty(ObjectAdapter inObject, ObjectAdapter value);
-}
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.metamodel.facets.propcoll.access.PropertyAccessorFacet;
+
+/**
+ * The mechanism by which the value of the property can be set.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to invoking the mutator method for a property.
+ * 
+ * @see PropertyAccessorFacet
+ * @see PropertyClearFacet
+ * @see PropertyInitializationFacet
+ */
+public interface PropertySetterFacet extends Facet {
+
+    /**
+     * Sets the value of this property.
+     */
+    public void setProperty(ObjectAdapter inObject, ObjectAdapter value);
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/searchable/SearchableFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/searchable/SearchableFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/searchable/SearchableFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/searchable/SearchableFacet.java Wed Nov  3 01:24:18 2010
@@ -17,35 +17,32 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.properties.searchable;
 
-package org.apache.isis.metamodel.facets.properties.searchable;
-
-import org.apache.isis.metamodel.facets.MultipleValueFacet;
-
-
-/**
- * Indicates that this property should be used as part of a generic searching capability (for example, query
- * by example).
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to annotating the property with the
- * <tt>@Searchable</tt> annotation.
- * 
- * <p>
- * TODO: not yet implemented by the framework or any viewer. Originally introduced for the
- * adapterrcp.sourceforge.net viewer as an extension point plug-in for the Search menu (
- * <tt>org.eclipse.search.searchPages</tt>).
- */
-public interface SearchableFacet extends MultipleValueFacet {
-
-    /**
-     * The (class of the) repository to delegate to.
-     */
-    public Class<?> repository();
-
-    /**
-     * Whether this is a query by example search.
-     */
-    public boolean queryByExample();
-
-}
+import org.apache.isis.metamodel.facets.MultipleValueFacet;
+
+/**
+ * Indicates that this property should be used as part of a generic searching capability (for example, query by
+ * example).
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to annotating the property with the <tt>@Searchable</tt>
+ * annotation.
+ * 
+ * <p>
+ * TODO: not yet implemented by the framework or any viewer. Originally introduced for the adapterrcp.sourceforge.net
+ * viewer as an extension point plug-in for the Search menu ( <tt>org.eclipse.search.searchPages</tt>).
+ */
+public interface SearchableFacet extends MultipleValueFacet {
+
+    /**
+     * The (class of the) repository to delegate to.
+     */
+    public Class<?> repository();
+
+    /**
+     * Whether this is a query by example search.
+     */
+    public boolean queryByExample();
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propparam/multiline/MultiLineFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propparam/multiline/MultiLineFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propparam/multiline/MultiLineFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propparam/multiline/MultiLineFacet.java Wed Nov  3 01:24:18 2010
@@ -17,32 +17,30 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.propparam.multiline;
 
-package org.apache.isis.metamodel.facets.propparam.multiline;
-
-import org.apache.isis.metamodel.facets.MultipleValueFacet;
-
-
-/**
- * Whether the (string) property or parameter should be rendered over multiple lines.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to the <tt>@MultiLine</tt> annotation.
- */
-public interface MultiLineFacet extends MultipleValueFacet {
-
-    /**
-     * How many lines to use.
-     */
-    public int numberOfLines();
-
-    /**
-     * Whether carriage returns should be used to split over multiple lines or not.
-     * 
-     * <p>
-     * If set to <tt>true</tt>, then user must use carriage returns to split. If set to <tt>false</tt>, then
-     * the viewer should automatically wrap when spills over the length of one line.
-     */
-    public boolean preventWrapping();
-
-}
+import org.apache.isis.metamodel.facets.MultipleValueFacet;
+
+/**
+ * Whether the (string) property or parameter should be rendered over multiple lines.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to the <tt>@MultiLine</tt> annotation.
+ */
+public interface MultiLineFacet extends MultipleValueFacet {
+
+    /**
+     * How many lines to use.
+     */
+    public int numberOfLines();
+
+    /**
+     * Whether carriage returns should be used to split over multiple lines or not.
+     * 
+     * <p>
+     * If set to <tt>true</tt>, then user must use carriage returns to split. If set to <tt>false</tt>, then the viewer
+     * should automatically wrap when spills over the length of one line.
+     */
+    public boolean preventWrapping();
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propparam/typicallength/TypicalLengthFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propparam/typicallength/TypicalLengthFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propparam/typicallength/TypicalLengthFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propparam/typicallength/TypicalLengthFacet.java Wed Nov  3 01:24:18 2010
@@ -17,23 +17,22 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.propparam.typicallength;
 
-package org.apache.isis.metamodel.facets.propparam.typicallength;
-
-import org.apache.isis.metamodel.facets.SingleIntValueFacet;
-
-
-/**
- * The typical length of a property or a parameter.
- * 
- * <p>
- * Intended to be used by the viewer as a rendering hint to size the UI field to an appropriate size.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to the <tt>@TypicalLength</tt> annotation.
- */
-public interface TypicalLengthFacet extends SingleIntValueFacet {
-
-    public int value();
-
-}
+import org.apache.isis.metamodel.facets.SingleIntValueFacet;
+
+/**
+ * The typical length of a property or a parameter.
+ * 
+ * <p>
+ * Intended to be used by the viewer as a rendering hint to size the UI field to an appropriate size.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to the <tt>@TypicalLength</tt> annotation.
+ */
+public interface TypicalLengthFacet extends SingleIntValueFacet {
+
+    @Override
+    public int value();
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propparam/validate/mandatory/MandatoryFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propparam/validate/mandatory/MandatoryFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propparam/validate/mandatory/MandatoryFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propparam/validate/mandatory/MandatoryFacet.java Wed Nov  3 01:24:18 2010
@@ -17,41 +17,39 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.propparam.validate.mandatory;
 
-package org.apache.isis.metamodel.facets.propparam.validate.mandatory;
-
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MarkerFacet;
-import org.apache.isis.metamodel.interactions.ValidatingInteractionAdvisor;
-
-
-/**
- * Whether a property or a parameter is mandatory (not optional).
- * 
- * <p>
- * For a mandatory property, the object cannot be saved/updated without the value being provided. For a
- * mandatory parameter, the action cannot be invoked without the value being provided.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, specify mandatory by <i>omitting</i> the
- * <tt>@Optional</tt> annotation.
- */
-public interface MandatoryFacet extends MarkerFacet, ValidatingInteractionAdvisor {
-
-    /**
-     * Whether this value is required but has not been provided (and is therefore invalid).
-     * 
-     * <p>
-     * If the value has been provided, <i>or</i> if the property or parameter is not required, then will
-     * return <tt>false</tt>.
-     */
-    boolean isRequiredButNull(ObjectAdapter adapter);
-
-    /**
-     * Indicates that the implementation is overridding the usual semantics, in other words that the
-     * {@link FacetHolder} to which this {@link Facet} is attached is <i>not</i> mandatory.
-     */
-    public boolean isInvertedSemantics();
-}
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.metamodel.facets.MarkerFacet;
+import org.apache.isis.metamodel.interactions.ValidatingInteractionAdvisor;
+
+/**
+ * Whether a property or a parameter is mandatory (not optional).
+ * 
+ * <p>
+ * For a mandatory property, the object cannot be saved/updated without the value being provided. For a mandatory
+ * parameter, the action cannot be invoked without the value being provided.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, specify mandatory by <i>omitting</i> the <tt>@Optional</tt>
+ * annotation.
+ */
+public interface MandatoryFacet extends MarkerFacet, ValidatingInteractionAdvisor {
+
+    /**
+     * Whether this value is required but has not been provided (and is therefore invalid).
+     * 
+     * <p>
+     * If the value has been provided, <i>or</i> if the property or parameter is not required, then will return
+     * <tt>false</tt>.
+     */
+    boolean isRequiredButNull(ObjectAdapter adapter);
+
+    /**
+     * Indicates that the implementation is overridding the usual semantics, in other words that the {@link FacetHolder}
+     * to which this {@link Facet} is attached is <i>not</i> mandatory.
+     */
+    public boolean isInvertedSemantics();
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propparam/validate/maxlength/MaxLengthFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propparam/validate/maxlength/MaxLengthFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propparam/validate/maxlength/MaxLengthFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propparam/validate/maxlength/MaxLengthFacet.java Wed Nov  3 01:24:18 2010
@@ -17,25 +17,23 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.propparam.validate.maxlength;
 
-package org.apache.isis.metamodel.facets.propparam.validate.maxlength;
-
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.SingleIntValueFacet;
-import org.apache.isis.metamodel.interactions.ValidatingInteractionAdvisor;
-
-
-/**
- * Whether the (string) property or a parameter's length must not exceed a certain length.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to the <tt>@MaxLength</tt> annotation.
- */
-public interface MaxLengthFacet extends SingleIntValueFacet, ValidatingInteractionAdvisor {
-
-    /**
-     * Whether the provided string exceeds the maximum length.
-     */
-    public boolean exceeds(ObjectAdapter adapter);
-
-}
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.facets.SingleIntValueFacet;
+import org.apache.isis.metamodel.interactions.ValidatingInteractionAdvisor;
+
+/**
+ * Whether the (string) property or a parameter's length must not exceed a certain length.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to the <tt>@MaxLength</tt> annotation.
+ */
+public interface MaxLengthFacet extends SingleIntValueFacet, ValidatingInteractionAdvisor {
+
+    /**
+     * Whether the provided string exceeds the maximum length.
+     */
+    public boolean exceeds(ObjectAdapter adapter);
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecificationException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecificationException.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecificationException.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecificationException.java Wed Nov  3 01:24:18 2010
@@ -17,11 +17,10 @@
  *  under the License.
  */
 
-
 package org.apache.isis.metamodel.spec;
 
 /**
- * A runtime exception indicating an problem has occurred within the [[NAME]] framework.
+ * A runtime exception indicating an problem has occurred within the Apache Isis framework.
  */
 public class ObjectSpecificationException extends RuntimeException {
     private static final long serialVersionUID = 1L;

Modified: incubator/isis/trunk/core/metamodel/src/main/test-archived/org.nakedobjects.nof.reflect.java.reflect/JavaActionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/test-archived/org.nakedobjects.nof.reflect.java.reflect/JavaActionTest.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/test-archived/org.nakedobjects.nof.reflect.java.reflect/JavaActionTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/test-archived/org.nakedobjects.nof.reflect.java.reflect/JavaActionTest.java Wed Nov  3 01:24:18 2010
@@ -22,7 +22,7 @@ package org.apache.isis.progmodel.java5.
 
 import java.lang.reflect.Method;
 
-import org.apache.isis.noa.adapter.[[NAME]];
+import org.apache.isis.noa.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.facets.When;
 import org.apache.isis.metamodel.facets.actions.debug.DebugFacet;
 import org.apache.isis.metamodel.facets.actions.executed.ExecutedFacet;
@@ -76,7 +76,7 @@ public class JavaActionTest extends Prox
     }
 
     public void testAction() throws Exception {
-        javaAction.execute(target, new [[NAME]][0]);
+        javaAction.execute(target, new ObjectAdapter[0]);
         assertTrue(javaObject.actionCalled());
     }
 
@@ -149,7 +149,7 @@ public class JavaActionTest extends Prox
     }
 
     public void testParameterSetValid() throws Exception {
-        Consent consent = javaAction.isParameterSetValidImperatively(target, new [[NAME]][0]);
+        Consent consent = javaAction.isParameterSetValidImperatively(target, new ObjectAdapter[0]);
         assertEquals(false, consent.isAllowed());
         assertEquals("invalid", consent.getReason());
     }

Modified: incubator/isis/trunk/core/metamodel/src/main/test-archived/org.nakedobjects.nof.reflect.java.reflect/JavaIntrospectorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/test-archived/org.nakedobjects.nof.reflect.java.reflect/JavaIntrospectorTest.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/test-archived/org.nakedobjects.nof.reflect.java.reflect/JavaIntrospectorTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/test-archived/org.nakedobjects.nof.reflect.java.reflect/JavaIntrospectorTest.java Wed Nov  3 01:24:18 2010
@@ -25,7 +25,6 @@ import java.util.HashMap;
 
 import junit.framework.TestSuite;
 
-import org.apache.isis.noa.adapter.[[NAME]];
 import org.apache.isis.noa.adapter.ObjectAdapter;
 import org.apache.isis.noa.adapter.ResolveState;
 import org.apache.isis.noa.facets.Facet;
@@ -304,19 +303,19 @@ public class JavaIntrospectorTest extend
 
     public void testClassActionValidatesWhenNoValidateMethodExists() {
         JavaAction action = findClassAction("bottom");
-        assertEquals(Allow.DEFAULT, action.isParameterSetValidImperatively(null, new [[NAME]][0]));
+        assertEquals(Allow.DEFAULT, action.isParameterSetValidImperatively(null, new ObjectAdapter[0]));
     }
     
     public void testClassActionValidate() {
         JavaAction action = findClassAction("top");
-        assertEquals(Allow.DEFAULT, action.isParameterSetValidImperatively(null, new [[NAME]][0]));
+        assertEquals(Allow.DEFAULT, action.isParameterSetValidImperatively(null, new ObjectAdapter[0]));
     }
 
     public void testClassActionValidateFails() {
         JavaAction action = findClassAction("top");
         JavaObjectWithBasicProgramConventions.classActionValid = "not now";
-        assertEquals(true, action.isParameterSetValidImperatively(null, new [[NAME]][0]).isVetoed());
-        assertEquals("not now", action.isParameterSetValidImperatively(null, new [[NAME]][0]).getReason());
+        assertEquals(true, action.isParameterSetValidImperatively(null, new ObjectAdapter[0]).isVetoed());
+        assertEquals("not now", action.isParameterSetValidImperatively(null, new ObjectAdapter[0]).getReason());
     }
 
     public void testCollectionReturnCollectionFieldProxy() throws Exception {
@@ -538,14 +537,14 @@ public class JavaIntrospectorTest extend
         Enumeration elements = actions.elements();
 
         JavaAction action = ((JavaAction) elements.nextElement());
-        assertEquals(Allow.DEFAULT, action.isParameterSetValidImperatively(adapter, new [[NAME]][1]));
+        assertEquals(Allow.DEFAULT, action.isParameterSetValidImperatively(adapter, new ObjectAdapter[1]));
         target.objectActionValid = "not valid";
-        assertEquals(true, action.isParameterSetValidImperatively(adapter, new [[NAME]][1]).isVetoed());
-        assertEquals("not valid", action.isParameterSetValidImperatively(adapter, new [[NAME]][1]).getReason());
+        assertEquals(true, action.isParameterSetValidImperatively(adapter, new ObjectAdapter[1]).isVetoed());
+        assertEquals("not valid", action.isParameterSetValidImperatively(adapter, new ObjectAdapter[1]).getReason());
 
         action = ((JavaAction) elements.nextElement());
-        assertEquals(Allow.DEFAULT, action.isParameterSetValidImperatively(adapter, new [[NAME]][1]));
-        assertEquals(Allow.DEFAULT, action.isParameterSetValidImperatively(adapter, new [[NAME]][1]));
+        assertEquals(Allow.DEFAULT, action.isParameterSetValidImperatively(adapter, new ObjectAdapter[1]));
+        assertEquals(Allow.DEFAULT, action.isParameterSetValidImperatively(adapter, new ObjectAdapter[1]));
 
     }
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacet.java Wed Nov  3 01:24:18 2010
@@ -17,18 +17,16 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.actcoll.typeof;
 
-package org.apache.isis.metamodel.facets.actcoll.typeof;
-
-import org.apache.isis.metamodel.facets.SingleClassValueFacet;
-
-
-/**
- * The type of the collection or the action.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to annotating the collection's accessor or the
- * action's invoker method with the <tt>@TypeOf</tt> annotation.
- */
-public interface TypeOfFacet extends SingleClassValueFacet {
-}
+import org.apache.isis.metamodel.facets.SingleClassValueFacet;
+
+/**
+ * The type of the collection or the action.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to annotating the collection's accessor or the action's
+ * invoker method with the <tt>@TypeOf</tt> annotation.
+ */
+public interface TypeOfFacet extends SingleClassValueFacet {
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacet.java Wed Nov  3 01:24:18 2010
@@ -17,21 +17,19 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.actions.choices;
 
-package org.apache.isis.metamodel.facets.actions.choices;
-
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
-
-
-/**
- * Obtain choices for each of the parameters of the action.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to invoking the <tt>choicesXxx</tt> support
- * method for an action.
- */
-public interface ActionChoicesFacet extends Facet {
-
-    public Object[][] getChoices(ObjectAdapter inObject);
-}
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.facets.Facet;
+
+/**
+ * Obtain choices for each of the parameters of the action.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to invoking the <tt>choicesXxx</tt> support method for an
+ * action.
+ */
+public interface ActionChoicesFacet extends Facet {
+
+    public Object[][] getChoices(ObjectAdapter inObject);
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacet.java Wed Nov  3 01:24:18 2010
@@ -28,7 +28,7 @@ import org.apache.isis.metamodel.facets.
  * Obtain choices for each of the parameters of the action.
  * 
  * <p>
- * In the standard [[NAME]] Programming Model, corresponds to invoking the <tt>choicesNXxx</tt> support
+ * In the standard Apache Isis Programming Model, corresponds to invoking the <tt>choicesNXxx</tt> support
  * method for an action (where N is the 0-based parameter number).
  */
 public interface ActionParameterChoicesFacet extends Facet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/debug/DebugFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/debug/DebugFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/debug/DebugFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/debug/DebugFacet.java Wed Nov  3 01:24:18 2010
@@ -27,7 +27,7 @@ import org.apache.isis.metamodel.facets.
  * Indicates that the action should only be available in a special <i>debug</i> mode.
  * 
  * <p>
- * In the standard [[NAME]] Programming Model, corresponds to annotating the action method using
+ * In the standard Apache Isis Programming Model, corresponds to annotating the action method using
  * <tt>@Debug</tt>.
  */
 public interface DebugFacet extends Facet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacet.java Wed Nov  3 01:24:18 2010
@@ -17,21 +17,19 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.actions.defaults;
 
-package org.apache.isis.metamodel.facets.actions.defaults;
-
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
-
-
-/**
- * Obtain defaults for each of the parameters of the action.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to invoking the <tt>defaultsXxx(...)</tt>
- * support method for an action.
- */
-public interface ActionDefaultsFacet extends Facet {
-
-    public abstract Object[] getDefaults(ObjectAdapter inObject);
-}
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.facets.Facet;
+
+/**
+ * Obtain defaults for each of the parameters of the action.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to invoking the <tt>defaultsXxx(...)</tt> support method
+ * for an action.
+ */
+public interface ActionDefaultsFacet extends Facet {
+
+    public abstract Object[] getDefaults(ObjectAdapter inObject);
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacet.java Wed Nov  3 01:24:18 2010
@@ -17,21 +17,19 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.actions.defaults;
 
-package org.apache.isis.metamodel.facets.actions.defaults;
-
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
-
-
-/**
- * Obtain defaults for each of the parameters of the action.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to invoking the <tt>defaultsNXxx(...)</tt>
- * support method for an action (where N is the 0-based parameter number).
- */
-public interface ActionParameterDefaultsFacet extends Facet {
-
-    public abstract Object getDefault(ObjectAdapter inObject);
-}
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.facets.Facet;
+
+/**
+ * Obtain defaults for each of the parameters of the action.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to invoking the <tt>defaultsNXxx(...)</tt> support method
+ * for an action (where N is the 0-based parameter number).
+ */
+public interface ActionParameterDefaultsFacet extends Facet {
+
+    public abstract Object getDefault(ObjectAdapter inObject);
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacet.java Wed Nov  3 01:24:18 2010
@@ -17,37 +17,34 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.actions.executed;
 
-package org.apache.isis.metamodel.facets.actions.executed;
-
-import org.apache.isis.metamodel.facets.EnumerationAbstract;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.spec.Target;
-
-
-/**
- * Whether the action should be invoked locally, remotely, or on the default location depending on its
- * persistence state.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to annotating the action method using
- * <tt>@Executed</tt>.
- */
-public interface ExecutedFacet extends Facet {
-
-    public static final class Where extends EnumerationAbstract {
-
-        public static Where DEFAULT = new Where(0, "DEFAULT", "Default");
-        public static Where LOCALLY = new Where(1, "LOCAL", "Locally");
-        public static Where REMOTELY = new Where(2, "REMOTE", "Remotely");
-
-        private Where(final int num, final String nameInCode, final String friendlyName) {
-            super(num, nameInCode, friendlyName);
-        }
-
-    }
-
-    public Where value();
-
-    public Target getTarget();
-}
+import org.apache.isis.metamodel.facets.EnumerationAbstract;
+import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.metamodel.spec.Target;
+
+/**
+ * Whether the action should be invoked locally, remotely, or on the default location depending on its persistence
+ * state.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to annotating the action method using <tt>@Executed</tt>.
+ */
+public interface ExecutedFacet extends Facet {
+
+    public static final class Where extends EnumerationAbstract {
+
+        public static Where DEFAULT = new Where(0, "DEFAULT", "Default");
+        public static Where LOCALLY = new Where(1, "LOCAL", "Locally");
+        public static Where REMOTELY = new Where(2, "REMOTE", "Remotely");
+
+        private Where(final int num, final String nameInCode, final String friendlyName) {
+            super(num, nameInCode, friendlyName);
+        }
+
+    }
+
+    public Where value();
+
+    public Target getTarget();
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationFacet.java Wed Nov  3 01:24:18 2010
@@ -17,19 +17,17 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.actions.exploration;
 
-package org.apache.isis.metamodel.facets.actions.exploration;
-
-import org.apache.isis.metamodel.facets.Facet;
-
-
-/**
- * Indicates that the action should only be available in a special <i>exploration</i> mode.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to annotating the action method using
- * <tt>@Exploration</tt>.
- */
-public interface ExplorationFacet extends Facet {
-
-}
+import org.apache.isis.metamodel.facets.Facet;
+
+/**
+ * Indicates that the action should only be available in a special <i>exploration</i> mode.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to annotating the action method using
+ * <tt>@Exploration</tt>.
+ */
+public interface ExplorationFacet extends Facet {
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacet.java Wed Nov  3 01:24:18 2010
@@ -29,7 +29,7 @@ import org.apache.isis.metamodel.spec.Ob
  * Represents the mechanism by which the action should be invoked.
  * 
  * <p>
- * In the standard [[NAME]] Programming Model, corresponds to invoking the actual action method itself (a
+ * In the standard Apache Isis Programming Model, corresponds to invoking the actual action method itself (a
  * <tt>public</tt> method that does not represent a property, a collection or any of the supporting methods).
  */
 public interface ActionInvocationFacet extends Facet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/notcontributed/NotContributedFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/notcontributed/NotContributedFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/notcontributed/NotContributedFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/notcontributed/NotContributedFacet.java Wed Nov  3 01:24:18 2010
@@ -17,19 +17,17 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.actions.notcontributed;
 
-package org.apache.isis.metamodel.facets.actions.notcontributed;
-
-import org.apache.isis.metamodel.facets.Facet;
-
-
-/**
- * Indicates that the (repository) action should not be contributed to any objects.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to annotating the action method using
- * <tt>@NotContributed</tt>.
- */
-public interface NotContributedFacet extends Facet {
-
-}
+import org.apache.isis.metamodel.facets.Facet;
+
+/**
+ * Indicates that the (repository) action should not be contributed to any objects.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to annotating the action method using
+ * <tt>@NotContributed</tt>.
+ */
+public interface NotContributedFacet extends Facet {
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuFacet.java Wed Nov  3 01:24:18 2010
@@ -17,19 +17,17 @@
  *  under the License.
  */
 
+package org.apache.isis.metamodel.facets.actions.notinrepositorymenu;
 
-package org.apache.isis.metamodel.facets.actions.notinrepositorymenu;
-
-import org.apache.isis.metamodel.facets.Facet;
-
-
-/**
- * Indicates that the (repository) action should not be contributed to any objects.
- * 
- * <p>
- * In the standard [[NAME]] Programming Model, corresponds to annotating the action method using
- * <tt>@NotContributed</tt>.
- */
-public interface NotInRepositoryMenuFacet extends Facet {
-
-}
+import org.apache.isis.metamodel.facets.Facet;
+
+/**
+ * Indicates that the (repository) action should not be contributed to any objects.
+ * 
+ * <p>
+ * In the standard Apache Isis Programming Model, corresponds to annotating the action method using
+ * <tt>@NotContributed</tt>.
+ */
+public interface NotInRepositoryMenuFacet extends Facet {
+
+}

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacet.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacet.java Wed Nov  3 01:24:18 2010
@@ -27,7 +27,7 @@ import org.apache.isis.metamodel.facets.
  * Indicates that the action should only be available in a special <i>prototype</i> mode.
  * 
  * <p>
- * In the standard [[NAME]] Programming Model, corresponds to annotating the action method using
+ * In the standard Apache Isis Programming Model, corresponds to annotating the action method using
  * <tt>@Prototype</tt>.
  */
 public interface PrototypeFacet extends Facet {