incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1096837 [5/14] - in /incubator/isis/trunk: core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/map/ core/metamodel/src/main/java/org/apache/isis/core/meta...
Date Tue, 26 Apr 2011 18:24:13 GMT
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultipleValueFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultipleValueFacetAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultipleValueFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultipleValueFacetAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,18 +17,16 @@
  *  under the License.
  */
 
-
-package org.apache.isis.core.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
-
-public abstract class MultipleValueFacetAbstract extends FacetAbstract implements MultipleValueFacet {
-
-    public MultipleValueFacetAbstract(final Class<? extends Facet> facetType, final FacetHolder holder) {
-        super(facetType, holder, false);
-    }
-
-}
+
+public abstract class MultipleValueFacetAbstract extends FacetAbstract implements MultipleValueFacet {
+
+    public MultipleValueFacetAbstract(final Class<? extends Facet> facetType, final FacetHolder holder) {
+        super(facetType, holder, false);
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactory.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactory.java Tue Apr 26 18:24:05 2011
@@ -17,64 +17,61 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets;
 
-package org.apache.isis.core.metamodel.facets;
-
-
 import java.lang.reflect.Method;
 import java.util.List;
 
 import org.apache.isis.core.metamodel.facetapi.MethodRemover;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-
-
-/**
- * A {@link FacetFactory} implementation that is able to identify a property or collection.
- * 
- * <p>
- * For example, a <i>getter</i> method is most commonly used to represent either a property (value or
- * reference) or a collection, with the return type indicating which.
- * 
- * <p>
- * Used by the Java5 Reflector's <tt>ProgrammingModel</tt> to determine which facet factories to ask whether a {@link Method}
- * represents a property or a collection.
- * 
- */
-public interface PropertyOrCollectionIdentifyingFacetFactory extends FacetFactory {
-
-    /**
-     * Whether (this facet is able to determine that) the supplied {@link Method} possibly represents the
-     * accessor of either a {@link ValueAssociation value property}, {@link OneToOneAssociation reference
-     * property} or a {@link OneToManyAssociation collection}.
-     * 
-     * <p>
-     * For example, if a method name has a prefix of <tt>get</tt> or alternatively has a prefix of <tt>is</tt>
-     * and returns a <tt>boolean</tt>, then it would be a candidate.
-     */
-    public boolean isPropertyOrCollectionAccessorCandidate(Method method);
-
-    /**
-     * Whether (this facet is able to determine that) the supplied {@link Method} represents <i>either</i> a
-     * {@link ValueAssociation value property} or a {@link OneToOneAssociation reference property}.
-     */
-    public boolean isPropertyAccessor(Method method);
-
-    /**
-     * Whether (this facet is able to determine that) the supplied {@link Method} represents a
-     * {@link OneToManyAssociation collection}.
-     */
-    public boolean isCollectionAccessor(Method method);
-
-    /**
-     * Use the provided {@link MethodRemover} to remove all reference property accessors, and append them to
-     * the supplied methodList.
-     */
-    public void findAndRemovePropertyAccessors(MethodRemover methodRemover, List<Method> methodListToAppendTo);
-
-    /**
-     * Use the provided {@link MethodRemover} to remove all collection accessors, and append them to the
-     * supplied methodList.
-     */
-    public void findAndRemoveCollectionAccessors(MethodRemover methodRemover, List<Method> methodListToAppendTo);
-}
+
+/**
+ * A {@link FacetFactory} implementation that is able to identify a property or collection.
+ * 
+ * <p>
+ * For example, a <i>getter</i> method is most commonly used to represent either a property (value or reference) or a
+ * collection, with the return type indicating which.
+ * 
+ * <p>
+ * Used by the Java5 Reflector's <tt>ProgrammingModel</tt> to determine which facet factories to ask whether a
+ * {@link Method} represents a property or a collection.
+ * 
+ */
+public interface PropertyOrCollectionIdentifyingFacetFactory extends FacetFactory {
+
+    /**
+     * Whether (this facet is able to determine that) the supplied {@link Method} possibly represents the accessor of
+     * either a {@link ValueAssociation value property}, {@link OneToOneAssociation reference property} or a
+     * {@link OneToManyAssociation collection}.
+     * 
+     * <p>
+     * For example, if a method name has a prefix of <tt>get</tt> or alternatively has a prefix of <tt>is</tt> and
+     * returns a <tt>boolean</tt>, then it would be a candidate.
+     */
+    public boolean isPropertyOrCollectionAccessorCandidate(Method method);
+
+    /**
+     * Whether (this facet is able to determine that) the supplied {@link Method} represents <i>either</i> a
+     * {@link ValueAssociation value property} or a {@link OneToOneAssociation reference property}.
+     */
+    public boolean isPropertyAccessor(Method method);
+
+    /**
+     * Whether (this facet is able to determine that) the supplied {@link Method} represents a
+     * {@link OneToManyAssociation collection}.
+     */
+    public boolean isCollectionAccessor(Method method);
+
+    /**
+     * Use the provided {@link MethodRemover} to remove all reference property accessors, and append them to the
+     * supplied methodList.
+     */
+    public void findAndRemovePropertyAccessors(MethodRemover methodRemover, List<Method> methodListToAppendTo);
+
+    /**
+     * Use the provided {@link MethodRemover} to remove all collection accessors, and append them to the supplied
+     * methodList.
+     */
+    public void findAndRemoveCollectionAccessors(MethodRemover methodRemover, List<Method> methodListToAppendTo);
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacet.java Tue Apr 26 18:24:05 2011
@@ -17,21 +17,18 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets;
 
-package org.apache.isis.core.metamodel.facets;
-
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-
-
-public interface SingleClassValueFacet extends Facet {
-
-    public Class<?> value();
-
-    /**
-     * Convenience to return the {@link ObjectSpecification} corresponding to this facet's
-     * {@link #value() class}.
-     */
-    public ObjectSpecification valueSpec();
-
-}
+
+public interface SingleClassValueFacet extends Facet {
+
+    public Class<?> value();
+
+    /**
+     * Convenience to return the {@link ObjectSpecification} corresponding to this facet's {@link #value() class}.
+     */
+    public ObjectSpecification valueSpec();
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacetAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleClassValueFacetAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,47 +17,42 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets;
 
-package org.apache.isis.core.metamodel.facets;
-
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.SpecificationLookup;
-
-
-public abstract class SingleClassValueFacetAbstract extends FacetAbstract implements SingleClassValueFacet {
-
-    private final Class<?> value;
-    private final SpecificationLookup specificationLookup;
-
-    public SingleClassValueFacetAbstract(
-            final Class<? extends Facet> facetType,
-            final FacetHolder holder,
-            final Class<?> value,
-            final SpecificationLookup specificationLookup) {
-        super(facetType, holder, false);
-        this.value = value;
-        this.specificationLookup = specificationLookup;
-    }
-
+
+public abstract class SingleClassValueFacetAbstract extends FacetAbstract implements SingleClassValueFacet {
+
+    private final Class<?> value;
+    private final SpecificationLookup specificationLookup;
+
+    public SingleClassValueFacetAbstract(final Class<? extends Facet> facetType, final FacetHolder holder,
+        final Class<?> value, final SpecificationLookup specificationLookup) {
+        super(facetType, holder, false);
+        this.value = value;
+        this.specificationLookup = specificationLookup;
+    }
+
     @Override
-    public Class<?> value() {
-        return value;
-    }
-
-    /**
-     * The {@link ObjectSpecification} of the {@link #value()}.
-     */
+    public Class<?> value() {
+        return value;
+    }
+
+    /**
+     * The {@link ObjectSpecification} of the {@link #value()}.
+     */
     @Override
-    public ObjectSpecification valueSpec() {
-        final Class<?> valueType = value();
-        return valueType != null ? getSpecificationLookup().loadSpecification(valueType) : null;
-    }
-
-    private SpecificationLookup getSpecificationLookup() {
-        return specificationLookup;
-    }
-
-}
+    public ObjectSpecification valueSpec() {
+        final Class<?> valueType = value();
+        return valueType != null ? getSpecificationLookup().loadSpecification(valueType) : null;
+    }
+
+    private SpecificationLookup getSpecificationLookup() {
+        return specificationLookup;
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleIntValueFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleIntValueFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleIntValueFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleIntValueFacet.java Tue Apr 26 18:24:05 2011
@@ -17,12 +17,11 @@
  *  under the License.
  */
 
-
-package org.apache.isis.core.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
-
-public interface SingleIntValueFacet extends Facet {
-
-    public int value();
-}
+
+public interface SingleIntValueFacet extends Facet {
+
+    public int value();
+}

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

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleStringValueFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleStringValueFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleStringValueFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleStringValueFacet.java Tue Apr 26 18:24:05 2011
@@ -17,12 +17,11 @@
  *  under the License.
  */
 
-
-package org.apache.isis.core.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
-
-public interface SingleStringValueFacet extends Facet {
-
-    public String value();
-}
+
+public interface SingleStringValueFacet extends Facet {
+
+    public String value();
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleStringValueFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleStringValueFacetAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleStringValueFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleStringValueFacetAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,34 +17,33 @@
  *  under the License.
  */
 
-
-package org.apache.isis.core.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
-
-
-public abstract class SingleStringValueFacetAbstract extends FacetAbstract implements SingleStringValueFacet {
-    private final String value;
-
-    public SingleStringValueFacetAbstract(final Class<? extends Facet> facetType, final FacetHolder holder, final String value) {
-        super(facetType, holder, false);
-        this.value = value;
-    }
-
-	public String value() {
-        return value;
-    }
-
-    @Override
-    protected String toStringValues() {
-        if (value == null) {
-            return "null";
-        } else {
-            return "\"" + value + "\"";
-        }
-    }
-
-}
+
+public abstract class SingleStringValueFacetAbstract extends FacetAbstract implements SingleStringValueFacet {
+    private final String value;
+
+    public SingleStringValueFacetAbstract(final Class<? extends Facet> facetType, final FacetHolder holder,
+        final String value) {
+        super(facetType, holder, false);
+        this.value = value;
+    }
+
+    @Override
+    public String value() {
+        return value;
+    }
+
+    @Override
+    protected String toStringValues() {
+        if (value == null) {
+            return "null";
+        } else {
+            return "\"" + value + "\"";
+        }
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleValueFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleValueFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleValueFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleValueFacet.java Tue Apr 26 18:24:05 2011
@@ -17,11 +17,10 @@
  *  under the License.
  */
 
-
-package org.apache.isis.core.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
-
-public interface SingleValueFacet extends Facet {
-
-}
+
+public interface SingleValueFacet extends Facet {
+
+}

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

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleWhenValueFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleWhenValueFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleWhenValueFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleWhenValueFacet.java Tue Apr 26 18:24:05 2011
@@ -17,13 +17,11 @@
  *  under the License.
  */
 
-
-package org.apache.isis.core.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
-
-
-public interface SingleWhenValueFacet extends Facet {
-
-    public When value();
-}
+
+public interface SingleWhenValueFacet extends Facet {
+
+    public When value();
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleWhenValueFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleWhenValueFacetAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleWhenValueFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/SingleWhenValueFacetAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,37 +17,37 @@
  *  under the License.
  */
 
-
-package org.apache.isis.core.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
-
-public abstract class SingleWhenValueFacetAbstract extends FacetAbstract implements SingleWhenValueFacet {
-    private final When value;
-
-    public SingleWhenValueFacetAbstract(final Class<? extends Facet> facetType, final FacetHolder holder, final When value) {
-        super(facetType, holder, false);
-        this.value = value;
-    }
-
-    public When value() {
-        return value;
-    }
-
-    /**
-     * More descriptive, same as {@link #value()}.
-     * 
-     * @return
-     */
-    protected When when() {
-        return value();
-    }
-
-    @Override
-    protected String toStringValues() {
-        return "when=" + value.getFriendlyName();
-    }
-}
+
+public abstract class SingleWhenValueFacetAbstract extends FacetAbstract implements SingleWhenValueFacet {
+    private final When value;
+
+    public SingleWhenValueFacetAbstract(final Class<? extends Facet> facetType, final FacetHolder holder,
+        final When value) {
+        super(facetType, holder, false);
+        this.value = value;
+    }
+
+    @Override
+    public When value() {
+        return value;
+    }
+
+    /**
+     * More descriptive, same as {@link #value()}.
+     * 
+     * @return
+     */
+    protected When when() {
+        return value();
+    }
+
+    @Override
+    protected String toStringValues() {
+        return "when=" + value.getFriendlyName();
+    }
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/TypedHolder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/TypedHolder.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/TypedHolder.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/TypedHolder.java Tue Apr 26 18:24:05 2011
@@ -17,41 +17,36 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets;
 
-package org.apache.isis.core.metamodel.facets;
-
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-
 
 /**
  * A {@link FacetHolder} that also has a {@link ObjectSpecification type}.
  * 
  * <p>
  * Used to represent class members when building up the metamodel.
- */
-public interface TypedHolder extends FacetHolder {
-
+ */
+public interface TypedHolder extends FacetHolder {
 
     public FeatureType getFeatureType();
 
     /**
-     * The type of a {@link FeatureType#PROPERTY property}, the referenced type
-     * of a {@link FeatureType#COLLECTION collection}, the return type of an
-     * {@link FeatureType#ACTION action} and the type of a {@link FeatureType#ACTION_PARAMETER action parameter}.
+     * The type of a {@link FeatureType#PROPERTY property}, the referenced type of a {@link FeatureType#COLLECTION
+     * collection}, the return type of an {@link FeatureType#ACTION action} and the type of a
+     * {@link FeatureType#ACTION_PARAMETER action parameter}.
      */
     public Class<?> getType();
 
-
     /**
      * Type may not be known initially (eg {@link FeatureType#COLLECTION}s).
      * 
      * <p>
-     * For example, the accessor might return a raw type such as 
-     * <tt>java.util.List</tt>, rather than a generic one such as 
-     * <tt>java.util.List&lt;Customer&gt;</tt>.
+     * For example, the accessor might return a raw type such as <tt>java.util.List</tt>, rather than a generic one such
+     * as <tt>java.util.List&lt;Customer&gt;</tt>.
      */
-    public void setType(Class<?> type);
-
-}
+    public void setType(Class<?> type);
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/TypedHolderDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/TypedHolderDefault.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/TypedHolderDefault.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/TypedHolderDefault.java Tue Apr 26 18:24:05 2011
@@ -19,13 +19,12 @@ package org.apache.isis.core.metamodel.f
 import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 
-
 public class TypedHolderDefault extends FacetHolderImpl implements TypedHolder {
 
     private final FeatureType featureType;
     private Class<?> type;
-    
-    public TypedHolderDefault(FeatureType featureType ,Class<?> type) {
+
+    public TypedHolderDefault(final FeatureType featureType, final Class<?> type) {
         this.featureType = featureType;
         this.type = type;
     }
@@ -41,11 +40,10 @@ public class TypedHolderDefault extends 
     }
 
     /**
-     * For {@link FeatureType#COLLECTION collection}s,
-     * represents the element type.
+     * For {@link FeatureType#COLLECTION collection}s, represents the element type.
      */
     @Override
-    public void setType(Class<?> type) {
+    public void setType(final Class<?> type) {
         this.type = type;
     }
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/When.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/When.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/When.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/When.java Tue Apr 26 18:24:05 2011
@@ -17,35 +17,32 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets;
 
-package org.apache.isis.core.metamodel.facets;
-
 import org.apache.isis.applib.marker.AlwaysImmutable;
 import org.apache.isis.applib.marker.ImmutableOncePersisted;
 import org.apache.isis.applib.marker.ImmutableUntilPersisted;
 import org.apache.isis.applib.marker.NeverImmutable;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-
-
-public final class When extends EnumerationAbstract {
-
-    public static When ALWAYS = new When(0, "ALWAYS", "Always");
-    public static When ONCE_PERSISTED = new When(1, "ONCE_PERSISTED", "Once Persisted");
-    public static When UNTIL_PERSISTED = new When(1, "UNTIL_PERSISTED", "Until Persisted");
-    public static When NEVER = new When(1, "NEVER", "Never");
-
-    private When(final int num, final String nameInCode, final String friendlyName) {
-        super(num, nameInCode, friendlyName);
-    }
-
-    /**
-     * Whether the state of the supplied {@link ObjectAdapter} corresponds to this 'when'.
-     */
-    public boolean isNowFor(final ObjectAdapter targetAdapter) {
-        final boolean isTransient = targetAdapter.isTransient();
-        return this == When.ALWAYS || 
-               this == When.ONCE_PERSISTED && !isTransient || 
-               this == When.UNTIL_PERSISTED && isTransient;
+
+public final class When extends EnumerationAbstract {
+
+    public static When ALWAYS = new When(0, "ALWAYS", "Always");
+    public static When ONCE_PERSISTED = new When(1, "ONCE_PERSISTED", "Once Persisted");
+    public static When UNTIL_PERSISTED = new When(1, "UNTIL_PERSISTED", "Until Persisted");
+    public static When NEVER = new When(1, "NEVER", "Never");
+
+    private When(final int num, final String nameInCode, final String friendlyName) {
+        super(num, nameInCode, friendlyName);
+    }
+
+    /**
+     * Whether the state of the supplied {@link ObjectAdapter} corresponds to this 'when'.
+     */
+    public boolean isNowFor(final ObjectAdapter targetAdapter) {
+        final boolean isTransient = targetAdapter.isTransient();
+        return this == When.ALWAYS || this == When.ONCE_PERSISTED && !isTransient || this == When.UNTIL_PERSISTED
+            && isTransient;
     }
 
     public static When forCorrespondingMarkerSubType(final Class<?> cls) {
@@ -61,7 +58,7 @@ public final class When extends Enumerat
         return null;
     }
 
-    public static org.apache.isis.core.metamodel.facets.When decode(org.apache.isis.applib.annotation.When when) {
+    public static org.apache.isis.core.metamodel.facets.When decode(final org.apache.isis.applib.annotation.When when) {
         if (when == org.apache.isis.applib.annotation.When.ALWAYS) {
             return org.apache.isis.core.metamodel.facets.When.ALWAYS;
         }
@@ -72,6 +69,6 @@ public final class When extends Enumerat
             return org.apache.isis.core.metamodel.facets.When.UNTIL_PERSISTED;
         }
         return org.apache.isis.core.metamodel.facets.When.NEVER;
-    }
-
-}
+    }
+
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/accessor/PropertyOrCollectionAccessorFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/accessor/PropertyOrCollectionAccessorFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/accessor/PropertyOrCollectionAccessorFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/accessor/PropertyOrCollectionAccessorFacet.java Tue Apr 26 18:24:05 2011
@@ -26,7 +26,8 @@ import org.apache.isis.core.metamodel.fa
  * 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 OR a collection.
+ * In the standard Apache Isis Programming Model, corresponds to invoking the accessor method for a property OR a
+ * collection.
  */
 public interface PropertyOrCollectionAccessorFacet extends Facet {
 

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

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/choices/ActionChoicesFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/choices/ActionChoicesFacetAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/choices/ActionChoicesFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/choices/ActionChoicesFacetAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,14 +17,12 @@
  *  under the License.
  */
 
-
 package org.apache.isis.core.metamodel.facets.actions.choices;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 
-
 public abstract class ActionChoicesFacetAbstract extends FacetAbstract implements ActionChoicesFacet {
 
     public static Class<? extends Facet> type() {
@@ -36,4 +34,3 @@ public abstract class ActionChoicesFacet
     }
 
 }
-

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

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/executed/ExecutedFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/executed/ExecutedFacetAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/executed/ExecutedFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/executed/ExecutedFacetAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,44 +17,44 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.actions.executed;
 
-package org.apache.isis.core.metamodel.facets.actions.executed;
-
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.SingleValueFacetAbstract;
 import org.apache.isis.core.metamodel.spec.Target;
-
-
-public abstract class ExecutedFacetAbstract extends SingleValueFacetAbstract implements ExecutedFacet {
-
-    public static Class<? extends Facet> type() {
-        return ExecutedFacet.class;
-    }
-
-    private final Where value;
-
-    public ExecutedFacetAbstract(final Where value, final FacetHolder holder) {
-        super(type(), holder);
-        this.value = value;
-    }
-
-    public Where value() {
-        return value;
-    }
-
-    public Target getTarget() {
-        if (value == Where.LOCALLY) {
-            return Target.LOCAL;
-        }
-        if (value == Where.REMOTELY) {
-            return Target.REMOTE;
-        }
-        return Target.DEFAULT;
-    }
-
-    @Override
-    protected String toStringValues() {
-        return "where=" + value.getFriendlyName();
-    }
-}
+
+public abstract class ExecutedFacetAbstract extends SingleValueFacetAbstract implements ExecutedFacet {
+
+    public static Class<? extends Facet> type() {
+        return ExecutedFacet.class;
+    }
+
+    private final Where value;
+
+    public ExecutedFacetAbstract(final Where value, final FacetHolder holder) {
+        super(type(), holder);
+        this.value = value;
+    }
+
+    @Override
+    public Where value() {
+        return value;
+    }
+
+    @Override
+    public Target getTarget() {
+        if (value == Where.LOCALLY) {
+            return Target.LOCAL;
+        }
+        if (value == Where.REMOTELY) {
+            return Target.REMOTE;
+        }
+        return Target.DEFAULT;
+    }
+
+    @Override
+    protected String toStringValues() {
+        return "where=" + value.getFriendlyName();
+    }
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/invoke/ActionInvocationFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/invoke/ActionInvocationFacetAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/invoke/ActionInvocationFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/invoke/ActionInvocationFacetAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,20 +17,18 @@
  *  under the License.
  */
 
-
 package org.apache.isis.core.metamodel.facets.actions.invoke;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 
-
 /**
  * Language-specific introspectors should implement in order to invoke with the language-specific API.
  * 
  * <p>
- * For example, a Java-based subclass would use <tt>java.lang.reflect.Method</tt> to invoke whereas under .NET
- * it would be <tt>System.Reflect.MethodInfo</tt>.
+ * For example, a Java-based subclass would use <tt>java.lang.reflect.Method</tt> to invoke whereas under .NET it would
+ * be <tt>System.Reflect.MethodInfo</tt>.
  */
 public abstract class ActionInvocationFacetAbstract extends FacetAbstract implements ActionInvocationFacet {
 
@@ -43,4 +41,3 @@ public abstract class ActionInvocationFa
     }
 
 }
-

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/choices/ChoicesFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/choices/ChoicesFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/choices/ChoicesFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/choices/ChoicesFacet.java Tue Apr 26 18:24:05 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.core.metamodel.facets.choices;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/choices/ChoicesFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/choices/ChoicesFacetAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/choices/ChoicesFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/choices/ChoicesFacetAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.core.metamodel.facets.choices;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -30,8 +29,7 @@ public abstract class ChoicesFacetAbstra
         return ChoicesFacet.class;
     }
 
-
-    public ChoicesFacetAbstract(FacetHolder holder) {
+    public ChoicesFacetAbstract(final FacetHolder holder) {
         super(type(), holder, false);
     }
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacetAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/CollectionFacetAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.core.metamodel.facets.collections;
 
 import java.util.Collection;
@@ -25,20 +24,18 @@ import java.util.Enumeration;
 import java.util.Iterator;
 
 import org.apache.commons.collections.iterators.IteratorEnumeration;
-
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.facets.typeof.TypeOfFacet;
 
-
 public abstract class CollectionFacetAbstract extends FacetAbstract implements CollectionFacet {
 
     public CollectionFacetAbstract(final FacetHolder holder) {
         super(CollectionFacet.class, holder, false);
     }
-    
+
     @Override
     @SuppressWarnings("unchecked")
     public final Enumeration<ObjectAdapter> elements(final ObjectAdapter collectionAdapter) {
@@ -47,13 +44,13 @@ public abstract class CollectionFacetAbs
 
     @Override
     public final boolean contains(final ObjectAdapter collectionAdapter, final ObjectAdapter candidateObjectAdapter) {
-        Collection<ObjectAdapter> collection = collection(collectionAdapter);
+        final Collection<ObjectAdapter> collection = collection(collectionAdapter);
         return collection.contains(candidateObjectAdapter);
     }
 
     @Override
     public final Iterator<ObjectAdapter> iterator(final ObjectAdapter collectionAdapter) {
-        Collection<ObjectAdapter> collection = collection(collectionAdapter);
+        final Collection<ObjectAdapter> collection = collection(collectionAdapter);
         return collection.iterator();
     }
 
@@ -72,6 +69,4 @@ public abstract class CollectionFacetAbs
         return getFacetHolder().getFacet(TypeOfFacet.class);
     }
 
-
 }
-

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

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

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacet.java Tue Apr 26 18:24:05 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.core.metamodel.facets.collections.modify;
 
 import java.util.Collection;
@@ -29,15 +28,12 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
-
 /**
- * Attached to {@link ObjectSpecification}s that represent a 
- * collection.
+ * Attached to {@link ObjectSpecification}s that represent a collection.
  * 
  * <p>
- * Factories of (implementations of this) facet should ensure that a
- * {@link TypeOfFacet} is also attached to the same facet holder.  The
- * {@link #getTypeOfFacet()} is a convenience for this.
+ * Factories of (implementations of this) facet should ensure that a {@link TypeOfFacet} is also attached to the same
+ * facet holder. The {@link #getTypeOfFacet()} is a convenience for this.
  */
 public interface CollectionFacet extends Facet {
 
@@ -52,9 +48,9 @@ public interface CollectionFacet extends
     Iterable<ObjectAdapter> iterable(ObjectAdapter collectionAdapter);
 
     Iterator<ObjectAdapter> iterator(ObjectAdapter collectionAdapter);
-    
+
     /**
-     * Returns an unmodifiable {@link Collection} of {@link ObjectAdapter}s. 
+     * Returns an unmodifiable {@link Collection} of {@link ObjectAdapter}s.
      */
     Collection<ObjectAdapter> collection(ObjectAdapter collectionAdapter);
 
@@ -63,12 +59,10 @@ public interface CollectionFacet extends
     boolean contains(ObjectAdapter collectionAdapter, ObjectAdapter element);
 
     void init(ObjectAdapter collectionAdapter, ObjectAdapter[] initData);
-    
+
     /**
-     * Convenience method that returns the {@link TypeOfFacet} on this
-     * facet's {@link #getFacetHolder() holder}.
+     * Convenience method that returns the {@link TypeOfFacet} on this facet's {@link #getFacetHolder() holder}.
      */
     TypeOfFacet getTypeOfFacet();
-    
-}
 
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacetUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacetUtils.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacetUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacetUtils.java Tue Apr 26 18:24:05 2011
@@ -17,58 +17,57 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.collections.modify;
 
-package org.apache.isis.core.metamodel.facets.collections.modify;
-
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-
-
-public final class CollectionFacetUtils {
-    private CollectionFacetUtils() {}
-
-    public static CollectionFacet getCollectionFacetFromSpec(final ObjectAdapter objectRepresentingCollection) {
-        final ObjectSpecification collectionSpec = objectRepresentingCollection.getSpecification();
-        return collectionSpec.getFacet(CollectionFacet.class);
-    }
-
-    public static int size(final ObjectAdapter collection) {
-        final CollectionFacet facet = getCollectionFacetFromSpec(collection);
-        return facet.size(collection);
-    }
-
-    public static ObjectAdapter firstElement(final ObjectAdapter collection) {
-        final CollectionFacet facet = getCollectionFacetFromSpec(collection);
-        return facet.firstElement(collection);
-    }
-
-    /**
-     * @deprecated - use instead {@link #convertToList(ObjectAdapter)}.
-     */
-    @Deprecated
-    public static Object[] convertToArray(final ObjectAdapter collection) {
-    	return convertToList(collection).toArray();
-    }
-
-    public static List<Object> convertToList(final ObjectAdapter collection) {
-        final CollectionFacet facet = getCollectionFacetFromSpec(collection);
-        final List<Object> objects = new ArrayList<Object>();
-        for(ObjectAdapter adapter: facet.iterable(collection)) {
-        	objects.add(adapter.getObject());
-        }
-        return objects;
-    }
-
-    public static List<ObjectAdapter> convertToAdapterList(final ObjectAdapter collection) {
-        final CollectionFacet facet = getCollectionFacetFromSpec(collection);
-        final List<ObjectAdapter> adapters = new ArrayList<ObjectAdapter>();
-        for(ObjectAdapter adapter: facet.iterable(collection)) {
-        	adapters.add(adapter);
-        }
-        return adapters;
-    }
-
-}
+
+public final class CollectionFacetUtils {
+    private CollectionFacetUtils() {
+    }
+
+    public static CollectionFacet getCollectionFacetFromSpec(final ObjectAdapter objectRepresentingCollection) {
+        final ObjectSpecification collectionSpec = objectRepresentingCollection.getSpecification();
+        return collectionSpec.getFacet(CollectionFacet.class);
+    }
+
+    public static int size(final ObjectAdapter collection) {
+        final CollectionFacet facet = getCollectionFacetFromSpec(collection);
+        return facet.size(collection);
+    }
+
+    public static ObjectAdapter firstElement(final ObjectAdapter collection) {
+        final CollectionFacet facet = getCollectionFacetFromSpec(collection);
+        return facet.firstElement(collection);
+    }
+
+    /**
+     * @deprecated - use instead {@link #convertToList(ObjectAdapter)}.
+     */
+    @Deprecated
+    public static Object[] convertToArray(final ObjectAdapter collection) {
+        return convertToList(collection).toArray();
+    }
+
+    public static List<Object> convertToList(final ObjectAdapter collection) {
+        final CollectionFacet facet = getCollectionFacetFromSpec(collection);
+        final List<Object> objects = new ArrayList<Object>();
+        for (final ObjectAdapter adapter : facet.iterable(collection)) {
+            objects.add(adapter.getObject());
+        }
+        return objects;
+    }
+
+    public static List<ObjectAdapter> convertToAdapterList(final ObjectAdapter collection) {
+        final CollectionFacet facet = getCollectionFacetFromSpec(collection);
+        final List<ObjectAdapter> adapters = new ArrayList<ObjectAdapter>();
+        for (final ObjectAdapter adapter : facet.iterable(collection)) {
+            adapters.add(adapter);
+        }
+        return adapters;
+    }
+
+}

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

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

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

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/facets/FacetsFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/facets/FacetsFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/facets/FacetsFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/facets/FacetsFacet.java Tue Apr 26 18:24:05 2011
@@ -17,33 +17,31 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.facets;
 
-package org.apache.isis.core.metamodel.facets.facets;
-
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facets.FacetFactory;
 import org.apache.isis.core.metamodel.facets.MultipleValueFacet;
-
-
-/**
- * Indicates that this class has additional arbitrary facets, to be processed.
- * 
- * <p>
- * Corresponds to the <tt>@Facets</tt> annotation in the applib.
- * 
- * <p>
- * <i>This</i> {@link Facet} allows the {@link FacetFactory}(s) that will create those {@link Facet}s to be
- * accessed. Which, admittedly, is rather confusing.
- */
-public interface FacetsFacet extends MultipleValueFacet {
-
-    /**
-     * Returns the fully qualified class of the facet factory, which should be
-     * {@link Class#isAssignableFrom(Class)} {@link FacetFactory}.
-     * 
-     * <p>
-     * Includes both the named facet factories and those identified directly by class. However, all are
-     * guaranteed to implement {@link FacetFactory}.
-     */
-    public Class<? extends FacetFactory>[] facetFactories();
-}
+
+/**
+ * Indicates that this class has additional arbitrary facets, to be processed.
+ * 
+ * <p>
+ * Corresponds to the <tt>@Facets</tt> annotation in the applib.
+ * 
+ * <p>
+ * <i>This</i> {@link Facet} allows the {@link FacetFactory}(s) that will create those {@link Facet}s to be accessed.
+ * Which, admittedly, is rather confusing.
+ */
+public interface FacetsFacet extends MultipleValueFacet {
+
+    /**
+     * Returns the fully qualified class of the facet factory, which should be {@link Class#isAssignableFrom(Class)}
+     * {@link FacetFactory}.
+     * 
+     * <p>
+     * Includes both the named facet factories and those identified directly by class. However, all are guaranteed to
+     * implement {@link FacetFactory}.
+     */
+    public Class<? extends FacetFactory>[] facetFactories();
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/help/HelpFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/help/HelpFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/help/HelpFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/help/HelpFacet.java Tue Apr 26 18:24:05 2011
@@ -17,14 +17,13 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.help;
 
-package org.apache.isis.core.metamodel.facets.help;
-
 import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
-
-
-/**
- * Provide help about a class, a property, collection or action or a parameter.
- * 
- */
-public interface HelpFacet extends SingleStringValueFacet {}
+
+/**
+ * Provide help about a class, a property, collection or action or a parameter.
+ * 
+ */
+public interface HelpFacet extends SingleStringValueFacet {
+}

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

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/mandatory/MandatoryFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/mandatory/MandatoryFacetAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/mandatory/MandatoryFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/mandatory/MandatoryFacetAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.mandatory;
 
-package org.apache.isis.core.metamodel.facets.mandatory;
-
 import org.apache.isis.applib.events.ValidityEvent;
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -28,27 +27,27 @@ import org.apache.isis.core.metamodel.in
 import org.apache.isis.core.metamodel.interactions.PropertyModifyContext;
 import org.apache.isis.core.metamodel.interactions.ProposedHolder;
 import org.apache.isis.core.metamodel.interactions.ValidityContext;
-
-
-public abstract class MandatoryFacetAbstract extends MarkerFacetAbstract implements MandatoryFacet {
-
-    public static Class<? extends Facet> type() {
-        return MandatoryFacet.class;
-    }
-
-    public MandatoryFacetAbstract(final FacetHolder holder) {
-        super(type(), holder);
-    }
-
-    public String invalidates(final ValidityContext<? extends ValidityEvent> context) {
-        if (!(context instanceof PropertyModifyContext) && !(context instanceof ActionArgumentContext)) {
-            return null;
-        }
-        if (!(context instanceof ProposedHolder)) {
-            // shouldn't happen, since both the above should hold a proposed value/argument
-            return null;
-        }
-        final ProposedHolder proposedHolder = (ProposedHolder) context;
-        return isRequiredButNull(proposedHolder.getProposed()) ? "Mandatory" : null;
-    }
-}
+
+public abstract class MandatoryFacetAbstract extends MarkerFacetAbstract implements MandatoryFacet {
+
+    public static Class<? extends Facet> type() {
+        return MandatoryFacet.class;
+    }
+
+    public MandatoryFacetAbstract(final FacetHolder holder) {
+        super(type(), holder);
+    }
+
+    @Override
+    public String invalidates(final ValidityContext<? extends ValidityEvent> context) {
+        if (!(context instanceof PropertyModifyContext) && !(context instanceof ActionArgumentContext)) {
+            return null;
+        }
+        if (!(context instanceof ProposedHolder)) {
+            // shouldn't happen, since both the above should hold a proposed value/argument
+            return null;
+        }
+        final ProposedHolder proposedHolder = (ProposedHolder) context;
+        return isRequiredButNull(proposedHolder.getProposed()) ? "Mandatory" : null;
+    }
+}

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/mandatory/MandatoryFacetDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/mandatory/MandatoryFacetDefault.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/mandatory/MandatoryFacetDefault.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/mandatory/MandatoryFacetDefault.java Tue Apr 26 18:24:05 2011
@@ -59,5 +59,4 @@ public class MandatoryFacetDefault exten
         return false;
     }
 
-
 }

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/multiline/MultiLineFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/multiline/MultiLineFacetAbstract.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/multiline/MultiLineFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/multiline/MultiLineFacetAbstract.java Tue Apr 26 18:24:05 2011
@@ -17,40 +17,40 @@
  *  under the License.
  */
 
+package org.apache.isis.core.metamodel.facets.multiline;
 
-package org.apache.isis.core.metamodel.facets.multiline;
-
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.MultipleValueFacetAbstract;
-
-
-public abstract class MultiLineFacetAbstract extends MultipleValueFacetAbstract implements MultiLineFacet {
-
-    public static Class<? extends Facet> type() {
-        return MultiLineFacet.class;
-    }
-
-    private final int numberOfLines;
-    private final boolean preventWrapping;
-
-    public MultiLineFacetAbstract(final int numberOfLines, final boolean preventWrapping, final FacetHolder holder) {
-        super(type(), holder);
-        this.numberOfLines = numberOfLines;
-        this.preventWrapping = preventWrapping;
-    }
-
-    public int numberOfLines() {
-        return numberOfLines;
-    }
-
-    public boolean preventWrapping() {
-        return preventWrapping;
-    }
-
-    @Override
-    protected String toStringValues() {
-        return "lines=" + numberOfLines + "," + (preventWrapping ? "prevent-wrapping" : "allow-wrapping");
-    }
-
-}
+
+public abstract class MultiLineFacetAbstract extends MultipleValueFacetAbstract implements MultiLineFacet {
+
+    public static Class<? extends Facet> type() {
+        return MultiLineFacet.class;
+    }
+
+    private final int numberOfLines;
+    private final boolean preventWrapping;
+
+    public MultiLineFacetAbstract(final int numberOfLines, final boolean preventWrapping, final FacetHolder holder) {
+        super(type(), holder);
+        this.numberOfLines = numberOfLines;
+        this.preventWrapping = preventWrapping;
+    }
+
+    @Override
+    public int numberOfLines() {
+        return numberOfLines;
+    }
+
+    @Override
+    public boolean preventWrapping() {
+        return preventWrapping;
+    }
+
+    @Override
+    protected String toStringValues() {
+        return "lines=" + numberOfLines + "," + (preventWrapping ? "prevent-wrapping" : "allow-wrapping");
+    }
+
+}

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

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

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

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

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bounded/BoundedFacetUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bounded/BoundedFacetUtils.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bounded/BoundedFacetUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bounded/BoundedFacetUtils.java Tue Apr 26 18:24:05 2011
@@ -17,20 +17,16 @@
  *  under the License.
  */
 
-
 package org.apache.isis.core.metamodel.facets.object.bounded;
 
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
-
-
 public class BoundedFacetUtils {
 
-
-    private BoundedFacetUtils() {}
+    private BoundedFacetUtils() {
+    }
 
     public static boolean isBoundedSet(final ObjectSpecification specification) {
         return specification.getFacet(BoundedFacet.class) != null;
     }
 }
-

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cached/CachedFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cached/CachedFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cached/CachedFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cached/CachedFacet.java Tue Apr 26 18:24:05 2011
@@ -37,5 +37,4 @@ import org.apache.isis.core.metamodel.fa
  */
 public interface CachedFacet extends MarkerFacet {
 
-
 }

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

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cached/CachedFacetUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cached/CachedFacetUtils.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cached/CachedFacetUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cached/CachedFacetUtils.java Tue Apr 26 18:24:05 2011
@@ -17,20 +17,16 @@
  *  under the License.
  */
 
-
 package org.apache.isis.core.metamodel.facets.object.cached;
 
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
-
-
 public class CachedFacetUtils {
 
-
-    private CachedFacetUtils() {}
+    private CachedFacetUtils() {
+    }
 
     public static boolean isCached(final ObjectSpecification specification) {
         return specification.getFacet(CachedFacet.class) != null;
     }
 }
-

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CallbackFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CallbackFacet.java?rev=1096837&r1=1096836&r2=1096837&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CallbackFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/callbacks/CallbackFacet.java Tue Apr 26 18:24:05 2011
@@ -17,14 +17,12 @@
  *  under the License.
  */
 
-
 package org.apache.isis.core.metamodel.facets.object.callbacks;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facets.ImperativeFacetMulti;
 
-
 /**
  * A {@link Facet} that represents some type of lifecycle callback on the object (eg about to be persisted).
  */
@@ -33,4 +31,3 @@ public interface CallbackFacet extends F
     public void invoke(ObjectAdapter object);
 
 }
-



Mime
View raw message