svn commit: r1098945 [3/25] - in /incubator/isis/trunk/viewer: bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/ bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/ bdd/common/src/main/java/org/apache/isis/viewer/bdd/common...

[da...@apache.org]

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/CheckListPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/CheckListPeer.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/CheckListPeer.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/CheckListPeer.java Tue May  3 07:18:19 2011
@@ -31,17 +31,17 @@ public class CheckListPeer extends Abstr
 
     public static enum CheckMode {
         EXACT {
-			@Override
-			public boolean isExact() {
-				return true;
-			}
-		}, 
+            @Override
+            public boolean isExact() {
+                return true;
+            }
+        },
         NOT_EXACT {
-			@Override
-			public boolean isExact() {
-				return false;
-			}
-		};
+            @Override
+            public boolean isExact() {
+                return false;
+            }
+        };
         public abstract boolean isExact();
     }
 
@@ -58,25 +58,22 @@ public class CheckListPeer extends Abstr
      */
     private final List<ObjectAdapter> foundAdapters = new ArrayList<ObjectAdapter>();
 
-
-    public CheckListPeer(final AliasRegistry aliasesRegistry,
-            String listAlias, final CheckMode checkMode,
-            final CellBinding titleBinding) {
+    public CheckListPeer(final AliasRegistry aliasesRegistry, final String listAlias, final CheckMode checkMode,
+        final CellBinding titleBinding) {
         this(aliasesRegistry, listAlias, checkMode, titleBinding, null);
     }
 
-    public CheckListPeer(final AliasRegistry aliasesRegistry,
-        String listAlias, final CheckMode checkMode,
+    public CheckListPeer(final AliasRegistry aliasesRegistry, final String listAlias, final CheckMode checkMode,
         final CellBinding titleBinding, final CellBinding typeBinding) {
-    super(aliasesRegistry, listAlias, titleBinding, typeBinding);
-    this.checkMode = checkMode;
-    this.titleBinding = titleBinding;
-    this.typeBinding = typeBinding;
-}
-
-	public boolean isCheckModeExact() {
-		return getCheckMode().isExact();
-	}
+        super(aliasesRegistry, listAlias, titleBinding, typeBinding);
+        this.checkMode = checkMode;
+        this.titleBinding = titleBinding;
+        this.typeBinding = typeBinding;
+    }
+
+    public boolean isCheckModeExact() {
+        return getCheckMode().isExact();
+    }
 
     public CellBinding getTitleBinding() {
         return titleBinding;
@@ -89,31 +86,30 @@ public class CheckListPeer extends Abstr
         return typeBinding;
     }
 
-	private CheckMode getCheckMode() {
-		return checkMode;
-	}
-	
-	public List<ObjectAdapter> getFoundAdapters() {
-		return foundAdapters;
-	}
-
-	public List<ObjectAdapter> getNotFoundAdapters() {
-		final List<ObjectAdapter> allAdapters = 
-		    new ArrayList<ObjectAdapter>(collectionAdapters());
-		allAdapters.removeAll(foundAdapters);
-		return allAdapters;
-	}
-	
-	public boolean findAndAddObject() {
-		ObjectAdapter foundAdapter = findAdapter();
+    private CheckMode getCheckMode() {
+        return checkMode;
+    }
+
+    public List<ObjectAdapter> getFoundAdapters() {
+        return foundAdapters;
+    }
+
+    public List<ObjectAdapter> getNotFoundAdapters() {
+        final List<ObjectAdapter> allAdapters = new ArrayList<ObjectAdapter>(collectionAdapters());
+        allAdapters.removeAll(foundAdapters);
+        return allAdapters;
+    }
+
+    public boolean findAndAddObject() {
+        final ObjectAdapter foundAdapter = findAdapter();
         if (foundAdapter == null) {
-        	return false;
-        } 
+            return false;
+        }
         foundAdapters.add(foundAdapter);
-		return true;
-	}
+        return true;
+    }
 
-	private ObjectAdapter findAdapter() {
+    private ObjectAdapter findAdapter() {
         for (final ObjectAdapter adapter : collectionAdapters()) {
 
             if (!titleMatches(adapter)) {
@@ -125,8 +121,8 @@ public class CheckListPeer extends Abstr
 
             return adapter;
         }
-		return null;
-	}
+        return null;
+    }
 
     private boolean titleMatches(final ObjectAdapter adapter) {
         final String adapterTitle = adapter.titleString();
@@ -147,10 +143,8 @@ public class CheckListPeer extends Abstr
         }
 
         final String simpleSpecName = StringUtils.simpleName(specFullName);
-        final String simpleRequiredType = StringUtils
-                .simpleName(requiredTypeName);
+        final String simpleRequiredType = StringUtils.simpleName(requiredTypeName);
         return simpleSpecName.equalsIgnoreCase(simpleRequiredType);
     }
 
-
 }
\ No newline at end of file

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/DebugClockPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/DebugClockPeer.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/DebugClockPeer.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/DebugClockPeer.java Tue May  3 07:18:19 2011
@@ -28,24 +28,22 @@ import org.apache.isis.viewer.bdd.common
 
 public class DebugClockPeer extends AbstractFixturePeer {
 
-	private final CellBinding cellBinding;
-	private final static SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd-MMM-yyyy HH:mm");
+    private final CellBinding cellBinding;
+    private final static SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd-MMM-yyyy HH:mm");
 
-	public DebugClockPeer(AliasRegistry aliasesRegistry,
-			final CellBinding cellBinding) {
-		super(aliasesRegistry, cellBinding);
-		this.cellBinding = cellBinding;
-	}
-
-	public ScenarioCell getCurrentCell() {
-		return cellBinding.getCurrentCell();
-	}
-
-	public String getFormattedClockTime() {
-		final Calendar cal = Clock.getTimeAsCalendar();
-		final String formattedDate = DATE_FORMAT
-                .format(cal.getTime());
-		return formattedDate;
-	}
+    public DebugClockPeer(final AliasRegistry aliasesRegistry, final CellBinding cellBinding) {
+        super(aliasesRegistry, cellBinding);
+        this.cellBinding = cellBinding;
+    }
+
+    public ScenarioCell getCurrentCell() {
+        return cellBinding.getCurrentCell();
+    }
+
+    public String getFormattedClockTime() {
+        final Calendar cal = Clock.getTimeAsCalendar();
+        final String formattedDate = DATE_FORMAT.format(cal.getTime());
+        return formattedDate;
+    }
 
 }

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/DebugObjectStorePeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/DebugObjectStorePeer.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/DebugObjectStorePeer.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/DebugObjectStorePeer.java Tue May  3 07:18:19 2011
@@ -23,19 +23,17 @@ import org.apache.isis.runtimes.dflt.run
 import org.apache.isis.viewer.bdd.common.AliasRegistry;
 import org.apache.isis.viewer.bdd.common.CellBinding;
 
-
 public class DebugObjectStorePeer extends AbstractFixturePeer {
 
-	public DebugObjectStorePeer(AliasRegistry aliasesRegistry,
-			CellBinding... cellBindings) {
-		super(aliasesRegistry, cellBindings);
-	}
+    public DebugObjectStorePeer(final AliasRegistry aliasesRegistry, final CellBinding... cellBindings) {
+        super(aliasesRegistry, cellBindings);
+    }
 
-	public String debugObjectStore() {
+    public String debugObjectStore() {
         final ObjectStorePersistence objectStore = getObjectStore();
         final DebugString debug = new DebugString();
         objectStore.debugData(debug);
         return debug.toString().replaceAll("\n", "<br>");
-	}
+    }
 
 }

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/DebugServicesPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/DebugServicesPeer.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/DebugServicesPeer.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/DebugServicesPeer.java Tue May  3 07:18:19 2011
@@ -24,16 +24,13 @@ import org.apache.isis.core.commons.debu
 import org.apache.isis.viewer.bdd.common.AliasRegistry;
 import org.apache.isis.viewer.bdd.common.CellBinding;
 
-
-
 public class DebugServicesPeer extends AbstractFixturePeer {
-	
-	public DebugServicesPeer(AliasRegistry aliasesRegistry,
-			CellBinding... cellBindings) {
-		super(aliasesRegistry, cellBindings);
-	}
 
-	public String debugServices() {
+    public DebugServicesPeer(final AliasRegistry aliasesRegistry, final CellBinding... cellBindings) {
+        super(aliasesRegistry, cellBindings);
+    }
+
+    public String debugServices() {
         final DebugString debug = new DebugString();
 
         final List<Object> services = getServices();
@@ -43,6 +40,6 @@ public class DebugServicesPeer extends A
             debug.append("\n");
         }
         return debug.toString().replaceAll("\n", "<br>");
-	}
+    }
 
 }

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/SetUpObjectsPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/SetUpObjectsPeer.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/SetUpObjectsPeer.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/SetUpObjectsPeer.java Tue May  3 07:18:19 2011
@@ -60,7 +60,7 @@ public class SetUpObjectsPeer extends Ab
             this(null);
         }
 
-        private SetUpObjectResult(String errorMessage) {
+        private SetUpObjectResult(final String errorMessage) {
             this.errorMessage = errorMessage;
         }
 
@@ -94,8 +94,8 @@ public class SetUpObjectsPeer extends Ab
     // constructor
     // ///////////////////////////////////////////////////////////////////////
 
-    public SetUpObjectsPeer(AliasRegistry aliasRegistry, final String className, final SetUpObjectsPeer.Mode mode,
-        final CellBinding aliasBinding) {
+    public SetUpObjectsPeer(final AliasRegistry aliasRegistry, final String className,
+        final SetUpObjectsPeer.Mode mode, final CellBinding aliasBinding) {
         super(aliasRegistry, aliasBinding);
 
         this.spec = loadSpecIfValid(className);
@@ -128,7 +128,7 @@ public class SetUpObjectsPeer extends Ab
     // header
     // ///////////////////////////////////////////////////////////////////////
 
-    public PropertyResult definePropertyOrAlias(String heading, int colNum) {
+    public PropertyResult definePropertyOrAlias(final String heading, final int colNum) {
 
         OneToOneAssociation otoa = null;
 
@@ -170,13 +170,13 @@ public class SetUpObjectsPeer extends Ab
      * FitNesse, on the other hand, uses a more fine-grained approach, calling the underlying methods.
      */
     public void createObject() throws ScenarioBoundValueException {
-        ObjectAdapter adapter = createInstance();
+        final ObjectAdapter adapter = createInstance();
 
         for (int colNum = 0; colNum < getProperties().size(); colNum++) {
-            SetUpObjectResult result = setUpProperty(adapter, colNum);
+            final SetUpObjectResult result = setUpProperty(adapter, colNum);
 
             if (!result.isHandled()) {
-                CellBinding cellBinding = getCellBindings().get(colNum);
+                final CellBinding cellBinding = getCellBindings().get(colNum);
                 throw ScenarioBoundValueException.current(cellBinding, result.getErrorMessage());
             }
         }
@@ -198,7 +198,7 @@ public class SetUpObjectsPeer extends Ab
         return getPersistenceSession().createInstance(spec);
     }
 
-    public SetUpObjectResult setUpProperty(ObjectAdapter adapter, int colNum) {
+    public SetUpObjectResult setUpProperty(final ObjectAdapter adapter, final int colNum) {
 
         final OneToOneAssociation association = getProperties().get(colNum);
         if (association == null) {
@@ -259,7 +259,7 @@ public class SetUpObjectsPeer extends Ab
         return SetUpObjectResult.OK;
     }
 
-    public void persistIfNecessary(ObjectAdapter adapter) {
+    public void persistIfNecessary(final ObjectAdapter adapter) {
         if (mode.isPersist()) {
             // xactn mgmt now done by PersistenceSession#makePersistent()
             // getTransactionManager().startTransaction();
@@ -268,21 +268,21 @@ public class SetUpObjectsPeer extends Ab
         }
     }
 
-    public void alias(ObjectAdapter adapter) {
+    public void alias(final ObjectAdapter adapter) {
         final String alias = aliasFor(adapter);
         getAliasRegistry().aliasAs(alias, adapter);
     }
 
-    public String aliasFor(ObjectAdapter adapter) {
+    public String aliasFor(final ObjectAdapter adapter) {
         if (alias != null) {
             return alias;
         } else {
-            String specShortName = StringUtils.lowerLeading(spec.getShortIdentifier());
+            final String specShortName = StringUtils.lowerLeading(spec.getShortIdentifier());
             return getAliasRegistry().aliasPrefixedAs(specShortName, adapter);
         }
     }
 
-    public void forEachAssociation(AssociationVisitor visitor) {
+    public void forEachAssociation(final AssociationVisitor visitor) {
         for (int colNum = 0; colNum < getProperties().size(); colNum++) {
             final OneToOneAssociation association = getProperties().get(colNum);
             if (association != null) {
@@ -291,11 +291,11 @@ public class SetUpObjectsPeer extends Ab
         }
     }
 
-    public boolean addPropertyValueOrAlias(String propertyValue) {
+    public boolean addPropertyValueOrAlias(final String propertyValue) {
         cellTextList.add(propertyValue);
 
         // capture alias if just added
-        int aliasColumn1based = getAliasBinding().getColumn() + 1;
+        final int aliasColumn1based = getAliasBinding().getColumn() + 1;
         if (cellTextList.size() == aliasColumn1based) {
             alias = propertyValue;
         }

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingIsisViewerPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingIsisViewerPeer.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingIsisViewerPeer.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingIsisViewerPeer.java Tue May  3 07:18:19 2011
@@ -66,7 +66,7 @@ import org.apache.isis.viewer.bdd.common
 public class UsingIsisViewerPeer extends AbstractFixturePeer {
 
     private static List<Perform> performCommands(final Perform.Mode mode) {
-        ArrayList<Perform> commands = new ArrayList<Perform>();
+        final ArrayList<Perform> commands = new ArrayList<Perform>();
 
         commands.add(new CheckProperty(mode));
         commands.add(new CheckSetProperty(mode));
@@ -109,12 +109,12 @@ public class UsingIsisViewerPeer extends
     private final DeploymentType deploymentType;
     private final DateParser dateParser;
 
-
     private final Map<String, Perform> commandByKey = new HashMap<String, Perform>();
 
-    public UsingIsisViewerPeer(final AliasRegistry aliasesRegistry, final DeploymentType deploymentType, final DateParser dateParser, final Perform.Mode mode,
-        final CellBinding onObjectBinding, final CellBinding aliasResultAsBinding, final CellBinding performBinding,
-        final CellBinding onMemberBinding, final CellBinding thatItBinding, final CellBinding arg0Binding) {
+    public UsingIsisViewerPeer(final AliasRegistry aliasesRegistry, final DeploymentType deploymentType,
+        final DateParser dateParser, final Perform.Mode mode, final CellBinding onObjectBinding,
+        final CellBinding aliasResultAsBinding, final CellBinding performBinding, final CellBinding onMemberBinding,
+        final CellBinding thatItBinding, final CellBinding arg0Binding) {
         super(aliasesRegistry, onObjectBinding, aliasResultAsBinding, performBinding, onMemberBinding, thatItBinding,
             arg0Binding);
 
@@ -124,7 +124,7 @@ public class UsingIsisViewerPeer extends
         this.onMemberBinding = onMemberBinding;
         this.thatItBinding = thatItBinding;
         this.arg0Binding = arg0Binding;
-        
+
         this.deploymentType = deploymentType;
         this.dateParser = dateParser;
 
@@ -137,7 +137,7 @@ public class UsingIsisViewerPeer extends
     public DeploymentType getDeploymentType() {
         return deploymentType;
     }
-    
+
     public DateParser getDateParser() {
         return dateParser;
     }
@@ -183,14 +183,13 @@ public class UsingIsisViewerPeer extends
         return false;
     }
 
-    
     // //////////////////////////////////////////////////////////////////
     // validate API
     // //////////////////////////////////////////////////////////////////
 
     public ObjectAdapter validateOnObject() throws ScenarioBoundValueException {
 
-        ScenarioCell onObjectCell = onObjectBinding.getCurrentCell();
+        final ScenarioCell onObjectCell = onObjectBinding.getCurrentCell();
         String onObject = onObjectCell.getText();
         if (onObject == null) {
             if (previousOnObject == null) {
@@ -216,14 +215,14 @@ public class UsingIsisViewerPeer extends
             return null;
         }
 
-        String aliasAs = aliasCell.getText();
+        final String aliasAs = aliasCell.getText();
         if (getAliasRegistry().getAliased(aliasAs) != null) {
             throw ScenarioBoundValueException.current(aliasResultAsBinding, "(already used)");
         }
         return aliasAs;
     }
 
-    public ObjectMember validateOnMember(ObjectAdapter onAdapter) throws ScenarioBoundValueException {
+    public ObjectMember validateOnMember(final ObjectAdapter onAdapter) throws ScenarioBoundValueException {
 
         final ScenarioCell onMemberCell = onMemberBinding.getCurrentCell();
         final String onMember = onMemberCell.getText();
@@ -284,9 +283,9 @@ public class UsingIsisViewerPeer extends
     // "perform" API
     // //////////////////////////////////////////////////////////////////
 
-    public void performCommand(ObjectAdapter onAdapter, String aliasAs, ObjectMember objectMember,
-        Perform performCommand, List<ScenarioCell> argumentStoryCells) throws ScenarioBoundValueException {
-        PerformContext performContext = new PerformContext(this, onAdapter, objectMember, argumentStoryCells);
+    public void performCommand(final ObjectAdapter onAdapter, final String aliasAs, final ObjectMember objectMember,
+        final Perform performCommand, final List<ScenarioCell> argumentStoryCells) throws ScenarioBoundValueException {
+        final PerformContext performContext = new PerformContext(this, onAdapter, objectMember, argumentStoryCells);
         try {
             performCommand.perform(performContext);
         } catch (final RuntimeException ex) {
@@ -295,7 +294,8 @@ public class UsingIsisViewerPeer extends
         aliasResultFromPerformCommand(performCommand, aliasAs);
     }
 
-    private void aliasResultFromPerformCommand(Perform performCommand, String aliasAs) throws ScenarioBoundValueException {
+    private void aliasResultFromPerformCommand(final Perform performCommand, final String aliasAs)
+        throws ScenarioBoundValueException {
         if (StringUtils.isNullOrEmpty(aliasAs)) {
             return;
         }
@@ -315,7 +315,7 @@ public class UsingIsisViewerPeer extends
     /**
      * Not public API
      */
-    public void provideDefault(ScenarioCell storySource, String resultStr) {
+    public void provideDefault(final ScenarioCell storySource, final String resultStr) {
         // TODO Auto-generated method stub
         throw new NotYetImplementedException();
     }
@@ -334,18 +334,18 @@ public class UsingIsisViewerPeer extends
             try {
                 return parseableFacet.parseTextEntry(contextAdapter, cellText);
             } catch (final TextEntryParseException ex) {
-                throw ScenarioBoundValueException.arg(contextBinding, paramCell, "(cannot parse '"+cellText+"')");
+                throw ScenarioBoundValueException.arg(contextBinding, paramCell, "(cannot parse '" + cellText + "')");
             } catch (final IllegalArgumentException ex) {
-                // REVIEW: isn't what is thrown, but perhaps 
-                // TextEntryParseException should inherit from IllegalArgumentException? 
-                throw ScenarioBoundValueException.arg(contextBinding, paramCell, "(cannot parse '"+cellText+"')");
+                // REVIEW: isn't what is thrown, but perhaps
+                // TextEntryParseException should inherit from IllegalArgumentException?
+                throw ScenarioBoundValueException.arg(contextBinding, paramCell, "(cannot parse '" + cellText + "')");
             }
         }
 
         // otherwise, handle as reference to known object
         final ObjectAdapter adapter = getAliasRegistry().getAliased(cellText);
         if (adapter == null) {
-            throw ScenarioBoundValueException.arg(contextBinding, paramCell, "(unknown reference'"+cellText+"')");
+            throw ScenarioBoundValueException.arg(contextBinding, paramCell, "(unknown reference'" + cellText + "')");
         }
 
         return adapter;
@@ -358,10 +358,10 @@ public class UsingIsisViewerPeer extends
      * Ensures that there are at least enough arguments for the number of parameters required.
      */
     public ObjectAdapter[] getAdapters(final ObjectAdapter onAdapter, final ObjectAction objectAction,
-        CellBinding onMemberBinding, final List<ScenarioCell> argumentCells) throws ScenarioBoundValueException {
+        final CellBinding onMemberBinding, final List<ScenarioCell> argumentCells) throws ScenarioBoundValueException {
         final List<ObjectActionParameter> parameters = objectAction.getParameters();
 
-        int parameterCount = parameters.size();
+        final int parameterCount = parameters.size();
         if (argumentCells.size() < parameterCount) {
             throw ScenarioBoundValueException.current(onMemberBinding, "(action requires " + parameterCount
                 + " arguments)");
@@ -389,5 +389,4 @@ public class UsingIsisViewerPeer extends
         return getAdapterManager().adapterFor(choiceList);
     }
 
-
 }

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/AddToCollection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/AddToCollection.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/AddToCollection.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/AddToCollection.java Tue May  3 07:18:19 2011
@@ -16,67 +16,65 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.bdd.common.fixtures.perform;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.viewer.bdd.common.CellBinding;
-import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException;
-import org.apache.isis.viewer.bdd.common.ScenarioCell;
-
-public class AddToCollection extends PerformAbstractTypeParams {
-
-    private ObjectAdapter result;
-
-    public AddToCollection(final Perform.Mode mode) {
-        super("add to collection", Type.COLLECTION, NumParameters.ONE, mode);
-    }
-
-    @Override
-    public void doHandle(final PerformContext performContext) throws ScenarioBoundValueException {
-
-        final ObjectAdapter onAdapter = performContext.getOnAdapter();
-        final ObjectMember nakedObjectMember = performContext
-                .getObjectMember();
-        final CellBinding onMemberBinding = performContext
-                .getPeer().getOnMemberBinding();
-        
-        final OneToManyAssociation otma = (OneToManyAssociation) nakedObjectMember;
-
-        final CollectionAddToFacet addToFacet = nakedObjectMember
-                .getFacet(CollectionAddToFacet.class);
-        if (addToFacet == null) {
-            throw ScenarioBoundValueException.current(onMemberBinding, "(cannot add to collection)");
-        }
-        
-        // safe since guaranteed by superclass
-        CellBinding arg0Binding = performContext.getPeer().getArg0Binding();
-        final ScenarioCell arg0Cell = arg0Binding.getCurrentCell();
-        final String toAddAlias = arg0Cell.getText();
-
-        final ObjectAdapter toAddAdapter = performContext.getPeer().getAliasRegistry().getAliased(toAddAlias);
-        if (toAddAdapter == null) {
-			throw ScenarioBoundValueException.current(arg0Binding, "(unknown alias)");
-        }
-
-        // validate argument
-        otma.createValidateAddInteractionContext(getSession(),
-                InteractionInvocationMethod.BY_USER, onAdapter, toAddAdapter);
-        final Consent validToAdd = otma.isValidToAdd(onAdapter, toAddAdapter);
-        if (validToAdd.isVetoed()) {
-        	 throw ScenarioBoundValueException.current(arg0Binding, validToAdd.getReason());
-        }
-
-        // add
-        addToFacet.add(onAdapter, toAddAdapter);
-    }
-
-    public ObjectAdapter getResult() {
-        return result;
-    }
-
-}
+package org.apache.isis.viewer.bdd.common.fixtures.perform;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.viewer.bdd.common.CellBinding;
+import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException;
+import org.apache.isis.viewer.bdd.common.ScenarioCell;
+
+public class AddToCollection extends PerformAbstractTypeParams {
+
+    private ObjectAdapter result;
+
+    public AddToCollection(final Perform.Mode mode) {
+        super("add to collection", Type.COLLECTION, NumParameters.ONE, mode);
+    }
+
+    @Override
+    public void doHandle(final PerformContext performContext) throws ScenarioBoundValueException {
+
+        final ObjectAdapter onAdapter = performContext.getOnAdapter();
+        final ObjectMember nakedObjectMember = performContext.getObjectMember();
+        final CellBinding onMemberBinding = performContext.getPeer().getOnMemberBinding();
+
+        final OneToManyAssociation otma = (OneToManyAssociation) nakedObjectMember;
+
+        final CollectionAddToFacet addToFacet = nakedObjectMember.getFacet(CollectionAddToFacet.class);
+        if (addToFacet == null) {
+            throw ScenarioBoundValueException.current(onMemberBinding, "(cannot add to collection)");
+        }
+
+        // safe since guaranteed by superclass
+        final CellBinding arg0Binding = performContext.getPeer().getArg0Binding();
+        final ScenarioCell arg0Cell = arg0Binding.getCurrentCell();
+        final String toAddAlias = arg0Cell.getText();
+
+        final ObjectAdapter toAddAdapter = performContext.getPeer().getAliasRegistry().getAliased(toAddAlias);
+        if (toAddAdapter == null) {
+            throw ScenarioBoundValueException.current(arg0Binding, "(unknown alias)");
+        }
+
+        // validate argument
+        otma.createValidateAddInteractionContext(getSession(), InteractionInvocationMethod.BY_USER, onAdapter,
+            toAddAdapter);
+        final Consent validToAdd = otma.isValidToAdd(onAdapter, toAddAdapter);
+        if (validToAdd.isVetoed()) {
+            throw ScenarioBoundValueException.current(arg0Binding, validToAdd.getReason());
+        }
+
+        // add
+        addToFacet.add(onAdapter, toAddAdapter);
+    }
+
+    @Override
+    public ObjectAdapter getResult() {
+        return result;
+    }
+
+}

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckAction.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckAction.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckAction.java Tue May  3 07:18:19 2011
@@ -16,22 +16,21 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.bdd.common.fixtures.perform;
-
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.Disabled;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.Hidden;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.PerformCheckThatAbstract;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.Usable;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.Visible;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.action.ArgumentSetNotValid;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.action.ArgumentSetValid;
-
-public class CheckAction extends PerformCheckThatAbstract {
-
-    public CheckAction(final Perform.Mode mode) {
-        super("check action", OnMemberColumn.REQUIRED, mode, new Hidden(),
-                new Visible(), new Disabled(), new Usable(),
-                new ArgumentSetValid(), new ArgumentSetNotValid());
-    }
-
-}
+package org.apache.isis.viewer.bdd.common.fixtures.perform;
+
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.Disabled;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.Hidden;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.PerformCheckThatAbstract;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.Usable;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.Visible;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.action.ArgumentSetNotValid;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.action.ArgumentSetValid;
+
+public class CheckAction extends PerformCheckThatAbstract {
+
+    public CheckAction(final Perform.Mode mode) {
+        super("check action", OnMemberColumn.REQUIRED, mode, new Hidden(), new Visible(), new Disabled(), new Usable(),
+            new ArgumentSetValid(), new ArgumentSetNotValid());
+    }
+
+}

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckAddToCollection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckAddToCollection.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckAddToCollection.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckAddToCollection.java Tue May  3 07:18:19 2011
@@ -16,18 +16,17 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.bdd.common.fixtures.perform;
-
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.AssertsValidity;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.PerformCheckThatAbstract;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.collections.ProposedAddTo;
-
-public class CheckAddToCollection extends PerformCheckThatAbstract {
-
-    public CheckAddToCollection(final Perform.Mode mode) {
-        super("check add to collection", OnMemberColumn.REQUIRED, mode,
-                new ProposedAddTo(AssertsValidity.VALID), new ProposedAddTo(
-                AssertsValidity.INVALID));
-    }
-
-}
+package org.apache.isis.viewer.bdd.common.fixtures.perform;
+
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.AssertsValidity;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.PerformCheckThatAbstract;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.collections.ProposedAddTo;
+
+public class CheckAddToCollection extends PerformCheckThatAbstract {
+
+    public CheckAddToCollection(final Perform.Mode mode) {
+        super("check add to collection", OnMemberColumn.REQUIRED, mode, new ProposedAddTo(AssertsValidity.VALID),
+            new ProposedAddTo(AssertsValidity.INVALID));
+    }
+
+}

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckClearProperty.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckClearProperty.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckClearProperty.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckClearProperty.java Tue May  3 07:18:19 2011
@@ -16,18 +16,17 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.bdd.common.fixtures.perform;
-
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.AssertsValidity;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.PerformCheckThatAbstract;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.property.ProposedClear;
-
-public class CheckClearProperty extends PerformCheckThatAbstract {
-
-    public CheckClearProperty(final Perform.Mode mode) {
-        super("check clear property", OnMemberColumn.REQUIRED, mode,
-                new ProposedClear(AssertsValidity.VALID), new ProposedClear(
-                AssertsValidity.INVALID));
-    }
-
-}
+package org.apache.isis.viewer.bdd.common.fixtures.perform;
+
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.AssertsValidity;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.PerformCheckThatAbstract;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.property.ProposedClear;
+
+public class CheckClearProperty extends PerformCheckThatAbstract {
+
+    public CheckClearProperty(final Perform.Mode mode) {
+        super("check clear property", OnMemberColumn.REQUIRED, mode, new ProposedClear(AssertsValidity.VALID),
+            new ProposedClear(AssertsValidity.INVALID));
+    }
+
+}

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckCollection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckCollection.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckCollection.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckCollection.java Tue May  3 07:18:19 2011
@@ -16,27 +16,24 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.bdd.common.fixtures.perform;
-
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.AssertsContainment;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.AssertsEmpty;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.Disabled;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.Hidden;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.PerformCheckThatAbstract;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.Usable;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.Visible;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.collections.Containment;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.collections.Emptiness;
-
-public class CheckCollection extends PerformCheckThatAbstract {
-
-    public CheckCollection(final Perform.Mode mode) {
-        super("check collection", OnMemberColumn.REQUIRED, mode, new Hidden(),
-                new Visible(), new Disabled(), new Usable(), new Emptiness(
-                AssertsEmpty.EMPTY), new Emptiness(
-                AssertsEmpty.NOT_EMPTY), new Containment(
-                AssertsContainment.CONTAINS), new Containment(
-                AssertsContainment.DOES_NOT_CONTAIN));
-    }
-
-}
+package org.apache.isis.viewer.bdd.common.fixtures.perform;
+
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.AssertsContainment;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.AssertsEmpty;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.Disabled;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.Hidden;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.PerformCheckThatAbstract;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.Usable;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.Visible;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.collections.Containment;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.collections.Emptiness;
+
+public class CheckCollection extends PerformCheckThatAbstract {
+
+    public CheckCollection(final Perform.Mode mode) {
+        super("check collection", OnMemberColumn.REQUIRED, mode, new Hidden(), new Visible(), new Disabled(),
+            new Usable(), new Emptiness(AssertsEmpty.EMPTY), new Emptiness(AssertsEmpty.NOT_EMPTY), new Containment(
+                AssertsContainment.CONTAINS), new Containment(AssertsContainment.DOES_NOT_CONTAIN));
+    }
+
+}

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckObject.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckObject.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckObject.java Tue May  3 07:18:19 2011
@@ -16,19 +16,19 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.bdd.common.fixtures.perform;
-
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.PerformCheckThatAbstract;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.object.NotSaved;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.object.NotValid;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.object.Saved;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.object.Valid;
-
-public class CheckObject extends PerformCheckThatAbstract {
-
-    public CheckObject(final Perform.Mode mode) {
-        super("check object", OnMemberColumn.NOT_REQUIRED, mode, new Valid(),
-                new NotValid(), new NotSaved(), new Saved());
-    }
-
-}
+package org.apache.isis.viewer.bdd.common.fixtures.perform;
+
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.PerformCheckThatAbstract;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.object.NotSaved;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.object.NotValid;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.object.Saved;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.object.Valid;
+
+public class CheckObject extends PerformCheckThatAbstract {
+
+    public CheckObject(final Perform.Mode mode) {
+        super("check object", OnMemberColumn.NOT_REQUIRED, mode, new Valid(), new NotValid(), new NotSaved(),
+            new Saved());
+    }
+
+}

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckProperty.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckProperty.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckProperty.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckProperty.java Tue May  3 07:18:19 2011
@@ -16,24 +16,23 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.bdd.common.fixtures.perform;
-
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.Disabled;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.Hidden;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.PerformCheckThatAbstract;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.Usable;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.Visible;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.property.Contains;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.property.DoesNotContain;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.property.Empty;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.property.NotEmpty;
-
-public class CheckProperty extends PerformCheckThatAbstract {
-
-    public CheckProperty(final Perform.Mode mode) {
-        super("check property", OnMemberColumn.REQUIRED, mode, new Hidden(),
-                new Visible(), new Disabled(), new Usable(), new Contains(),
-                new DoesNotContain(), new Empty(), new NotEmpty());
-    }
-
-}
+package org.apache.isis.viewer.bdd.common.fixtures.perform;
+
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.Disabled;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.Hidden;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.PerformCheckThatAbstract;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.Usable;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.Visible;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.property.Contains;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.property.DoesNotContain;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.property.Empty;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.property.NotEmpty;
+
+public class CheckProperty extends PerformCheckThatAbstract {
+
+    public CheckProperty(final Perform.Mode mode) {
+        super("check property", OnMemberColumn.REQUIRED, mode, new Hidden(), new Visible(), new Disabled(),
+            new Usable(), new Contains(), new DoesNotContain(), new Empty(), new NotEmpty());
+    }
+
+}

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckRemoveFromCollection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckRemoveFromCollection.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckRemoveFromCollection.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckRemoveFromCollection.java Tue May  3 07:18:19 2011
@@ -16,18 +16,17 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.bdd.common.fixtures.perform;
-
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.AssertsValidity;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.PerformCheckThatAbstract;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.collections.ProposedRemoveFrom;
-
-public class CheckRemoveFromCollection extends PerformCheckThatAbstract {
-
-    public CheckRemoveFromCollection(final Perform.Mode mode) {
-        super("check remove from collection", OnMemberColumn.REQUIRED, mode,
-                new ProposedRemoveFrom(AssertsValidity.VALID),
-                new ProposedRemoveFrom(AssertsValidity.INVALID));
-    }
-
-}
+package org.apache.isis.viewer.bdd.common.fixtures.perform;
+
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.AssertsValidity;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.PerformCheckThatAbstract;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.collections.ProposedRemoveFrom;
+
+public class CheckRemoveFromCollection extends PerformCheckThatAbstract {
+
+    public CheckRemoveFromCollection(final Perform.Mode mode) {
+        super("check remove from collection", OnMemberColumn.REQUIRED, mode, new ProposedRemoveFrom(
+            AssertsValidity.VALID), new ProposedRemoveFrom(AssertsValidity.INVALID));
+    }
+
+}

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckSetProperty.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckSetProperty.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckSetProperty.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckSetProperty.java Tue May  3 07:18:19 2011
@@ -16,18 +16,17 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.bdd.common.fixtures.perform;
-
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.AssertsValidity;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.PerformCheckThatAbstract;
-import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.property.ProposedSet;
-
-public class CheckSetProperty extends PerformCheckThatAbstract {
-
-    public CheckSetProperty(final Perform.Mode mode) {
-        super("check set property", OnMemberColumn.REQUIRED, mode,
-                new ProposedSet(AssertsValidity.VALID), new ProposedSet(
-                AssertsValidity.INVALID));
-    }
-
-}
+package org.apache.isis.viewer.bdd.common.fixtures.perform;
+
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.AssertsValidity;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.PerformCheckThatAbstract;
+import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.property.ProposedSet;
+
+public class CheckSetProperty extends PerformCheckThatAbstract {
+
+    public CheckSetProperty(final Perform.Mode mode) {
+        super("check set property", OnMemberColumn.REQUIRED, mode, new ProposedSet(AssertsValidity.VALID),
+            new ProposedSet(AssertsValidity.INVALID));
+    }
+
+}

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/ClearProperty.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/ClearProperty.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/ClearProperty.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/ClearProperty.java Tue May  3 07:18:19 2011
@@ -16,56 +16,52 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.bdd.common.fixtures.perform;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.facets.properties.modify.PropertyClearFacet;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.viewer.bdd.common.CellBinding;
-import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException;
-
-public class ClearProperty extends PerformAbstractTypeParams {
-
-	private ObjectAdapter result;
-
-	public ClearProperty(final Perform.Mode mode) {
-		super("clear property", Type.PROPERTY, NumParameters.ZERO, mode);
-	}
-
-	@Override
-	public void doHandle(final PerformContext performContext)
-			throws ScenarioBoundValueException {
-
-		final ObjectAdapter onAdapter = performContext.getOnAdapter();
-		final ObjectMember nakedObjectMember = performContext
-				.getObjectMember();
-
-		final OneToOneAssociation otoa = (OneToOneAssociation) nakedObjectMember;
-
-		// set
-		final PropertyClearFacet clearFacet = otoa
-				.getFacet(PropertyClearFacet.class);
-		CellBinding thatItBinding = performContext.getPeer().getThatItBinding();
-		if (clearFacet == null) {
-			throw ScenarioBoundValueException
-					.current(thatItBinding, "(cannot clear)");
-		}
-
-		// validate setting to null
-		final Consent validConsent = otoa.isAssociationValid(onAdapter, null);
-		if (validConsent.isVetoed()) {
-			throw ScenarioBoundValueException.current(thatItBinding, validConsent
-					.getReason());
-		}
-
-		clearFacet.clearProperty(onAdapter);
-
-	}
-
-	public ObjectAdapter getResult() {
-		return result;
-	}
-
-}
+package org.apache.isis.viewer.bdd.common.fixtures.perform;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertyClearFacet;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.viewer.bdd.common.CellBinding;
+import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException;
+
+public class ClearProperty extends PerformAbstractTypeParams {
+
+    private ObjectAdapter result;
+
+    public ClearProperty(final Perform.Mode mode) {
+        super("clear property", Type.PROPERTY, NumParameters.ZERO, mode);
+    }
+
+    @Override
+    public void doHandle(final PerformContext performContext) throws ScenarioBoundValueException {
+
+        final ObjectAdapter onAdapter = performContext.getOnAdapter();
+        final ObjectMember nakedObjectMember = performContext.getObjectMember();
+
+        final OneToOneAssociation otoa = (OneToOneAssociation) nakedObjectMember;
+
+        // set
+        final PropertyClearFacet clearFacet = otoa.getFacet(PropertyClearFacet.class);
+        final CellBinding thatItBinding = performContext.getPeer().getThatItBinding();
+        if (clearFacet == null) {
+            throw ScenarioBoundValueException.current(thatItBinding, "(cannot clear)");
+        }
+
+        // validate setting to null
+        final Consent validConsent = otoa.isAssociationValid(onAdapter, null);
+        if (validConsent.isVetoed()) {
+            throw ScenarioBoundValueException.current(thatItBinding, validConsent.getReason());
+        }
+
+        clearFacet.clearProperty(onAdapter);
+
+    }
+
+    @Override
+    public ObjectAdapter getResult() {
+        return result;
+    }
+
+}

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterChoices.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterChoices.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterChoices.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterChoices.java Tue May  3 07:18:19 2011
@@ -16,54 +16,52 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.bdd.common.fixtures.perform;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.viewer.bdd.common.CellBinding;
-import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException;
-import org.apache.isis.viewer.bdd.common.ScenarioCell;
-
-public class GetActionParameterChoices extends PerformAbstractTypeParams {
-
-    private ObjectAdapter result;
-
-    public GetActionParameterChoices(final Perform.Mode mode) {
-        super("get action parameter choices", Type.ACTION, NumParameters.ONE,
-                mode);
-    }
-
-    @Override
-    public void doHandle(final PerformContext performContext) throws ScenarioBoundValueException {
-
-        final ObjectAdapter onAdapter = performContext.getOnAdapter();
-        final ObjectMember nakedObjectMember = performContext
-                .getObjectMember();
-        CellBinding arg0Binding = performContext.getPeer().getArg0Binding();
-		final ScenarioCell arg0Cell = arg0Binding.getCurrentCell();
-
-        int requestedParamNum = -1;
-        try {
-            requestedParamNum = Integer.valueOf(arg0Cell.getText());
-        } catch (final NumberFormatException ex) {
-            throw ScenarioBoundValueException.current(arg0Binding, ex.getMessage());
-        }
-
-        final ObjectAction noa = (ObjectAction) nakedObjectMember;
-        final int parameterCount = noa.getParameterCount();
-        if (requestedParamNum < 0 || requestedParamNum > parameterCount - 1) {
-            throw ScenarioBoundValueException.current(arg0Binding, 
-                    "(must be between 0 and " + (parameterCount - 1) + ")");
-        }
-
-        final ObjectAdapter[][] allParameterChoices = noa.getChoices(onAdapter);
-        result = performContext.getPeer()
-                .toAdaptedListOfPojos(allParameterChoices[requestedParamNum]);
-    }
-
-    public ObjectAdapter getResult() {
-        return result;
-    }
-
-}
+package org.apache.isis.viewer.bdd.common.fixtures.perform;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.viewer.bdd.common.CellBinding;
+import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException;
+import org.apache.isis.viewer.bdd.common.ScenarioCell;
+
+public class GetActionParameterChoices extends PerformAbstractTypeParams {
+
+    private ObjectAdapter result;
+
+    public GetActionParameterChoices(final Perform.Mode mode) {
+        super("get action parameter choices", Type.ACTION, NumParameters.ONE, mode);
+    }
+
+    @Override
+    public void doHandle(final PerformContext performContext) throws ScenarioBoundValueException {
+
+        final ObjectAdapter onAdapter = performContext.getOnAdapter();
+        final ObjectMember nakedObjectMember = performContext.getObjectMember();
+        final CellBinding arg0Binding = performContext.getPeer().getArg0Binding();
+        final ScenarioCell arg0Cell = arg0Binding.getCurrentCell();
+
+        int requestedParamNum = -1;
+        try {
+            requestedParamNum = Integer.valueOf(arg0Cell.getText());
+        } catch (final NumberFormatException ex) {
+            throw ScenarioBoundValueException.current(arg0Binding, ex.getMessage());
+        }
+
+        final ObjectAction noa = (ObjectAction) nakedObjectMember;
+        final int parameterCount = noa.getParameterCount();
+        if (requestedParamNum < 0 || requestedParamNum > parameterCount - 1) {
+            throw ScenarioBoundValueException.current(arg0Binding, "(must be between 0 and " + (parameterCount - 1)
+                + ")");
+        }
+
+        final ObjectAdapter[][] allParameterChoices = noa.getChoices(onAdapter);
+        result = performContext.getPeer().toAdaptedListOfPojos(allParameterChoices[requestedParamNum]);
+    }
+
+    @Override
+    public ObjectAdapter getResult() {
+        return result;
+    }
+
+}

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterDefault.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterDefault.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterDefault.java Tue May  3 07:18:19 2011
@@ -16,52 +16,51 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.bdd.common.fixtures.perform;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.viewer.bdd.common.CellBinding;
-import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException;
-import org.apache.isis.viewer.bdd.common.ScenarioCell;
-
-public class GetActionParameterDefault extends PerformAbstractTypeParams {
-
-    private ObjectAdapter result;
-
-    public GetActionParameterDefault(final Perform.Mode mode) {
-        super("get action parameter default", Type.ACTION, NumParameters.ONE,
-                mode);
-    }
-
-    @Override
-    public void doHandle(final PerformContext performContext) throws ScenarioBoundValueException {
-
-        final ObjectAdapter onAdapter = performContext.getOnAdapter();
-        final ObjectMember nakedObjectMember = performContext
-                .getObjectMember();
-        CellBinding arg0Binding = performContext.getPeer().getArg0Binding();
-		final ScenarioCell arg0Cell = arg0Binding.getCurrentCell();
-        int requestedParamNum = -1;
-        try {
-            requestedParamNum = Integer.valueOf(arg0Cell.getText());
-        } catch (final NumberFormatException ex) {
-            throw ScenarioBoundValueException.current(arg0Binding, ex.getMessage());
-        }
-
-        final ObjectAction noa = (ObjectAction) nakedObjectMember;
-        final int parameterCount = noa.getParameterCount();
-        if (requestedParamNum < 0 || requestedParamNum > parameterCount - 1) {
-            throw ScenarioBoundValueException.current(arg0Binding, 
-                    "(must be between 0 and " + (parameterCount - 1) + ")");
-        }
-
-        final ObjectAdapter[] defaults = noa.getDefaults(onAdapter);
-        result = defaults[requestedParamNum];
-    }
-
-    public ObjectAdapter getResult() {
-        return result;
-    }
-
-}
+package org.apache.isis.viewer.bdd.common.fixtures.perform;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.viewer.bdd.common.CellBinding;
+import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException;
+import org.apache.isis.viewer.bdd.common.ScenarioCell;
+
+public class GetActionParameterDefault extends PerformAbstractTypeParams {
+
+    private ObjectAdapter result;
+
+    public GetActionParameterDefault(final Perform.Mode mode) {
+        super("get action parameter default", Type.ACTION, NumParameters.ONE, mode);
+    }
+
+    @Override
+    public void doHandle(final PerformContext performContext) throws ScenarioBoundValueException {
+
+        final ObjectAdapter onAdapter = performContext.getOnAdapter();
+        final ObjectMember nakedObjectMember = performContext.getObjectMember();
+        final CellBinding arg0Binding = performContext.getPeer().getArg0Binding();
+        final ScenarioCell arg0Cell = arg0Binding.getCurrentCell();
+        int requestedParamNum = -1;
+        try {
+            requestedParamNum = Integer.valueOf(arg0Cell.getText());
+        } catch (final NumberFormatException ex) {
+            throw ScenarioBoundValueException.current(arg0Binding, ex.getMessage());
+        }
+
+        final ObjectAction noa = (ObjectAction) nakedObjectMember;
+        final int parameterCount = noa.getParameterCount();
+        if (requestedParamNum < 0 || requestedParamNum > parameterCount - 1) {
+            throw ScenarioBoundValueException.current(arg0Binding, "(must be between 0 and " + (parameterCount - 1)
+                + ")");
+        }
+
+        final ObjectAdapter[] defaults = noa.getDefaults(onAdapter);
+        result = defaults[requestedParamNum];
+    }
+
+    @Override
+    public ObjectAdapter getResult() {
+        return result;
+    }
+
+}

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetCollection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetCollection.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetCollection.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetCollection.java Tue May  3 07:18:19 2011
@@ -16,34 +16,34 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.bdd.common.fixtures.perform;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-
-public class GetCollection extends PerformAbstractTypeParams {
-
-    private ObjectAdapter result;
-
-    public GetCollection(final Perform.Mode mode) {
-        super("get collection", Type.COLLECTION, NumParameters.ZERO, mode);
-    }
-
-    @Override
-    public void doHandle(final PerformContext performContext) {
-
-        final ObjectAdapter onAdapter = performContext.getOnAdapter();
-        final ObjectMember nakedObjectMember = performContext
-                .getObjectMember();
-
-        final OneToManyAssociation otma = (OneToManyAssociation) nakedObjectMember;
-
-        result = otma.get(onAdapter);
-    }
-
-    public ObjectAdapter getResult() {
-        return result;
-    }
-
-}
+package org.apache.isis.viewer.bdd.common.fixtures.perform;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+
+public class GetCollection extends PerformAbstractTypeParams {
+
+    private ObjectAdapter result;
+
+    public GetCollection(final Perform.Mode mode) {
+        super("get collection", Type.COLLECTION, NumParameters.ZERO, mode);
+    }
+
+    @Override
+    public void doHandle(final PerformContext performContext) {
+
+        final ObjectAdapter onAdapter = performContext.getOnAdapter();
+        final ObjectMember nakedObjectMember = performContext.getObjectMember();
+
+        final OneToManyAssociation otma = (OneToManyAssociation) nakedObjectMember;
+
+        result = otma.get(onAdapter);
+    }
+
+    @Override
+    public ObjectAdapter getResult() {
+        return result;
+    }
+
+}

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetProperty.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetProperty.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetProperty.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetProperty.java Tue May  3 07:18:19 2011
@@ -16,34 +16,34 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.bdd.common.fixtures.perform;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-
-public class GetProperty extends PerformAbstractTypeParams {
-
-    private ObjectAdapter result;
-
-    public GetProperty(final Perform.Mode mode) {
-        super("get property", Type.PROPERTY, NumParameters.ZERO, mode);
-    }
-
-    @Override
-    public void doHandle(final PerformContext performContext) {
-
-        final ObjectAdapter onAdapter = performContext.getOnAdapter();
-        final ObjectMember nakedObjectMember = performContext
-                .getObjectMember();
-
-        final OneToOneAssociation otoa = (OneToOneAssociation) nakedObjectMember;
-
-        result = otoa.get(onAdapter);
-    }
-
-    public ObjectAdapter getResult() {
-        return result;
-    }
-
-}
+package org.apache.isis.viewer.bdd.common.fixtures.perform;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+
+public class GetProperty extends PerformAbstractTypeParams {
+
+    private ObjectAdapter result;
+
+    public GetProperty(final Perform.Mode mode) {
+        super("get property", Type.PROPERTY, NumParameters.ZERO, mode);
+    }
+
+    @Override
+    public void doHandle(final PerformContext performContext) {
+
+        final ObjectAdapter onAdapter = performContext.getOnAdapter();
+        final ObjectMember nakedObjectMember = performContext.getObjectMember();
+
+        final OneToOneAssociation otoa = (OneToOneAssociation) nakedObjectMember;
+
+        result = otoa.get(onAdapter);
+    }
+
+    @Override
+    public ObjectAdapter getResult() {
+        return result;
+    }
+
+}

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetPropertyChoices.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetPropertyChoices.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetPropertyChoices.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetPropertyChoices.java Tue May  3 07:18:19 2011
@@ -16,35 +16,34 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.bdd.common.fixtures.perform;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-
-public class GetPropertyChoices extends PerformAbstractTypeParams {
-
-    private ObjectAdapter result;
-
-    public GetPropertyChoices(final Perform.Mode mode) {
-        super("get property choices", Type.PROPERTY, NumParameters.ZERO, mode);
-    }
-
-    @Override
-    public void doHandle(final PerformContext performContext) {
-
-        final ObjectAdapter onAdapter = performContext.getOnAdapter();
-        final ObjectMember nakedObjectMember = performContext
-                .getObjectMember();
-
-        final OneToOneAssociation otoa = (OneToOneAssociation) nakedObjectMember;
-
-        result = performContext.getPeer().toAdaptedListOfPojos(otoa
-                .getChoices(onAdapter));
-    }
-
-    public ObjectAdapter getResult() {
-        return result;
-    }
-
-}
+package org.apache.isis.viewer.bdd.common.fixtures.perform;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+
+public class GetPropertyChoices extends PerformAbstractTypeParams {
+
+    private ObjectAdapter result;
+
+    public GetPropertyChoices(final Perform.Mode mode) {
+        super("get property choices", Type.PROPERTY, NumParameters.ZERO, mode);
+    }
+
+    @Override
+    public void doHandle(final PerformContext performContext) {
+
+        final ObjectAdapter onAdapter = performContext.getOnAdapter();
+        final ObjectMember nakedObjectMember = performContext.getObjectMember();
+
+        final OneToOneAssociation otoa = (OneToOneAssociation) nakedObjectMember;
+
+        result = performContext.getPeer().toAdaptedListOfPojos(otoa.getChoices(onAdapter));
+    }
+
+    @Override
+    public ObjectAdapter getResult() {
+        return result;
+    }
+
+}

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetPropertyDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetPropertyDefault.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetPropertyDefault.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetPropertyDefault.java Tue May  3 07:18:19 2011
@@ -16,37 +16,37 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.bdd.common.fixtures.perform;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-
-public class GetPropertyDefault extends PerformAbstractTypeParams {
-
-    private ObjectAdapter result;
-
-    public GetPropertyDefault(final Perform.Mode mode) {
-        super("get property default", Type.PROPERTY, NumParameters.ZERO, mode);
-    }
-
-    @Override
-    public void doHandle(final PerformContext performContext) {
-
-        final ObjectAdapter onAdapter = performContext.getOnAdapter();
-        final ObjectMember nakedObjectMember = performContext
-                .getObjectMember();
-
-        final OneToOneAssociation otoa = (OneToOneAssociation) nakedObjectMember;
-
-        // TODO: the OTOA interface is wrong, should be declared as returning a
-        // NakedObject
-        // (which is indeed what the implementation does)
-        result = otoa.getDefault(onAdapter);
-    }
-
-    public ObjectAdapter getResult() {
-        return result;
-    }
-
-}
+package org.apache.isis.viewer.bdd.common.fixtures.perform;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+
+public class GetPropertyDefault extends PerformAbstractTypeParams {
+
+    private ObjectAdapter result;
+
+    public GetPropertyDefault(final Perform.Mode mode) {
+        super("get property default", Type.PROPERTY, NumParameters.ZERO, mode);
+    }
+
+    @Override
+    public void doHandle(final PerformContext performContext) {
+
+        final ObjectAdapter onAdapter = performContext.getOnAdapter();
+        final ObjectMember nakedObjectMember = performContext.getObjectMember();
+
+        final OneToOneAssociation otoa = (OneToOneAssociation) nakedObjectMember;
+
+        // TODO: the OTOA interface is wrong, should be declared as returning a
+        // NakedObject
+        // (which is indeed what the implementation does)
+        result = otoa.getDefault(onAdapter);
+    }
+
+    @Override
+    public ObjectAdapter getResult() {
+        return result;
+    }
+
+}

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/InvokeAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/InvokeAction.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/InvokeAction.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/InvokeAction.java Tue May  3 07:18:19 2011
@@ -16,72 +16,64 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.bdd.common.fixtures.perform;
-
-import java.util.List;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.viewer.bdd.common.CellBinding;
-import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException;
-import org.apache.isis.viewer.bdd.common.ScenarioCell;
-
-public class InvokeAction extends PerformAbstractTypeParams {
-
-	private ObjectAdapter result;
-
-	public InvokeAction(final Perform.Mode mode) {
-		super("invoke action", Type.ACTION, NumParameters.UNLIMITED, mode);
-	}
-
-	@Override
-	public void doHandle(final PerformContext performContext)
-			throws ScenarioBoundValueException {
-
-	    final ObjectAdapter onAdapter = performContext.getOnAdapter();
-		final ObjectMember objectMember = performContext
-				.getObjectMember();
-		final CellBinding onMemberBinding = performContext.getPeer()
-				.getOnMemberBinding();
-		final List<ScenarioCell> argumentCells = performContext.getArgumentCells();
-
-		final ObjectAction objectAction = (ObjectAction) objectMember;
-		
-
-		final int parameterCount = objectAction.getParameterCount();
-		final boolean isContributedOneArgAction = objectAction
-				.isContributed()
-				&& parameterCount == 1;
-
-		ObjectAdapter[] proposedArguments;
-		if (!isContributedOneArgAction) {
-
-			// lookup arguments
-			proposedArguments = performContext.getPeer().getAdapters(onAdapter,
-					objectAction, onMemberBinding, argumentCells);
-
-			// validate arguments
-			final Consent argSetValid = objectAction
-					.isProposedArgumentSetValid(onAdapter, proposedArguments);
-			if (argSetValid.isVetoed()) {
-				throw ScenarioBoundValueException.current(onMemberBinding, argSetValid
-						.getReason());
-			}
-		} else {
-			proposedArguments = new ObjectAdapter[] { onAdapter };
-		}
-
-		// execute
-		result = objectAction.execute(onAdapter, proposedArguments);
-
-		// all OK.
-	}
-
-	@Override
-    public ObjectAdapter getResult() {
-		return result;
-	}
-
-}
+package org.apache.isis.viewer.bdd.common.fixtures.perform;
+
+import java.util.List;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.viewer.bdd.common.CellBinding;
+import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException;
+import org.apache.isis.viewer.bdd.common.ScenarioCell;
+
+public class InvokeAction extends PerformAbstractTypeParams {
+
+    private ObjectAdapter result;
+
+    public InvokeAction(final Perform.Mode mode) {
+        super("invoke action", Type.ACTION, NumParameters.UNLIMITED, mode);
+    }
+
+    @Override
+    public void doHandle(final PerformContext performContext) throws ScenarioBoundValueException {
+
+        final ObjectAdapter onAdapter = performContext.getOnAdapter();
+        final ObjectMember objectMember = performContext.getObjectMember();
+        final CellBinding onMemberBinding = performContext.getPeer().getOnMemberBinding();
+        final List<ScenarioCell> argumentCells = performContext.getArgumentCells();
+
+        final ObjectAction objectAction = (ObjectAction) objectMember;
+
+        final int parameterCount = objectAction.getParameterCount();
+        final boolean isContributedOneArgAction = objectAction.isContributed() && parameterCount == 1;
+
+        ObjectAdapter[] proposedArguments;
+        if (!isContributedOneArgAction) {
+
+            // lookup arguments
+            proposedArguments =
+                performContext.getPeer().getAdapters(onAdapter, objectAction, onMemberBinding, argumentCells);
+
+            // validate arguments
+            final Consent argSetValid = objectAction.isProposedArgumentSetValid(onAdapter, proposedArguments);
+            if (argSetValid.isVetoed()) {
+                throw ScenarioBoundValueException.current(onMemberBinding, argSetValid.getReason());
+            }
+        } else {
+            proposedArguments = new ObjectAdapter[] { onAdapter };
+        }
+
+        // execute
+        result = objectAction.execute(onAdapter, proposedArguments);
+
+        // all OK.
+    }
+
+    @Override
+    public ObjectAdapter getResult() {
+        return result;
+    }
+
+}

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/Perform.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/Perform.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/Perform.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/Perform.java Tue May  3 07:18:19 2011
@@ -16,22 +16,22 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.bdd.common.fixtures.perform;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException;
-
-public interface Perform {
-
-    public static enum Mode {
-		SETUP, TEST
-	}
-
-	String getKey();
-
-    void perform(PerformContext performContext) throws ScenarioBoundValueException;
-
-    ObjectAdapter getResult();
-
-    boolean requiresMember();
-}
+package org.apache.isis.viewer.bdd.common.fixtures.perform;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.viewer.bdd.common.ScenarioBoundValueException;
+
+public interface Perform {
+
+    public static enum Mode {
+        SETUP, TEST
+    }
+
+    String getKey();
+
+    void perform(PerformContext performContext) throws ScenarioBoundValueException;
+
+    ObjectAdapter getResult();
+
+    boolean requiresMember();
+}

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformAbstract.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformAbstract.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformAbstract.java Tue May  3 07:18:19 2011
@@ -16,31 +16,32 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.bdd.common.fixtures.perform;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
-
-public abstract class PerformAbstract implements Perform {
-
-    private final String key;
-    private final Perform.Mode mode;
-
-    public PerformAbstract(final String key, final Perform.Mode mode) {
-        this.key = key;
-        this.mode = mode;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    protected Perform.Mode getMode() {
-        return mode;
-    }
-
-    protected AuthenticationSession getSession() {
-        return IsisContext.getAuthenticationSession();
-    }
-
-}
+package org.apache.isis.viewer.bdd.common.fixtures.perform;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+
+public abstract class PerformAbstract implements Perform {
+
+    private final String key;
+    private final Perform.Mode mode;
+
+    public PerformAbstract(final String key, final Perform.Mode mode) {
+        this.key = key;
+        this.mode = mode;
+    }
+
+    @Override
+    public String getKey() {
+        return key;
+    }
+
+    protected Perform.Mode getMode() {
+        return mode;
+    }
+
+    protected AuthenticationSession getSession() {
+        return IsisContext.getAuthenticationSession();
+    }
+
+}