You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2012/01/22 09:05:57 UTC
svn commit: r1234460 [2/30] - in /incubator/isis/trunk/framework/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/...
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/AliasRegistry.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/AliasRegistry.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/AliasRegistry.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/AliasRegistry.java Sun Jan 22 08:05:17 2012
@@ -29,7 +29,8 @@ public interface AliasRegistry extends I
public String getAlias(final ObjectAdapter adapter);
/**
- * Holds a new {@link NakedObject adapter}, automatically assigning it a new heldAs alias.
+ * Holds a new {@link NakedObject adapter}, automatically assigning it a new
+ * heldAs alias.
*/
public String aliasPrefixedAs(final String prefix, final ObjectAdapter adapter);
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/CellBinding.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/CellBinding.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/CellBinding.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/CellBinding.java Sun Jan 22 08:05:17 2012
@@ -41,8 +41,7 @@ public abstract class CellBinding {
// Constructor
// ///////////////////////////////////////////////////////////////
- protected CellBinding(final String name, final boolean autoCreate, final boolean ditto, final boolean optional,
- final String[] headTexts) {
+ protected CellBinding(final String name, final boolean autoCreate, final boolean ditto, final boolean optional, final String[] headTexts) {
this.name = name;
this.autoCreate = autoCreate;
this.ditto = ditto;
@@ -86,8 +85,8 @@ public abstract class CellBinding {
// ///////////////////////////////////////////////////////////////
/**
- * For the BDD framework integration to search whether this particular {@link CellBinding} corresponds to a
- * particular head text.
+ * For the BDD framework integration to search whether this particular
+ * {@link CellBinding} corresponds to a particular head text.
*/
public boolean matches(final String candidateText) {
final String candidateTextCamelLower = StringUtils.camel(candidateText).toLowerCase();
@@ -104,7 +103,8 @@ public abstract class CellBinding {
// ///////////////////////////////////////////////////////////////
/**
- * For the BDD framework integration to indicate the head column, but without no {@link #getHeadCell() head cell}.
+ * For the BDD framework integration to indicate the head column, but
+ * without no {@link #getHeadCell() head cell}.
*/
public void setHeadColumn(final int column) {
this.found = true;
@@ -112,7 +112,8 @@ public abstract class CellBinding {
}
/**
- * For the BDD framework integration to indicate that the head cell has been found.
+ * For the BDD framework integration to indicate that the head cell has been
+ * found.
*/
public void setHeadColumn(final int column, final ScenarioCell headCell) {
this.found = true;
@@ -120,7 +121,8 @@ public abstract class CellBinding {
}
/**
- * For the BDD framework integration to indicate that the head cell was not found and has been created.
+ * For the BDD framework integration to indicate that the head cell was not
+ * found and has been created.
*/
public void createHeadCell(final int column, final ScenarioCell headCell) {
setColumnAndHeadCell(column, headCell);
@@ -173,8 +175,9 @@ public abstract class CellBinding {
private boolean dittoed;
/**
- * Captures the current value, but also checking that the column in which the {@link ScenarioCell value} has been
- * provided corresponds to the {@link #getColumn() column} of this binding.
+ * Captures the current value, but also checking that the column in which
+ * the {@link ScenarioCell value} has been provided corresponds to the
+ * {@link #getColumn() column} of this binding.
*
* @see #captureCurrent(ScenarioCell)
*/
@@ -189,7 +192,8 @@ public abstract class CellBinding {
* Captures the current {@link ScenarioCell value} for this binding.
*
* <p>
- * For implementations where we already know that the value provided is for this particular binding.
+ * For implementations where we already know that the value provided is for
+ * this particular binding.
*/
public void captureCurrent(final ScenarioCell cell) {
final ScenarioCell previousCell = getCurrentCell();
@@ -205,7 +209,8 @@ public abstract class CellBinding {
}
/**
- * Whether the most recent call to {@link #captureCurrent(ScenarioCell)} resulted in a ditto.
+ * Whether the most recent call to {@link #captureCurrent(ScenarioCell)}
+ * resulted in a ditto.
*/
public boolean isDittoed() {
return dittoed;
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/CellBindingDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/CellBindingDefault.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/CellBindingDefault.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/CellBindingDefault.java Sun Jan 22 08:05:17 2012
@@ -56,8 +56,7 @@ public class CellBindingDefault extends
return new Builder(name, headText);
}
- private CellBindingDefault(final String name, final boolean autoCreate, final boolean ditto,
- final boolean optional, final String[] headTexts) {
+ private CellBindingDefault(final String name, final boolean autoCreate, final boolean ditto, final boolean optional, final String[] headTexts) {
super(name, autoCreate, ditto, optional, headTexts);
}
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/IsisViewerConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/IsisViewerConstants.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/IsisViewerConstants.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/IsisViewerConstants.java Sun Jan 22 08:05:17 2012
@@ -33,8 +33,7 @@ public final class IsisViewerConstants {
public static final String ALIAS_RESULT_HEAD_ALT1 = "result=";
public static final String ALIAS_RESULT_HEAD_ALT2 = "alias=";
public static final String ALIAS_RESULT_HEAD_ALT3 = "alias as";
- public static final String[] ALIAS_RESULT_HEAD_SET = { ALIAS_RESULT_HEAD, ALIAS_RESULT_HEAD_ALT1,
- ALIAS_RESULT_HEAD_ALT2, ALIAS_RESULT_HEAD_ALT3 };
+ public static final String[] ALIAS_RESULT_HEAD_SET = { ALIAS_RESULT_HEAD, ALIAS_RESULT_HEAD_ALT1, ALIAS_RESULT_HEAD_ALT2, ALIAS_RESULT_HEAD_ALT3 };
public static final String ALIAS_RESULT_NAME = ALIAS_RESULT_HEAD;
public static final String TITLE_NAME = "Title";
@@ -50,16 +49,14 @@ public final class IsisViewerConstants {
public static final String PERFORM_HEAD_ALT1 = "do";
public static final String PERFORM_HEAD_ALT2 = "interaction";
public static final String PERFORM_HEAD_ALT3 = "interaction type";
- public static final String[] PERFORM_HEAD_SET = { PERFORM_HEAD, PERFORM_HEAD_ALT1, PERFORM_HEAD_ALT2,
- PERFORM_HEAD_ALT3 };
+ public static final String[] PERFORM_HEAD_SET = { PERFORM_HEAD, PERFORM_HEAD_ALT1, PERFORM_HEAD_ALT2, PERFORM_HEAD_ALT3 };
public static final String PERFORM_NAME = PERFORM_HEAD;
public static final String ON_MEMBER_HEAD = "on member";
public static final String ON_MEMBER_HEAD_ALT1 = "using member";
public static final String ON_MEMBER_HEAD_ALT2 = "using";
public static final String ON_MEMBER_HEAD_ALT3 = "member";
- public static final String[] ON_MEMBER_HEAD_SET = { ON_MEMBER_HEAD, ON_MEMBER_HEAD_ALT1, ON_MEMBER_HEAD_ALT2,
- ON_MEMBER_HEAD_ALT3 };
+ public static final String[] ON_MEMBER_HEAD_SET = { ON_MEMBER_HEAD, ON_MEMBER_HEAD_ALT1, ON_MEMBER_HEAD_ALT2, ON_MEMBER_HEAD_ALT3 };
public static final String ON_MEMBER_NAME = ON_MEMBER_HEAD;
public static final String THAT_IT_HEAD = "that it";
@@ -78,9 +75,8 @@ public final class IsisViewerConstants {
public static final String WITH_ARGUMENTS_HEAD_ALT7 = "for parameters";
public static final String WITH_ARGUMENTS_HEAD_ALT8 = "value";
public static final String WITH_ARGUMENTS_HEAD_ALT9 = "reference";
- public static final String[] WITH_ARGUMENTS_HEAD_SET = { WITH_ARGUMENTS_HEAD, WITH_ARGUMENTS_HEAD_ALT1,
- WITH_ARGUMENTS_HEAD_ALT2, WITH_ARGUMENTS_HEAD_ALT3, WITH_ARGUMENTS_HEAD_ALT4, WITH_ARGUMENTS_HEAD_ALT5,
- WITH_ARGUMENTS_HEAD_ALT6, WITH_ARGUMENTS_HEAD_ALT7, WITH_ARGUMENTS_HEAD_ALT8, WITH_ARGUMENTS_HEAD_ALT9 };
+ public static final String[] WITH_ARGUMENTS_HEAD_SET = { WITH_ARGUMENTS_HEAD, WITH_ARGUMENTS_HEAD_ALT1, WITH_ARGUMENTS_HEAD_ALT2, WITH_ARGUMENTS_HEAD_ALT3, WITH_ARGUMENTS_HEAD_ALT4, WITH_ARGUMENTS_HEAD_ALT5, WITH_ARGUMENTS_HEAD_ALT6, WITH_ARGUMENTS_HEAD_ALT7, WITH_ARGUMENTS_HEAD_ALT8,
+ WITH_ARGUMENTS_HEAD_ALT9 };
public static final String WITH_ARGUMENTS_NAME = WITH_ARGUMENTS_HEAD;
}
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Scenario.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Scenario.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Scenario.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Scenario.java Sun Jan 22 08:05:17 2012
@@ -62,15 +62,19 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
/**
- * Holds the bootstrapped {@link IsisSystem} and provides access to the {@link AliasRegistry aliases}.
+ * Holds the bootstrapped {@link IsisSystem} and provides access to the
+ * {@link AliasRegistry aliases}.
*
* <p>
- * Typically held in a thread-local by the test framework, acting as a context to the story.
+ * Typically held in a thread-local by the test framework, acting as a context
+ * to the story.
*
* <p>
- * Implementation note: this class directly implements {@link AliasRegistrySpi}, though delegates to an underlying
- * {@link AliasRegistryDefault}. This is needed because the underlying {@link AliasRegistry} can change on
- * {@link #switchUserWithRoles(String, String)} (see {@link #reAdapt(AliasRegistrySpi)} method).
+ * Implementation note: this class directly implements {@link AliasRegistrySpi},
+ * though delegates to an underlying {@link AliasRegistryDefault}. This is
+ * needed because the underlying {@link AliasRegistry} can change on
+ * {@link #switchUserWithRoles(String, String)} (see
+ * {@link #reAdapt(AliasRegistrySpi)} method).
*/
public class Scenario implements AliasRegistryHolder {
@@ -108,12 +112,9 @@ public class Scenario implements AliasRe
@SuppressWarnings("unchecked")
public void bootstrapIsis(final String configDirectory, final DeploymentType deploymentType) {
this.configDirectory = configDirectory;
- this.deploymentType =
- ensureThatArg(deploymentType,
- is(anyOf(equalTo(DeploymentType.EXPLORATION), equalTo(DeploymentType.PROTOTYPE))));
+ this.deploymentType = ensureThatArg(deploymentType, is(anyOf(equalTo(DeploymentType.EXPLORATION), equalTo(DeploymentType.PROTOTYPE))));
- final IsisConfigurationBuilderFileSystem configurationBuilder =
- new IsisConfigurationBuilderFileSystem(getConfigDirectory());
+ final IsisConfigurationBuilderFileSystem configurationBuilder = new IsisConfigurationBuilderFileSystem(getConfigDirectory());
configurationBuilder.add(SystemConstants.DEPLOYMENT_TYPE_KEY, deploymentType.name());
defaultStoryComponentsInto(configurationBuilder);
@@ -135,8 +136,7 @@ public class Scenario implements AliasRe
}
}
- private IsisSystem createSystem(final DeploymentType deploymentType,
- final IsisConfigurationBuilder isisConfigurationBuilder) {
+ private IsisSystem createSystem(final DeploymentType deploymentType, final IsisConfigurationBuilder isisConfigurationBuilder) {
this.installerLookup = new InstallerLookupDefault();
isisConfigurationBuilder.injectInto(installerLookup);
@@ -146,18 +146,14 @@ public class Scenario implements AliasRe
}
private void defaultStoryComponentsInto(final IsisConfigurationBuilder isisConfigurationBuilder) {
- isisConfigurationBuilder.add(SystemConstants.AUTHENTICATION_INSTALLER_KEY,
- BddAuthenticationManagerInstaller.class.getName());
- isisConfigurationBuilder.add(SystemConstants.OBJECT_PERSISTOR_INSTALLER_KEY,
- BddInMemoryPersistenceMechanismInstaller.class.getName());
- isisConfigurationBuilder.add(SystemConstants.PROFILE_PERSISTOR_INSTALLER_KEY,
- InMemoryUserProfileStoreInstaller.class.getName());
+ isisConfigurationBuilder.add(SystemConstants.AUTHENTICATION_INSTALLER_KEY, BddAuthenticationManagerInstaller.class.getName());
+ isisConfigurationBuilder.add(SystemConstants.OBJECT_PERSISTOR_INSTALLER_KEY, BddInMemoryPersistenceMechanismInstaller.class.getName());
+ isisConfigurationBuilder.add(SystemConstants.PROFILE_PERSISTOR_INSTALLER_KEY, InMemoryUserProfileStoreInstaller.class.getName());
isisConfigurationBuilder.add(SystemConstants.FIXTURES_INSTALLER_KEY, FixturesInstallerNoop.class.getName());
isisConfigurationBuilder.add(SystemConstants.NOSPLASH_KEY, "" + true);
}
- private Injector createGuiceInjector(final DeploymentType deploymentType,
- final IsisConfigurationBuilder isisConfigurationBuilder, final InstallerLookup installerLookup) {
+ private Injector createGuiceInjector(final DeploymentType deploymentType, final IsisConfigurationBuilder isisConfigurationBuilder, final InstallerLookup installerLookup) {
final IsisModule isisModule = new IsisModule(deploymentType, isisConfigurationBuilder, installerLookup);
return Guice.createInjector(isisModule);
}
@@ -183,8 +179,9 @@ public class Scenario implements AliasRe
/**
* Logon, specifying no roles.
* <p>
- * Unlike the {@link LogonFixture} on regular fixtures, the logonAs is not automatically remembered until the end of
- * the setup. It should therefore be invoked at the end of setup explicitly.
+ * Unlike the {@link LogonFixture} on regular fixtures, the logonAs is not
+ * automatically remembered until the end of the setup. It should therefore
+ * be invoked at the end of setup explicitly.
*/
public void logonAsOrSwitchUserTo(final String userName) {
final List<String> noRoles = Collections.emptyList();
@@ -194,8 +191,9 @@ public class Scenario implements AliasRe
/**
* Logon, specifying roles.
* <p>
- * Unlike the {@link LogonFixture} on regular Isis fixtures, the logonAs is not automatically remembered until the
- * end of the setup. It should therefore be invoked at the end of setup explicitly.
+ * Unlike the {@link LogonFixture} on regular Isis fixtures, the logonAs is
+ * not automatically remembered until the end of the setup. It should
+ * therefore be invoked at the end of setup explicitly.
*/
public void logonAsOrSwitchUserTo(final String userName, final List<String> roleList) {
new OpenSession(this).openSession(userName, roleList);
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/ScenarioBoundValueException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/ScenarioBoundValueException.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/ScenarioBoundValueException.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/ScenarioBoundValueException.java Sun Jan 22 08:05:17 2012
@@ -32,13 +32,11 @@ public class ScenarioBoundValueException
return new ScenarioBoundValueException(cellBinding, cellBinding.getCurrentCell(), message);
}
- public static ScenarioBoundValueException arg(final CellBinding cellBinding, final ScenarioCell storyCell,
- final String message) {
+ public static ScenarioBoundValueException arg(final CellBinding cellBinding, final ScenarioCell storyCell, final String message) {
return new ScenarioBoundValueException(cellBinding, storyCell, message);
}
- private ScenarioBoundValueException(final CellBinding cellBinding, final ScenarioCell storyCell,
- final String message) {
+ private ScenarioBoundValueException(final CellBinding cellBinding, final ScenarioCell storyCell, final String message) {
super(message);
this.cellBinding = cellBinding;
this.storyCell = storyCell;
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/BddAuthenticationManagerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/BddAuthenticationManagerInstaller.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/BddAuthenticationManagerInstaller.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/BddAuthenticationManagerInstaller.java Sun Jan 22 08:05:17 2012
@@ -35,6 +35,6 @@ public class BddAuthenticationManagerIns
@Override
protected List<Authenticator> createAuthenticators(final IsisConfiguration configuration) {
- return Lists.<Authenticator>newArrayList(new AuthenticatorNoop(configuration));
+ return Lists.<Authenticator> newArrayList(new AuthenticatorNoop(configuration));
}
}
\ No newline at end of file
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/BddInMemoryPersistenceSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/BddInMemoryPersistenceSessionFactory.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/BddInMemoryPersistenceSessionFactory.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/BddInMemoryPersistenceSessionFactory.java Sun Jan 22 08:05:17 2012
@@ -26,14 +26,15 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
/**
- * As per {@link InMemoryPersistenceSessionFactory}, but uses the {@link BddObjectStorePersistedObjects} implementation
- * which stores any {@link CachedFacet cached} {@link ObjectSpecification class}es <tt>static</tt>ally (and thus
- * persisted across multiple setups/teardowns of the {@link NakedObjectsContext}.
+ * As per {@link InMemoryPersistenceSessionFactory}, but uses the
+ * {@link BddObjectStorePersistedObjects} implementation which stores any
+ * {@link CachedFacet cached} {@link ObjectSpecification class}es
+ * <tt>static</tt>ally (and thus persisted across multiple setups/teardowns of
+ * the {@link NakedObjectsContext}.
*/
public class BddInMemoryPersistenceSessionFactory extends InMemoryPersistenceSessionFactory {
- public BddInMemoryPersistenceSessionFactory(final DeploymentType deploymentType,
- final PersistenceSessionFactoryDelegate persistenceSessionFactoryDelegate) {
+ public BddInMemoryPersistenceSessionFactory(final DeploymentType deploymentType, final PersistenceSessionFactoryDelegate persistenceSessionFactoryDelegate) {
super(deploymentType, persistenceSessionFactoryDelegate);
}
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/BddObjectStorePersistedObjects.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/BddObjectStorePersistedObjects.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/BddObjectStorePersistedObjects.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/BddObjectStorePersistedObjects.java Sun Jan 22 08:05:17 2012
@@ -32,16 +32,17 @@ import org.apache.isis.runtimes.dflt.run
import com.google.common.collect.Iterables;
/**
- * Stores instances in one of two maps, based on whether have their specification has the {@link CachedFacet}
- * (represents cached or reference data) or not (represents operational data).
+ * Stores instances in one of two maps, based on whether have their
+ * specification has the {@link CachedFacet} (represents cached or reference
+ * data) or not (represents operational data).
* <p>
- * Those that are cached are stored in a <tt>static</tt> map that is never {@link #clear()}ed down. Those that are
- * operational go in a regular instance cache and can be {@link #clear()}ed.
+ * Those that are cached are stored in a <tt>static</tt> map that is never
+ * {@link #clear()}ed down. Those that are operational go in a regular instance
+ * cache and can be {@link #clear()}ed.
*/
public class BddObjectStorePersistedObjects implements ObjectStorePersistedObjects {
- private static final Map<ObjectSpecification, ObjectStoreInstances> cachedInstancesBySpecMap =
- new HashMap<ObjectSpecification, ObjectStoreInstances>();
+ private static final Map<ObjectSpecification, ObjectStoreInstances> cachedInstancesBySpecMap = new HashMap<ObjectSpecification, ObjectStoreInstances>();
private final Map<ObjectSpecification, ObjectStoreInstances> operationalInstancesBySpecMap;
@@ -73,8 +74,7 @@ public class BddObjectStorePersistedObje
final Oid oidLookedUpByName = serviceOidByIdMap.get(name);
if (oidLookedUpByName != null) {
if (!oidLookedUpByName.equals(oid)) {
- throw new IsisException("Already another service registered as name: " + name + " (existing Oid: "
- + oidLookedUpByName + ", " + "intended: " + oid + ")");
+ throw new IsisException("Already another service registered as name: " + name + " (existing Oid: " + oidLookedUpByName + ", " + "intended: " + oid + ")");
}
} else {
serviceOidByIdMap.put(name, oid);
@@ -83,14 +83,12 @@ public class BddObjectStorePersistedObje
@Override
public Iterable<ObjectSpecification> specifications() {
- return Iterables.concat(BddObjectStorePersistedObjects.cachedInstancesBySpecMap.keySet(),
- operationalInstancesBySpecMap.keySet());
+ return Iterables.concat(BddObjectStorePersistedObjects.cachedInstancesBySpecMap.keySet(), operationalInstancesBySpecMap.keySet());
}
@Override
public Iterable<ObjectStoreInstances> instances() {
- return Iterables.concat(BddObjectStorePersistedObjects.cachedInstancesBySpecMap.values(),
- operationalInstancesBySpecMap.values());
+ return Iterables.concat(BddObjectStorePersistedObjects.cachedInstancesBySpecMap.values(), operationalInstancesBySpecMap.values());
}
@Override
@@ -106,8 +104,7 @@ public class BddObjectStorePersistedObje
// Helpers
// //////////////////////////////////////////////////////////////////
- private ObjectStoreInstances getFromMap(final ObjectSpecification spec,
- final Map<ObjectSpecification, ObjectStoreInstances> map) {
+ private ObjectStoreInstances getFromMap(final ObjectSpecification spec, final Map<ObjectSpecification, ObjectStoreInstances> map) {
ObjectStoreInstances ins = map.get(spec);
if (ins == null) {
ins = new ObjectStoreInstances(spec);
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/IsisSystemUsingInstallersWithinStory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/IsisSystemUsingInstallersWithinStory.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/IsisSystemUsingInstallersWithinStory.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/IsisSystemUsingInstallersWithinStory.java Sun Jan 22 08:05:17 2012
@@ -28,8 +28,7 @@ import org.apache.isis.runtimes.dflt.run
public class IsisSystemUsingInstallersWithinStory extends IsisSystemUsingInstallers {
- public IsisSystemUsingInstallersWithinStory(final DeploymentType deploymentType,
- final InstallerLookup installerLookup) {
+ public IsisSystemUsingInstallersWithinStory(final DeploymentType deploymentType, final InstallerLookup installerLookup) {
super(deploymentType, installerLookup);
final AuthenticationManagerInstaller authManagerInstaller = new BddAuthenticationManagerInstaller();
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java Sun Jan 22 08:05:17 2012
@@ -75,8 +75,7 @@ public abstract class AbstractFixturePee
}
protected ObjectStorePersistence getObjectStore() {
- final PersistenceSessionObjectStore persistenceSession =
- (PersistenceSessionObjectStore) getPersistenceSession();
+ final PersistenceSessionObjectStore persistenceSession = (PersistenceSessionObjectStore) getPersistenceSession();
return persistenceSession.getObjectStore();
}
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractListFixturePeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractListFixturePeer.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractListFixturePeer.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractListFixturePeer.java Sun Jan 22 08:05:17 2012
@@ -38,8 +38,7 @@ public class AbstractListFixturePeer ext
*/
private List<ObjectAdapter> objects;
- public AbstractListFixturePeer(final AliasRegistry aliasesRegistry, final String listAlias,
- final CellBinding... cellBindings) {
+ public AbstractListFixturePeer(final AliasRegistry aliasesRegistry, final String listAlias, final CellBinding... cellBindings) {
super(aliasesRegistry, cellBindings);
this.listAlias = listAlias;
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AliasItemsInListPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AliasItemsInListPeer.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AliasItemsInListPeer.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AliasItemsInListPeer.java Sun Jan 22 08:05:17 2012
@@ -32,8 +32,7 @@ public class AliasItemsInListPeer extend
private final CellBinding typeBinding;
private final CellBinding aliasBinding;
- public AliasItemsInListPeer(final AliasRegistry aliasesRegistry, final String listAlias,
- final CellBinding titleBinding, final CellBinding typeBinding, final CellBinding aliasBinding) {
+ public AliasItemsInListPeer(final AliasRegistry aliasesRegistry, final String listAlias, final CellBinding titleBinding, final CellBinding typeBinding, final CellBinding aliasBinding) {
super(aliasesRegistry, listAlias, titleBinding, typeBinding, aliasBinding);
this.titleBinding = titleBinding;
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/CheckCollectionContentsPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/CheckCollectionContentsPeer.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/CheckCollectionContentsPeer.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/CheckCollectionContentsPeer.java Sun Jan 22 08:05:17 2012
@@ -31,8 +31,8 @@ public class CheckCollectionContentsPeer
* Returns <tt>true</tt> if collection contains specified alias.
*
* <p>
- * If either the list alias is invalid, or the provided alias is {@link #isValidAlias(String) invalid}, will return
- * <tt>false</tt>.
+ * If either the list alias is invalid, or the provided alias is
+ * {@link #isValidAlias(String) invalid}, will return <tt>false</tt>.
*/
public boolean contains(final String alias) {
if (!isValidListAlias()) {
@@ -50,8 +50,8 @@ public class CheckCollectionContentsPeer
* Returns <tt>true</tt> if collection does not contain specified alias.
*
* <p>
- * If either the list alias is invalid, or the provided alias is {@link #isValidAlias(String) invalid}, will return
- * <tt>false</tt>.
+ * If either the list alias is invalid, or the provided alias is
+ * {@link #isValidAlias(String) invalid}, will return <tt>false</tt>.
*/
public boolean doesNotContain(final String alias) {
if (!isValidListAlias()) {
@@ -67,7 +67,8 @@ public class CheckCollectionContentsPeer
/**
* Returns <tt>true</tt> if is empty.
*
- * @return <tt>false</tt> if the alias is invalid or does not represent a list
+ * @return <tt>false</tt> if the alias is invalid or does not represent a
+ * list
*/
public boolean isEmpty() {
if (!isValidListAlias()) {
@@ -79,7 +80,8 @@ public class CheckCollectionContentsPeer
/**
* Returns <tt>true</tt> if is not empty.
*
- * @return <tt>false</tt> if the alias is invalid or does not represent a list
+ * @return <tt>false</tt> if the alias is invalid or does not represent a
+ * list
*/
public boolean isNotEmpty() {
if (!isValidListAlias()) {
@@ -92,7 +94,8 @@ public class CheckCollectionContentsPeer
/**
* Returns <tt>true</tt> if collection has specified size.
*
- * @return <tt>false</tt> if the alias is invalid or does not represent a list
+ * @return <tt>false</tt> if the alias is invalid or does not represent a
+ * list
*/
public boolean assertSize(final int size) {
if (!isValidListAlias()) {
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/CheckListPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/CheckListPeer.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/CheckListPeer.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/CheckListPeer.java Sun Jan 22 08:05:17 2012
@@ -58,13 +58,11 @@ public class CheckListPeer extends Abstr
*/
private final List<ObjectAdapter> foundAdapters = new ArrayList<ObjectAdapter>();
- public CheckListPeer(final AliasRegistry aliasesRegistry, final 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, final String listAlias, final CheckMode checkMode,
- final CellBinding titleBinding, final CellBinding typeBinding) {
+ 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;
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/SetUpObjectsPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/SetUpObjectsPeer.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/SetUpObjectsPeer.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/SetUpObjectsPeer.java Sun Jan 22 08:05:17 2012
@@ -52,8 +52,7 @@ public class SetUpObjectsPeer extends Ab
}
public static enum SetUpObjectResult {
- OK, NO_ASSOCIATION, CLEARED, CANNOT_CLEAR("(cannot clear)"), CANNOT_SET("(cannot set"),
- CANNOT_PARSE("(cannot parse)"), UNKNOWN_REFERENCE("(unknown reference)");
+ OK, NO_ASSOCIATION, CLEARED, CANNOT_CLEAR("(cannot clear)"), CANNOT_SET("(cannot set"), CANNOT_PARSE("(cannot parse)"), UNKNOWN_REFERENCE("(unknown reference)");
private String errorMessage;
private SetUpObjectResult() {
@@ -94,8 +93,7 @@ public class SetUpObjectsPeer extends Ab
// constructor
// ///////////////////////////////////////////////////////////////////////
- public SetUpObjectsPeer(final 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);
@@ -167,7 +165,8 @@ public class SetUpObjectsPeer extends Ab
* Used by Concordion only.
*
* <p>
- * FitNesse, on the other hand, uses a more fine-grained approach, calling the underlying methods.
+ * FitNesse, on the other hand, uses a more fine-grained approach, calling
+ * the underlying methods.
*/
public void createObject() throws ScenarioBoundValueException {
final ObjectAdapter adapter = createInstance();
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingIsisViewerPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingIsisViewerPeer.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingIsisViewerPeer.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingIsisViewerPeer.java Sun Jan 22 08:05:17 2012
@@ -113,12 +113,9 @@ public class UsingIsisViewerPeer extends
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) {
- super(aliasesRegistry, onObjectBinding, aliasResultAsBinding, performBinding, onMemberBinding, thatItBinding,
- 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);
this.onObjectBinding = onObjectBinding;
this.aliasResultAsBinding = aliasResultAsBinding;
@@ -283,8 +280,7 @@ public class UsingIsisViewerPeer extends
// "perform" API
// //////////////////////////////////////////////////////////////////
- public void performCommand(final ObjectAdapter onAdapter, final String aliasAs, final ObjectMember objectMember,
- final Perform performCommand, final List<ScenarioCell> argumentStoryCells) throws ScenarioBoundValueException {
+ 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);
@@ -294,8 +290,7 @@ public class UsingIsisViewerPeer extends
aliasResultFromPerformCommand(performCommand, aliasAs);
}
- private void aliasResultFromPerformCommand(final Perform performCommand, final String aliasAs)
- throws ScenarioBoundValueException {
+ private void aliasResultFromPerformCommand(final Perform performCommand, final String aliasAs) throws ScenarioBoundValueException {
if (StringUtils.isNullOrEmpty(aliasAs)) {
return;
}
@@ -323,8 +318,7 @@ public class UsingIsisViewerPeer extends
/**
* Not public API
*/
- public ObjectAdapter getAdapter(final ObjectAdapter contextAdapter, final ObjectSpecification noSpec,
- final CellBinding contextBinding, final ScenarioCell paramCell) throws ScenarioBoundValueException {
+ public ObjectAdapter getAdapter(final ObjectAdapter contextAdapter, final ObjectSpecification noSpec, final CellBinding contextBinding, final ScenarioCell paramCell) throws ScenarioBoundValueException {
final String cellText = paramCell.getText();
@@ -337,7 +331,8 @@ public class UsingIsisViewerPeer extends
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?
+ // TextEntryParseException should inherit from
+ // IllegalArgumentException?
throw ScenarioBoundValueException.arg(contextBinding, paramCell, "(cannot parse '" + cellText + "')");
}
}
@@ -355,16 +350,15 @@ public class UsingIsisViewerPeer extends
* Not public API
*
* <p>
- * Ensures that there are at least enough arguments for the number of parameters required.
+ * Ensures that there are at least enough arguments for the number of
+ * parameters required.
*/
- public ObjectAdapter[] getAdapters(final ObjectAdapter onAdapter, final ObjectAction objectAction,
- final CellBinding onMemberBinding, final List<ScenarioCell> argumentCells) throws ScenarioBoundValueException {
+ public ObjectAdapter[] getAdapters(final ObjectAdapter onAdapter, final ObjectAction objectAction, final CellBinding onMemberBinding, final List<ScenarioCell> argumentCells) throws ScenarioBoundValueException {
final List<ObjectActionParameter> parameters = objectAction.getParameters();
final int parameterCount = parameters.size();
if (argumentCells.size() < parameterCount) {
- throw ScenarioBoundValueException.current(onMemberBinding, "(action requires " + parameterCount
- + " arguments)");
+ throw ScenarioBoundValueException.current(onMemberBinding, "(action requires " + parameterCount + " arguments)");
}
final ObjectAdapter[] adapters = new ObjectAdapter[parameterCount];
Modified: incubator/isis/trunk/framework/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/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/AddToCollection.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/AddToCollection.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/AddToCollection.java Sun Jan 22 08:05:17 2012
@@ -61,8 +61,7 @@ public class AddToCollection extends Per
}
// validate argument
- otma.createValidateAddInteractionContext(getSession(), InteractionInvocationMethod.BY_USER, onAdapter,
- toAddAdapter);
+ otma.createValidateAddInteractionContext(getSession(), InteractionInvocationMethod.BY_USER, onAdapter, toAddAdapter);
final Consent validToAdd = otma.isValidToAdd(onAdapter, toAddAdapter);
if (validToAdd.isVetoed()) {
throw ScenarioBoundValueException.current(arg0Binding, validToAdd.getReason());
Modified: incubator/isis/trunk/framework/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/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckAction.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckAction.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckAction.java Sun Jan 22 08:05:17 2012
@@ -29,8 +29,7 @@ import org.apache.isis.viewer.bdd.common
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());
+ super("check action", OnMemberColumn.REQUIRED, mode, new Hidden(), new Visible(), new Disabled(), new Usable(), new ArgumentSetValid(), new ArgumentSetNotValid());
}
}
Modified: incubator/isis/trunk/framework/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/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckAddToCollection.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckAddToCollection.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckAddToCollection.java Sun Jan 22 08:05:17 2012
@@ -25,8 +25,7 @@ import org.apache.isis.viewer.bdd.common
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));
+ super("check add to collection", OnMemberColumn.REQUIRED, mode, new ProposedAddTo(AssertsValidity.VALID), new ProposedAddTo(AssertsValidity.INVALID));
}
}
Modified: incubator/isis/trunk/framework/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/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckClearProperty.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckClearProperty.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckClearProperty.java Sun Jan 22 08:05:17 2012
@@ -25,8 +25,7 @@ import org.apache.isis.viewer.bdd.common
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));
+ super("check clear property", OnMemberColumn.REQUIRED, mode, new ProposedClear(AssertsValidity.VALID), new ProposedClear(AssertsValidity.INVALID));
}
}
Modified: incubator/isis/trunk/framework/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/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckCollection.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckCollection.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckCollection.java Sun Jan 22 08:05:17 2012
@@ -31,9 +31,7 @@ import org.apache.isis.viewer.bdd.common
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));
+ 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/framework/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/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckObject.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckObject.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckObject.java Sun Jan 22 08:05:17 2012
@@ -27,8 +27,7 @@ import org.apache.isis.viewer.bdd.common
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());
+ super("check object", OnMemberColumn.NOT_REQUIRED, mode, new Valid(), new NotValid(), new NotSaved(), new Saved());
}
}
Modified: incubator/isis/trunk/framework/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/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckProperty.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckProperty.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckProperty.java Sun Jan 22 08:05:17 2012
@@ -31,8 +31,7 @@ import org.apache.isis.viewer.bdd.common
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());
+ 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/framework/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/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckRemoveFromCollection.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckRemoveFromCollection.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckRemoveFromCollection.java Sun Jan 22 08:05:17 2012
@@ -25,8 +25,7 @@ import org.apache.isis.viewer.bdd.common
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));
+ super("check remove from collection", OnMemberColumn.REQUIRED, mode, new ProposedRemoveFrom(AssertsValidity.VALID), new ProposedRemoveFrom(AssertsValidity.INVALID));
}
}
Modified: incubator/isis/trunk/framework/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/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckSetProperty.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckSetProperty.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/CheckSetProperty.java Sun Jan 22 08:05:17 2012
@@ -25,8 +25,7 @@ import org.apache.isis.viewer.bdd.common
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));
+ super("check set property", OnMemberColumn.REQUIRED, mode, new ProposedSet(AssertsValidity.VALID), new ProposedSet(AssertsValidity.INVALID));
}
}
Modified: incubator/isis/trunk/framework/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/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterChoices.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterChoices.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterChoices.java Sun Jan 22 08:05:17 2012
@@ -51,8 +51,7 @@ public class GetActionParameterChoices e
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)
- + ")");
+ throw ScenarioBoundValueException.current(arg0Binding, "(must be between 0 and " + (parameterCount - 1) + ")");
}
final ObjectAdapter[][] allParameterChoices = noa.getChoices(onAdapter);
Modified: incubator/isis/trunk/framework/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/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterDefault.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterDefault.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterDefault.java Sun Jan 22 08:05:17 2012
@@ -50,8 +50,7 @@ public class GetActionParameterDefault e
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)
- + ")");
+ throw ScenarioBoundValueException.current(arg0Binding, "(must be between 0 and " + (parameterCount - 1) + ")");
}
final ObjectAdapter[] defaults = noa.getDefaults(onAdapter);
Modified: incubator/isis/trunk/framework/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/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/InvokeAction.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/InvokeAction.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/InvokeAction.java Sun Jan 22 08:05:17 2012
@@ -53,8 +53,7 @@ public class InvokeAction extends Perfor
if (!isContributedOneArgAction) {
// lookup arguments
- proposedArguments =
- performContext.getPeer().getAdapters(onAdapter, objectAction, onMemberBinding, argumentCells);
+ proposedArguments = performContext.getPeer().getAdapters(onAdapter, objectAction, onMemberBinding, argumentCells);
// validate arguments
final Consent argSetValid = objectAction.isProposedArgumentSetValid(onAdapter, proposedArguments);
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformAbstractTypeParams.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformAbstractTypeParams.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformAbstractTypeParams.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformAbstractTypeParams.java Sun Jan 22 08:05:17 2012
@@ -82,8 +82,7 @@ public abstract class PerformAbstractTyp
private final Type type;
private final NumParameters numParameters;
- public PerformAbstractTypeParams(final String key, final Type type, final NumParameters numParameters,
- final Perform.Mode mode) {
+ public PerformAbstractTypeParams(final String key, final Type type, final NumParameters numParameters, final Perform.Mode mode) {
super(key, mode);
this.type = type;
this.numParameters = numParameters;
@@ -95,9 +94,10 @@ public abstract class PerformAbstractTyp
}
/**
- * Can be overridden, but provides basic checking that member is of correct type and, if taking
- * {@link NumParameters#ZERO zero} or {@link NumParameters#ONE one} parameter, that the correct number of actual
- * arguments match.
+ * Can be overridden, but provides basic checking that member is of correct
+ * type and, if taking {@link NumParameters#ZERO zero} or
+ * {@link NumParameters#ONE one} parameter, that the correct number of
+ * actual arguments match.
*/
@Override
public void perform(final PerformContext performContext) throws ScenarioBoundValueException {
@@ -144,8 +144,9 @@ public abstract class PerformAbstractTyp
}
/**
- * Hook method that does nothing; should be overridden if {@link #perform(PerformContextForFitNesse) handle(...)}
- * method has not been.
+ * Hook method that does nothing; should be overridden if
+ * {@link #perform(PerformContextForFitNesse) handle(...)} method has not
+ * been.
*/
protected void doHandle(final PerformContext performContext) throws ScenarioBoundValueException {
// does nothing
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformContext.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformContext.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/PerformContext.java Sun Jan 22 08:05:17 2012
@@ -34,7 +34,8 @@ import org.apache.isis.viewer.bdd.common
import org.apache.isis.viewer.bdd.common.parsers.DateParser;
/**
- * Represents the context for a single {@link Perform} command; in effect, a row of a table.
+ * Represents the context for a single {@link Perform} command; in effect, a row
+ * of a table.
*/
public class PerformContext {
@@ -44,8 +45,7 @@ public class PerformContext {
private final ObjectMember objectMember;
private final List<ScenarioCell> argumentCells;
- public PerformContext(final UsingIsisViewerPeer peer, final ObjectAdapter onAdapter,
- final ObjectMember objectMember, final List<ScenarioCell> argumentCells) {
+ public PerformContext(final UsingIsisViewerPeer peer, final ObjectAdapter onAdapter, final ObjectMember objectMember, final List<ScenarioCell> argumentCells) {
this.onAdapter = onAdapter;
this.objectMember = objectMember;
this.peer = peer;
@@ -81,24 +81,21 @@ public class PerformContext {
return onAdapter.getSpecification().isValid(onAdapter);
}
- public void ensureVisible(final CellBinding onMemberBinding, final ScenarioCell onMemberCell)
- throws ScenarioBoundValueException {
+ public void ensureVisible(final CellBinding onMemberBinding, final ScenarioCell onMemberCell) throws ScenarioBoundValueException {
final Consent visible = objectMember.isVisible(getAuthenticationSession(), getOnAdapter());
if (visible.isVetoed()) {
throw ScenarioBoundValueException.current(onMemberBinding, "(not visible)");
}
}
- public void ensureUsable(final CellBinding onMemberBinding, final ScenarioCell onMemberCell)
- throws ScenarioBoundValueException {
+ public void ensureUsable(final CellBinding onMemberBinding, final ScenarioCell onMemberCell) throws ScenarioBoundValueException {
final Consent usable = objectMember.isUsable(getAuthenticationSession(), getOnAdapter());
if (usable.isVetoed()) {
throw ScenarioBoundValueException.current(onMemberBinding, "(not usable)");
}
}
- public void ensureAvailableForDeploymentType(final CellBinding onMemberBinding, final ScenarioCell onMemberCell)
- throws ScenarioBoundValueException {
+ public void ensureAvailableForDeploymentType(final CellBinding onMemberBinding, final ScenarioCell onMemberCell) throws ScenarioBoundValueException {
final DeploymentType deploymentType = this.peer.getDeploymentType();
final boolean isExploration = objectMember.getFacet(ExplorationFacet.class) != null;
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/RemoveFromCollection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/RemoveFromCollection.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/RemoveFromCollection.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/RemoveFromCollection.java Sun Jan 22 08:05:17 2012
@@ -67,8 +67,7 @@ public class RemoveFromCollection extend
}
// validate argument
- otma.createValidateAddInteractionContext(getSession(), InteractionInvocationMethod.BY_USER, onAdapter,
- toRemoveAdapter);
+ otma.createValidateAddInteractionContext(getSession(), InteractionInvocationMethod.BY_USER, onAdapter, toRemoveAdapter);
final Consent validToRemove = otma.isValidToRemove(onAdapter, toRemoveAdapter);
if (validToRemove.isVetoed()) {
throw ScenarioBoundValueException.current(onMemberBinding, validToRemove.getReason());
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/SetProperty.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/SetProperty.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/SetProperty.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/SetProperty.java Sun Jan 22 08:05:17 2012
@@ -61,8 +61,7 @@ public class SetProperty extends Perform
final ObjectAdapter contextAdapter = otoa.get(onAdapter);
// validate parameter
- final ObjectAdapter toSetAdapter =
- performContext.getPeer().getAdapter(contextAdapter, otoa.getSpecification(), arg0Binding, arg0Cell);
+ final ObjectAdapter toSetAdapter = performContext.getPeer().getAdapter(contextAdapter, otoa.getSpecification(), arg0Binding, arg0Cell);
final Consent validConsent = otoa.isAssociationValid(onAdapter, toSetAdapter);
if (validConsent.isVetoed()) {
throw ScenarioBoundValueException.current(arg0Binding, validConsent.getReason());
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/AssertsValidity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/AssertsValidity.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/AssertsValidity.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/AssertsValidity.java Sun Jan 22 08:05:17 2012
@@ -28,8 +28,7 @@ import org.apache.isis.viewer.bdd.common
*/
public enum AssertsValidity {
- VALID(true, "is valid for", "is valid", "valid"), INVALID(false, "is not valid for", "is not valid", "not valid",
- "invalid");
+ VALID(true, "is valid for", "is valid", "valid"), INVALID(false, "is not valid for", "is not valid", "not valid", "invalid");
private final String[] keys;
private final boolean valid;
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/PerformCheckThatAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/PerformCheckThatAbstract.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/PerformCheckThatAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/PerformCheckThatAbstract.java Sun Jan 22 08:05:17 2012
@@ -40,8 +40,7 @@ public abstract class PerformCheckThatAb
private ObjectAdapter result;
private final boolean requiresMember;
- public PerformCheckThatAbstract(final String key, final OnMemberColumn onMemberColumn, final Perform.Mode mode,
- final ThatSubcommand... thatSubcommands) {
+ public PerformCheckThatAbstract(final String key, final OnMemberColumn onMemberColumn, final Perform.Mode mode, final ThatSubcommand... thatSubcommands) {
super(key, mode);
requiresMember = onMemberColumn == OnMemberColumn.REQUIRED;
for (final ThatSubcommand thatSubcommand : thatSubcommands) {
@@ -56,15 +55,13 @@ public abstract class PerformCheckThatAb
final CellBinding thatItBinding = performContext.getPeer().getThatItBinding();
if (!thatItBinding.isFound()) {
final CellBinding performBinding = performContext.getPeer().getPerformBinding();
- throw ScenarioBoundValueException.current(performBinding, "(require " + IsisViewerConstants.THAT_IT_NAME
- + "' column)");
+ throw ScenarioBoundValueException.current(performBinding, "(require " + IsisViewerConstants.THAT_IT_NAME + "' column)");
}
final ScenarioCell thatItCell = thatItBinding.getCurrentCell();
final String thatIt = thatItCell.getText();
final ThatSubcommand thatSubcommand = subcommandByKey.get(thatIt);
if (thatSubcommand == null) {
- throw ScenarioBoundValueException.current(thatItBinding, "(unknown '" + IsisViewerConstants.THAT_IT_NAME
- + "' verb)");
+ throw ScenarioBoundValueException.current(thatItBinding, "(unknown '" + IsisViewerConstants.THAT_IT_NAME + "' verb)");
}
result = thatSubcommand.that(performContext);
}
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/ProposedArgumentValidityAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/ProposedArgumentValidityAbstract.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/ProposedArgumentValidityAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/ProposedArgumentValidityAbstract.java Sun Jan 22 08:05:17 2012
@@ -51,12 +51,10 @@ public abstract class ProposedArgumentVa
throw ScenarioBoundValueException.current(arg0Binding, "(required)");
}
- final ObjectAdapter toValidateAdapter =
- performContext.getPeer().getAdapter(null, nakedObjectMember.getSpecification(), arg0Binding, arg0Cell);
+ final ObjectAdapter toValidateAdapter = performContext.getPeer().getAdapter(null, nakedObjectMember.getSpecification(), arg0Binding, arg0Cell);
final Consent validityConsent = determineConsent(performContext, toValidateAdapter);
if (!getAssertion().satisfiedBy(validityConsent)) {
- throw ScenarioBoundValueException.current(getAssertion().colorBinding(arg0Binding, thatBinding),
- getAssertion().getReason(validityConsent));
+ throw ScenarioBoundValueException.current(getAssertion().colorBinding(arg0Binding, thatBinding), getAssertion().getReason(validityConsent));
}
return toValidateAdapter;
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/action/ArgumentSetNotValid.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/action/ArgumentSetNotValid.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/action/ArgumentSetNotValid.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/action/ArgumentSetNotValid.java Sun Jan 22 08:05:17 2012
@@ -54,8 +54,7 @@ public class ArgumentSetNotValid extends
}
// lookup arguments
- final ObjectAdapter[] proposedArguments =
- performContext.getPeer().getAdapters(onAdapter, nakedObjectAction, onMemberBinding, argumentCells);
+ final ObjectAdapter[] proposedArguments = performContext.getPeer().getAdapters(onAdapter, nakedObjectAction, onMemberBinding, argumentCells);
// validate arguments
final Consent argSetValid = nakedObjectAction.isProposedArgumentSetValid(onAdapter, proposedArguments);
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/action/ArgumentSetValid.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/action/ArgumentSetValid.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/action/ArgumentSetValid.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/action/ArgumentSetValid.java Sun Jan 22 08:05:17 2012
@@ -54,8 +54,7 @@ public class ArgumentSetValid extends Th
}
// lookup arguments
- final ObjectAdapter[] proposedArguments =
- performContext.getPeer().getAdapters(onAdapter, nakedObjectAction, onMemberBinding, argumentCells);
+ final ObjectAdapter[] proposedArguments = performContext.getPeer().getAdapters(onAdapter, nakedObjectAction, onMemberBinding, argumentCells);
// validate arguments
final Consent argSetValid = nakedObjectAction.isProposedArgumentSetValid(onAdapter, proposedArguments);
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Containment.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Containment.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Containment.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Containment.java Sun Jan 22 08:05:17 2012
@@ -36,8 +36,7 @@ public class Containment extends ThatAbs
}
@Override
- protected void doThat(final PerformContext performContext, final Iterable<ObjectAdapter> collection)
- throws ScenarioBoundValueException {
+ protected void doThat(final PerformContext performContext, final Iterable<ObjectAdapter> collection) throws ScenarioBoundValueException {
final ObjectMember nakedObjectMember = performContext.getObjectMember();
final CellBinding thatBinding = performContext.getPeer().getThatItBinding();
@@ -49,8 +48,7 @@ public class Containment extends ThatAbs
final ScenarioCell arg0Cell = arg0Binding.getCurrentCell();
- final ObjectAdapter containedAdapter =
- performContext.getPeer().getAdapter(null, nakedObjectMember.getSpecification(), arg0Binding, arg0Cell);
+ final ObjectAdapter containedAdapter = performContext.getPeer().getAdapter(null, nakedObjectMember.getSpecification(), arg0Binding, arg0Cell);
boolean contains = false;
for (final ObjectAdapter eachAdapter : collection) {
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Emptiness.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Emptiness.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Emptiness.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Emptiness.java Sun Jan 22 08:05:17 2012
@@ -34,8 +34,7 @@ public class Emptiness extends ThatAbstr
}
@Override
- protected void doThat(final PerformContext performContext, final Iterable<ObjectAdapter> collection)
- throws ScenarioBoundValueException {
+ protected void doThat(final PerformContext performContext, final Iterable<ObjectAdapter> collection) throws ScenarioBoundValueException {
boolean empty = true;
for (@SuppressWarnings("unused")
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Size.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Size.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Size.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/Size.java Sun Jan 22 08:05:17 2012
@@ -31,8 +31,7 @@ public class Size extends ThatAbstract {
}
@Override
- protected void doThat(final PerformContext performContext, final Iterable<ObjectAdapter> collection)
- throws ScenarioBoundValueException {
+ protected void doThat(final PerformContext performContext, final Iterable<ObjectAdapter> collection) throws ScenarioBoundValueException {
final CellBinding thatBinding = performContext.getPeer().getThatItBinding();
final CellBinding arg0Binding = performContext.getPeer().getArg0Binding();
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ThatAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ThatAbstract.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ThatAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ThatAbstract.java Sun Jan 22 08:05:17 2012
@@ -38,15 +38,13 @@ public abstract class ThatAbstract exten
final OneToManyAssociation otma = (OneToManyAssociation) performContext.getObjectMember();
final ObjectAdapter nakedObjectRepresentingCollection = otma.get(onAdapter);
- final CollectionFacet collectionFacet =
- nakedObjectRepresentingCollection.getSpecification().getFacet(CollectionFacet.class);
+ final CollectionFacet collectionFacet = nakedObjectRepresentingCollection.getSpecification().getFacet(CollectionFacet.class);
doThat(performContext, collectionFacet.iterable(nakedObjectRepresentingCollection));
return nakedObjectRepresentingCollection; // can alias if wish
}
- protected abstract void doThat(PerformContext performContext, Iterable<ObjectAdapter> collection)
- throws ScenarioBoundValueException;
+ protected abstract void doThat(PerformContext performContext, Iterable<ObjectAdapter> collection) throws ScenarioBoundValueException;
}
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/parsers/DateParser.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/parsers/DateParser.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/parsers/DateParser.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/parsers/DateParser.java Sun Jan 22 08:05:17 2012
@@ -26,8 +26,8 @@ import java.util.Date;
import java.util.TimeZone;
/**
- * A mutable wrapper around a {@link DateFormat}, allowing the date and time parts of the format to be specified
- * independently specified.
+ * A mutable wrapper around a {@link DateFormat}, allowing the date and time
+ * parts of the format to be specified independently specified.
*/
public class DateParser {
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/SetClock.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/SetClock.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/SetClock.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/SetClock.java Sun Jan 22 08:05:17 2012
@@ -34,8 +34,7 @@ public class SetClock extends AbstractHe
final FixtureClock clock = FixtureClock.initialize();
final Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
- clock.setDate(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH) + 1,
- calendar.get(Calendar.DAY_OF_MONTH));
+ clock.setDate(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH) + 1, calendar.get(Calendar.DAY_OF_MONTH));
clock.setTime(calendar.get(Calendar.HOUR_OF_DAY), calendar.get(Calendar.MINUTE));
}
Modified: incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/AbstractApplicationStory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/AbstractApplicationStory.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/AbstractApplicationStory.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/AbstractApplicationStory.java Sun Jan 22 08:05:17 2012
@@ -23,8 +23,8 @@ import org.apache.isis.viewer.bdd.concor
public abstract class AbstractApplicationStory extends AbstractIsisConcordionScenario {
/**
- * This superclass also acts as the marker for the location of the
- * custom CSS.
+ * This superclass also acts as the marker for the location of the custom
+ * CSS.
*/
@Override
protected Class<?> customCssPackage() {
Modified: incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/common/BootstrapInExplorationMode.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/common/BootstrapInExplorationMode.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/common/BootstrapInExplorationMode.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/common/BootstrapInExplorationMode.java Sun Jan 22 08:05:17 2012
@@ -20,8 +20,6 @@ package viewer.bdd.common;
import org.apache.isis.viewer.bdd.concordion.AbstractIsisConcordionScenario;
-
public class BootstrapInExplorationMode extends AbstractIsisConcordionScenario {
-
}
Modified: incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/common/ToDoItems.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/common/ToDoItems.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/common/ToDoItems.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/common/ToDoItems.java Sun Jan 22 08:05:17 2012
@@ -20,8 +20,6 @@ package viewer.bdd.common;
import org.apache.isis.viewer.bdd.concordion.AbstractIsisConcordionScenario;
-
public class ToDoItems extends AbstractIsisConcordionScenario {
-
}