incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1234453 [10/33] - in /incubator/isis/trunk/framework/core: commons/src/main/java/org/apache/isis/core/commons/authentication/ commons/src/main/java/org/apache/isis/core/commons/components/ commons/src/main/java/org/apache/isis/core/commons...
Date Sun, 22 Jan 2012 06:59:23 GMT
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java Sun Jan 22 06:58:43 2012
@@ -37,8 +37,7 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.OneToOneActionParameter;
 import org.apache.isis.core.metamodel.spec.feature.ParseableEntryActionParameter;
 
-public class ObjectActionParameterParseable extends ObjectActionParameterAbstract implements
-    ParseableEntryActionParameter {
+public class ObjectActionParameterParseable extends ObjectActionParameterAbstract implements ParseableEntryActionParameter {
 
     public ObjectActionParameterParseable(final int index, final ObjectActionImpl action, final TypedHolder peer) {
         super(index, action, peer);
@@ -92,9 +91,7 @@ public class ObjectActionParameterParsea
         final ParseableFacet p = parameterSpecification.getFacet(ParseableFacet.class);
         final ObjectAdapter newValue = p.parseTextEntry(null, proposedString);
 
-        final ValidityContext<?> ic =
-            parameter.createProposedArgumentInteractionContext(getAuthenticationSession(),
-                InteractionInvocationMethod.BY_USER, adapter, arguments(newValue), getNumber());
+        final ValidityContext<?> ic = parameter.createProposedArgumentInteractionContext(getAuthenticationSession(), InteractionInvocationMethod.BY_USER, adapter, arguments(newValue), getNumber());
 
         final InteractionResultSet buf = new InteractionResultSet();
         InteractionUtils.isValidResultSet(parameter, ic, buf);
@@ -106,9 +103,10 @@ public class ObjectActionParameterParsea
     }
 
     /**
-     * TODO: this is not ideal, because we can only populate the array for single argument, rather than the entire
-     * argument set. Instead, we ought to do this in two passes, one to build up the argument set as a single unit, and
-     * then validate each in turn.
+     * TODO: this is not ideal, because we can only populate the array for
+     * single argument, rather than the entire argument set. Instead, we ought
+     * to do this in two passes, one to build up the argument set as a single
+     * unit, and then validate each in turn.
      * 
      * @param proposedValue
      * @return
@@ -135,8 +133,9 @@ public class ObjectActionParameterParsea
     // //////////////////////////////////////////////////////////////////////
 
     /**
-     * Gets the proposed value of the {@link Instance} (downcast as a {@link MutableProposed}, wrapping the proposed
-     * value into a {@link ObjectAdapter}.
+     * Gets the proposed value of the {@link Instance} (downcast as a
+     * {@link MutableProposed}, wrapping the proposed value into a
+     * {@link ObjectAdapter}.
      */
     @Override
     public ObjectAdapter get(final ObjectAdapter owner) {
@@ -146,8 +145,9 @@ public class ObjectActionParameterParsea
     }
 
     /**
-     * Sets the proposed value of the {@link Instance} (downcast as a {@link MutableProposed}, unwrapped the proposed
-     * value from a {@link ObjectAdapter}.
+     * Sets the proposed value of the {@link Instance} (downcast as a
+     * {@link MutableProposed}, unwrapped the proposed value from a
+     * {@link ObjectAdapter}.
      */
     public void set(final ObjectAdapter owner, final ObjectAdapter newValue) {
         final MutableProposedHolder proposedHolder = getProposedHolder(owner);

Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java Sun Jan 22 06:58:43 2012
@@ -35,8 +35,7 @@ public abstract class ObjectAssociationA
 
     private final ObjectSpecification specification;
 
-    public ObjectAssociationAbstract(final FacetedMethod facetedMethod, final FeatureType featureType,
-        final ObjectSpecification specification, final ObjectMemberContext parameterObject) {
+    public ObjectAssociationAbstract(final FacetedMethod facetedMethod, final FeatureType featureType, final ObjectSpecification specification, final ObjectMemberContext parameterObject) {
         super(facetedMethod, featureType, parameterObject);
         if (specification == null) {
             throw new IllegalArgumentException("field type for '" + getId() + "' must exist");
@@ -48,9 +47,10 @@ public abstract class ObjectAssociationA
     public abstract ObjectAdapter get(final ObjectAdapter fromObject);
 
     /**
-     * Return the specification of the object (or objects) that this field holds. For a value are one-to-one reference
-     * this will be type that the accessor returns. For a collection it will be the type of element, not the type of
-     * collection.
+     * Return the specification of the object (or objects) that this field
+     * holds. For a value are one-to-one reference this will be type that the
+     * accessor returns. For a collection it will be the type of element, not
+     * the type of collection.
      */
     @Override
     public ObjectSpecification getSpecification() {

Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java Sun Jan 22 06:58:43 2012
@@ -53,8 +53,7 @@ import org.apache.isis.core.metamodel.sp
 
 public abstract class ObjectMemberAbstract implements ObjectMember {
 
-    public static ObjectSpecification getSpecification(final SpecificationLookup specificationLookup,
-        final Class<?> type) {
+    public static ObjectSpecification getSpecification(final SpecificationLookup specificationLookup, final Class<?> type) {
         return type == null ? null : specificationLookup.loadSpecification(type);
     }
 
@@ -68,8 +67,7 @@ public abstract class ObjectMemberAbstra
     private final QuerySubmitter querySubmitter;
     private final CollectionTypeRegistry collectionTypeRegistry;
 
-    protected ObjectMemberAbstract(final FacetedMethod facetedMethod, final FeatureType featureType,
-        final ObjectMemberContext objectMemberContext) {
+    protected ObjectMemberAbstract(final FacetedMethod facetedMethod, final FeatureType featureType, final ObjectMemberContext objectMemberContext) {
         final String id = facetedMethod.getIdentifier().getMemberName();
         if (id == null) {
             throw new IllegalArgumentException("Name must always be set");
@@ -166,14 +164,15 @@ public abstract class ObjectMemberAbstra
     // /////////////////////////////////////////////////////////////
 
     /**
-     * Return the default label for this member. This is based on the name of this member.
+     * Return the default label for this member. This is based on the name of
+     * this member.
      * 
      * @see #getId()
      */
     @Override
     public String getName() {
         final NamedFacet facet = getFacet(NamedFacet.class);
-        String name = facet.value();
+        final String name = facet.value();
         return name != null ? name : defaultName;
     }
 
@@ -199,12 +198,12 @@ public abstract class ObjectMemberAbstra
     }
 
     /**
-     * Loops over all {@link HidingInteractionAdvisor} {@link Facet}s and returns <tt>true</tt> only if none hide the
-     * member.
+     * Loops over all {@link HidingInteractionAdvisor} {@link Facet}s and
+     * returns <tt>true</tt> only if none hide the member.
      * 
      * <p>
-     * TODO: currently this method is hard-coded to assume all interactions are initiated
-     * {@link InteractionInvocationMethod#BY_USER by user}.
+     * TODO: currently this method is hard-coded to assume all interactions are
+     * initiated {@link InteractionInvocationMethod#BY_USER by user}.
      */
     @Override
     public Consent isVisible(final AuthenticationSession session, final ObjectAdapter target) {
@@ -212,8 +211,7 @@ public abstract class ObjectMemberAbstra
     }
 
     private InteractionResult isVisibleResult(final AuthenticationSession session, final ObjectAdapter target) {
-        final VisibilityContext<?> ic =
-            createVisibleInteractionContext(session, InteractionInvocationMethod.BY_USER, target);
+        final VisibilityContext<?> ic = createVisibleInteractionContext(session, InteractionInvocationMethod.BY_USER, target);
         return InteractionUtils.isVisibleResult(this, ic);
     }
 
@@ -222,12 +220,12 @@ public abstract class ObjectMemberAbstra
     // /////////////////////////////////////////////////////////////
 
     /**
-     * Loops over all {@link DisablingInteractionAdvisor} {@link Facet}s and returns <tt>true</tt> only if none disables
-     * the member.
+     * Loops over all {@link DisablingInteractionAdvisor} {@link Facet}s and
+     * returns <tt>true</tt> only if none disables the member.
      * 
      * <p>
-     * TODO: currently this method is hard-coded to assume all interactions are initiated
-     * {@link InteractionInvocationMethod#BY_USER by user}.
+     * TODO: currently this method is hard-coded to assume all interactions are
+     * initiated {@link InteractionInvocationMethod#BY_USER by user}.
      */
     @Override
     public Consent isUsable(final AuthenticationSession session, final ObjectAdapter target) {
@@ -235,8 +233,7 @@ public abstract class ObjectMemberAbstra
     }
 
     private InteractionResult isUsableResult(final AuthenticationSession session, final ObjectAdapter target) {
-        final UsabilityContext<?> ic =
-            createUsableInteractionContext(session, InteractionInvocationMethod.BY_USER, target);
+        final UsabilityContext<?> ic = createUsableInteractionContext(session, InteractionInvocationMethod.BY_USER, target);
         return InteractionUtils.isUsableResult(this, ic);
     }
 
@@ -269,7 +266,8 @@ public abstract class ObjectMemberAbstra
     // //////////////////////////////////////////////////////////////////
 
     /**
-     * The current {@link AuthenticationSession} (can change over time so do not cache).
+     * The current {@link AuthenticationSession} (can change over time so do not
+     * cache).
      */
     protected AuthenticationSession getAuthenticationSession() {
         return authenticationSessionProvider.getAuthenticationSession();

Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java Sun Jan 22 06:58:43 2012
@@ -141,8 +141,7 @@ public abstract class ObjectSpecificatio
     // Constructor
     // //////////////////////////////////////////////////////////////////////
 
-    public ObjectSpecificationAbstract(final Class<?> introspectedClass, final String shortName,
-        final SpecificationContext specificationContext) {
+    public ObjectSpecificationAbstract(final Class<?> introspectedClass, final String shortName, final SpecificationContext specificationContext) {
 
         this.correspondingClass = introspectedClass;
         this.fullName = introspectedClass.getName();
@@ -168,10 +167,12 @@ public abstract class ObjectSpecificatio
 
     /**
      * As provided explicitly within the
-     * {@link #IntrospectableSpecificationAbstract(Class, String, SpecificationContext) constructor}.
+     * {@link #IntrospectableSpecificationAbstract(Class, String, SpecificationContext)
+     * constructor}.
      * 
      * <p>
-     * Not API, but <tt>public</tt> so that {@link FacetedMethodsBuilder} can call it.
+     * Not API, but <tt>public</tt> so that {@link FacetedMethodsBuilder} can
+     * call it.
      */
     @Override
     public Class<?> getCorrespondingClass() {
@@ -180,7 +181,8 @@ public abstract class ObjectSpecificatio
 
     /**
      * As provided explicitly within the
-     * {@link #IntrospectableSpecificationAbstract(Class, String, SpecificationContext) constructor}.
+     * {@link #IntrospectableSpecificationAbstract(Class, String, SpecificationContext)
+     * constructor}.
      */
     @Override
     public String getShortIdentifier() {
@@ -188,7 +190,8 @@ public abstract class ObjectSpecificatio
     }
 
     /**
-     * The {@link Class#getName() (full) name} of the {@link #getCorrespondingClass() class}.
+     * The {@link Class#getName() (full) name} of the
+     * {@link #getCorrespondingClass() class}.
      */
     @Override
     public String getFullIdentifier() {
@@ -196,8 +199,8 @@ public abstract class ObjectSpecificatio
     }
 
     /**
-     * Only if {@link #setIntrospected(boolean)} has been called (should be called within
-     * {@link #updateFromFacetValues()}.
+     * Only if {@link #setIntrospected(boolean)} has been called (should be
+     * called within {@link #updateFromFacetValues()}.
      */
     @Override
     public boolean isIntrospected() {
@@ -209,7 +212,8 @@ public abstract class ObjectSpecificatio
     // //////////////////////////////////////////////////////////////////////
 
     /**
-     * Intended to be called within {@link #introspectTypeHierarchyAndMembers()}.
+     * Intended to be called within {@link #introspectTypeHierarchyAndMembers()}
+     * .
      */
     protected void setSuperclass(final Class<?> superclass) {
         if (superclass == null) {
@@ -225,26 +229,30 @@ public abstract class ObjectSpecificatio
     }
 
     /**
-     * Intended to be called within {@link #introspectTypeHierarchyAndMembers()}.
+     * Intended to be called within {@link #introspectTypeHierarchyAndMembers()}
+     * .
      */
     protected void addInterfaces(final List<ObjectSpecification> interfaces) {
         this.interfaces.addAll(interfaces);
     }
 
     /**
-     * Intended to be called within {@link #introspectTypeHierarchyAndMembers()}.
+     * Intended to be called within {@link #introspectTypeHierarchyAndMembers()}
+     * .
      */
     protected void addAsSubclassTo(final ObjectSpecification supertypeSpec) {
         if (!(supertypeSpec instanceof ObjectSpecificationAbstract)) {
             return;
         }
-        // downcast required because addSubclass is (deliberately) not public API
+        // downcast required because addSubclass is (deliberately) not public
+        // API
         final ObjectSpecificationAbstract introspectableSpec = (ObjectSpecificationAbstract) supertypeSpec;
         introspectableSpec.addSubclass(this);
     }
 
     /**
-     * Intended to be called within {@link #introspectTypeHierarchyAndMembers()}.
+     * Intended to be called within {@link #introspectTypeHierarchyAndMembers()}
+     * .
      */
     protected void addAsSubclassTo(final List<ObjectSpecification> supertypeSpecs) {
         for (final ObjectSpecification supertypeSpec : supertypeSpecs) {
@@ -257,7 +265,8 @@ public abstract class ObjectSpecificatio
     }
 
     /**
-     * Intended to be called within {@link #introspectTypeHierarchyAndMembers()}.
+     * Intended to be called within {@link #introspectTypeHierarchyAndMembers()}
+     * .
      */
     protected void addAssociations(final List<ObjectAssociation> associations) {
         if (associations == null) {
@@ -267,7 +276,8 @@ public abstract class ObjectSpecificatio
     }
 
     /**
-     * Intended to be called within {@link #introspectTypeHierarchyAndMembers()}.
+     * Intended to be called within {@link #introspectTypeHierarchyAndMembers()}
+     * .
      */
     protected void addObjectActions(final List<ObjectAction> objectActions) {
         if (objectActions == null) {
@@ -309,7 +319,8 @@ public abstract class ObjectSpecificatio
     }
 
     /**
-     * Intended to be called (if at all) within {@link #updateFromFacetValues()}.
+     * Intended to be called (if at all) within {@link #updateFromFacetValues()}
+     * .
      */
     protected void setClearDirtyObjectFacet(final ClearDirtyObjectFacet clearDirtyObjectFacet) {
         this.clearDirtyObjectFacet = clearDirtyObjectFacet;
@@ -356,10 +367,12 @@ public abstract class ObjectSpecificatio
     // //////////////////////////////////////////////////////////////////////
 
     /**
-     * Determines if this class represents the same class, or a subclass, of the specified class.
+     * Determines if this class represents the same class, or a subclass, of the
+     * specified class.
      * 
      * <p>
-     * cf {@link Class#isAssignableFrom(Class)}, though target and parameter are the opposite way around, ie:
+     * cf {@link Class#isAssignableFrom(Class)}, though target and parameter are
+     * the opposite way around, ie:
      * 
      * <pre>
      * cls1.isAssignableFrom(cls2);
@@ -372,7 +385,8 @@ public abstract class ObjectSpecificatio
      * </pre>
      * 
      * <p>
-     * Callable after {@link #introspectTypeHierarchyAndMembers()} has been called.
+     * Callable after {@link #introspectTypeHierarchyAndMembers()} has been
+     * called.
      */
     @Override
     public boolean isOfType(final ObjectSpecification specification) {
@@ -393,7 +407,8 @@ public abstract class ObjectSpecificatio
     // //////////////////////////////////////////////////////////////////////
 
     /**
-     * Expect to be populated using {@link #setSingularName(String)}, but has default name as well.
+     * Expect to be populated using {@link #setSingularName(String)}, but has
+     * default name as well.
      */
     @Override
     public String getSingularName() {
@@ -402,7 +417,8 @@ public abstract class ObjectSpecificatio
     }
 
     /**
-     * Expect to be populated using {@link #setPluralName(String)} but has default name as well.
+     * Expect to be populated using {@link #setPluralName(String)} but has
+     * default name as well.
      */
     @Override
     public String getPluralName() {
@@ -411,7 +427,8 @@ public abstract class ObjectSpecificatio
     }
 
     /**
-     * Expect to be populated using {@link #setDescribedAs(String)} but has default name as well.
+     * Expect to be populated using {@link #setDescribedAs(String)} but has
+     * default name as well.
      */
     @Override
     public String getDescription() {
@@ -420,7 +437,10 @@ public abstract class ObjectSpecificatio
         return describedAs == null ? "" : describedAs;
     }
 
-    /* help is typically a reference (eg a URL) and so should not default to a textual value if not set up */
+    /*
+     * help is typically a reference (eg a URL) and so should not default to a
+     * textual value if not set up
+     */
     @Override
     public String getHelp() {
         final HelpFacet helpFacet = getFacet(HelpFacet.class);
@@ -473,7 +493,8 @@ public abstract class ObjectSpecificatio
             for (int i = 0; i < interfaces.size(); i++) {
                 final ObjectSpecification interfaceSpec = interfaces.get(i);
                 if (interfaceSpec == null) {
-                    // HACK: shouldn't happen, but occurring on occasion when running
+                    // HACK: shouldn't happen, but occurring on occasion when
+                    // running
                     // XATs under JUnit4. Some sort of race condition?
                     continue;
                 }
@@ -525,10 +546,8 @@ public abstract class ObjectSpecificatio
     // //////////////////////////////////////////////////////////////////
 
     @Override
-    public ObjectTitleContext createTitleInteractionContext(final AuthenticationSession session,
-        final InteractionInvocationMethod interactionMethod, final ObjectAdapter targetObjectAdapter) {
-        return new ObjectTitleContext(session, interactionMethod, targetObjectAdapter, getIdentifier(),
-            targetObjectAdapter.titleString());
+    public ObjectTitleContext createTitleInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod interactionMethod, final ObjectAdapter targetObjectAdapter) {
+        return new ObjectTitleContext(session, interactionMethod, targetObjectAdapter, getIdentifier(), targetObjectAdapter.titleString());
     }
 
     // //////////////////////////////////////////////////////////////////////
@@ -573,14 +592,15 @@ public abstract class ObjectSpecificatio
      * The association with the given {@link ObjectAssociation#getId() id}.
      * 
      * <p>
-     * This is overridable because {@link ObjectSpecificationForObjectList} simply returns <tt>null</tt>.
+     * This is overridable because {@link ObjectSpecificationForObjectList}
+     * simply returns <tt>null</tt>.
      * 
      * <p>
      * TODO put fields into hash.
      * 
      * <p>
-     * TODO: could this be made final? (ie does the framework ever call this method for an
-     * {@link ObjectSpecificationForObjectList})
+     * TODO: could this be made final? (ie does the framework ever call this
+     * method for an {@link ObjectSpecificationForObjectList})
      */
     @Override
     public ObjectAssociation getAssociation(final String id) {
@@ -621,7 +641,7 @@ public abstract class ObjectSpecificatio
     public List<OneToManyAssociation> getCollections() {
         final List<OneToManyAssociation> list = Lists.newArrayList();
         @SuppressWarnings("rawtypes")
-		final List associationList = getAssociations(ObjectAssociationFilters.COLLECTIONS);
+        final List associationList = getAssociations(ObjectAssociationFilters.COLLECTIONS);
         list.addAll(associationList);
         return list;
     }
@@ -631,17 +651,17 @@ public abstract class ObjectSpecificatio
     // //////////////////////////////////////////////////////////////////////
 
     @Override
-    public List<ObjectAction> getObjectActions(Contributed contributed) {
-    	if(contributed.isExcluded()) {
-    		// REVIEW: this special case almost certainly isn't required
-    		return Collections.unmodifiableList(objectActions);
-    	} else {
-    		return getObjectActions(ActionType.ALL_EXCEPT_SET, Contributed.INCLUDED);
-    	}
+    public List<ObjectAction> getObjectActions(final Contributed contributed) {
+        if (contributed.isExcluded()) {
+            // REVIEW: this special case almost certainly isn't required
+            return Collections.unmodifiableList(objectActions);
+        } else {
+            return getObjectActions(ActionType.ALL_EXCEPT_SET, Contributed.INCLUDED);
+        }
     }
 
     @Override
-    public List<ObjectAction> getObjectActions(final List<ActionType> requestedTypes, Contributed contributed) {
+    public List<ObjectAction> getObjectActions(final List<ActionType> requestedTypes, final Contributed contributed) {
         final List<ObjectAction> actions = Lists.newArrayList();
         for (final ActionType type : requestedTypes) {
             addActions(type, actions, contributed);
@@ -650,12 +670,12 @@ public abstract class ObjectSpecificatio
     }
 
     @Override
-    public List<ObjectAction> getObjectActions(final ActionType type, Contributed contributed) {
+    public List<ObjectAction> getObjectActions(final ActionType type, final Contributed contributed) {
         final List<ObjectAction> actions = Lists.newArrayList();
         return addActions(type, actions, contributed);
     }
 
-    private List<ObjectAction> addActions(final ActionType type, final List<ObjectAction> actionListToAppendTo, Contributed contributed) {
+    private List<ObjectAction> addActions(final ActionType type, final List<ObjectAction> actionListToAppendTo, final Contributed contributed) {
         if (!isService() && contributed.isIncluded()) {
             actionListToAppendTo.addAll(getContributedActions(type));
         }
@@ -684,10 +704,9 @@ public abstract class ObjectSpecificatio
         return actions;
     }
 
-    
     @Override
     public List<ObjectAction> getServiceActionsReturning(final ActionType type) {
-    	return getServiceActionsReturning(Collections.singletonList(type));
+        return getServiceActionsReturning(Collections.singletonList(type));
     }
 
     @Override
@@ -700,8 +719,7 @@ public abstract class ObjectSpecificatio
         return serviceActions;
     }
 
-    private void appendServiceActionsReturning(final ObjectAdapter serviceAdapter, final List<ActionType> types,
-        final List<ObjectAction> relatedActionsToAppendTo) {
+    private void appendServiceActionsReturning(final ObjectAdapter serviceAdapter, final List<ActionType> types, final List<ObjectAction> relatedActionsToAppendTo) {
         final List<ObjectAction> matchingActionsToAppendTo = Lists.newArrayList();
         for (final ActionType type : types) {
             final List<ObjectAction> serviceActions = serviceAdapter.getSpecification().getObjectActions(type, Contributed.INCLUDED);
@@ -710,14 +728,12 @@ public abstract class ObjectSpecificatio
             }
         }
         if (matchingActionsToAppendTo.size() > 0) {
-            final ObjectActionSet set =
-                new ObjectActionSet("id", serviceAdapter.titleString(), matchingActionsToAppendTo);
+            final ObjectActionSet set = new ObjectActionSet("id", serviceAdapter.titleString(), matchingActionsToAppendTo);
             relatedActionsToAppendTo.add(set);
         }
     }
 
-    private void addIfReturnsSubtype(final ObjectAction serviceAction,
-        final List<ObjectAction> matchingActionsToAppendTo) {
+    private void addIfReturnsSubtype(final ObjectAction serviceAction, final List<ObjectAction> matchingActionsToAppendTo) {
         final ObjectSpecification returnType = serviceAction.getReturnType();
         if (returnType == null) {
             return;
@@ -733,8 +749,7 @@ public abstract class ObjectSpecificatio
         }
     }
 
-    private void addIfReturnsSubtype(final ObjectAction serviceAction, final ObjectSpecification actionType,
-        final List<ObjectAction> matchingActionsToAppendTo) {
+    private void addIfReturnsSubtype(final ObjectAction serviceAction, final ObjectSpecification actionType, final List<ObjectAction> matchingActionsToAppendTo) {
         if (actionType.isOfType(this)) {
             matchingActionsToAppendTo.add(serviceAction);
         }
@@ -748,10 +763,11 @@ public abstract class ObjectSpecificatio
      * Finds all service actions that contribute to this spec, if any.
      * 
      * <p>
-     * If this specification {@link #isService() is actually for} a service, then returns an empty array.
+     * If this specification {@link #isService() is actually for} a service,
+     * then returns an empty array.
      * 
-     * @return an array of {@link ObjectActionSet}s (!!), each of which contains {@link ObjectAction}s of the requested
-     *         type.
+     * @return an array of {@link ObjectActionSet}s (!!), each of which contains
+     *         {@link ObjectAction}s of the requested type.
      * 
      */
     protected List<ObjectAction> getContributedActions(final ActionType actionType) {
@@ -760,7 +776,8 @@ public abstract class ObjectSpecificatio
         }
         List<ObjectAction> contributedActionSets = contributedActionSetsByType.get(actionType);
         if (contributedActionSets == null) {
-            // populate an ActionSet with all actions contributed by each service
+            // populate an ActionSet with all actions contributed by each
+            // service
             contributedActionSets = Lists.newArrayList();
             final List<ObjectAdapter> services = getServicesProvider().getServices();
             for (final ObjectAdapter serviceAdapter : services) {
@@ -770,9 +787,8 @@ public abstract class ObjectSpecificatio
         }
         return contributedActionSets;
     }
-    
-    private void addContributedActionsIfAny(final ObjectAdapter serviceAdapter, final ActionType actionType,
-        final List<ObjectAction> contributedActionSetsToAppendTo) {
+
+    private void addContributedActionsIfAny(final ObjectAdapter serviceAdapter, final ActionType actionType, final List<ObjectAction> contributedActionSetsToAppendTo) {
         final ObjectSpecification specification = serviceAdapter.getSpecification();
         if (specification == this) {
             return;
@@ -782,13 +798,11 @@ public abstract class ObjectSpecificatio
         if (contributedActions.size() == 0) {
             return;
         }
-        final ObjectActionSet contributedActionSet =
-            new ObjectActionSet("id", serviceAdapter.titleString(), contributedActions);
+        final ObjectActionSet contributedActionSet = new ObjectActionSet("id", serviceAdapter.titleString(), contributedActions);
         contributedActionSetsToAppendTo.add(contributedActionSet);
     }
 
-    private List<ObjectAction> findContributedActions(final ObjectSpecification specification,
-        final ActionType actionType) {
+    private List<ObjectAction> findContributedActions(final ObjectSpecification specification, final ActionType actionType) {
         final List<ObjectAction> contributedActions = Lists.newArrayList();
         final List<ObjectAction> serviceActions = specification.getObjectActions(actionType, Contributed.INCLUDED);
         for (final ObjectAction serviceAction : serviceActions) {
@@ -823,23 +837,21 @@ public abstract class ObjectSpecificatio
     }
 
     /**
-     * TODO: currently this method is hard-coded to assume all interactions are initiated
-     * {@link InteractionInvocationMethod#BY_USER by user}.
+     * TODO: currently this method is hard-coded to assume all interactions are
+     * initiated {@link InteractionInvocationMethod#BY_USER by user}.
      */
     @Override
     public InteractionResult isValidResult(final ObjectAdapter targetObjectAdapter) {
-        final ObjectValidityContext validityContext =
-            createValidityInteractionContext(getAuthenticationSession(), InteractionInvocationMethod.BY_USER,
-                targetObjectAdapter);
+        final ObjectValidityContext validityContext = createValidityInteractionContext(getAuthenticationSession(), InteractionInvocationMethod.BY_USER, targetObjectAdapter);
         return InteractionUtils.isValidResult(this, validityContext);
     }
 
     /**
-     * Create an {@link InteractionContext} representing an attempt to save the object.
+     * Create an {@link InteractionContext} representing an attempt to save the
+     * object.
      */
     @Override
-    public ObjectValidityContext createValidityInteractionContext(final AuthenticationSession session,
-        final InteractionInvocationMethod interactionMethod, final ObjectAdapter targetObjectAdapter) {
+    public ObjectValidityContext createValidityInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod interactionMethod, final ObjectAdapter targetObjectAdapter) {
         return new ObjectValidityContext(session, interactionMethod, targetObjectAdapter, getIdentifier());
     }
 
@@ -927,8 +939,9 @@ public abstract class ObjectSpecificatio
     // //////////////////////////////////////////////////////////////////////
 
     /**
-     * convenience method to return the current {@link AuthenticationSession} from the
-     * {@link #getAuthenticationSessionProvider() injected} {@link AuthenticationSessionProvider}.
+     * convenience method to return the current {@link AuthenticationSession}
+     * from the {@link #getAuthenticationSessionProvider() injected}
+     * {@link AuthenticationSessionProvider}.
      */
     protected final AuthenticationSession getAuthenticationSession() {
         return getAuthenticationSessionProvider().getAuthenticationSession();

Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java Sun Jan 22 06:58:43 2012
@@ -50,13 +50,12 @@ import org.apache.isis.core.metamodel.sp
 public class OneToManyAssociationImpl extends ObjectAssociationAbstract implements OneToManyAssociation {
 
     public OneToManyAssociationImpl(final FacetedMethod facetedMethod, final ObjectMemberContext objectMemberContext) {
-        super(facetedMethod, FeatureType.COLLECTION, getSpecification(objectMemberContext.getSpecificationLookup(),
-            facetedMethod.getType()), objectMemberContext);
+        super(facetedMethod, FeatureType.COLLECTION, getSpecification(objectMemberContext.getSpecificationLookup(), facetedMethod.getType()), objectMemberContext);
     }
 
     @Override
     public CollectionSemantics getCollectionSemantics() {
-        Class<?> underlyingClass = getSpecification().getCorrespondingClass();
+        final Class<?> underlyingClass = getSpecification().getCorrespondingClass();
         return getCollectionTypeRegistry().semanticsOf(underlyingClass);
     }
 
@@ -65,8 +64,7 @@ public class OneToManyAssociationImpl ex
     // /////////////////////////////////////////////////////////////
 
     @Override
-    public VisibilityContext<?> createVisibleInteractionContext(final AuthenticationSession session,
-        final InteractionInvocationMethod invocationMethod, final ObjectAdapter ownerAdapter) {
+    public VisibilityContext<?> createVisibleInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter ownerAdapter) {
         return new CollectionVisibilityContext(session, invocationMethod, ownerAdapter, getIdentifier());
     }
 
@@ -75,8 +73,7 @@ public class OneToManyAssociationImpl ex
     // /////////////////////////////////////////////////////////////
 
     @Override
-    public UsabilityContext<?> createUsableInteractionContext(final AuthenticationSession session,
-        final InteractionInvocationMethod invocationMethod, final ObjectAdapter ownerAdapter) {
+    public UsabilityContext<?> createUsableInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter ownerAdapter) {
         return new CollectionUsabilityContext(session, invocationMethod, ownerAdapter, getIdentifier());
     }
 
@@ -85,27 +82,21 @@ public class OneToManyAssociationImpl ex
     // /////////////////////////////////////////////////////////////
 
     @Override
-    public ValidityContext<?> createValidateAddInteractionContext(final AuthenticationSession session,
-        final InteractionInvocationMethod invocationMethod, final ObjectAdapter ownerAdapter,
-        final ObjectAdapter proposedToAddAdapter) {
-        return new CollectionAddToContext(session, invocationMethod, ownerAdapter, getIdentifier(),
-            proposedToAddAdapter);
+    public ValidityContext<?> createValidateAddInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter ownerAdapter, final ObjectAdapter proposedToAddAdapter) {
+        return new CollectionAddToContext(session, invocationMethod, ownerAdapter, getIdentifier(), proposedToAddAdapter);
     }
 
     /**
-     * TODO: currently this method is hard-coded to assume all interactions are initiated
-     * {@link InteractionInvocationMethod#BY_USER by user}.
+     * TODO: currently this method is hard-coded to assume all interactions are
+     * initiated {@link InteractionInvocationMethod#BY_USER by user}.
      */
     @Override
     public Consent isValidToAdd(final ObjectAdapter ownerAdapter, final ObjectAdapter proposedToAddAdapter) {
         return isValidToAddResult(ownerAdapter, proposedToAddAdapter).createConsent();
     }
 
-    private InteractionResult isValidToAddResult(final ObjectAdapter ownerAdapter,
-        final ObjectAdapter proposedToAddAdapter) {
-        final ValidityContext<?> validityContext =
-            createValidateAddInteractionContext(getAuthenticationSession(), InteractionInvocationMethod.BY_USER,
-                ownerAdapter, proposedToAddAdapter);
+    private InteractionResult isValidToAddResult(final ObjectAdapter ownerAdapter, final ObjectAdapter proposedToAddAdapter) {
+        final ValidityContext<?> validityContext = createValidateAddInteractionContext(getAuthenticationSession(), InteractionInvocationMethod.BY_USER, ownerAdapter, proposedToAddAdapter);
         return InteractionUtils.isValidResult(this, validityContext);
     }
 
@@ -114,27 +105,21 @@ public class OneToManyAssociationImpl ex
     // /////////////////////////////////////////////////////////////
 
     @Override
-    public ValidityContext<?> createValidateRemoveInteractionContext(final AuthenticationSession session,
-        final InteractionInvocationMethod invocationMethod, final ObjectAdapter ownerAdapter,
-        final ObjectAdapter proposedToRemoveAdapter) {
-        return new CollectionRemoveFromContext(session, invocationMethod, ownerAdapter, getIdentifier(),
-            proposedToRemoveAdapter);
+    public ValidityContext<?> createValidateRemoveInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter ownerAdapter, final ObjectAdapter proposedToRemoveAdapter) {
+        return new CollectionRemoveFromContext(session, invocationMethod, ownerAdapter, getIdentifier(), proposedToRemoveAdapter);
     }
 
     /**
-     * TODO: currently this method is hard-coded to assume all interactions are initiated
-     * {@link InteractionInvocationMethod#BY_USER by user}.
+     * TODO: currently this method is hard-coded to assume all interactions are
+     * initiated {@link InteractionInvocationMethod#BY_USER by user}.
      */
     @Override
     public Consent isValidToRemove(final ObjectAdapter ownerAdapter, final ObjectAdapter proposedToRemoveAdapter) {
         return isValidToRemoveResult(ownerAdapter, proposedToRemoveAdapter).createConsent();
     }
 
-    private InteractionResult isValidToRemoveResult(final ObjectAdapter ownerAdapter,
-        final ObjectAdapter proposedToRemoveAdapter) {
-        final ValidityContext<?> validityContext =
-            createValidateRemoveInteractionContext(getAuthenticationSession(), InteractionInvocationMethod.BY_USER,
-                ownerAdapter, proposedToRemoveAdapter);
+    private InteractionResult isValidToRemoveResult(final ObjectAdapter ownerAdapter, final ObjectAdapter proposedToRemoveAdapter) {
+        final ValidityContext<?> validityContext = createValidateRemoveInteractionContext(getAuthenticationSession(), InteractionInvocationMethod.BY_USER, ownerAdapter, proposedToRemoveAdapter);
         return InteractionUtils.isValidResult(this, validityContext);
     }
 
@@ -159,7 +144,8 @@ public class OneToManyAssociationImpl ex
 
     @Override
     public boolean isEmpty(final ObjectAdapter parentAdapter) {
-        // REVIEW should we be able to determine if a collection is empty without loading it?
+        // REVIEW should we be able to determine if a collection is empty
+        // without loading it?
         final ObjectAdapter collection = get(parentAdapter);
         final CollectionFacet facet = CollectionFacetUtils.getCollectionFacetFromSpec(collection);
         return facet.size(collection) == 0;
@@ -176,9 +162,7 @@ public class OneToManyAssociationImpl ex
         }
         if (readWrite()) {
             if (ownerAdapter.isPersistent() && referencedAdapter.isTransient()) {
-                throw new IsisException("can't set a reference to a transient object from a persistent one: "
-                    + ownerAdapter.titleString() + " (persistent) -> " + referencedAdapter.titleString()
-                    + " (transient)");
+                throw new IsisException("can't set a reference to a transient object from a persistent one: " + ownerAdapter.titleString() + " (persistent) -> " + referencedAdapter.titleString() + " (transient)");
             }
             final CollectionAddToFacet facet = getFacet(CollectionAddToFacet.class);
             facet.add(ownerAdapter, referencedAdapter);
@@ -269,5 +253,4 @@ public class OneToManyAssociationImpl ex
         return str.toString();
     }
 
-
 }

Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterImpl.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterImpl.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterImpl.java Sun Jan 22 06:58:43 2012
@@ -43,8 +43,9 @@ public class OneToOneActionParameterImpl
     }
 
     /**
-     * TODO: need to be able to validate parameters individually, eg if have <tt>RegEx</tt> annotation; should delegate
-     * to the Check framework instead.
+     * TODO: need to be able to validate parameters individually, eg if have
+     * <tt>RegEx</tt> annotation; should delegate to the Check framework
+     * instead.
      */
     @Override
     public String isValid(final ObjectAdapter adapter, final Object proposedValue) {
@@ -66,8 +67,9 @@ public class OneToOneActionParameterImpl
     // //////////////////////////////////////////////////////////////////////
 
     /**
-     * Gets the proposed value of the {@link Instance} (downcast as a {@link MutableProposed}, wrapping the proposed
-     * value into a {@link ObjectAdapter}.
+     * Gets the proposed value of the {@link Instance} (downcast as a
+     * {@link MutableProposed}, wrapping the proposed value into a
+     * {@link ObjectAdapter}.
      */
     @Override
     public ObjectAdapter get(final ObjectAdapter owner) {
@@ -77,8 +79,9 @@ public class OneToOneActionParameterImpl
     }
 
     /**
-     * Sets the proposed value of the {@link Instance} (downcast as a {@link MutableProposed}, unwrapped the proposed
-     * value from a {@link ObjectAdapter}.
+     * Sets the proposed value of the {@link Instance} (downcast as a
+     * {@link MutableProposed}, unwrapped the proposed value from a
+     * {@link ObjectAdapter}.
      */
     public void set(final ObjectAdapter owner, final ObjectAdapter newValue) {
         final MutableProposedHolder proposedHolder = getProposedHolder(owner);

Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java Sun Jan 22 06:58:43 2012
@@ -56,8 +56,7 @@ import org.apache.isis.core.metamodel.sp
 public class OneToOneAssociationImpl extends ObjectAssociationAbstract implements OneToOneAssociation {
 
     public OneToOneAssociationImpl(final FacetedMethod facetedMethod, final ObjectMemberContext objectMemberContext) {
-        super(facetedMethod, FeatureType.PROPERTY, getSpecification(objectMemberContext.getSpecificationLookup(),
-            facetedMethod.getType()), objectMemberContext);
+        super(facetedMethod, FeatureType.PROPERTY, getSpecification(objectMemberContext.getSpecificationLookup(), facetedMethod.getType()), objectMemberContext);
     }
 
     // /////////////////////////////////////////////////////////////
@@ -65,8 +64,7 @@ public class OneToOneAssociationImpl ext
     // /////////////////////////////////////////////////////////////
 
     @Override
-    public VisibilityContext<?> createVisibleInteractionContext(final AuthenticationSession session,
-        final InteractionInvocationMethod invocationMethod, final ObjectAdapter ownerAdapter) {
+    public VisibilityContext<?> createVisibleInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter ownerAdapter) {
         return new PropertyVisibilityContext(session, invocationMethod, ownerAdapter, getIdentifier());
     }
 
@@ -75,8 +73,7 @@ public class OneToOneAssociationImpl ext
     // /////////////////////////////////////////////////////////////
 
     @Override
-    public UsabilityContext<?> createUsableInteractionContext(final AuthenticationSession session,
-        final InteractionInvocationMethod invocationMethod, final ObjectAdapter ownerAdapter) {
+    public UsabilityContext<?> createUsableInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter ownerAdapter) {
         return new PropertyUsabilityContext(session, invocationMethod, ownerAdapter, getIdentifier());
     }
 
@@ -85,27 +82,21 @@ public class OneToOneAssociationImpl ext
     // /////////////////////////////////////////////////////////////
 
     @Override
-    public ValidityContext<?> createValidateInteractionContext(final AuthenticationSession session,
-        final InteractionInvocationMethod interactionMethod, final ObjectAdapter ownerAdapter,
-        final ObjectAdapter proposedToReferenceAdapter) {
-        return new PropertyModifyContext(session, interactionMethod, ownerAdapter, getIdentifier(),
-            proposedToReferenceAdapter);
+    public ValidityContext<?> createValidateInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod interactionMethod, final ObjectAdapter ownerAdapter, final ObjectAdapter proposedToReferenceAdapter) {
+        return new PropertyModifyContext(session, interactionMethod, ownerAdapter, getIdentifier(), proposedToReferenceAdapter);
     }
 
     /**
-     * TODO: currently this method is hard-coded to assume all interactions are initiated
-     * {@link InteractionInvocationMethod#BY_USER by user}.
+     * TODO: currently this method is hard-coded to assume all interactions are
+     * initiated {@link InteractionInvocationMethod#BY_USER by user}.
      */
     @Override
     public Consent isAssociationValid(final ObjectAdapter ownerAdapter, final ObjectAdapter proposedToReferenceAdapter) {
         return isAssociationValidResult(ownerAdapter, proposedToReferenceAdapter).createConsent();
     }
 
-    private InteractionResult isAssociationValidResult(final ObjectAdapter ownerAdapter,
-        final ObjectAdapter proposedToReferenceAdapter) {
-        final ValidityContext<?> validityContext =
-            createValidateInteractionContext(getAuthenticationSession(), InteractionInvocationMethod.BY_USER,
-                ownerAdapter, proposedToReferenceAdapter);
+    private InteractionResult isAssociationValidResult(final ObjectAdapter ownerAdapter, final ObjectAdapter proposedToReferenceAdapter) {
+        final ValidityContext<?> validityContext = createValidateInteractionContext(getAuthenticationSession(), InteractionInvocationMethod.BY_USER, ownerAdapter, proposedToReferenceAdapter);
         return InteractionUtils.isValidResult(this, validityContext);
     }
 
@@ -138,14 +129,12 @@ public class OneToOneAssociationImpl ext
     }
 
     /**
-     * TODO: currently this method is hard-coded to assume all interactions are initiated
-     * {@link InteractionInvocationMethod#BY_USER by user}.
+     * TODO: currently this method is hard-coded to assume all interactions are
+     * initiated {@link InteractionInvocationMethod#BY_USER by user}.
      */
     @Override
-    public PropertyAccessContext createAccessInteractionContext(final AuthenticationSession session,
-        final InteractionInvocationMethod interactionMethod, final ObjectAdapter ownerAdapter) {
-        return new PropertyAccessContext(session, InteractionInvocationMethod.BY_USER, ownerAdapter, getIdentifier(),
-            get(ownerAdapter));
+    public PropertyAccessContext createAccessInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod interactionMethod, final ObjectAdapter ownerAdapter) {
+        return new PropertyAccessContext(session, InteractionInvocationMethod.BY_USER, ownerAdapter, getIdentifier(), get(ownerAdapter));
     }
 
     @Override
@@ -179,14 +168,10 @@ public class OneToOneAssociationImpl ext
         final PropertySetterFacet setterFacet = getFacet(PropertySetterFacet.class);
         if (setterFacet == null) {
             return;
-        } 
-        if (ownerAdapter.isPersistent() && 
-                newReferencedAdapter != null && 
-                newReferencedAdapter.isTransient() && 
-                !newReferencedAdapter.getSpecification().isAggregated()) {
+        }
+        if (ownerAdapter.isPersistent() && newReferencedAdapter != null && newReferencedAdapter.isTransient() && !newReferencedAdapter.getSpecification().isAggregated()) {
             // TODO: move to facet ?
-            throw new IsisException("can't set a reference to a transient object from a persistent one: "
-                + newReferencedAdapter.titleString() + " (transient)");
+            throw new IsisException("can't set a reference to a transient object from a persistent one: " + newReferencedAdapter.titleString() + " (transient)");
         }
         setterFacet.setProperty(ownerAdapter, newReferencedAdapter);
     }
@@ -212,7 +197,8 @@ public class OneToOneAssociationImpl ext
     @Override
     public ObjectAdapter getDefault(final ObjectAdapter ownerAdapter) {
         PropertyDefaultFacet propertyDefaultFacet = getFacet(PropertyDefaultFacet.class);
-        // if no default on the association, attempt to find a default on the specification (eg an int should
+        // if no default on the association, attempt to find a default on the
+        // specification (eg an int should
         // default to 0).
         if (propertyDefaultFacet == null || propertyDefaultFacet.isNoop()) {
             propertyDefaultFacet = this.getSpecification().getFacet(PropertyDefaultFacet.class);
@@ -251,9 +237,7 @@ public class OneToOneAssociationImpl ext
     @Override
     public ObjectAdapter[] getChoices(final ObjectAdapter ownerAdapter) {
         final PropertyChoicesFacet propertyChoicesFacet = getFacet(PropertyChoicesFacet.class);
-        final Object[] pojoOptions =
-            propertyChoicesFacet == null ? null : propertyChoicesFacet.getChoices(ownerAdapter,
-                getSpecificationLookup());
+        final Object[] pojoOptions = propertyChoicesFacet == null ? null : propertyChoicesFacet.getChoices(ownerAdapter, getSpecificationLookup());
         if (pojoOptions != null) {
             final ObjectAdapter[] options = new ObjectAdapter[pojoOptions.length];
             for (int i = 0; i < options.length; i++) {

Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java Sun Jan 22 06:58:43 2012
@@ -109,10 +109,8 @@ public class ObjectSpecificationDefault 
     // Constructor
     // //////////////////////////////////////////////////////////////////////
 
-    public ObjectSpecificationDefault(final Class<?> correspondingClass,
-        final FacetedMethodsBuilderContext facetedMethodsBuilderContext,
-        final IntrospectionContext introspectionContext, final SpecificationContext specContext,
-        final ObjectMemberContext objectMemberContext, final CreateObjectContext createObjectContext) {
+    public ObjectSpecificationDefault(final Class<?> correspondingClass, final FacetedMethodsBuilderContext facetedMethodsBuilderContext, final IntrospectionContext introspectionContext, final SpecificationContext specContext, final ObjectMemberContext objectMemberContext,
+            final CreateObjectContext createObjectContext) {
         super(correspondingClass, determineShortName(correspondingClass), specContext);
 
         this.facetedMethodsBuilder = new FacetedMethodsBuilder(this, facetedMethodsBuilderContext);
@@ -139,20 +137,20 @@ public class ObjectSpecificationDefault 
         setSuperclass(superclass);
 
         // go no further if required
-        final boolean skipFurtherIntrospection =
-            JavaClassUtils.isJavaClass(getCorrespondingClass()) || isAppLibValue(getCorrespondingClass());
+        final boolean skipFurtherIntrospection = JavaClassUtils.isJavaClass(getCorrespondingClass()) || isAppLibValue(getCorrespondingClass());
         if (skipFurtherIntrospection) {
             if (LOG.isDebugEnabled()) {
-                LOG.debug("skipping introspection of interfaces, properties, actions and interfaces for "
-                    + getFullIdentifier() + " (java.xxx or applib value class)");
+                LOG.debug("skipping introspection of interfaces, properties, actions and interfaces for " + getFullIdentifier() + " (java.xxx or applib value class)");
             }
             return;
         }
 
         // walk superinterfaces
 
-        // REVIEW: the processing here isn't quite the same as with superclasses,
-        // in that with superclasses the superclass adds this type as its subclass,
+        // REVIEW: the processing here isn't quite the same as with
+        // superclasses,
+        // in that with superclasses the superclass adds this type as its
+        // subclass,
         // whereas here this type defines itself as the subtype.
         // it'd be nice to push the responsibility for adding subclasses to
         // the interface type... needs some tests around it, though, before
@@ -162,8 +160,7 @@ public class ObjectSpecificationDefault 
         for (final Class<?> interfaceType : interfaceTypes) {
             final Class<?> substitutedInterfaceType = getClassSubstitutor().getClass(interfaceType);
             if (substitutedInterfaceType != null) {
-                final ObjectSpecification interfaceSpec =
-                    getSpecificationLookup().loadSpecification(substitutedInterfaceType);
+                final ObjectSpecification interfaceSpec = getSpecificationLookup().loadSpecification(substitutedInterfaceType);
                 interfaceSpecList.add(interfaceSpec);
             }
         }
@@ -176,8 +173,7 @@ public class ObjectSpecificationDefault 
         final List<FacetedMethod> actionFacetedMethods = facetedMethodsBuilder.getActionFacetedMethods();
 
         // ordering
-        final OrderSet associationOrderSet =
-            getMemberLayoutArranger().createAssociationOrderSetFor(this, associationFacetedMethods);
+        final OrderSet associationOrderSet = getMemberLayoutArranger().createAssociationOrderSetFor(this, associationFacetedMethods);
         addAssociations(asAssociations(associationOrderSet));
 
         final OrderSet actionOrderSet = getMemberLayoutArranger().createActionOrderSetFor(this, actionFacetedMethods);
@@ -204,7 +200,8 @@ public class ObjectSpecificationDefault 
     }
 
     /**
-     * TODO: review this, should be more general and check for value facet, surely?
+     * TODO: review this, should be more general and check for value facet,
+     * surely?
      */
     private boolean isAppLibValue(final Class<?> type) {
         return type.getName().startsWith("org.apache.isis.applib.value.");
@@ -288,8 +285,8 @@ public class ObjectSpecificationDefault 
     }
 
     /**
-     * TODO: should ensure that service has at least one user action; fix when specification knows of its hidden
-     * methods.
+     * TODO: should ensure that service has at least one user action; fix when
+     * specification knows of its hidden methods.
      * 
      * <pre>
      * if (objectActions != null &amp;&amp; objectActions.length == 0) {
@@ -314,8 +311,7 @@ public class ObjectSpecificationDefault 
             }
         }
         if (buf.length() > 0) {
-            throw new ObjectSpecificationException("Service object " + getFullIdentifier()
-                + " should have no fields, but has: " + buf);
+            throw new ObjectSpecificationException("Service object " + getFullIdentifier() + " should have no fields, but has: " + buf);
         }
     }
 
@@ -339,33 +335,29 @@ public class ObjectSpecificationDefault 
     // //////////////////////////////////////////////////////////////////////
 
     @Override
-    public ObjectAction getObjectAction(final ActionType type, final String id,
-        final List<ObjectSpecification> parameters) {
-        final List<ObjectAction> availableActions =
-            ListUtils.combine(getObjectActions(Contributed.EXCLUDED), getContributedActions(type));
+    public ObjectAction getObjectAction(final ActionType type, final String id, final List<ObjectSpecification> parameters) {
+        final List<ObjectAction> availableActions = ListUtils.combine(getObjectActions(Contributed.EXCLUDED), getContributedActions(type));
         return getAction(availableActions, type, id, parameters);
     }
 
     @Override
     public ObjectAction getObjectAction(final ActionType type, final String id) {
-        final List<ObjectAction> availableActions =
-            ListUtils.combine(getObjectActions(type, Contributed.INCLUDED), getContributedActions(type));
+        final List<ObjectAction> availableActions = ListUtils.combine(getObjectActions(type, Contributed.INCLUDED), getContributedActions(type));
         return getAction(availableActions, type, id);
     }
 
     @Override
     public ObjectAction getObjectAction(final String id) {
-        for(ActionType type: ActionType.values()) {
-            ObjectAction action = getObjectAction(type, id);
-            if(action != null) {
+        for (final ActionType type : ActionType.values()) {
+            final ObjectAction action = getObjectAction(type, id);
+            if (action != null) {
                 return action;
             }
         }
         return null;
     }
 
-    private ObjectAction getAction(final List<ObjectAction> availableActions, final ActionType type,
-        final String actionName, final List<ObjectSpecification> parameters) {
+    private ObjectAction getAction(final List<ObjectAction> availableActions, final ActionType type, final String actionName, final List<ObjectSpecification> parameters) {
         outer: for (int i = 0; i < availableActions.size(); i++) {
             final ObjectAction action = availableActions.get(i);
             if (action.getActions().size() > 0) {
@@ -396,8 +388,7 @@ public class ObjectSpecificationDefault 
         return null;
     }
 
-    private ObjectAction getAction(final List<ObjectAction> availableActions, final ActionType type,
-        final String id) {
+    private ObjectAction getAction(final List<ObjectAction> availableActions, final ActionType type, final String id) {
         if (id == null) {
             return null;
         }
@@ -416,10 +407,10 @@ public class ObjectSpecificationDefault 
                 }
                 if (id.equals(action.getIdentifier().toNameParmsIdentityString())) {
                     return action;
-                } 
+                }
                 if (id.equals(action.getIdentifier().toNameIdentityString())) {
                     return action;
-                } 
+                }
                 continue outer;
             }
         }

Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/CollectionFacetForObjectList.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/CollectionFacetForObjectList.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/CollectionFacetForObjectList.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/CollectionFacetForObjectList.java Sun Jan 22 06:58:43 2012
@@ -33,7 +33,8 @@ public class CollectionFacetForObjectLis
     }
 
     /**
-     * Expected to be called with a {@link ObjectAdapter} wrapping a {@link ObjectList}.
+     * Expected to be called with a {@link ObjectAdapter} wrapping a
+     * {@link ObjectList}.
      */
     @Override
     public List<ObjectAdapter> collection(final ObjectAdapter wrappedObjectList) {
@@ -41,7 +42,8 @@ public class CollectionFacetForObjectLis
     }
 
     /**
-     * Expected to be called with a {@link ObjectAdapter} wrapping a {@link ObjectList}.
+     * Expected to be called with a {@link ObjectAdapter} wrapping a
+     * {@link ObjectList}.
      */
     @Override
     public ObjectAdapter firstElement(final ObjectAdapter wrappedInstanceCollectionVector) {
@@ -50,7 +52,8 @@ public class CollectionFacetForObjectLis
     }
 
     /**
-     * Expected to be called with a {@link ObjectAdapter} wrapping a {@link ObjectList}.
+     * Expected to be called with a {@link ObjectAdapter} wrapping a
+     * {@link ObjectList}.
      */
     @Override
     public int size(final ObjectAdapter wrappedInstanceCollectionVector) {

Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/ObjectSpecificationForObjectList.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/ObjectSpecificationForObjectList.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/ObjectSpecificationForObjectList.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/objectlist/ObjectSpecificationForObjectList.java Sun Jan 22 06:58:43 2012
@@ -36,13 +36,14 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.specloader.specimpl.ObjectSpecificationAbstract;
 
 /**
- * A custom {@link ObjectSpecification} that is designed to treat the {@link ObjectList} class as a "standalone"
- * collection.
+ * A custom {@link ObjectSpecification} that is designed to treat the
+ * {@link ObjectList} class as a "standalone" collection.
  */
 public class ObjectSpecificationForObjectList extends ObjectSpecificationAbstract {
 
     /**
-     * Used as {@link #getShortIdentifier()}, {@link #getName()} and {@link #getPluralName()}.
+     * Used as {@link #getShortIdentifier()}, {@link #getName()} and
+     * {@link #getPluralName()}.
      */
     private static final String NAME = "Instances";
     private static final String DESCRIBED_AS = "Typed instances";
@@ -57,8 +58,9 @@ public class ObjectSpecificationForObjec
     // /////////////////////////////////////////////////////////
 
     /**
-     * Review: wouldn't it be better to have a FacetFactory that specifically recognized {@link ObjectList} as a type
-     * and installed a {@link CollectionFacet} for it.
+     * Review: wouldn't it be better to have a FacetFactory that specifically
+     * recognized {@link ObjectList} as a type and installed a
+     * {@link CollectionFacet} for it.
      */
     @Override
     public boolean isCollectionOrIsAggregated() {
@@ -96,7 +98,8 @@ public class ObjectSpecificationForObjec
      * No-op.
      * 
      * <p>
-     * Review: is this ever called for an instance of this class? If not, then no need to override.
+     * Review: is this ever called for an instance of this class? If not, then
+     * no need to override.
      */
     @Override
     public void markAsService() {
@@ -112,7 +115,8 @@ public class ObjectSpecificationForObjec
     // /////////////////////////////////////////////////////
 
     /**
-     * Review: is this ever called for an instance of this class? If not, then no need to override.
+     * Review: is this ever called for an instance of this class? If not, then
+     * no need to override.
      */
     @Override
     public ObjectAssociation getAssociation(final String id) {
@@ -141,8 +145,7 @@ public class ObjectSpecificationForObjec
      * Review: is it necessary to override for this subclass?
      */
     @Override
-    public ObjectAction getObjectAction(final ActionType type, final String id,
-        final List<ObjectSpecification> parameters) {
+    public ObjectAction getObjectAction(final ActionType type, final String id, final List<ObjectSpecification> parameters) {
         return null;
     }
 
@@ -162,7 +165,6 @@ public class ObjectSpecificationForObjec
         return null;
     }
 
-
     // /////////////////////////////////////////////////////
     // Service Actions
     // /////////////////////////////////////////////////////

Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/SpecificationTraverser.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/SpecificationTraverser.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/SpecificationTraverser.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/SpecificationTraverser.java Sun Jan 22 06:58:43 2012
@@ -29,7 +29,6 @@ public interface SpecificationTraverser 
 
     void traverseTypes(Method method, List<Class<?>> discoveredTypes);
 
-    void traverseReferencedClasses(ObjectSpecification noSpec, List<Class<?>> discoveredTypes)
-        throws ClassNotFoundException;
+    void traverseReferencedClasses(ObjectSpecification noSpec, List<Class<?>> discoveredTypes) throws ClassNotFoundException;
 
 }

Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/SpecificationTraverserDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/SpecificationTraverserDefault.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/SpecificationTraverserDefault.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/SpecificationTraverserDefault.java Sun Jan 22 06:58:43 2012
@@ -55,7 +55,8 @@ public class SpecificationTraverserDefau
      * Traverses the return types of each method.
      * 
      * <p>
-     * It's possible for there to be multiple return types: the generic type, and the parameterized type.
+     * It's possible for there to be multiple return types: the generic type,
+     * and the parameterized type.
      */
     @Override
     public void traverseTypes(final Method method, final List<Class<?>> discoveredTypes) {
@@ -69,8 +70,7 @@ public class SpecificationTraverserDefau
      * Does nothing.
      */
     @Override
-    public void traverseReferencedClasses(final ObjectSpecification noSpec, final List<Class<?>> discoveredTypes)
-        throws ClassNotFoundException {
+    public void traverseReferencedClasses(final ObjectSpecification noSpec, final List<Class<?>> discoveredTypes) throws ClassNotFoundException {
     }
 
     // ////////////////////////////////////////////////////////////////////

Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorAbstract.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorAbstract.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorAbstract.java Sun Jan 22 06:58:43 2012
@@ -28,7 +28,8 @@ import java.util.Iterator;
 import java.util.List;
 
 /**
- * Abstract base class factoring out common functionality for helper methods that extract parameterized types.
+ * Abstract base class factoring out common functionality for helper methods
+ * that extract parameterized types.
  * 
  */
 abstract class TypeExtractorAbstract implements Iterable<Class<?>> {
@@ -65,7 +66,8 @@ abstract class TypeExtractorAbstract imp
     }
 
     /**
-     * The {@link Method} provided in the {@link #TypeExtractorAbstract(Method) constructor.}
+     * The {@link Method} provided in the {@link #TypeExtractorAbstract(Method)
+     * constructor.}
      */
     protected Method getMethod() {
         return method;

Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorMethodParameters.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorMethodParameters.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorMethodParameters.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorMethodParameters.java Sun Jan 22 06:58:43 2012
@@ -23,7 +23,8 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 
 /**
- * Helper that finds all parameter types (including generic types) for the provided {@link Method}.
+ * Helper that finds all parameter types (including generic types) for the
+ * provided {@link Method}.
  * 
  * <p>
  * For example,

Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorMethodReturn.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorMethodReturn.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorMethodReturn.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/TypeExtractorMethodReturn.java Sun Jan 22 06:58:43 2012
@@ -22,7 +22,8 @@ package org.apache.isis.core.metamodel.s
 import java.lang.reflect.Method;
 
 /**
- * Helper that finds all return types (including generic types) for the provided {@link Method}.
+ * Helper that finds all return types (including generic types) for the provided
+ * {@link Method}.
  * 
  * <p>
  * For example,

Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/Dump.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/Dump.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/Dump.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/Dump.java Sun Jan 22 06:58:43 2012
@@ -65,8 +65,10 @@ public final class Dump {
     }
 
     /**
-     * Convenience overload of {@link #specification(ObjectSpecification, DebugBuilder)} that takes the
-     * {@link ObjectSpecification} ( {@link ObjectAdapter#getSpecification()}) of the provided {@link ObjectAdapter}
+     * Convenience overload of
+     * {@link #specification(ObjectSpecification, DebugBuilder)} that takes the
+     * {@link ObjectSpecification} ( {@link ObjectAdapter#getSpecification()})
+     * of the provided {@link ObjectAdapter}
      * 
      * @see #specification(ObjectAdapter)
      * @see #specification(ObjectSpecification, DebugBuilder)
@@ -147,8 +149,7 @@ public final class Dump {
         return names;
     }
 
-    private static void specificationActionMethods(final ObjectSpecification specification,
-        final DebugBuilder debugBuilder) {
+    private static void specificationActionMethods(final ObjectSpecification specification, final DebugBuilder debugBuilder) {
         try {
             final List<ObjectAction> userActions = specification.getObjectActions(ActionType.USER, Contributed.INCLUDED);
             final List<ObjectAction> explActions = specification.getObjectActions(ActionType.EXPLORATION, Contributed.INCLUDED);
@@ -160,8 +161,7 @@ public final class Dump {
         }
     }
 
-    private static void specificationServiceMethods(final ObjectSpecification specification,
-        final DebugBuilder debugBuilder) {
+    private static void specificationServiceMethods(final ObjectSpecification specification, final DebugBuilder debugBuilder) {
         try {
             final List<ObjectAction> userActions = specification.getServiceActionsReturning(ActionType.USER);
             final List<ObjectAction> explActions = specification.getServiceActionsReturning(ActionType.EXPLORATION);
@@ -182,8 +182,7 @@ public final class Dump {
         }
         debugBuilder.unindent();
 
-        final List<ObjectAssociation> fields2 =
-            specification.getAssociations(ObjectAssociationFilters.STATICALLY_VISIBLE_ASSOCIATIONS);
+        final List<ObjectAssociation> fields2 = specification.getAssociations(ObjectAssociationFilters.STATICALLY_VISIBLE_ASSOCIATIONS);
         debugBuilder.appendln("Static");
         debugBuilder.indent();
         for (int i = 0; i < fields2.size(); i++) {
@@ -208,24 +207,18 @@ public final class Dump {
                     }
                     final String help = field.getHelp();
                     if (help != null && !help.equals("")) {
-                        debugBuilder.appendln("Help", help.substring(0, Math.min(30, help.length()))
-                            + (help.length() > 30 ? "..." : ""));
+                        debugBuilder.appendln("Help", help.substring(0, Math.min(30, help.length())) + (help.length() > 30 ? "..." : ""));
                     }
 
                     debugBuilder.appendln("ID", field.getIdentifier());
                     debugBuilder.appendln("Short ID", field.getId());
                     debugBuilder.appendln("Name", field.getName());
-                    final String type =
-                        field.isOneToManyAssociation() ? "Collection" : field.isOneToOneAssociation() ? "Object"
-                            : "Unknown";
+                    final String type = field.isOneToManyAssociation() ? "Collection" : field.isOneToOneAssociation() ? "Object" : "Unknown";
                     debugBuilder.appendln("Type", type);
                     debugBuilder.appendln("Has identity", !field.getSpecification().isCollectionOrIsAggregated());
                     debugBuilder.appendln("Spec", field.getSpecification().getFullIdentifier());
 
-                    debugBuilder
-                        .appendln("Flags", (field.isAlwaysHidden() ? "" : "Visible ")
-                            + (field.isNotPersisted() ? "Not Persisted " : " ")
-                            + (field.isMandatory() ? "Mandatory " : ""));
+                    debugBuilder.appendln("Flags", (field.isAlwaysHidden() ? "" : "Visible ") + (field.isNotPersisted() ? "Not Persisted " : " ") + (field.isMandatory() ? "Mandatory " : ""));
 
                     final Class<? extends Facet>[] facets = field.getFacetTypes();
                     if (facets.length > 0) {
@@ -253,11 +246,8 @@ public final class Dump {
 
     }
 
-    private static void specificationMethods(final List<ObjectAction> userActions,
-        final List<ObjectAction> explActions, final List<ObjectAction> prototypeActions,
-        final List<ObjectAction> debugActions, final DebugBuilder debugBuilder) {
-        if (userActions.size() == 0 && explActions.size() == 0 && prototypeActions.size() == 0
-            && debugActions.size() == 0) {
+    private static void specificationMethods(final List<ObjectAction> userActions, final List<ObjectAction> explActions, final List<ObjectAction> prototypeActions, final List<ObjectAction> debugActions, final DebugBuilder debugBuilder) {
+        if (userActions.size() == 0 && explActions.size() == 0 && prototypeActions.size() == 0 && debugActions.size() == 0) {
             debugBuilder.appendln("no actions...");
         } else {
             appendActionDetails(debugBuilder, "User actions", userActions);
@@ -267,8 +257,7 @@ public final class Dump {
         }
     }
 
-    private static void appendActionDetails(final DebugBuilder debug, final String desc,
-        final List<ObjectAction> actions) {
+    private static void appendActionDetails(final DebugBuilder debug, final String desc, final List<ObjectAction> actions) {
         debug.appendln(desc);
         debug.indent();
         for (int i = 0; i < actions.size(); i++) {
@@ -277,10 +266,8 @@ public final class Dump {
         debug.unindent();
     }
 
-    private static void actionDetails(final ObjectAction objectAction, final int indent, final int count,
-        final DebugBuilder debugBuilder) {
-        debugBuilder
-            .appendln((count + 1) + "." + objectAction.getId() + " (" + objectAction.getClass().getName() + ")");
+    private static void actionDetails(final ObjectAction objectAction, final int indent, final int count, final DebugBuilder debugBuilder) {
+        debugBuilder.appendln((count + 1) + "." + objectAction.getId() + " (" + objectAction.getClass().getName() + ")");
         debugBuilder.indent();
         final int newIndent = indent + 4;
         try {
@@ -295,7 +282,8 @@ public final class Dump {
                     debugBuilder.appendln("Description", objectAction.getDescription());
                 }
                 debugBuilder.appendln("ID", objectAction.getId());
-                // debug.appendln(12, "Returns", f.getReturnType() == null ? "Nothing" :
+                // debug.appendln(12, "Returns", f.getReturnType() == null ?
+                // "Nothing" :
                 // f.getReturnType().getFullName());
 
                 debugBuilder.appendln(objectAction.debugData());
@@ -410,7 +398,8 @@ public final class Dump {
     // /////////////////////////////////////////////////////////////////////
 
     /**
-     * Creates an ascii object graph diagram for the specified object, up to three levels deep.
+     * Creates an ascii object graph diagram for the specified object, up to
+     * three levels deep.
      * 
      * @see #graph(ObjectAdapter, AuthenticationSession, DebugBuilder)
      */
@@ -421,12 +410,12 @@ public final class Dump {
     }
 
     /**
-     * As {@link #graph(ObjectAdapter, AuthenticationSession)}, but appending to the provided {@link DebugBuilder}.
+     * As {@link #graph(ObjectAdapter, AuthenticationSession)}, but appending to
+     * the provided {@link DebugBuilder}.
      * 
      * @see #graph(ObjectAdapter, AuthenticationSession)
      */
-    public static void graph(final ObjectAdapter object, final AuthenticationSession authenticationSession,
-        final DebugBuilder debugBuilder) {
+    public static void graph(final ObjectAdapter object, final AuthenticationSession authenticationSession, final DebugBuilder debugBuilder) {
         simpleObject(object, debugBuilder);
         debugBuilder.appendln();
         debugBuilder.append(object);
@@ -463,9 +452,7 @@ public final class Dump {
         }
     }
 
-    private static void collectionGraph(final ObjectAdapter collectionAdapter, final int level,
-        final List<ObjectAdapter> ignoreAdapters, final AuthenticationSession authenticationSession,
-        final DebugBuilder debugBuilder) {
+    private static void collectionGraph(final ObjectAdapter collectionAdapter, final int level, final List<ObjectAdapter> ignoreAdapters, final AuthenticationSession authenticationSession, final DebugBuilder debugBuilder) {
 
         if (ignoreAdapters.contains(collectionAdapter)) {
             debugBuilder.append("*\n");
@@ -484,8 +471,7 @@ public final class Dump {
         }
     }
 
-    private static void graph(final ObjectAdapter adapter, final int level, final List<ObjectAdapter> ignoreAdapters,
-        final AuthenticationSession authenticationSession, final DebugBuilder debugBuilder) {
+    private static void graph(final ObjectAdapter adapter, final int level, final List<ObjectAdapter> ignoreAdapters, final AuthenticationSession authenticationSession, final DebugBuilder debugBuilder) {
         if (level > 3) {
             debugBuilder.appendln("..."); // only go 3 levels?
         } else {
@@ -507,9 +493,7 @@ public final class Dump {
         debugBuilder.append(DebugUtils.indentString(4) + "+--");
     }
 
-    private static void objectGraph(final ObjectAdapter adapter, final int level,
-        final List<ObjectAdapter> ignoreAdapters, final DebugBuilder s,
-        final AuthenticationSession authenticationSession) {
+    private static void objectGraph(final ObjectAdapter adapter, final int level, final List<ObjectAdapter> ignoreAdapters, final DebugBuilder s, final AuthenticationSession authenticationSession) {
         ignoreAdapters.add(adapter);
 
         try {
@@ -528,7 +512,8 @@ public final class Dump {
                     if (obj == null) {
                         s.append(name + ": null\n");
                         /*
-                         * } else if (obj.getSpecification().isParseable()) { s.append(name + ": " + obj.titleString());
+                         * } else if (obj.getSpecification().isParseable()) {
+                         * s.append(name + ": " + obj.titleString());
                          * s.append("\n");
                          */} else {
                         if (ignoreAdapters.contains(obj)) {

Modified: incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_CouldResolveTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_CouldResolveTest.java?rev=1234453&r1=1234452&r2=1234453&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_CouldResolveTest.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_CouldResolveTest.java Sun Jan 22 06:58:43 2012
@@ -49,10 +49,8 @@ public class ResolveState_CouldResolveTe
 
     @Parameters
     public static Collection<Object[]> data() {
-        return Arrays.asList(new Object[][] { { false, NEW }, { true, GHOST }, { true, PART_RESOLVED },
-            { false, RESOLVED }, { true, RESOLVING }, { true, RESOLVING_PART }, { false, TRANSIENT },
-            { false, DESTROYED }, { true, UPDATING }, { false, SERIALIZING_TRANSIENT }, { true, SERIALIZING_GHOST },
-            { true, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { false, VALUE }, });
+        return Arrays.asList(new Object[][] { { false, NEW }, { true, GHOST }, { true, PART_RESOLVED }, { false, RESOLVED }, { true, RESOLVING }, { true, RESOLVING_PART }, { false, TRANSIENT }, { false, DESTROYED }, { true, UPDATING }, { false, SERIALIZING_TRANSIENT }, { true, SERIALIZING_GHOST },
+                { true, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { false, VALUE }, });
     }
 
     private final boolean couldResolve;



Mime
View raw message