isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1049995 [2/5] - in /incubator/isis/trunk/applib/src: main/java/org/apache/isis/applib/ main/java/org/apache/isis/applib/adapters/ main/java/org/apache/isis/applib/annotation/ main/java/org/apache/isis/applib/clock/ main/java/org/apache/isi...
Date Thu, 16 Dec 2010 14:55:56 GMT
Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/ActionOrder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/ActionOrder.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/ActionOrder.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/ActionOrder.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,14 +25,12 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * Indicates the order that actions should be grouped/displayed in.
  */
 @Inherited
-@Target( { ElementType.TYPE })
+@Target({ ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ActionOrder {
     String value();
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Aggregated.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Aggregated.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Aggregated.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Aggregated.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,10 +25,9 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
- * Indicates that the class is part of (aggregated within) a larger class, which may reference objects outside
- * the aggregate but may not be referenced by objects other than within the aggregate.
+ * Indicates that the class is part of (aggregated within) a larger class, which may reference objects outside the
+ * aggregate but may not be referenced by objects other than within the aggregate.
  * 
  * <p>
  * This is/should be interpreted by viewers as meaning that references to the object may not be shared between
@@ -39,7 +37,7 @@ import java.lang.annotation.Target;
  * @see Value
  */
 @Inherited
-@Target( { ElementType.TYPE })
+@Target({ ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
-public @interface Aggregated {}
-
+public @interface Aggregated {
+}

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Bounded.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Bounded.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Bounded.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Bounded.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,12 +25,11 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * Indicates that the class has a bounded, or finite, set of instances.
  */
 @Inherited
-@Target( { ElementType.TYPE })
+@Target({ ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
-public @interface Bounded {}
-
+public @interface Bounded {
+}

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Debug.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Debug.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Debug.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Debug.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,12 +25,11 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * Indicates the an action should be only available for debugging.
  */
 @Inherited
-@Target( { ElementType.METHOD })
+@Target({ ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
-public @interface Debug {}
-
+public @interface Debug {
+}

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Defaulted.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Defaulted.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Defaulted.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Defaulted.java Thu Dec 16 14:55:52 2010
@@ -17,60 +17,56 @@
  *  under the License.
  */
 
+package org.apache.isis.applib.annotation;
 
-package org.apache.isis.applib.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.apache.isis.applib.adapters.DefaultsProvider;
-
-
-/**
- * Indicates that the class should have a default, by providing a link to a {@link DefaultsProvider}, or some
- * externally-configured mechanism.
- * 
- * <p>
- * This possibly seems a little tortuous. The more obvious means to provide a default would seem to be a
- * simple <tt>@DefaultsTo(new SomeObject())</tt>. However, Java only allows primitives, strings and class literals to
- *                 be used in annotations. We therefore need delegate to an external implementation. (This
- *                 more complex design is also more flexible of course; the implementation of
- *                 {@link DefaultsProvider} could adjust the default it provides according to circumstance,
- *                 for example).
- * 
- * @see Encodable
- * @see Parseable
- * @see Value
- */
-@Inherited
-@Target( { ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Defaulted {
-
-    /**
-     * The fully qualified name of a class that implements the {@link DefaultsProvider} interface.
-     * 
-     * <p>
-     * This is optional because some implementations may pick up the defaults provider via a configuration
-     * file, or via the equivalent {@link #defaultsProviderClass()}.
-     * 
-     * <p>
-     * Implementation note: the default value provided here is simply an empty string because <tt>null</tt>
-     * is not a valid default.
-     */
-    String defaultsProviderName() default "";
-
-    /**
-     * As per {@link #defaultsProviderName()}, but specifying a class literal rather than a fully qualified
-     * class name.
-     * 
-     * <p>
-     * Implementation note: the default value provided here is simply the {@link Defaulted}'s own class,
-     * because <tt>null</tt> is not a valid default.
-     */
-    Class<?> defaultsProviderClass() default Defaulted.class;
-
-}
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apache.isis.applib.adapters.DefaultsProvider;
+
+/**
+ * Indicates that the class should have a default, by providing a link to a {@link DefaultsProvider}, or some
+ * externally-configured mechanism.
+ * 
+ * <p>
+ * This possibly seems a little tortuous. The more obvious means to provide a default would seem to be a simple
+ * <tt>@DefaultsTo(new SomeObject())</tt>. However, Java only allows primitives, strings and class literals to be used
+ * in annotations. We therefore need delegate to an external implementation. (This more complex design is also more
+ * flexible of course; the implementation of {@link DefaultsProvider} could adjust the default it provides according to
+ * circumstance, for example).
+ * 
+ * @see Encodable
+ * @see Parseable
+ * @see Value
+ */
+@Inherited
+@Target({ ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Defaulted {
+
+    /**
+     * The fully qualified name of a class that implements the {@link DefaultsProvider} interface.
+     * 
+     * <p>
+     * This is optional because some implementations may pick up the defaults provider via a configuration file, or via
+     * the equivalent {@link #defaultsProviderClass()}.
+     * 
+     * <p>
+     * Implementation note: the default value provided here is simply an empty string because <tt>null</tt> is not a
+     * valid default.
+     */
+    String defaultsProviderName() default "";
+
+    /**
+     * As per {@link #defaultsProviderName()}, but specifying a class literal rather than a fully qualified class name.
+     * 
+     * <p>
+     * Implementation note: the default value provided here is simply the {@link Defaulted}'s own class, because
+     * <tt>null</tt> is not a valid default.
+     */
+    Class<?> defaultsProviderClass() default Defaulted.class;
+
+}

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/DescribedAs.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/DescribedAs.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/DescribedAs.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/DescribedAs.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,14 +25,12 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * Description of a property/action.
  */
 @Inherited
-@Target( { ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER })
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface DescribedAs {
     String value();
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Disabled.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Disabled.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Disabled.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Disabled.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,14 +25,12 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * Indicates that a property/action is to be always unavailable to the user.
  */
 @Inherited
-@Target( { ElementType.METHOD })
+@Target({ ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Disabled {
     When value() default When.ALWAYS;
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Encodable.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Encodable.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Encodable.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Encodable.java Thu Dec 16 14:55:52 2010
@@ -17,59 +17,56 @@
  *  under the License.
  */
 
+package org.apache.isis.applib.annotation;
 
-package org.apache.isis.applib.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.apache.isis.applib.adapters.EncoderDecoder;
-
-
-/**
- * Indicates that the class can be encoded or decoded either by delegating to an {@link EncoderDecoder} or
- * through some externally-configured mechanism.
- * 
- * @see Defaulted
- * @see Parseable
- * @see Value
- */
-@Inherited
-@Target( { ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Encodable {
-
-    /**
-     * The fully qualified name of a class that implements the {@link EncoderDecoder} interface.
-     * 
-     * <p>
-     * This is optional because some implementations may pick up encodeability via a configuration file, or
-     * via the equivalent {@link #encoderDecoderClass()}.
-     * 
-     * <p>
-     * It is common for value classes to act as their own encoder/decoders. Note that the framework requires
-     * that the nominated class provides a <tt>public</tt> no-arg constructor on the class. It instantiates
-     * an instance in order to do the encoding or decoding, uses the result and discards the instantiated
-     * object. What that means in particular is that a self-encoding class shouldn't encode its own state, it
-     * should encode the state of the object passed to it.
-     * 
-     * <p>
-     * Implementation note: the default value provided here is simply an empty string because <tt>null</tt>
-     * is not a valid default.
-     */
-    String encoderDecoderName() default "";
-
-    /**
-     * As per {@link #encoderDecoderName()}, but specifying a class literal rather than a fully qualified
-     * class name.
-     * 
-     * <p>
-     * Implementation note: the default value provided here is simply the {@link Encodable}'s own class,
-     * because <tt>null</tt> is not a valid default.
-     */
-    Class<?> encoderDecoderClass() default Encodable.class;
-
-}
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apache.isis.applib.adapters.EncoderDecoder;
+
+/**
+ * Indicates that the class can be encoded or decoded either by delegating to an {@link EncoderDecoder} or through some
+ * externally-configured mechanism.
+ * 
+ * @see Defaulted
+ * @see Parseable
+ * @see Value
+ */
+@Inherited
+@Target({ ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Encodable {
+
+    /**
+     * The fully qualified name of a class that implements the {@link EncoderDecoder} interface.
+     * 
+     * <p>
+     * This is optional because some implementations may pick up encodeability via a configuration file, or via the
+     * equivalent {@link #encoderDecoderClass()}.
+     * 
+     * <p>
+     * It is common for value classes to act as their own encoder/decoders. Note that the framework requires that the
+     * nominated class provides a <tt>public</tt> no-arg constructor on the class. It instantiates an instance in order
+     * to do the encoding or decoding, uses the result and discards the instantiated object. What that means in
+     * particular is that a self-encoding class shouldn't encode its own state, it should encode the state of the object
+     * passed to it.
+     * 
+     * <p>
+     * Implementation note: the default value provided here is simply an empty string because <tt>null</tt> is not a
+     * valid default.
+     */
+    String encoderDecoderName() default "";
+
+    /**
+     * As per {@link #encoderDecoderName()}, but specifying a class literal rather than a fully qualified class name.
+     * 
+     * <p>
+     * Implementation note: the default value provided here is simply the {@link Encodable}'s own class, because
+     * <tt>null</tt> is not a valid default.
+     */
+    Class<?> encoderDecoderClass() default Encodable.class;
+
+}

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/EqualByContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/EqualByContent.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/EqualByContent.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/EqualByContent.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -29,34 +28,30 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.HashMap;
 
-
 /**
- * Indicates that the class follows the equal-by-content contract, usually associated with {@link Value value}
- * types.
+ * Indicates that the class follows the equal-by-content contract, usually associated with {@link Value value} types.
  * 
  * <p>
- * If a class claims to be equal-by-content then its {@link #equals(Object)} should return <tt>true</tt> if
- * its content (as opposed to identity) is the same. For example, {@link String}, {@link BigDecimal} and
- * {@link Date} follow this contract.
+ * If a class claims to be equal-by-content then its {@link #equals(Object)} should return <tt>true</tt> if its content
+ * (as opposed to identity) is the same. For example, {@link String}, {@link BigDecimal} and {@link Date} follow this
+ * contract.
  * 
  * <p>
- * Note also that the Java Language Specification requires that two objects that are
- * {@link #equals(Object) equal} must return the same value from {@link #hashCode()}. Failure to do this
- * means that that the object will not behave correctly when used as a key into a hashing structure (eg a
- * {@link HashMap}).
+ * Note also that the Java Language Specification requires that two objects that are {@link #equals(Object) equal} must
+ * return the same value from {@link #hashCode()}. Failure to do this means that that the object will not behave
+ * correctly when used as a key into a hashing structure (eg a {@link HashMap}).
  * 
  * <p>
- * By default any {@link Value value} types are assumed to follow the equal-by-content rule, though this can
- * be overridden if required. Value types are usually also {@link Immutable immutable} (though there are some
- * classic exceptions to this, such as {@link Date}).
+ * By default any {@link Value value} types are assumed to follow the equal-by-content rule, though this can be
+ * overridden if required. Value types are usually also {@link Immutable immutable} (though there are some classic
+ * exceptions to this, such as {@link Date}).
  * 
  * @see Immutable
  * @see Value
  */
 @Inherited
-@Target( { ElementType.TYPE, ElementType.METHOD })
+@Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface EqualByContent {
     When value() default When.ALWAYS;
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Executed.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Executed.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Executed.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Executed.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,14 +25,13 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * <pre>
  * e.g @Executed(Executed.Where.LOCALLY)
  * </pre>
  */
 @Inherited
-@Target( { ElementType.METHOD })
+@Target({ ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Executed {
 
@@ -43,4 +41,3 @@ public @interface Executed {
 
     Where value();
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Exploration.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Exploration.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Exploration.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Exploration.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,12 +25,11 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * Indicates the an action should be only available in exploration mode
  */
 @Inherited
-@Target( { ElementType.METHOD })
+@Target({ ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
-public @interface Exploration {}
-
+public @interface Exploration {
+}

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Facets.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Facets.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Facets.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Facets.java Thu Dec 16 14:55:52 2010
@@ -17,44 +17,42 @@
  *  under the License.
  */
 
+package org.apache.isis.applib.annotation;
 
-package org.apache.isis.applib.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-/**
- * Indicates that the class has additional facets, and specifies the how to obtain the <tt>FacetFactory</tt>
- * to manufacture them.
- * 
- * <p>
- * At least one named factory (as per {@link #facetFactoryNames()}) or one class factory (as per
- * {@link #facetFactoryClasses()}) should be specified.
- */
-@Inherited
-@Target( { ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Facets {
-    /**
-     * Array of fully qualified names of classes each implementing
-     * <tt>org.apache.isis.metamodel.facets.FacetFactory</tt>.
-     * 
-     * <p>
-     * Either the array provided by this method or by {@link #facetFactoryClasses()} should be non-empty.
-     */
-    String[] facetFactoryNames() default {};
-
-    /**
-     * Array of {@link Class}s, each indicating a class implementing
-     * <tt>org.apache.isis.metamodel.facets.FacetFactory</tt>.
-     * 
-     * <p>
-     * Either the array provided by this method or by {@link #facetFactoryNames()} should be non-empty.
-     */
-    Class<?>[] facetFactoryClasses() default {};
-
-}
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that the class has additional facets, and specifies the how to obtain the <tt>FacetFactory</tt> to
+ * manufacture them.
+ * 
+ * <p>
+ * At least one named factory (as per {@link #facetFactoryNames()}) or one class factory (as per
+ * {@link #facetFactoryClasses()}) should be specified.
+ */
+@Inherited
+@Target({ ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Facets {
+    /**
+     * Array of fully qualified names of classes each implementing
+     * <tt>org.apache.isis.metamodel.facets.FacetFactory</tt>.
+     * 
+     * <p>
+     * Either the array provided by this method or by {@link #facetFactoryClasses()} should be non-empty.
+     */
+    String[] facetFactoryNames() default {};
+
+    /**
+     * Array of {@link Class}s, each indicating a class implementing
+     * <tt>org.apache.isis.metamodel.facets.FacetFactory</tt>.
+     * 
+     * <p>
+     * Either the array provided by this method or by {@link #facetFactoryNames()} should be non-empty.
+     */
+    Class<?>[] facetFactoryClasses() default {};
+
+}

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/FieldOrder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/FieldOrder.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/FieldOrder.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/FieldOrder.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,14 +25,12 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * Indicates the order that properties should be displayed in.
  */
 @Inherited
-@Target( { ElementType.TYPE })
+@Target({ ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface FieldOrder {
     String value();
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Hidden.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Hidden.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Hidden.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Hidden.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,7 +25,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * Indicates that a property, collection or action is to be hidden from the user.
  * 
@@ -34,9 +32,8 @@ import java.lang.annotation.Target;
  * For a repository action, is equivalent to {@link NotContributed} and also {@link NotInServiceMenu}.
  */
 @Inherited
-@Target( { ElementType.TYPE, ElementType.METHOD })
+@Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Hidden {
     When value() default When.ALWAYS;
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Ignore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Ignore.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Ignore.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Ignore.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,18 +25,16 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * Indicates that an property, collection or action should be ignored from the metamodel.
  * 
  * <p>
- * For example, it may be a helper method that needs to be <tt>public</tt> but that doesn't conform to the
- * requirements of an action (for example, invalid parameter types).
+ * For example, it may be a helper method that needs to be <tt>public</tt> but that doesn't conform to the requirements
+ * of an action (for example, invalid parameter types).
  */
 @Inherited
-@Target( { ElementType.METHOD })
+@Target({ ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Ignore {
 
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Immutable.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Immutable.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Immutable.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Immutable.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,26 +25,24 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * Indicates that an instance cannot be changed.
  * 
  * <p>
- * To make something always immutable used the form <tt>@Immutable</tt>. To make something immutable only once persisted use the form
- *            <tt>@Immutable(Immutable.ONCE_PERSISTED)</tt>.
+ * To make something always immutable used the form <tt>@Immutable</tt>. To make something immutable only once persisted
+ * use the form <tt>@Immutable(Immutable.ONCE_PERSISTED)</tt>.
  * 
  * <p>
- * By default any {@link Value value} types are assumed to be immutable, though this can be overridden if
- * required. Immutable objects that are acting as a value type should almost certainly also follow the
- * {@link EqualByContent equal-by-content} contract.
+ * By default any {@link Value value} types are assumed to be immutable, though this can be overridden if required.
+ * Immutable objects that are acting as a value type should almost certainly also follow the {@link EqualByContent
+ * equal-by-content} contract.
  * 
  * @see Value
  * @see EqualByContent
  */
 @Inherited
-@Target( { ElementType.TYPE })
+@Target({ ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Immutable {
     When value() default When.ALWAYS;
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Mask.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Mask.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Mask.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Mask.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,15 +25,14 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * Provides a mask that a value entry should conform to
  * 
  * A mask to apply to string attributes.
  * 
  * <p>
- * The characters that can be used are shown in the following table (adapted from masks used by Swing's
- * MaskFormatter, Java's SimpleDateFormat and also Microsoft's MaskedEdit control): 
+ * The characters that can be used are shown in the following table (adapted from masks used by Swing's MaskFormatter,
+ * Java's SimpleDateFormat and also Microsoft's MaskedEdit control):
  * 
  * <table border='2'>
  * <tr>
@@ -49,14 +47,14 @@ import java.lang.annotation.Target;
  * </tr>
  * <tr>
  * <td align='center'>.</td>
- * <td align='left'>Decimal placeholder. The actual character used is the one specified as the decimal
- * placeholder in your international settings. This character is treated as a literal for masking purposes.</td>
+ * <td align='left'>Decimal placeholder. The actual character used is the one specified as the decimal placeholder in
+ * your international settings. This character is treated as a literal for masking purposes.</td>
  * <td align='left'>MS</td>
  * </tr>
  * <tr>
  * <td align='center'>,</td>
- * <td align='left'>Thousands separator. The actual character used is the one specified as the thousands
- * separator in your international settings. This character is treated as a literal for masking purposes.</td>
+ * <td align='left'>Thousands separator. The actual character used is the one specified as the thousands separator in
+ * your international settings. This character is treated as a literal for masking purposes.</td>
  * <td align='left'>MS</td>
  * </tr>
  * <tr>
@@ -71,8 +69,8 @@ import java.lang.annotation.Target;
  * </tr>
  * <tr>
  * <td align='center'>&amp;</td>
- * <td align='left'>Character placeholder. Valid values for this placeholder are ANSI characters in the
- * following ranges: 32-126 and 128-255.</td>
+ * <td align='left'>Character placeholder. Valid values for this placeholder are ANSI characters in the following
+ * ranges: 32-126 and 128-255.</td>
  * <td align='left'>MS</td>
  * </tr>
  * 
@@ -100,14 +98,12 @@ import java.lang.annotation.Target;
  * </tr>
  * <tr>
  * <td align='center'>U</td>
- * <td align='left'>Any character (<code>Character.isLetter</code>). All lowercase letters are mapped to
- * upper case.</td>
+ * <td align='left'>Any character (<code>Character.isLetter</code>). All lowercase letters are mapped to upper case.</td>
  * <td align='left'>Swing</td>
  * </tr>
  * <tr>
  * <td align='center'>L</td>
- * <td align='left'>Any character (<code>Character.isLetter</code>). All lowercase letters are mapped to
- * lower case.</td>
+ * <td align='left'>Any character (<code>Character.isLetter</code>). All lowercase letters are mapped to lower case.</td>
  * <td align='left'>Swing</td>
  * </tr>
  * <tr>
@@ -118,10 +114,12 @@ import java.lang.annotation.Target;
  * </table>
  * 
  * <p>
- * Can also be specified for types that are annotated as <tt>@Value</tt> types. To apply, the value must have string semantics.
+ * Can also be specified for types that are annotated as <tt>@Value</tt> types. To apply, the value must have string
+ * semantics.
  * 
  * <p>
- * Not yet implemented: <table border='2'>
+ * Not yet implemented:
+ * <table border='2'>
  * <tr>
  * <th align='center'>Character</th>
  * <th align='center'>Description</th>
@@ -129,8 +127,8 @@ import java.lang.annotation.Target;
  * </tr>
  * <tr>
  * <td align='center'>\ or '</td>
- * <td align='left'>Treat the next character in the mask string as a literal. This allows you to include the
- * '#', '&', 'A', and '?' characters in the mask. This character is treated as a literal for masking purposes.</td>
+ * <td align='left'>Treat the next character in the mask string as a literal. This allows you to include the '#', '&',
+ * 'A', and '?' characters in the mask. This character is treated as a literal for masking purposes.</td>
  * <td align='left'>MS (\), Swing (')</td>
  * </tr>
  * <tr>
@@ -182,9 +180,8 @@ import java.lang.annotation.Target;
  * 
  */
 @Inherited
-@Target( { ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER })
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Mask {
     String value();
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/MaxLength.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/MaxLength.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/MaxLength.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/MaxLength.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,17 +25,16 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * The maximum entry length of a field.
  * 
  * <p>
- * Can also be specified for types that are annotated as <tt>@Value</tt> types. To apply, the value must have string semantics.
+ * Can also be specified for types that are annotated as <tt>@Value</tt> types. To apply, the value must have string
+ * semantics.
  */
 @Inherited
-@Target( { ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER })
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface MaxLength {
     int value();
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/MemberOrder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/MemberOrder.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/MemberOrder.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/MemberOrder.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,7 +25,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * Indicates the position a method should be placed in.
  */
@@ -45,4 +43,3 @@ public @interface MemberOrder {
      */
     String name() default "";
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/MultiLine.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/MultiLine.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/MultiLine.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/MultiLine.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,23 +25,23 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * Indicates that a string property may have more than one line (ie may contain carriage returns).
  * 
  * <p>
- * In addition you can specify the typical number of lines (defaults to 6) and whether the lines should not be
- * wrapped (by default they will not be wrapped).
+ * In addition you can specify the typical number of lines (defaults to 6) and whether the lines should not be wrapped
+ * (by default they will not be wrapped).
  * 
  * <p>
- * Can also be specified for types that are annotated as <tt>@Value</tt> types. To apply, the value must have string semantics.
+ * Can also be specified for types that are annotated as <tt>@Value</tt> types. To apply, the value must have string
+ * semantics.
  * 
  * <p>
- * Note that if this annotation is applied, then any choices for the property (ie as per a <tt>choicesXxx</tt>
- * method) will be ignored.
+ * Note that if this annotation is applied, then any choices for the property (ie as per a <tt>choicesXxx</tt> method)
+ * will be ignored.
  */
 @Inherited
-@Target( { ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER })
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface MultiLine {
 
@@ -50,4 +49,3 @@ public @interface MultiLine {
 
     boolean preventWrapping() default true;
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/MustSatisfy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/MustSatisfy.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/MustSatisfy.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/MustSatisfy.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -32,7 +31,7 @@ import org.apache.isis.applib.spec.Speci
  * 
  */
 @Inherited
-@Target( { ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE })
+@Target({ ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface MustSatisfy {
     /**
@@ -43,4 +42,3 @@ public @interface MustSatisfy {
      */
     Class<? extends Specification>[] value();
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Named.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Named.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Named.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Named.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,14 +25,12 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * Indicates the name that a property/action should be been known by.
  */
 @Inherited
-@Target( { ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER })
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Named {
     String value();
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/NotContributed.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/NotContributed.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/NotContributed.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/NotContributed.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,19 +25,18 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * Indicates the a (repository) action should be not be contributed.
  * 
  * <p>
- * It may still be appear in the repository menu (unless it has been annotated as {@link NotInServiceMenu}).
- * If {@link Hidden}, then also implies that the menu should not be contributed.
+ * It may still be appear in the repository menu (unless it has been annotated as {@link NotInServiceMenu}). If
+ * {@link Hidden}, then also implies that the menu should not be contributed.
  * 
  * <p>
  * Has no meanings for actions on regular entities.
  */
 @Inherited
-@Target( { ElementType.METHOD })
+@Target({ ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
-public @interface NotContributed {}
-
+public @interface NotContributed {
+}

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/NotInServiceMenu.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/NotInServiceMenu.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/NotInServiceMenu.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/NotInServiceMenu.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,19 +25,18 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * Indicates the a (service) action should be not be displayed in the service menu.
  * 
  * <p>
- * It may still be contributed (unless it has been annotated as {@link NotContributed}).
- * If {@link Hidden}, then also implies that the menu should not appear in the service menu.
+ * It may still be contributed (unless it has been annotated as {@link NotContributed}). If {@link Hidden}, then also
+ * implies that the menu should not appear in the service menu.
  * 
  * <p>
  * Has no meanings for actions on regular entities.
  */
 @Inherited
-@Target( { ElementType.METHOD })
+@Target({ ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
-public @interface NotInServiceMenu {}
-
+public @interface NotInServiceMenu {
+}

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/NotPersistable.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/NotPersistable.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/NotPersistable.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/NotPersistable.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,12 +25,11 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * Indicates that an instance cannot be persisted by a user, but only programmatically.
  */
 @Inherited
-@Target( { ElementType.TYPE })
+@Target({ ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface NotPersistable {
 
@@ -42,4 +40,3 @@ public @interface NotPersistable {
     By value() default By.USER_OR_PROGRAM;
 
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/NotPersisted.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/NotPersisted.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/NotPersisted.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/NotPersisted.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,14 +25,12 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * Indicates that a property should not be persisted.
  */
 @Inherited
-@Target( { ElementType.METHOD })
+@Target({ ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface NotPersisted {
 
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Optional.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Optional.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Optional.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Optional.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,14 +25,12 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * Indicates that a property or parameter is not mandatory.
  */
 @Inherited
-@Target( { ElementType.METHOD, ElementType.PARAMETER })
+@Target({ ElementType.METHOD, ElementType.PARAMETER })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Optional {
 
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Parseable.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Parseable.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Parseable.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Parseable.java Thu Dec 16 14:55:52 2010
@@ -17,52 +17,50 @@
  *  under the License.
  */
 
+package org.apache.isis.applib.annotation;
 
-package org.apache.isis.applib.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.apache.isis.applib.adapters.Parser;
-
-
-/**
- * Indicates that the class can be parsed either by delegating to an {@link Parser} or through some
- * externally-configured mechanism.
- */
-@Inherited
-@Target( { ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Parseable {
-
-    /**
-     * The fully qualified name of a class that implements the {@link Parser} interface.
-     * 
-     * <p>
-     * This is optional because some implementations may pick up parseability via a configuration file either
-     * for the framework itself, or through a viewer-specific configuration of a widget (eg a calendar view
-     * for a date), or indeed through the equivalent {@link #parserClass()}.
-     * 
-     * <p>
-     * It is common for value classes to act as their own parsers. Note that the framework requires that the
-     * nominated class provides a <tt>public</tt> no-arg constructor on the class. It instantiates an
-     * instance in order to do the parsing, uses the result and discards the instantiated object.
-     * 
-     * <p>
-     * Implementation note: the default value provided here is simply the empty string because <tt>null</tt>
-     * is not a valid default.
-     */
-    String parserName() default "";
-
-    /**
-     * As per {@link #parserName()}, but specifying a class literal rather than a fully qualified class name.
-     * 
-     * <p>
-     * Implementation note: the default value provided here is simply the {@link Parseable}'s own class,
-     * because <tt>null</tt> is not a valid default.
-     */
-    Class<?> parserClass() default Parseable.class;
-}
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apache.isis.applib.adapters.Parser;
+
+/**
+ * Indicates that the class can be parsed either by delegating to an {@link Parser} or through some
+ * externally-configured mechanism.
+ */
+@Inherited
+@Target({ ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Parseable {
+
+    /**
+     * The fully qualified name of a class that implements the {@link Parser} interface.
+     * 
+     * <p>
+     * This is optional because some implementations may pick up parseability via a configuration file either for the
+     * framework itself, or through a viewer-specific configuration of a widget (eg a calendar view for a date), or
+     * indeed through the equivalent {@link #parserClass()}.
+     * 
+     * <p>
+     * It is common for value classes to act as their own parsers. Note that the framework requires that the nominated
+     * class provides a <tt>public</tt> no-arg constructor on the class. It instantiates an instance in order to do the
+     * parsing, uses the result and discards the instantiated object.
+     * 
+     * <p>
+     * Implementation note: the default value provided here is simply the empty string because <tt>null</tt> is not a
+     * valid default.
+     */
+    String parserName() default "";
+
+    /**
+     * As per {@link #parserName()}, but specifying a class literal rather than a fully qualified class name.
+     * 
+     * <p>
+     * Implementation note: the default value provided here is simply the {@link Parseable}'s own class, because
+     * <tt>null</tt> is not a valid default.
+     */
+    Class<?> parserClass() default Parseable.class;
+}

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Plural.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Plural.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Plural.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Plural.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,14 +25,12 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * The plural name of the class.
  */
 @Inherited
-@Target( { ElementType.TYPE })
+@Target({ ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Plural {
     String value();
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Prototype.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Prototype.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Prototype.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Prototype.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,12 +25,11 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * Indicates the an action should be only available in prototype mode
  */
 @Inherited
-@Target( { ElementType.METHOD })
+@Target({ ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
-public @interface Prototype {}
-
+public @interface Prototype {
+}

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/RegEx.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/RegEx.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/RegEx.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/RegEx.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,15 +25,15 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 /**
  * Provides a regular expression that a value entry should conform to, and can be formatted as.
  * 
  * <p>
- * Can also be specified for types that are annotated as <tt>@Value</tt> types. To apply, the value must have string semantics.
+ * Can also be specified for types that are annotated as <tt>@Value</tt> types. To apply, the value must have string
+ * semantics.
  */
 @Inherited
-@Target( { ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER })
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface RegEx {
     String validation();
@@ -43,4 +42,3 @@ public @interface RegEx {
 
     boolean caseSensitive() default true;
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/TypeOf.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/TypeOf.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/TypeOf.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/TypeOf.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -26,11 +25,9 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 @Inherited
-@Target( { ElementType.METHOD })
+@Target({ ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface TypeOf {
     Class<?> value();
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/TypicalLength.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/TypicalLength.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/TypicalLength.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/TypicalLength.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 import java.lang.annotation.ElementType;
@@ -28,16 +27,14 @@ import java.lang.annotation.Target;
 
 import org.apache.isis.applib.adapters.Parser;
 
-
 /**
  * The typical entry length of a field, use to determine the optimum width for display
  * 
  * @see Parser
  */
 @Inherited
-@Target( { ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE })
+@Target({ ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface TypicalLength {
     int value();
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Value.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Value.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Value.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/Value.java Thu Dec 16 14:55:52 2010
@@ -17,78 +17,73 @@
  *  under the License.
  */
 
+package org.apache.isis.applib.annotation;
 
-package org.apache.isis.applib.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.apache.isis.applib.adapters.EncoderDecoder;
-import org.apache.isis.applib.adapters.ValueSemanticsProvider;
-
-
-/**
- * Indicates that the class has value semantics.
- * 
- * <p>
- * By &quot;value semantics&quot; all we actually mean that the class is {@link Aggregated} and so therefore
- * (conceptually) is not shared between instances of classes. However, values very often have other semantics,
- * and so this annotation allows these to also be specified:
- * <li> it may be parseable (as per {@link Parseable})</li>
- * <li> it may be encodeable (as per {@link Encodable})</li>
- * <li> it may be immutable (as per {@link Immutable}), and by default is presumed that it is</li>
- * <li> it may follow the equal-by-content contract (as per {@link EqualByContent}), and by default is
- * presumed that it does.</i>
- * </ul>
- * 
- * <p>
- * Note also that though a value is conceptually not shared, if it is also {@link Immutable immutable} then it
- * is in fact safe to share objects (as in the flyweight pattern). In addition, the {@link EqualByContent}
- * semantic means that we needn't care whether value types are being shared or not.
- * 
- * @see Aggregated
- * @see Parseable
- * @see Encodable
- * @see Immutable
- * @see EqualByContent
- */
-@Inherited
-@Target( { ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Value {
-
-    /**
-     * The fully qualified name of a class that implements the {@link ValueSemanticsProvider} interface.
-     * 
-     * <p>
-     * This is optional because some implementations may pick up encodeability via a configuration file, or
-     * via the equivalent {@link #semanticsProviderClass()}.
-     * 
-     * <p>
-     * It is possible for value classes to act as their own semantics providers, and may in particular
-     * implement the {@link EncoderDecoder} interface. The framework requires that the nominated class
-     * provides a <tt>public</tt> no-arg constructor on the class, and will instantiates an instance of the
-     * class to interact with it. In the case of encoding, the framework uses the result of discards the
-     * instantiated object. What that means in particular is that a self-encoding class shouldn't encode its
-     * own state, it should encode the state of the object passed to it.
-     * 
-     * <p>
-     * Implementation note: the default value provided here is simply an empty string because <tt>null</tt>
-     * is not a valid default.
-     */
-    String semanticsProviderName() default "";
-
-    /**
-     * As per {@link #semanticsProviderName()}, but specifying a class literal rather than a fully qualified
-     * class name.
-     * 
-     * <p>
-     * Implementation note: the default value provided here is simply the {@link Value}'s own class, because
-     * <tt>null</tt> is not a valid default.
-     */
-    Class<?> semanticsProviderClass() default Value.class;
-
-}
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apache.isis.applib.adapters.EncoderDecoder;
+import org.apache.isis.applib.adapters.ValueSemanticsProvider;
+
+/**
+ * Indicates that the class has value semantics.
+ * 
+ * <p>
+ * By &quot;value semantics&quot; all we actually mean that the class is {@link Aggregated} and so therefore
+ * (conceptually) is not shared between instances of classes. However, values very often have other semantics, and so
+ * this annotation allows these to also be specified:
+ * <li>it may be parseable (as per {@link Parseable})</li>
+ * <li>it may be encodeable (as per {@link Encodable})</li>
+ * <li>it may be immutable (as per {@link Immutable}), and by default is presumed that it is</li>
+ * <li>it may follow the equal-by-content contract (as per {@link EqualByContent}), and by default is presumed that it
+ * does.</i> </ul>
+ * 
+ * <p>
+ * Note also that though a value is conceptually not shared, if it is also {@link Immutable immutable} then it is in
+ * fact safe to share objects (as in the flyweight pattern). In addition, the {@link EqualByContent} semantic means that
+ * we needn't care whether value types are being shared or not.
+ * 
+ * @see Aggregated
+ * @see Parseable
+ * @see Encodable
+ * @see Immutable
+ * @see EqualByContent
+ */
+@Inherited
+@Target({ ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Value {
+
+    /**
+     * The fully qualified name of a class that implements the {@link ValueSemanticsProvider} interface.
+     * 
+     * <p>
+     * This is optional because some implementations may pick up encodeability via a configuration file, or via the
+     * equivalent {@link #semanticsProviderClass()}.
+     * 
+     * <p>
+     * It is possible for value classes to act as their own semantics providers, and may in particular implement the
+     * {@link EncoderDecoder} interface. The framework requires that the nominated class provides a <tt>public</tt>
+     * no-arg constructor on the class, and will instantiates an instance of the class to interact with it. In the case
+     * of encoding, the framework uses the result of discards the instantiated object. What that means in particular is
+     * that a self-encoding class shouldn't encode its own state, it should encode the state of the object passed to it.
+     * 
+     * <p>
+     * Implementation note: the default value provided here is simply an empty string because <tt>null</tt> is not a
+     * valid default.
+     */
+    String semanticsProviderName() default "";
+
+    /**
+     * As per {@link #semanticsProviderName()}, but specifying a class literal rather than a fully qualified class name.
+     * 
+     * <p>
+     * Implementation note: the default value provided here is simply the {@link Value}'s own class, because
+     * <tt>null</tt> is not a valid default.
+     */
+    Class<?> semanticsProviderClass() default Value.class;
+
+}

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/When.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/When.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/When.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/annotation/When.java Thu Dec 16 14:55:52 2010
@@ -17,10 +17,8 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.annotation;
 
 public enum When {
     ALWAYS, ONCE_PERSISTED, UNTIL_PERSISTED, NEVER
 }
-

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/clock/Clock.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/clock/Clock.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/clock/Clock.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/clock/Clock.java Thu Dec 16 14:55:52 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.applib.clock;
 
 import java.util.Calendar;
@@ -26,20 +25,18 @@ import java.util.Date;
 import org.apache.isis.applib.ApplicationException;
 import org.apache.isis.applib.fixtures.FixtureClock;
 
-
 /**
  * Provides a mechanism to get (and possible to set) the current time.
  * 
  * <p>
- * The clock is used primarily by the temporal value classes, and is accessed by the NOF as a singleton. The
- * actual implementation used can be configured at startup, but once specified the clock instance cannot be
- * changed.
+ * The clock is used primarily by the temporal value classes, and is accessed by the NOF as a singleton. The actual
+ * implementation used can be configured at startup, but once specified the clock instance cannot be changed.
  * 
  * <p>
- * Unless another {@link Clock} implementation has been installed, the first call to {@link #getInstance()}
- * will instantiate an implementation that just uses the system's own clock. Alternate implementations can be 
- * created via suitable subclasses, but this must be done <b><i>before</i></b> the first call to {@link #getInstance()}.
- * See for example {@link FixtureClock#getInstance()}.
+ * Unless another {@link Clock} implementation has been installed, the first call to {@link #getInstance()} will
+ * instantiate an implementation that just uses the system's own clock. Alternate implementations can be created via
+ * suitable subclasses, but this must be done <b><i>before</i></b> the first call to {@link #getInstance()}. See for
+ * example {@link FixtureClock#getInstance()}.
  */
 public abstract class Clock {
     private static Clock instance;
@@ -49,9 +46,8 @@ public abstract class Clock {
      * Returns the (singleton) instance of {@link Clock}.
      * 
      * <p>
-     * Unless it has been otherwise created, will lazily instantiate an
-     * implementation that just delegate to the computer's own system clock
-     * (as per {@link System#currentTimeMillis()}.
+     * Unless it has been otherwise created, will lazily instantiate an implementation that just delegate to the
+     * computer's own system clock (as per {@link System#currentTimeMillis()}.
      * 
      * @return
      */
@@ -66,50 +62,50 @@ public abstract class Clock {
     /**
      * Whether has been initialized or not.
      */
-	public static boolean isInitialized() {
-		return instance != null;
-	}
-
-	/**
-	 * The time as the number of millseconds since the epoch.
-	 * 
-	 * @see Date#getTime()
-	 */
+    public static boolean isInitialized() {
+        return instance != null;
+    }
+
+    /**
+     * The time as the number of millseconds since the epoch.
+     * 
+     * @see Date#getTime()
+     */
     public static long getTime() {
         return getInstance().time();
     }
 
     /**
-     * Convenience method returning the current {@link #getTime() time}
-     * according to this Clock as a mutable {@link Calendar}.
+     * Convenience method returning the current {@link #getTime() time} according to this Clock as a mutable
+     * {@link Calendar}.
      */
     public static Calendar getTimeAsCalendar() {
         return getInstance().timeAsCalendar();
     }
 
     /**
-     * Convenience method returning the current {@link #getTime() time}
-     * according to this Clock as a (nominally im)mutable {@link Date}.
+     * Convenience method returning the current {@link #getTime() time} according to this Clock as a (nominally
+     * im)mutable {@link Date}.
      */
     public static Date getTimeAsDate() {
         return new Date(getTime());
     }
 
-	private static void ensureReplaceable() {
-		if (!isReplaceable && instance != null) {
+    private static void ensureReplaceable() {
+        if (!isReplaceable && instance != null) {
             throw new ApplicationException("Clock already set up");
         }
-	}
+    }
 
-	/**
-	 * Allows subclasses to remove their implementation.
-	 * 
-	 * @return whether a clock was removed.
-	 */
-    protected static boolean remove()  {
+    /**
+     * Allows subclasses to remove their implementation.
+     * 
+     * @return whether a clock was removed.
+     */
+    protected static boolean remove() {
         ensureReplaceable();
-        if(instance == null) {
-        	return false;
+        if (instance == null) {
+            return false;
         }
         instance = null;
         return true;
@@ -120,22 +116,20 @@ public abstract class Clock {
         instance = this;
     }
 
-	public final Calendar timeAsCalendar() {
-		Calendar cal = Calendar.getInstance();
+    public final Calendar timeAsCalendar() {
+        final Calendar cal = Calendar.getInstance();
         cal.setTimeInMillis(Clock.getTime());
-		return cal;
-	}
+        return cal;
+    }
 
     /**
      * The current time since midnight, January 1, 1970 UTC.
      * 
      * <p>
-     * Measured in milliseconds, modeled after (and possibly implemented by)
-     * {@link System#currentTimeMillis()}.
+     * Measured in milliseconds, modeled after (and possibly implemented by) {@link System#currentTimeMillis()}.
      */
     protected abstract long time();
 
-
 }
 
 final class SystemClock extends Clock {

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/AccessEvent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/AccessEvent.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/AccessEvent.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/AccessEvent.java Thu Dec 16 14:55:52 2010
@@ -17,33 +17,31 @@
  *  under the License.
  */
 
+package org.apache.isis.applib.events;
+
+import org.apache.isis.applib.Identifier;
+
+/**
+ * Represents an access (reading) of a property, collection or title.
+ * 
+ * <p>
+ * Analogous to {@link ValidityEvent} (which corresponds to modifying a property or collection etc), however the
+ * {@link #getReason()} will always be <tt>null</tt>. (If access is not allowed then a vetoing {@link VisibilityEvent}
+ * would have been fired).
+ * 
+ * @see UsabilityEvent
+ * @see VisibilityEvent
+ * @see ValidityEvent
+ */
+public abstract class AccessEvent extends InteractionEvent {
 
-package org.apache.isis.applib.events;
-
-import org.apache.isis.applib.Identifier;
-
-
-/**
- * Represents an access (reading) of a property, collection or title.
- * 
- * <p>
- * Analogous to {@link ValidityEvent} (which corresponds to modifying a property or collection etc), however
- * the {@link #getReason()} will always be <tt>null</tt>. (If access is not allowed then a vetoing
- * {@link VisibilityEvent} would have been fired).
- * 
- * @see UsabilityEvent
- * @see VisibilityEvent
- * @see ValidityEvent
- */
-public abstract class AccessEvent extends InteractionEvent {
-
     /**
      * 
-     */
-    private static final long serialVersionUID = 1L;
-
-    public AccessEvent(final Object source, final Identifier identifier) {
-        super(source, identifier);
-    }
-
-}
+     */
+    private static final long serialVersionUID = 1L;
+
+    public AccessEvent(final Object source, final Identifier identifier) {
+        super(source, identifier);
+    }
+
+}

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentEvent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentEvent.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentEvent.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentEvent.java Thu Dec 16 14:55:52 2010
@@ -17,52 +17,52 @@
  *  under the License.
  */
 
+package org.apache.isis.applib.events;
 
-package org.apache.isis.applib.events;
-
-import org.apache.isis.applib.Identifier;
-
-
-/**
- * Represents a check as to whether a particular argument for an action is valid or not.
- * 
- * <p>
- * If {@link #getReason()} is not <tt>null</tt> then provides the reason why the argument is invalid;
- * otherwise the argument is valid.
- * 
- * <p>
- * Called once per argument, and before {@link ActionInvocationEvent}.
- */
-public class ActionArgumentEvent extends ValidityEvent {
-
-    private static final long serialVersionUID = 1L;
-
-    private final Object[] args;
-    private final int position;
-    private final Object proposed;
-
-    public ActionArgumentEvent(final Object source, final Identifier actionIdentifier, final Object[] args, final int position) {
-        super(source, actionIdentifier);
-        this.args = args;
-        this.position = position;
-        this.proposed = args[position];
-    }
-
-    public Object[] getArgs() {
-        return args;
-    }
-
-    /**
-     * The position (0-based) of the invalid argument.
-     * 
-     * @return
-     */
-    public int getPosition() {
-        return position;
-    }
-
-    public Object getProposed() {
-        return proposed;
-    }
-
-}
+import org.apache.isis.applib.Identifier;
+
+/**
+ * Represents a check as to whether a particular argument for an action is valid or not.
+ * 
+ * <p>
+ * If {@link #getReason()} is not <tt>null</tt> then provides the reason why the argument is invalid; otherwise the
+ * argument is valid.
+ * 
+ * <p>
+ * Called once per argument, and before {@link ActionInvocationEvent}.
+ */
+public class ActionArgumentEvent extends ValidityEvent {
+
+    private static final long serialVersionUID = 1L;
+
+    private final Object[] args;
+    private final int position;
+    private final Object proposed;
+
+    public ActionArgumentEvent(final Object source, final Identifier actionIdentifier, final Object[] args,
+        final int position) {
+        super(source, actionIdentifier);
+        this.args = args;
+        this.position = position;
+        this.proposed = args[position];
+    }
+
+    public Object[] getArgs() {
+        return args;
+    }
+
+    /**
+     * The position (0-based) of the invalid argument.
+     * 
+     * @return
+     */
+    public int getPosition() {
+        return position;
+    }
+
+    @Override
+    public Object getProposed() {
+        return proposed;
+    }
+
+}

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ActionInvocationEvent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ActionInvocationEvent.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ActionInvocationEvent.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ActionInvocationEvent.java Thu Dec 16 14:55:52 2010
@@ -17,47 +17,45 @@
  *  under the License.
  */
 
+package org.apache.isis.applib.events;
 
-package org.apache.isis.applib.events;
-
-import org.apache.isis.applib.Identifier;
-
-
-/**
- * Represents a check as to whether a particular argument for an action is valid or not.
- * 
- * <p>
- * If {@link #getReason()} is not <tt>null</tt> then provides the reason why the set of arguments are
- * invalid; otherwise the arguments are valid.
- * 
- * <p>
- * Called after each of the {@link ActionArgumentEvent}s.
- */
-public class ActionInvocationEvent extends ValidityEvent {
-
-    private static final long serialVersionUID = 1L;
-
-    public ActionInvocationEvent(final Object source, final Identifier actionIdentifier, final Object[] args) {
-        super(source, actionIdentifier);
-        this.args = args;
-    }
-
-    private Object[] args;
-
-    public Object[] getArgs() {
-        return args;
-    }
-
-    public void setArgs(final Object[] args) {
-        this.args = args;
+import org.apache.isis.applib.Identifier;
+
+/**
+ * Represents a check as to whether a particular argument for an action is valid or not.
+ * 
+ * <p>
+ * If {@link #getReason()} is not <tt>null</tt> then provides the reason why the set of arguments are invalid; otherwise
+ * the arguments are valid.
+ * 
+ * <p>
+ * Called after each of the {@link ActionArgumentEvent}s.
+ */
+public class ActionInvocationEvent extends ValidityEvent {
+
+    private static final long serialVersionUID = 1L;
+
+    public ActionInvocationEvent(final Object source, final Identifier actionIdentifier, final Object[] args) {
+        super(source, actionIdentifier);
+        this.args = args;
+    }
+
+    private Object[] args;
+
+    public Object[] getArgs() {
+        return args;
+    }
+
+    public void setArgs(final Object[] args) {
+        this.args = args;
     }
 
     /**
      * Does not apply
      */
-	@Override
-	public Object getProposed() {
-		return null;
-	}
-
-}
+    @Override
+    public Object getProposed() {
+        return null;
+    }
+
+}

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ActionUsabilityEvent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ActionUsabilityEvent.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ActionUsabilityEvent.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ActionUsabilityEvent.java Thu Dec 16 14:55:52 2010
@@ -17,25 +17,23 @@
  *  under the License.
  */
 
+package org.apache.isis.applib.events;
 
-package org.apache.isis.applib.events;
-
-import org.apache.isis.applib.Identifier;
-
-
-/**
- * Represents a check as to whether an action is usable or has been disabled.
- * 
- * <p>
- * If {@link #getReason()} is not <tt>null</tt> then provides the reason why the action is disabled;
- * otherwise action is enabled.
- */
-public class ActionUsabilityEvent extends UsabilityEvent {
-
-    private static final long serialVersionUID = 1L;
-
-    public ActionUsabilityEvent(final Object source, final Identifier actionIdentifier) {
-        super(source, actionIdentifier);
-    }
-
-}
+import org.apache.isis.applib.Identifier;
+
+/**
+ * Represents a check as to whether an action is usable or has been disabled.
+ * 
+ * <p>
+ * If {@link #getReason()} is not <tt>null</tt> then provides the reason why the action is disabled; otherwise action is
+ * enabled.
+ */
+public class ActionUsabilityEvent extends UsabilityEvent {
+
+    private static final long serialVersionUID = 1L;
+
+    public ActionUsabilityEvent(final Object source, final Identifier actionIdentifier) {
+        super(source, actionIdentifier);
+    }
+
+}

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ActionVisibilityEvent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ActionVisibilityEvent.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ActionVisibilityEvent.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/ActionVisibilityEvent.java Thu Dec 16 14:55:52 2010
@@ -17,25 +17,23 @@
  *  under the License.
  */
 
+package org.apache.isis.applib.events;
 
-package org.apache.isis.applib.events;
-
-import org.apache.isis.applib.Identifier;
-
-
-/**
- * Represents a check as to whether an action is visible or has been hidden.
- * 
- * <p>
- * If {@link #getReason()} is not <tt>null</tt> then provides the reason why the action is invisible;
- * otherwise action is visible.
- */
-public class ActionVisibilityEvent extends VisibilityEvent {
-
-    private static final long serialVersionUID = 1L;
-
-    public ActionVisibilityEvent(final Object source, final Identifier actionIdentifier) {
-        super(source, actionIdentifier);
-    }
-
-}
+import org.apache.isis.applib.Identifier;
+
+/**
+ * Represents a check as to whether an action is visible or has been hidden.
+ * 
+ * <p>
+ * If {@link #getReason()} is not <tt>null</tt> then provides the reason why the action is invisible; otherwise action
+ * is visible.
+ */
+public class ActionVisibilityEvent extends VisibilityEvent {
+
+    private static final long serialVersionUID = 1L;
+
+    public ActionVisibilityEvent(final Object source, final Identifier actionIdentifier) {
+        super(source, actionIdentifier);
+    }
+
+}

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/CollectionAccessEvent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/CollectionAccessEvent.java?rev=1049995&r1=1049994&r2=1049995&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/CollectionAccessEvent.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/events/CollectionAccessEvent.java Thu Dec 16 14:55:52 2010
@@ -17,26 +17,24 @@
  *  under the License.
  */
 
+package org.apache.isis.applib.events;
 
-package org.apache.isis.applib.events;
-
-import org.apache.isis.applib.Identifier;
-
-
-/**
- * Represents an access (reading) of a collection.
- * 
- * <p>
- * Analogous to {@link CollectionAddToEvent} or {@link CollectionRemoveFromEvent}, however the
- * {@link #getReason()} will always be <tt>null</tt>. (If access is not allowed then a vetoing
- * {@link CollectionVisibilityEvent} would have been fired).
- */
-public class CollectionAccessEvent extends AccessEvent {
-
-    private static final long serialVersionUID = 1L;
-
-    public CollectionAccessEvent(final Object source, final Identifier collectionIdentifier) {
-        super(source, collectionIdentifier);
-    }
-
-}
+import org.apache.isis.applib.Identifier;
+
+/**
+ * Represents an access (reading) of a collection.
+ * 
+ * <p>
+ * Analogous to {@link CollectionAddToEvent} or {@link CollectionRemoveFromEvent}, however the {@link #getReason()} will
+ * always be <tt>null</tt>. (If access is not allowed then a vetoing {@link CollectionVisibilityEvent} would have been
+ * fired).
+ */
+public class CollectionAccessEvent extends AccessEvent {
+
+    private static final long serialVersionUID = 1L;
+
+    public CollectionAccessEvent(final Object source, final Identifier collectionIdentifier) {
+        super(source, collectionIdentifier);
+    }
+
+}



Mime
View raw message