isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1234460 [3/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/...
Date Sun, 22 Jan 2012 08:05:57 GMT
Modified: incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/stories/AllStories.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/stories/AllStories.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/stories/AllStories.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/stories/AllStories.java Sun Jan 22 08:05:17 2012
@@ -20,8 +20,6 @@ package viewer.bdd.stories;
 
 import viewer.bdd.AbstractApplicationStory;
 
-
 public class AllStories extends AbstractApplicationStory {
 
-
 }

Modified: incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/stories/todo/Fixture.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/stories/todo/Fixture.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/stories/todo/Fixture.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/stories/todo/Fixture.java Sun Jan 22 08:05:17 2012
@@ -20,8 +20,6 @@ package viewer.bdd.stories.todo;
 
 import viewer.bdd.AbstractApplicationStory;
 
-
 public class Fixture extends AbstractApplicationStory {
 
-
 }

Modified: incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/stories/todo/Index.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/stories/todo/Index.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/stories/todo/Index.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/stories/todo/Index.java Sun Jan 22 08:05:17 2012
@@ -20,8 +20,6 @@ package viewer.bdd.stories.todo;
 
 import viewer.bdd.AbstractApplicationStory;
 
-
 public class Index extends AbstractApplicationStory {
 
-
 }

Modified: incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/stories/todo/ScenarioMarkItemAsDone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/stories/todo/ScenarioMarkItemAsDone.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/stories/todo/ScenarioMarkItemAsDone.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/concordion-tck/src/test/java/viewer/bdd/stories/todo/ScenarioMarkItemAsDone.java Sun Jan 22 08:05:17 2012
@@ -20,8 +20,6 @@ package viewer.bdd.stories.todo;
 
 import viewer.bdd.AbstractApplicationStory;
 
-
 public class ScenarioMarkItemAsDone extends AbstractApplicationStory {
 
-
 }

Modified: incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionScenario.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionScenario.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionScenario.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionScenario.java Sun Jan 22 08:05:17 2012
@@ -56,14 +56,16 @@ public abstract class AbstractIsisConcor
     public static final String DEFAULT_CONCORDION_CSS = "concordion.css";
 
     /**
-     * The system property that is searched for to use as the {@link #outputDir() target directory}.
+     * The system property that is searched for to use as the
+     * {@link #outputDir() target directory}.
      */
     public static final String DEFAULT_CONCORDION_OUTPUT_DIR_PROPERTY = "concordion.output.dir";
 
     /**
-     * The directory used by default if the {@link #DEFAULT_CONCORDION_OUTPUT_DIR_PROPERTY default property} for the
-     * {@link #outputDir() target directory} is not specified (and the {@link #outputDir()} method has not been
-     * overridden).
+     * The directory used by default if the
+     * {@link #DEFAULT_CONCORDION_OUTPUT_DIR_PROPERTY default property} for the
+     * {@link #outputDir() target directory} is not specified (and the
+     * {@link #outputDir()} method has not been overridden).
      */
     public static final String DEFAULT_OUTPUT_DIR = "/tmp/concordion";
 
@@ -134,11 +136,13 @@ public abstract class AbstractIsisConcor
      * The directory to which the processed HTML should be copied.
      * 
      * <p>
-     * Defaults to the value of the {@value #DEFAULT_CONCORDION_OUTPUT_DIR_PROPERTY} system property, or
+     * Defaults to the value of the
+     * {@value #DEFAULT_CONCORDION_OUTPUT_DIR_PROPERTY} system property, or
      * {@value #DEFAULT_OUTPUT_DIR} if that property is not specified.
      * 
      * <p>
-     * Can either be overridden if wish to specify some other mechanism for determining where the output is generated.
+     * Can either be overridden if wish to specify some other mechanism for
+     * determining where the output is generated.
      */
     protected String outputDir() {
         final String concordionOutputDir = System.getProperty(DEFAULT_CONCORDION_OUTPUT_DIR_PROPERTY);
@@ -146,8 +150,8 @@ public abstract class AbstractIsisConcor
     }
 
     /**
-     * Optional hook method to specify the class (any class) that resides in the same package as the
-     * {@link #customCss()}.
+     * Optional hook method to specify the class (any class) that resides in the
+     * same package as the {@link #customCss()}.
      * 
      * <p>
      * Return <tt>null</tt> if no custom CSS has been provided.
@@ -162,9 +166,10 @@ public abstract class AbstractIsisConcor
      * Optional hook method to specify the name of the custom CSS file.
      * 
      * <p>
-     * Defaults to {@value #DEFAULT_CONCORDION_CSS} so you do not need to override if your custom CSS file has this
-     * name. However, it is necessary to override {@link #customCssPackage()} to indicate the package that the CSS
-     * resides in.
+     * Defaults to {@value #DEFAULT_CONCORDION_CSS} so you do not need to
+     * override if your custom CSS file has this name. However, it is necessary
+     * to override {@link #customCssPackage()} to indicate the package that the
+     * CSS resides in.
      * 
      * @see #customCssPackage()
      */
@@ -177,10 +182,8 @@ public abstract class AbstractIsisConcor
         if (targetDir == null) {
             throw new IllegalStateException("targetDir() cannot be null");
         }
-        final ConcordionBuilder builder =
-            new ConcordionBuilder() {
-            }.withTarget(new FileTarget(new File(targetDir))).withCommand(NS_URI, CMD_EXECUTE,
-                new IsisExecuteCommandWithHeader());
+        final ConcordionBuilder builder = new ConcordionBuilder() {
+        }.withTarget(new FileTarget(new File(targetDir))).withCommand(NS_URI, CMD_EXECUTE, new IsisExecuteCommandWithHeader());
         return builder.build();
     }
 
@@ -267,8 +270,7 @@ public abstract class AbstractIsisConcor
 
     public boolean aliasService(final String aliasAs, final String className) {
         try {
-            getScenario().getAliasRegistry().aliasService(StringUtils.normalized(aliasAs),
-                StringUtils.normalized(className));
+            getScenario().getAliasRegistry().aliasService(StringUtils.normalized(aliasAs), StringUtils.normalized(className));
             return true;
         } catch (final ScenarioValueException e) {
             return false;
@@ -287,45 +289,35 @@ public abstract class AbstractIsisConcor
         return setUpObjectsVarargs(className, alias, arg0, arg1);
     }
 
-    public String setUpObject(final String className, final String alias, final String arg0, final String arg1,
-        final String arg2) {
+    public String setUpObject(final String className, final String alias, final String arg0, final String arg1, final String arg2) {
         return setUpObjectsVarargs(className, alias, arg0, arg1, arg2);
     }
 
-    public String setUpObject(final String className, final String alias, final String arg0, final String arg1,
-        final String arg2, final String arg3) {
+    public String setUpObject(final String className, final String alias, final String arg0, final String arg1, final String arg2, final String arg3) {
         return setUpObjectsVarargs(className, alias, arg0, arg1, arg2, arg3);
     }
 
-    public String setUpObject(final String className, final String alias, final String arg0, final String arg1,
-        final String arg2, final String arg3, final String arg4) {
+    public String setUpObject(final String className, final String alias, final String arg0, final String arg1, final String arg2, final String arg3, final String arg4) {
         return setUpObjectsVarargs(className, alias, arg0, arg1, arg2, arg3, arg4);
     }
 
-    public String setUpObject(final String className, final String alias, final String arg0, final String arg1,
-        final String arg2, final String arg3, final String arg4, final String arg5) {
+    public String setUpObject(final String className, final String alias, final String arg0, final String arg1, final String arg2, final String arg3, final String arg4, final String arg5) {
         return setUpObjectsVarargs(className, alias, arg0, arg1, arg2, arg3, arg4, arg5);
     }
 
-    public String setUpObject(final String className, final String alias, final String arg0, final String arg1,
-        final String arg2, final String arg3, final String arg4, final String arg5, final String arg6) {
+    public String setUpObject(final String className, final String alias, final String arg0, final String arg1, final String arg2, final String arg3, final String arg4, final String arg5, final String arg6) {
         return setUpObjectsVarargs(className, alias, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
     }
 
-    public String setUpObject(final String className, final String alias, final String arg0, final String arg1,
-        final String arg2, final String arg3, final String arg4, final String arg5, final String arg6, final String arg7) {
+    public String setUpObject(final String className, final String alias, final String arg0, final String arg1, final String arg2, final String arg3, final String arg4, final String arg5, final String arg6, final String arg7) {
         return setUpObjectsVarargs(className, alias, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
     }
 
-    public String setUpObject(final String className, final String alias, final String arg0, final String arg1,
-        final String arg2, final String arg3, final String arg4, final String arg5, final String arg6,
-        final String arg7, final String arg8) {
+    public String setUpObject(final String className, final String alias, final String arg0, final String arg1, final String arg2, final String arg3, final String arg4, final String arg5, final String arg6, final String arg7, final String arg8) {
         return setUpObjectsVarargs(className, alias, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
     }
 
-    public String setUpObject(final String className, final String alias, final String arg0, final String arg1,
-        final String arg2, final String arg3, final String arg4, final String arg5, final String arg6,
-        final String arg7, final String arg8, final String arg9) {
+    public String setUpObject(final String className, final String alias, final String arg0, final String arg1, final String arg2, final String arg3, final String arg4, final String arg5, final String arg6, final String arg7, final String arg8, final String arg9) {
         return setUpObjectsVarargs(className, alias, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
     }
 
@@ -335,12 +327,10 @@ public abstract class AbstractIsisConcor
      * Workaround for OGNL defect.
      */
     protected String setUpObjectsVarargs(final String className, final String alias, final String... propertyValues) {
-        return setUpObjectsVarargsNormalized(StringUtils.normalized(className), StringUtils.normalized(alias),
-            StringUtils.normalized(propertyValues));
+        return setUpObjectsVarargsNormalized(StringUtils.normalized(className), StringUtils.normalized(alias), StringUtils.normalized(propertyValues));
     }
 
-    private String setUpObjectsVarargsNormalized(final String className, final String alias,
-        final String... propertyValues) {
+    private String setUpObjectsVarargsNormalized(final String className, final String alias, final String... propertyValues) {
         if (executingInline()) {
             setUpObjects = new SetUpObjectsForConcordion(getScenario().getAliasRegistry(), className, Mode.PERSIST);
             setUpObjects.executeHeader(alias, propertyValues);
@@ -361,112 +351,77 @@ public abstract class AbstractIsisConcor
 
     private UsingIsisViewerForConcordion usingIsisViewer;
 
-    public String usingIsisViewer(final String onObject, final String aliasResultAs, final String perform,
-        final String usingMember) {
+    public String usingIsisViewer(final String onObject, final String aliasResultAs, final String perform, final String usingMember) {
         return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, null, null, null);
     }
 
-    public String usingIsisViewerThat(final String onObject, final String aliasResultAs, final String perform,
-        final String usingMember, final String thatIt) {
+    public String usingIsisViewerThat(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String thatIt) {
         return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, thatIt, null, null, null);
     }
 
-    public String usingIsisViewerArgs(final String onObject, final String aliasResultAs, final String perform,
-        final String usingMember, final String arg0) {
+    public String usingIsisViewerArgs(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String arg0) {
         return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0);
     }
 
-    public String usingIsisViewerArgs(final String onObject, final String aliasResultAs, final String perform,
-        final String usingMember, final String arg0, final String arg1) {
+    public String usingIsisViewerArgs(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String arg0, final String arg1) {
         return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0, arg1);
     }
 
-    public String usingIsisViewerArgs(final String onObject, final String aliasResultAs, final String perform,
-        final String usingMember, final String arg0, final String arg1, final String arg2) {
+    public String usingIsisViewerArgs(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String arg0, final String arg1, final String arg2) {
         return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0, arg1, arg2);
     }
 
-    public String usingIsisViewerArgs(final String onObject, final String aliasResultAs, final String perform,
-        final String usingMember, final String arg0, final String arg1, final String arg2, final String arg3) {
-        return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0, arg1, arg2,
-            arg3);
+    public String usingIsisViewerArgs(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String arg0, final String arg1, final String arg2, final String arg3) {
+        return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0, arg1, arg2, arg3);
     }
 
-    public String usingIsisViewerArgs(final String onObject, final String aliasResultAs, final String perform,
-        final String usingMember, final String arg0, final String arg1, final String arg2, final String arg3,
-        final String arg4) {
-        return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0, arg1, arg2,
-            arg3, arg4);
+    public String usingIsisViewerArgs(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String arg0, final String arg1, final String arg2, final String arg3, final String arg4) {
+        return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0, arg1, arg2, arg3, arg4);
     }
 
-    public String usingIsisViewerArgs(final String onObject, final String aliasResultAs, final String perform,
-        final String usingMember, final String arg0, final String arg1, final String arg2, final String arg3,
-        final String arg4, final String arg5) {
-        return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0, arg1, arg2,
-            arg3, arg4, arg5);
+    public String usingIsisViewerArgs(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String arg0, final String arg1, final String arg2, final String arg3, final String arg4, final String arg5) {
+        return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, null, arg0, arg1, arg2, arg3, arg4, arg5);
     }
 
-    public String usingIsisViewerThatArgs(final String onObject, final String aliasResultAs, final String perform,
-        final String usingMember, final String thatIt, final String arg0) {
+    public String usingIsisViewerThatArgs(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String thatIt, final String arg0) {
         return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, thatIt, arg0);
     }
 
-    public String usingIsisViewerThatArgs(final String onObject, final String aliasResultAs, final String perform,
-        final String usingMember, final String thatIt, final String arg0, final String arg1) {
+    public String usingIsisViewerThatArgs(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String thatIt, final String arg0, final String arg1) {
         return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, thatIt, arg0, arg1);
     }
 
-    public String usingIsisViewerThatArgs(final String onObject, final String aliasResultAs, final String perform,
-        final String usingMember, final String thatIt, final String arg0, final String arg1, final String arg2) {
+    public String usingIsisViewerThatArgs(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String thatIt, final String arg0, final String arg1, final String arg2) {
         return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, thatIt, arg0, arg1, arg2);
     }
 
-    public String usingIsisViewerThatArgs(final String onObject, final String aliasResultAs, final String perform,
-        final String usingMember, final String thatIt, final String arg0, final String arg1, final String arg2,
-        final String arg3) {
-        return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, thatIt, arg0, arg1, arg2,
-            arg3);
+    public String usingIsisViewerThatArgs(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String thatIt, final String arg0, final String arg1, final String arg2, final String arg3) {
+        return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, thatIt, arg0, arg1, arg2, arg3);
     }
 
-    public String usingIsisViewerThatArgs(final String onObject, final String aliasResultAs, final String perform,
-        final String usingMember, final String thatIt, final String arg0, final String arg1, final String arg2,
-        final String arg3, final String arg4) {
-        return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, thatIt, arg0, arg1, arg2,
-            arg3, arg4);
+    public String usingIsisViewerThatArgs(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String thatIt, final String arg0, final String arg1, final String arg2, final String arg3, final String arg4) {
+        return usingIsisViewerThatArgsVarargs(onObject, aliasResultAs, perform, usingMember, thatIt, arg0, arg1, arg2, arg3, arg4);
     }
 
     /**
-     * With <tt>protected</tt> visibility so that it can be called by custom methods if required.
+     * With <tt>protected</tt> visibility so that it can be called by custom
+     * methods if required.
      */
-    protected String usingIsisViewerThatArgsVarargs(final String onObject, final String aliasResultAs,
-        final String perform, final String usingMember, final String thatIt, final String arg0,
-        final String... remainingArgs) {
-        return usingIsisViewerThatArgsVarargsNormalized(StringUtils.normalized(onObject),
-            StringUtils.normalized(aliasResultAs), StringUtils.normalized(perform),
-            StringUtils.normalized(usingMember), StringUtils.normalized(thatIt), StringUtils.normalized(arg0),
-            StringUtils.normalized(remainingArgs));
+    protected String usingIsisViewerThatArgsVarargs(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String thatIt, final String arg0, final String... remainingArgs) {
+        return usingIsisViewerThatArgsVarargsNormalized(StringUtils.normalized(onObject), StringUtils.normalized(aliasResultAs), StringUtils.normalized(perform), StringUtils.normalized(usingMember), StringUtils.normalized(thatIt), StringUtils.normalized(arg0), StringUtils.normalized(remainingArgs));
     }
 
-    private String usingIsisViewerThatArgsVarargsNormalized(final String onObject, final String aliasResultAs,
-        final String perform, final String usingMember, final String thatIt, final String arg0,
-        final String... remainingArgs) {
+    private String usingIsisViewerThatArgsVarargsNormalized(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String thatIt, final String arg0, final String... remainingArgs) {
         if (executingInline()) {
-            usingIsisViewer =
-                new UsingIsisViewerForConcordion(getScenario().getAliasRegistry(), getScenario().getDeploymentType(),
-                    getScenario().getDateParser(), Perform.Mode.TEST);
+            usingIsisViewer = new UsingIsisViewerForConcordion(getScenario().getAliasRegistry(), getScenario().getDeploymentType(), getScenario().getDateParser(), Perform.Mode.TEST);
             usingIsisViewer.executeHeader(onObject, aliasResultAs, perform, usingMember, thatIt, arg0, remainingArgs);
-            return usingIsisViewer.executeRow(onObject, aliasResultAs, perform, usingMember, thatIt, arg0,
-                remainingArgs);
+            return usingIsisViewer.executeRow(onObject, aliasResultAs, perform, usingMember, thatIt, arg0, remainingArgs);
         } else {
             if (executingTableHeader()) {
-                usingIsisViewer =
-                    new UsingIsisViewerForConcordion(getScenario().getAliasRegistry(), getScenario()
-                        .getDeploymentType(), getScenario().getDateParser(), Perform.Mode.TEST);
-                return usingIsisViewer.executeHeader(onObject, aliasResultAs, perform, usingMember, thatIt, arg0,
-                    remainingArgs);
+                usingIsisViewer = new UsingIsisViewerForConcordion(getScenario().getAliasRegistry(), getScenario().getDeploymentType(), getScenario().getDateParser(), Perform.Mode.TEST);
+                return usingIsisViewer.executeHeader(onObject, aliasResultAs, perform, usingMember, thatIt, arg0, remainingArgs);
             } else {
-                return usingIsisViewer.executeRow(onObject, aliasResultAs, perform, usingMember, thatIt, arg0,
-                    remainingArgs);
+                return usingIsisViewer.executeRow(onObject, aliasResultAs, perform, usingMember, thatIt, arg0, remainingArgs);
             }
         }
     }
@@ -476,28 +431,23 @@ public abstract class AbstractIsisConcor
     // ////////////////////////////////////////////////////////////////////////
 
     public String checkCollectionIsEmpty(final String listAlias) {
-        return new CheckCollectionContentsForConcordion(getScenario().getAliasRegistry(),
-            StringUtils.normalized(listAlias)).isEmpty();
+        return new CheckCollectionContentsForConcordion(getScenario().getAliasRegistry(), StringUtils.normalized(listAlias)).isEmpty();
     }
 
     public String checkCollectionIsNotEmpty(final String listAlias) {
-        return new CheckCollectionContentsForConcordion(getScenario().getAliasRegistry(),
-            StringUtils.normalized(listAlias)).isNotEmpty();
+        return new CheckCollectionContentsForConcordion(getScenario().getAliasRegistry(), StringUtils.normalized(listAlias)).isNotEmpty();
     }
 
     public String checkCollectionContains(final String listAlias, final String alias) {
-        return new CheckCollectionContentsForConcordion(getScenario().getAliasRegistry(),
-            StringUtils.normalized(listAlias)).contains(StringUtils.normalized(alias));
+        return new CheckCollectionContentsForConcordion(getScenario().getAliasRegistry(), StringUtils.normalized(listAlias)).contains(StringUtils.normalized(alias));
     }
 
     public String checkCollectionDoesNotContain(final String listAlias, final String alias) {
-        return new CheckCollectionContentsForConcordion(getScenario().getAliasRegistry(),
-            StringUtils.normalized(listAlias)).doesNotContain(StringUtils.normalized(alias));
+        return new CheckCollectionContentsForConcordion(getScenario().getAliasRegistry(), StringUtils.normalized(listAlias)).doesNotContain(StringUtils.normalized(alias));
     }
 
     public String checkCollectionSize(final String listAlias, final int size) {
-        return new CheckCollectionContentsForConcordion(getScenario().getAliasRegistry(),
-            StringUtils.normalized(listAlias)).assertSize(size);
+        return new CheckCollectionContentsForConcordion(getScenario().getAliasRegistry(), StringUtils.normalized(listAlias)).assertSize(size);
     }
 
     // ////////////////////////////////////////////////////////////////////////
@@ -526,8 +476,7 @@ public abstract class AbstractIsisConcor
     // ////////////////////////////////////////////////////////////////////////
 
     public Iterable<Object> getListContents(final String listAlias) {
-        final ObjectAdapter listAdapter =
-            getScenario().getAliasRegistry().getAliased(StringUtils.normalized(listAlias));
+        final ObjectAdapter listAdapter = getScenario().getAliasRegistry().getAliased(StringUtils.normalized(listAlias));
         if (listAdapter == null) {
             return Collections.emptyList();
         }
@@ -556,15 +505,12 @@ public abstract class AbstractIsisConcor
     }
 
     public String aliasItemsInList(final String listAlias, final String title, final String type, final String aliasAs) {
-        aliasItemsInList =
-            new AliasItemsInListForConcordion(getScenario().getAliasRegistry(), StringUtils.normalized(listAlias));
-        return aliasItemsInList.execute(StringUtils.normalized(aliasAs), StringUtils.normalized(title),
-            StringUtils.normalized(type));
+        aliasItemsInList = new AliasItemsInListForConcordion(getScenario().getAliasRegistry(), StringUtils.normalized(listAlias));
+        return aliasItemsInList.execute(StringUtils.normalized(aliasAs), StringUtils.normalized(title), StringUtils.normalized(type));
     }
 
     private boolean executingTableHeader() {
-        return executingTable()
-            && IsisExecuteCommandWithHeader.tableRow.get() == IsisExecuteCommandWithHeader.TableRow.HEADER;
+        return executingTable() && IsisExecuteCommandWithHeader.tableRow.get() == IsisExecuteCommandWithHeader.TableRow.HEADER;
     }
 
     private boolean executingTable() {

Modified: incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/concordion/IsisExecuteCommandWithHeader.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/concordion/IsisExecuteCommandWithHeader.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/concordion/IsisExecuteCommandWithHeader.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/concordion/IsisExecuteCommandWithHeader.java Sun Jan 22 08:05:17 2012
@@ -29,8 +29,9 @@ import org.concordion.internal.command.E
  * Handles tables slightly differently from Concordion's usual strategy.
  * 
  * <p>
- * Specifically, it will call execute for the header row as well as for the body rows. This is required in order to set
- * up the bindings of the column names to the positions.
+ * Specifically, it will call execute for the header row as well as for the body
+ * rows. This is required in order to set up the bindings of the column names to
+ * the positions.
  */
 public class IsisExecuteCommandWithHeader extends ExecuteCommand {
 
@@ -43,8 +44,8 @@ public class IsisExecuteCommandWithHeade
     }
 
     /**
-     * Provides a mechanism for the fixture to determine whether the command is being executed in the context of a table
-     * or inline.
+     * Provides a mechanism for the fixture to determine whether the command is
+     * being executed in the context of a table or inline.
      */
     public static ThreadLocal<Context> context = new ThreadLocal<Context>() {
         @Override
@@ -54,8 +55,9 @@ public class IsisExecuteCommandWithHeade
     };
 
     /**
-     * When executing in a {@link Context#TABLE table context}, provides a mechanism for the fixture to determine
-     * whether the header of a table or the body is being processed.
+     * When executing in a {@link Context#TABLE table context}, provides a
+     * mechanism for the fixture to determine whether the header of a table or
+     * the body is being processed.
      */
     public static ThreadLocal<TableRow> tableRow = new ThreadLocal<TableRow>() {
         @Override
@@ -65,8 +67,7 @@ public class IsisExecuteCommandWithHeade
     };
 
     @Override
-    public void execute(final org.concordion.api.CommandCall commandCall, final Evaluator evaluator,
-        final ResultRecorder resultRecorder) {
+    public void execute(final org.concordion.api.CommandCall commandCall, final Evaluator evaluator, final ResultRecorder resultRecorder) {
         if (commandCall.getElement().isNamed("table")) {
             // special handling for tables
             final Context contextIfAny = context.get();
@@ -92,8 +93,7 @@ public class IsisExecuteCommandWithHeade
         }
     }
 
-    private void executeTable(final CommandCall commandCall, final Evaluator evaluator,
-        final ResultRecorder resultRecorder) {
+    private void executeTable(final CommandCall commandCall, final Evaluator evaluator, final ResultRecorder resultRecorder) {
         final TableSupport tableSupport = new TableSupport(commandCall);
 
         // this is the bit that's different: also execute on the header
@@ -107,8 +107,7 @@ public class IsisExecuteCommandWithHeade
         final Row[] detailRows = tableSupport.getDetailRows();
         for (final Row detailRow : detailRows) {
             if (detailRow.getCells().length != tableSupport.getColumnCount()) {
-                throw new RuntimeException(
-                    "The <table> 'execute' command only supports rows with an equal number of columns.");
+                throw new RuntimeException("The <table> 'execute' command only supports rows with an equal number of columns.");
             }
             commandCall.setElement(detailRow.getElement());
             tableSupport.copyCommandCallsTo(detailRow);

Modified: incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/AliasItemsInListForConcordion.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/AliasItemsInListForConcordion.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/AliasItemsInListForConcordion.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/AliasItemsInListForConcordion.java Sun Jan 22 08:05:17 2012
@@ -30,16 +30,11 @@ import org.apache.isis.viewer.bdd.common
 public class AliasItemsInListForConcordion extends AbstractFixture<AliasItemsInListPeer> {
 
     public AliasItemsInListForConcordion(final AliasRegistry aliasRegistry, final String listAlias) {
-        this(aliasRegistry, listAlias, CellBindingDefault.builder(IsisViewerConstants.TITLE_NAME,
-            IsisViewerConstants.TITLE_HEAD).build(), CellBindingDefault
-            .builder(IsisViewerConstants.TYPE_NAME, IsisViewerConstants.TYPE_HEAD).optional().build(),
-            CellBindingDefault
-                .builder(IsisViewerConstants.ALIAS_RESULT_NAME, IsisViewerConstants.ALIAS_RESULT_HEAD_SET).autoCreate()
-                .build());
+        this(aliasRegistry, listAlias, CellBindingDefault.builder(IsisViewerConstants.TITLE_NAME, IsisViewerConstants.TITLE_HEAD).build(), CellBindingDefault.builder(IsisViewerConstants.TYPE_NAME, IsisViewerConstants.TYPE_HEAD).optional().build(), CellBindingDefault
+                .builder(IsisViewerConstants.ALIAS_RESULT_NAME, IsisViewerConstants.ALIAS_RESULT_HEAD_SET).autoCreate().build());
     }
 
-    private AliasItemsInListForConcordion(final AliasRegistry aliasRegistry, final String listAlias,
-        final CellBinding titleBinding, final CellBinding typeBinding, final CellBinding aliasBinding) {
+    private AliasItemsInListForConcordion(final AliasRegistry aliasRegistry, final String listAlias, final CellBinding titleBinding, final CellBinding typeBinding, final CellBinding aliasBinding) {
         super(new AliasItemsInListPeer(aliasRegistry, listAlias, titleBinding, typeBinding, aliasBinding));
     }
 

Modified: incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/CheckListForConcordion.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/CheckListForConcordion.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/CheckListForConcordion.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/CheckListForConcordion.java Sun Jan 22 08:05:17 2012
@@ -33,8 +33,7 @@ public class CheckListForConcordion exte
     }
 
     private static CellBindingDefault titleBinding() {
-        return CellBindingDefault.builder(CheckListConstants.TITLE_NAME, CheckListConstants.TITLE_HEAD_SET).ditto()
-            .build();
+        return CellBindingDefault.builder(CheckListConstants.TITLE_NAME, CheckListConstants.TITLE_HEAD_SET).ditto().build();
     }
 
     public String executeHeader(final String title) {

Modified: incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/SetUpObjectsForConcordion.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/SetUpObjectsForConcordion.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/SetUpObjectsForConcordion.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/SetUpObjectsForConcordion.java Sun Jan 22 08:05:17 2012
@@ -27,15 +27,11 @@ import org.apache.isis.viewer.bdd.common
 
 public class SetUpObjectsForConcordion extends AbstractFixture<SetUpObjectsPeer> {
 
-    public SetUpObjectsForConcordion(final AliasRegistry aliasesRegistry, final String className,
-        final SetUpObjectsPeer.Mode mode) {
-        this(aliasesRegistry, className, mode, CellBindingDefault
-            .builder(IsisViewerConstants.ALIAS_RESULT_NAME, IsisViewerConstants.ALIAS_RESULT_HEAD_SET).autoCreate()
-            .build());
+    public SetUpObjectsForConcordion(final AliasRegistry aliasesRegistry, final String className, final SetUpObjectsPeer.Mode mode) {
+        this(aliasesRegistry, className, mode, CellBindingDefault.builder(IsisViewerConstants.ALIAS_RESULT_NAME, IsisViewerConstants.ALIAS_RESULT_HEAD_SET).autoCreate().build());
     }
 
-    private SetUpObjectsForConcordion(final AliasRegistry storyFixture, final String className,
-        final SetUpObjectsPeer.Mode mode, final CellBinding aliasBinding) {
+    private SetUpObjectsForConcordion(final AliasRegistry storyFixture, final String className, final SetUpObjectsPeer.Mode mode, final CellBinding aliasBinding) {
         super(new SetUpObjectsPeer(storyFixture, className, mode, aliasBinding));
     }
 

Modified: incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/UsingIsisViewerForConcordion.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/UsingIsisViewerForConcordion.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/UsingIsisViewerForConcordion.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/UsingIsisViewerForConcordion.java Sun Jan 22 08:05:17 2012
@@ -39,38 +39,23 @@ import com.google.common.collect.Lists;
 
 public class UsingIsisViewerForConcordion extends AbstractFixture<UsingIsisViewerPeer> {
 
-    public UsingIsisViewerForConcordion(final AliasRegistry aliasesRegistry, final DeploymentType deploymentType,
-        final DateParser dateParser, final Perform.Mode mode) {
-        this(aliasesRegistry, deploymentType, dateParser, mode, CellBindingDefault
-            .builder(IsisViewerConstants.ON_OBJECT_NAME, IsisViewerConstants.ON_OBJECT_HEAD_SET).ditto().build(),
-            CellBindingDefault
-                .builder(IsisViewerConstants.ALIAS_RESULT_NAME, IsisViewerConstants.ALIAS_RESULT_HEAD_SET).optional()
-                .build(), CellBindingDefault
-                .builder(IsisViewerConstants.PERFORM_NAME, IsisViewerConstants.PERFORM_HEAD_SET).ditto().build(),
-            CellBindingDefault.builder(IsisViewerConstants.ON_MEMBER_NAME, IsisViewerConstants.ON_MEMBER_HEAD_SET)
-                .optional().build(), CellBindingDefault
-                .builder(IsisViewerConstants.THAT_IT_NAME, IsisViewerConstants.THAT_IT_HEAD_SET).ditto().optional()
-                .build(), CellBindingDefault
-                .builder(IsisViewerConstants.WITH_ARGUMENTS_NAME, IsisViewerConstants.WITH_ARGUMENTS_HEAD_SET)
-                .optional().build());
-    }
-
-    private UsingIsisViewerForConcordion(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(new UsingIsisViewerPeer(aliasesRegistry, deploymentType, dateParser, mode, onObjectBinding,
-            aliasResultAsBinding, performBinding, onMemberBinding, thatItBinding, arg0Binding));
+    public UsingIsisViewerForConcordion(final AliasRegistry aliasesRegistry, final DeploymentType deploymentType, final DateParser dateParser, final Perform.Mode mode) {
+        this(aliasesRegistry, deploymentType, dateParser, mode, CellBindingDefault.builder(IsisViewerConstants.ON_OBJECT_NAME, IsisViewerConstants.ON_OBJECT_HEAD_SET).ditto().build(), CellBindingDefault.builder(IsisViewerConstants.ALIAS_RESULT_NAME, IsisViewerConstants.ALIAS_RESULT_HEAD_SET)
+                .optional().build(), CellBindingDefault.builder(IsisViewerConstants.PERFORM_NAME, IsisViewerConstants.PERFORM_HEAD_SET).ditto().build(), CellBindingDefault.builder(IsisViewerConstants.ON_MEMBER_NAME, IsisViewerConstants.ON_MEMBER_HEAD_SET).optional().build(), CellBindingDefault
+                .builder(IsisViewerConstants.THAT_IT_NAME, IsisViewerConstants.THAT_IT_HEAD_SET).ditto().optional().build(), CellBindingDefault.builder(IsisViewerConstants.WITH_ARGUMENTS_NAME, IsisViewerConstants.WITH_ARGUMENTS_HEAD_SET).optional().build());
     }
 
-    public String executeHeader(final String onObject, final String aliasResultAs, final String perform,
-        final String usingMember, final String thatIt, final String arg0, final String... remainingArgs) {
+    private UsingIsisViewerForConcordion(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(new UsingIsisViewerPeer(aliasesRegistry, deploymentType, dateParser, mode, onObjectBinding, aliasResultAsBinding, performBinding, onMemberBinding, thatItBinding, arg0Binding));
+    }
+
+    public String executeHeader(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String thatIt, final String arg0, final String... remainingArgs) {
 
         return setupHeader(onObject, aliasResultAs, perform, usingMember, thatIt, arg0);
     }
 
-    private String setupHeader(final String onObject, final String aliasResultAs, final String perform,
-        final String usingMember, final String thatIt, final String arg0) {
+    private String setupHeader(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String thatIt, final String arg0) {
         int colNum = 0;
         getPeer().getOnObjectBinding().setHeadColumn(colNum++);
         getPeer().getAliasResultAsBinding().setHeadColumn(colNum++);
@@ -86,8 +71,7 @@ public class UsingIsisViewerForConcordio
         return ""; // ok
     }
 
-    public String executeRow(final String onObject, final String aliasResultAs, final String perform,
-        final String usingMember, final String thatIt, final String arg0, final String... remainingArgs) {
+    public String executeRow(final String onObject, final String aliasResultAs, final String perform, final String usingMember, final String thatIt, final String arg0, final String... remainingArgs) {
 
         setupHeader(onObject, aliasResultAs, perform, usingMember, thatIt, arg0);
 

Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java Sun Jan 22 08:05:17 2012
@@ -137,8 +137,7 @@ public class DndViewer extends IsisViewe
         defaultWindowSize.limitHeight(600);
 
         final Size size = Properties.getSize(Properties.PROPERTY_BASE + "initial.size", defaultWindowSize);
-        final Location location =
-            Properties.getLocation(Properties.PROPERTY_BASE + "initial.location", new Location(x, y));
+        final Location location = Properties.getLocation(Properties.PROPERTY_BASE + "initial.location", new Location(x, y));
         return new Bounds(location, size);
     }
 
@@ -226,8 +225,9 @@ public class DndViewer extends IsisViewe
     private boolean loggedInUsingLogonFixture = false;
 
     /**
-     * TODO: there is similar code in <tt>AuthenticationSessionLookupStrategyDefault</tt>; should try to combine
-     * somehow...
+     * TODO: there is similar code in
+     * <tt>AuthenticationSessionLookupStrategyDefault</tt>; should try to
+     * combine somehow...
      */
     private boolean login() {
         final AuthenticationRequest request = determineRequestIfPossible();
@@ -263,9 +263,10 @@ public class DndViewer extends IsisViewe
     }
 
     private AuthenticationRequest determineRequestIfPossible() {
-        
+
         // command line args
-        AuthenticationRequest request = getAuthenticationRequestViaArgs();;
+        AuthenticationRequest request = getAuthenticationRequestViaArgs();
+        ;
 
         // exploration & (optionally) logon fixture provided
         if (request == null) {
@@ -291,7 +292,8 @@ public class DndViewer extends IsisViewe
             bounds = calculateInitialWindowSize(frame.getToolkit().getScreenSize());
         }
 
-        frame.pack(); // forces insets to be calculated, hence need to then set bounds
+        frame.pack(); // forces insets to be calculated, hence need to then set
+                      // bounds
         frame.setBounds(bounds.getX(), bounds.getY(), bounds.getWidth(), bounds.getHeight());
 
         viewer = (XViewer) Toolkit.getViewer();
@@ -317,7 +319,8 @@ public class DndViewer extends IsisViewe
 
         final UserProfile userProfiler = IsisContext.getUserProfile();
 
-        // TODO viewer should be shown during init() (so login can take place on main window, and can quit
+        // TODO viewer should be shown during init() (so login can take place on
+        // main window, and can quit
         // before
         // logging in), and should be updated during start to show context.
 
@@ -373,11 +376,13 @@ public class DndViewer extends IsisViewe
         LOG.debug("setting up default views (provided by the framework)");
 
         /*
-         * viewFactory.addValueFieldSpecification(loadSpecification("field.option",
-         * OptionSelectionField.Specification.class));
-         * viewFactory.addValueFieldSpecification(loadSpecification("field.percentage",
+         * viewFactory.addValueFieldSpecification(loadSpecification("field.option"
+         * , OptionSelectionField.Specification.class));
+         * viewFactory.addValueFieldSpecification
+         * (loadSpecification("field.percentage",
          * PercentageBarField.Specification.class));
-         * viewFactory.addValueFieldSpecification(loadSpecification("field.timeperiod",
+         * viewFactory.addValueFieldSpecification
+         * (loadSpecification("field.timeperiod",
          * TimePeriodBarField.Specification.class));
          */
         viewFactory.addSpecification(loadSpecification("field.image", ImageField.Specification.class));
@@ -396,7 +401,8 @@ public class DndViewer extends IsisViewe
             viewFactory.addSpecification(new InternalListSpecification());
             viewFactory.addSpecification(new SimpleListSpecification());
             viewFactory.addSpecification(new GridSpecification());
-            // TBA viewFactory.addSpecification(new ListWithExpandableElementsSpecification());
+            // TBA viewFactory.addSpecification(new
+            // ListWithExpandableElementsSpecification());
             // TBA
             viewFactory.addSpecification(new CalendarSpecification());
             viewFactory.addSpecification(new ListWithDetailSpecification());
@@ -416,8 +422,10 @@ public class DndViewer extends IsisViewe
             viewFactory.addSpecification(new SummaryFormSpecification());
 
             viewFactory.addSpecification(new TreeSpecification());
-            // TODO allow window form to be used for objects with limited number of collections
-            // viewFactory.addSpecification(new TreeWithDetailSpecification(0, 3));
+            // TODO allow window form to be used for objects with limited number
+            // of collections
+            // viewFactory.addSpecification(new TreeWithDetailSpecification(0,
+            // 3));
 
             viewFactory.addDesignSpecification(new GridListSpecification());
             viewFactory.addDesignSpecification(new ConfigurableObjectViewSpecification());

Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtCanvas.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtCanvas.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtCanvas.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtCanvas.java Sun Jan 22 08:05:17 2012
@@ -48,8 +48,7 @@ public class AwtCanvas implements Canvas
         this.renderingArea = renderingArea;
     }
 
-    public AwtCanvas(final Graphics bufferGraphic, final RenderingArea renderingArea, final int x, final int y,
-        final int width, final int height) {
+    public AwtCanvas(final Graphics bufferGraphic, final RenderingArea renderingArea, final int x, final int y, final int width, final int height) {
         graphics = bufferGraphic;
         this.renderingArea = renderingArea;
         graphics.clipRect(x, y, width, height);
@@ -88,8 +87,7 @@ public class AwtCanvas implements Canvas
     }
 
     @Override
-    public void draw3DRectangle(final int x, final int y, final int width, final int height, final Color color,
-        final boolean raised) {
+    public void draw3DRectangle(final int x, final int y, final int width, final int height, final Color color, final boolean raised) {
         useColor(color);
         graphics.draw3DRect(x, y, width - 1, height - 1, raised);
     }
@@ -102,8 +100,7 @@ public class AwtCanvas implements Canvas
         final int midpoint = bounds.getY() + height / 2;
         drawLine(bounds.getX(), midpoint, width - 2, midpoint, color);
         if (baseline > 0) {
-            drawLine(bounds.getX(), baseline, width - 1, baseline,
-                Toolkit.getColor(ColorsAndFonts.COLOR_DEBUG_BASELINE));
+            drawLine(bounds.getX(), baseline, width - 1, baseline, Toolkit.getColor(ColorsAndFonts.COLOR_DEBUG_BASELINE));
         }
     }
 
@@ -114,8 +111,7 @@ public class AwtCanvas implements Canvas
 
     @Override
     public void drawImage(final Image image, final int x, final int y, final int width, final int height) {
-        graphics
-            .drawImage(((AwtImage) image).getAwtImage(), x, y, width - 1, height - 1, (ImageObserver) renderingArea);
+        graphics.drawImage(((AwtImage) image).getAwtImage(), x, y, width - 1, height - 1, (ImageObserver) renderingArea);
     }
 
     @Override
@@ -148,8 +144,7 @@ public class AwtCanvas implements Canvas
     }
 
     @Override
-    public void drawRoundedRectangle(final int x, final int y, final int width, final int height, final int arcWidth,
-        final int arcHeight, final Color color) {
+    public void drawRoundedRectangle(final int x, final int y, final int width, final int height, final int arcWidth, final int arcHeight, final Color color) {
         useColor(color);
         graphics.drawRoundRect(x, y, width - 1, height - 1, arcWidth, arcHeight);
     }
@@ -201,8 +196,7 @@ public class AwtCanvas implements Canvas
     }
 
     @Override
-    public void drawText(final String text, final int x, final int y, final int maxWidth, final Color color,
-        final Text style) {
+    public void drawText(final String text, final int x, final int y, final int maxWidth, final Color color, final Text style) {
         useColor(color);
         useFont(style);
 
@@ -247,8 +241,7 @@ public class AwtCanvas implements Canvas
     @Override
     public String toString() {
         final Rectangle cb = graphics.getClipBounds();
-        return "Canvas [area=" + cb.x + "," + cb.y + " " + cb.width + "x" + cb.height + ",color=" + color + ",font="
-            + font + "]";
+        return "Canvas [area=" + cb.x + "," + cb.y + " " + cb.width + "x" + cb.height + ",color=" + color + ",font=" + font + "]";
     }
 
     private void useColor(final Color color) {

Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtColor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtColor.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtColor.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtColor.java Sun Jan 22 08:05:17 2012
@@ -56,8 +56,7 @@ public class AwtColor implements Color {
 
     public AwtColor(final String propertyName, final String defaultColor) {
         this.name = propertyName;
-        color =
-            IsisContext.getConfiguration().getColor(PROPERTY_STEM + propertyName, java.awt.Color.decode(defaultColor));
+        color = IsisContext.getConfiguration().getColor(PROPERTY_STEM + propertyName, java.awt.Color.decode(defaultColor));
     }
 
     public AwtColor(final String propertyName, final AwtColor defaultColor) {

Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtText.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtText.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtText.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtText.java Sun Jan 22 08:05:17 2012
@@ -66,8 +66,7 @@ public class AwtText implements Text {
 
         ascentAdjust = cfg.getBoolean(ASCENT_ADJUST, false);
 
-        LOG.debug("font " + propertyName + " height=" + metrics.getHeight() + ", leading=" + metrics.getLeading()
-            + ", ascent=" + metrics.getAscent() + ", descent=" + metrics.getDescent() + ", line spacing=" + lineSpacing);
+        LOG.debug("font " + propertyName + " height=" + metrics.getHeight() + ", leading=" + metrics.getLeading() + ", ascent=" + metrics.getAscent() + ", descent=" + metrics.getDescent() + ", line spacing=" + lineSpacing);
     }
 
     @Override
@@ -174,7 +173,8 @@ public class AwtText implements Text {
     }
 
     // DKH: 20060404... yes, this will grow over time, but only used client-side
-    // RCM this is only a temporary solutions to help deal with titles, TODO move the caching up to the
+    // RCM this is only a temporary solutions to help deal with titles, TODO
+    // move the caching up to the
     // views/components that use this method
     private final java.util.Hashtable stringWidthByString = new java.util.Hashtable();
 
@@ -195,8 +195,8 @@ public class AwtText implements Text {
         if (stringWidth > text.length() * maxCharWidth) {
             LOG.debug("spurious width of string; calculating manually: " + stringWidth + " for " + this + ": " + text);
             /*
-             * This fixes an intermittent bug in .NET where stringWidth() returns a ridiculous number is returned for
-             * the width.
+             * This fixes an intermittent bug in .NET where stringWidth()
+             * returns a ridiculous number is returned for the width.
              * 
              * TODO don't do this when running Java
              */

Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java Sun Jan 22 08:05:17 2012
@@ -49,7 +49,8 @@ import org.apache.isis.viewer.dnd.view.d
 import org.apache.log4j.Logger;
 
 /**
- * A specialised frame for displaying the details of an object and its display mechanisms.
+ * A specialised frame for displaying the details of an object and its display
+ * mechanisms.
  */
 public abstract class DebugFrame extends Frame {
     private static final long serialVersionUID = 1L;
@@ -65,7 +66,7 @@ public abstract class DebugFrame extends
         final Frame[] f = new Frame[frames.size()];
 
         for (int i = 0; i < f.length; i++) {
-            f[i] = (Frame) frames.elementAt(i);
+            f[i] = frames.elementAt(i);
         }
 
         for (final Frame element : f) {
@@ -221,8 +222,9 @@ public abstract class DebugFrame extends
      */
     public void show(final int x, final int y) {
         /*
-         * WARNING - When refresh button is pressed it is in the AWT thread; if the repository is thread based then the
-         * wrong set of components will be used giving strange results, particularly in the object persistor.
+         * WARNING - When refresh button is pressed it is in the AWT thread; if
+         * the repository is thread based then the wrong set of components will
+         * be used giving strange results, particularly in the object persistor.
          */
         // TODO run in correct thread
         refresh();

Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugOptions.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugOptions.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugOptions.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugOptions.java Sun Jan 22 08:05:17 2012
@@ -44,8 +44,7 @@ public class DebugOptions implements Men
 
     @Override
     public void menuOptions(final UserActionSet options) {
-        final String showExplorationMenu =
-            "Always show exploration menu " + (viewer.showExplorationMenuByDefault ? "off" : "on");
+        final String showExplorationMenu = "Always show exploration menu " + (viewer.showExplorationMenuByDefault ? "off" : "on");
         options.add(new UserActionAbstract(showExplorationMenu, ActionType.DEBUG) {
             @Override
             public void execute(final Workspace workspace, final View view, final Location at) {
@@ -80,11 +79,14 @@ public class DebugOptions implements Men
             }
         });
 
-        // I've commented this out because in the new design we should close the ExecutionContext
+        // I've commented this out because in the new design we should close the
+        // ExecutionContext
         // and then re-login.
-        // options.add(new AbstractUserAction("Restart object loader/persistor", UserAction.DEBUG) {
+        // options.add(new AbstractUserAction("Restart object loader/persistor",
+        // UserAction.DEBUG) {
         // @Override
-        // public void execute(final Workspace workspace, final View view, final Location at) {
+        // public void execute(final Workspace workspace, final View view, final
+        // Location at) {
         // IsisContext.getObjectPersistor().reset();
         // }
         // });

Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/InteractionHandler.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/InteractionHandler.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/InteractionHandler.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/InteractionHandler.java Sun Jan 22 08:05:17 2012
@@ -59,8 +59,7 @@ public class InteractionHandler implemen
     private View draggedView;
     private final XFeedbackManager feedbackManager;
 
-    public InteractionHandler(final XViewer viewer, final XFeedbackManager feedbackManager,
-        final KeyboardManager keyboardManager, final InteractionSpy spy) {
+    public InteractionHandler(final XViewer viewer, final XFeedbackManager feedbackManager, final KeyboardManager keyboardManager, final InteractionSpy spy) {
         this.viewer = viewer;
         this.feedbackManager = feedbackManager;
         this.spy = spy;
@@ -102,7 +101,8 @@ public class InteractionHandler implemen
     }
 
     /**
-     * Returns true when the point is outside the area around the downAt location
+     * Returns true when the point is outside the area around the downAt
+     * location
      */
     private boolean isOverThreshold(final Location pressed, final Point dragged) {
         final int xDown = pressed.getX();
@@ -114,8 +114,8 @@ public class InteractionHandler implemen
     }
 
     /**
-     * Listener for key presses. Cancels popup and drags, and forwards key presses to the view that has the keyboard
-     * focus.
+     * Listener for key presses. Cancels popup and drags, and forwards key
+     * presses to the view that has the keyboard focus.
      * 
      * @see java.awt.event.KeyListener#keyPressed(KeyEvent)
      */
@@ -136,9 +136,8 @@ public class InteractionHandler implemen
             } else if (ke.getKeyCode() == KeyEvent.VK_F5) {
                 draggedView = identifiedView;
             } else if (draggedView != null && ke.getKeyCode() == KeyEvent.VK_F6) {
-                final ContentDrag content =
-                    new ContentDragImpl(draggedView, new Location(), new AbstractView(new NullContent()) {
-                    });
+                final ContentDrag content = new ContentDragImpl(draggedView, new Location(), new AbstractView(new NullContent()) {
+                });
                 if (identifiedView != null) {
                     identifiedView.drop(content);
                 }
@@ -156,7 +155,8 @@ public class InteractionHandler implemen
     }
 
     /**
-     * Listener for key releases and forward them to the view that has the keyboard focus.
+     * Listener for key releases and forward them to the view that has the
+     * keyboard focus.
      * 
      * @see java.awt.event.KeyListener#keyReleased(KeyEvent)
      */
@@ -165,11 +165,11 @@ public class InteractionHandler implemen
         if (isBusy(identifiedView)) {
             return;
         }
-        // LOG.debug("key " + KeyEvent.getKeyText(ke.getKeyCode()) + " released\n");
+        // LOG.debug("key " + KeyEvent.getKeyText(ke.getKeyCode()) +
+        // " released\n");
 
         try {
-            if (lastTyped == null && ke.getKeyCode() != KeyEvent.VK_SHIFT && ke.getKeyCode() != KeyEvent.VK_ALT
-                && ke.getKeyCode() != KeyEvent.VK_CONTROL) {
+            if (lastTyped == null && ke.getKeyCode() != KeyEvent.VK_SHIFT && ke.getKeyCode() != KeyEvent.VK_ALT && ke.getKeyCode() != KeyEvent.VK_CONTROL) {
                 if (ke.getKeyCode() >= KeyEvent.VK_0 && ke.getKeyCode() <= KeyEvent.VK_DIVIDE) {
                     LOG.error("no type event for '" + KeyEvent.getKeyText(ke.getKeyCode()) + "':  " + ke);
                 }
@@ -185,8 +185,8 @@ public class InteractionHandler implemen
     }
 
     /**
-     * Listener for key press, and subsequent release, and forward it as one event to the view that has the keyboard
-     * focus.
+     * Listener for key press, and subsequent release, and forward it as one
+     * event to the view that has the keyboard focus.
      * 
      * @see java.awt.event.KeyListener#keyTyped(KeyEvent)
      */
@@ -214,8 +214,9 @@ public class InteractionHandler implemen
     }
 
     /**
-     * Responds to mouse click events by calling <code>firstClick</code>, <code>secondClick</code>, and
-     * <code>thirdClick</code> on the view that the mouse is over. Ignored if the mouse is not over a view.
+     * Responds to mouse click events by calling <code>firstClick</code>,
+     * <code>secondClick</code>, and <code>thirdClick</code> on the view that
+     * the mouse is over. Ignored if the mouse is not over a view.
      * 
      * @see java.awt.event.MouseListener#mouseClicked(MouseEvent)
      */
@@ -228,7 +229,8 @@ public class InteractionHandler implemen
             final Click click = new ClickImpl(downAt, me.getModifiers());
             spy.addAction("Mouse clicked " + click.getLocation());
             if (click.button3() && identifiedView != null) {
-                // ignore popup trigger - dealt with by mousePressed or mouseReleased (depending on platform)
+                // ignore popup trigger - dealt with by mousePressed or
+                // mouseReleased (depending on platform)
             } else if (viewer.isOverlayAvailable()) {
                 overlayClick(click);
                 // } else if (click.button3() && identifiedView != null) {
@@ -244,9 +246,7 @@ public class InteractionHandler implemen
 
     private void overlayClick(final Click click) {
         final View overlayView = viewer.getOverlayView();
-        if (overlayView == identifiedView
-            || (identifiedView != null && identifiedView.getParent() != null && overlayView == identifiedView
-                .getParent())) {
+        if (overlayView == identifiedView || (identifiedView != null && identifiedView.getParent() != null && overlayView == identifiedView.getParent())) {
             viewer.firstClick(click);
         } else {
             viewer.clearAction();
@@ -271,25 +271,26 @@ public class InteractionHandler implemen
         viewer.setKeyboardFocus(identifiedView);
 
         switch (clickCount) {
-            case 1:
-                viewer.firstClick(click);
-                break;
+        case 1:
+            viewer.firstClick(click);
+            break;
 
-            case 2:
-                viewer.secondClick(click);
-                break;
+        case 2:
+            viewer.secondClick(click);
+            break;
 
-            case 3:
-                viewer.thirdClick(click);
-                break;
+        case 3:
+            viewer.thirdClick(click);
+            break;
 
-            default:
-                break;
+        default:
+            break;
         }
     }
 
     /**
-     * Responds to mouse dragged according to the button used. If the left button then identified view is moved.
+     * Responds to mouse dragged according to the button used. If the left
+     * button then identified view is moved.
      * 
      * @see java.awt.event.MouseMotionListener#mouseDragged(MouseEvent)
      */
@@ -345,9 +346,10 @@ public class InteractionHandler implemen
     }
 
     /**
-     * responds to mouse moved event by setting the view found underneath the mouse as the idetified view. Views
-     * normally respond by changing the colour of themselves so they are visual distinct and hence shows itself as
-     * special compared to the rest.
+     * responds to mouse moved event by setting the view found underneath the
+     * mouse as the idetified view. Views normally respond by changing the
+     * colour of themselves so they are visual distinct and hence shows itself
+     * as special compared to the rest.
      * 
      * @see java.awt.event.MouseMotionListener#mouseMoved(MouseEvent)
      */
@@ -405,8 +407,9 @@ public class InteractionHandler implemen
     }
 
     /**
-     * Responds to the mouse pressed event (with the left button pressed) by initiating a drag. This sets up the
-     * <code>View</code>'s dragging state to the view that the mouse was over when the button was pressed.
+     * Responds to the mouse pressed event (with the left button pressed) by
+     * initiating a drag. This sets up the <code>View</code>'s dragging state to
+     * the view that the mouse was over when the button was pressed.
      * 
      * @see java.awt.event.MouseListener#mousePressed(MouseEvent)
      */
@@ -450,10 +453,12 @@ public class InteractionHandler implemen
     }
 
     /**
-     * Responds to the mouse released event (with the left button pressed) by telling the identified view (the drop
-     * zone) that the dragged object is being dropped on it (via the views <code>drop</code> method). If the drop takes
-     * place outside of all of the other views then the <code>workspaceDrop</code> method is called instead to indicate
-     * a drop onto the workspace.
+     * Responds to the mouse released event (with the left button pressed) by
+     * telling the identified view (the drop zone) that the dragged object is
+     * being dropped on it (via the views <code>drop</code> method). If the drop
+     * takes place outside of all of the other views then the
+     * <code>workspaceDrop</code> method is called instead to indicate a drop
+     * onto the workspace.
      * 
      * @see java.awt.event.MouseListener#mouseReleased(MouseEvent)
      */

Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/KeyboardManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/KeyboardManager.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/KeyboardManager.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/KeyboardManager.java Sun Jan 22 08:05:17 2012
@@ -46,7 +46,8 @@ public class KeyboardManager {
     }
 
     /*
-     * At the moment, as a fudge, the text field is calling its parent's keyPressed method for enter presses.
+     * At the moment, as a fudge, the text field is calling its parent's
+     * keyPressed method for enter presses.
      */
     public void pressed(final int keyCode, final int modifiers) {
         if (ignoreKey(keyCode)) {
@@ -85,7 +86,8 @@ public class KeyboardManager {
             return;
         }
 
-        // this should really check the modifiers to ensure there are none in use.
+        // this should really check the modifiers to ensure there are none in
+        // use.
         if (keyCode == KeyEvent.VK_F10) {
             final Location location = keyboardFocus.getAbsoluteLocation();
             location.add(20, 14);
@@ -93,10 +95,12 @@ public class KeyboardManager {
             return;
         }
         /*
-         * if(keyCode == KeyEvent.VK_ENTER) { //viewer.firstClick(new Click(keyboardFocus, keyboardFocus.getLocation(),
-         * modifiers)); Location location = keyboardFocus.getAbsoluteLocation(); location.add(1, 1);
-         * viewer.secondClick(new Click(keyboardFocus, location, modifiers)); //viewer.thirdClick(new
-         * Click(keyboardFocus, keyboardFocus.getLocation(), modifiers)); return; }
+         * if(keyCode == KeyEvent.VK_ENTER) { //viewer.firstClick(new
+         * Click(keyboardFocus, keyboardFocus.getLocation(), modifiers));
+         * Location location = keyboardFocus.getAbsoluteLocation();
+         * location.add(1, 1); viewer.secondClick(new Click(keyboardFocus,
+         * location, modifiers)); //viewer.thirdClick(new Click(keyboardFocus,
+         * keyboardFocus.getLocation(), modifiers)); return; }
          */
 
         if (keyCode == KeyEvent.VK_F4 && (modifiers & InputEvent.CTRL_MASK) == InputEvent.CTRL_MASK) {
@@ -142,21 +146,21 @@ public class KeyboardManager {
         }
 
         switch (action) {
-            case KeyboardAction.NEXT_VIEW:
-                focusManager.focusNextView();
-                // focusNextSubview(keyboardFocus);
-                break;
-            case KeyboardAction.PREVIOUS_VIEW:
-                focusManager.focusPreviousView();
-                // focusPreviousSubview(keyboardFocus);
-                break;
-            case KeyboardAction.NEXT_WINDOW:
-                focusManager.focusParentView();
-                // focusNextRootView(keyboardFocus);
-                break;
-            case KeyboardAction.PREVIOUS_WINDOW:
-                focusManager.focusFirstChildView();
-                break;
+        case KeyboardAction.NEXT_VIEW:
+            focusManager.focusNextView();
+            // focusNextSubview(keyboardFocus);
+            break;
+        case KeyboardAction.PREVIOUS_VIEW:
+            focusManager.focusPreviousView();
+            // focusPreviousSubview(keyboardFocus);
+            break;
+        case KeyboardAction.NEXT_WINDOW:
+            focusManager.focusParentView();
+            // focusNextRootView(keyboardFocus);
+            break;
+        case KeyboardAction.PREVIOUS_WINDOW:
+            focusManager.focusFirstChildView();
+            break;
         }
     }
 

Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java Sun Jan 22 08:05:17 2012
@@ -186,8 +186,7 @@ public class LoginDialog extends Frame i
             instructionLabel.setText("Authorising...");
             instructionLabel.setForeground(Color.BLACK);
 
-            final AuthenticationRequestPassword authenticationRequest =
-                new AuthenticationRequestPassword(getUser(), getPassword());
+            final AuthenticationRequestPassword authenticationRequest = new AuthenticationRequestPassword(getUser(), getPassword());
             session = authenticationManager.authenticate(authenticationRequest);
             if (session == null) {
                 try {

Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ViewerFrame.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ViewerFrame.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ViewerFrame.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ViewerFrame.java Sun Jan 22 08:05:17 2012
@@ -59,7 +59,8 @@ public class ViewerFrame extends Frame i
             e1.printStackTrace();
         } catch (final NoSuchMethodException ignore) {
             /*
-             * Ignore no such method exception as this method is only available, but needed, in version 1.4 and later.
+             * Ignore no such method exception as this method is only available,
+             * but needed, in version 1.4 and later.
              */
         } catch (final IllegalArgumentException e) {
             e.printStackTrace();
@@ -92,7 +93,8 @@ public class ViewerFrame extends Frame i
     }
 
     /**
-     * Paints the double-buffered image. Calls the <code>draw()</code> method on each top-level view.
+     * Paints the double-buffered image. Calls the <code>draw()</code> method on
+     * each top-level view.
      * 
      * @see java.awt.Component#update(Graphics)
      */

Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XFeedbackManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XFeedbackManager.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XFeedbackManager.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XFeedbackManager.java Sun Jan 22 08:05:17 2012
@@ -59,7 +59,8 @@ public class XFeedbackManager implements
         return text.toString();
 
         // for debug
-        // return "[view: " + view + "] [action: " + action + "] [error: " + error + "] [message: " + message
+        // return "[view: " + view + "] [action: " + action + "] [error: " +
+        // error + "] [message: " + message
         // + "] [messages:" + messages + "]";
     }
 
@@ -72,7 +73,8 @@ public class XFeedbackManager implements
         }
     }
 
-    // REVIEW why can only objects be set to busy? Specifically the service icon do not show as bust when a
+    // REVIEW why can only objects be set to busy? Specifically the service icon
+    // do not show as bust when a
     // long standing option is being set up when a menu is being created.
     @Override
     public void setBusy(final View view, final BackgroundTask task) {

Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java Sun Jan 22 08:05:17 2012
@@ -121,8 +121,7 @@ public class XViewer implements Viewer {
 
     public XViewer() {
         doubleBuffering = IsisContext.getConfiguration().getBoolean(Properties.PROPERTY_BASE + "double-buffer", true);
-        showExplorationMenuByDefault =
-            IsisContext.getConfiguration().getBoolean(Properties.PROPERTY_BASE + "exploration.show", true);
+        showExplorationMenuByDefault = IsisContext.getConfiguration().getBoolean(Properties.PROPERTY_BASE + "exploration.show", true);
         overlayView = CLEAR_OVERLAY;
         redrawArea = new Bounds();
     }
@@ -150,8 +149,7 @@ public class XViewer implements Viewer {
         }
 
         final FocusManager currentFocusManager = keyboardManager.getFocusManager();
-        if (currentFocusManager != null && currentFocusManager.getFocus() != null
-            && currentFocusManager.getFocus().getParent() != null) {
+        if (currentFocusManager != null && currentFocusManager.getFocus() != null && currentFocusManager.getFocus().getParent() != null) {
             currentFocusManager.getFocus().getParent().markDamaged();
         }
 
@@ -234,7 +232,8 @@ public class XViewer implements Viewer {
 
     public void firstClick(final Click click) {
         /*
-         * for (int i = 0; i < panes.length; i++) { if(panes[i].respondsTo(click.getLocation())) {
+         * for (int i = 0; i < panes.length; i++) {
+         * if(panes[i].respondsTo(click.getLocation())) {
          * panes[i].firstClick(click); return; } }
          */
         if (onOverlay(click.getLocation())) {
@@ -303,8 +302,7 @@ public class XViewer implements Viewer {
         spy = new InteractionSpy(new SpyWindow());
 
         keyboardManager = new KeyboardManager(this);
-        final InteractionHandler interactionHandler =
-            new InteractionHandler(this, feedbackManager, keyboardManager, spy);
+        final InteractionHandler interactionHandler = new InteractionHandler(this, feedbackManager, keyboardManager, spy);
         renderingArea.addMouseMotionListener(interactionHandler);
         renderingArea.addMouseListener(interactionHandler);
         renderingArea.addKeyListener(interactionHandler);
@@ -398,8 +396,7 @@ public class XViewer implements Viewer {
             spy.redraw(paintArea.toString(), redrawCount);
         }
         if (UI_LOG.isDebugEnabled()) {
-            UI_LOG.debug("------ repaint viewer #" + redrawCount + " " + paintArea.x + "," + paintArea.y + " "
-                + paintArea.width + "x" + paintArea.height);
+            UI_LOG.debug("------ repaint viewer #" + redrawCount + " " + paintArea.x + "," + paintArea.y + " " + paintArea.width + "x" + paintArea.height);
         }
 
         final Canvas c = createCanvas(graphic, paintArea);
@@ -419,7 +416,8 @@ public class XViewer implements Viewer {
         }
 
         /*
-         * for (int i = 0; i < panes.length; i++) { panes[i].draw(c.createSubcanvas()); }
+         * for (int i = 0; i < panes.length; i++) {
+         * panes[i].draw(c.createSubcanvas()); }
          */
         // paint status
         // paintUserStatus(bufferGraphics);
@@ -441,8 +439,7 @@ public class XViewer implements Viewer {
         final int w = internalDisplaySize.getWidth();
         final int h = internalDisplaySize.getHeight();
         if (doubleBuffering) {
-            if ((doubleBuffer == null) || (bufferGraphics == null) || (doubleBuffer.getWidth(null) < w)
-                || (doubleBuffer.getHeight(null) < h)) {
+            if ((doubleBuffer == null) || (bufferGraphics == null) || (doubleBuffer.getWidth(null) < w) || (doubleBuffer.getHeight(null) < h)) {
                 doubleBuffer = renderingArea.createImage(w, h);
                 LOG.debug("buffer sized to " + doubleBuffer.getWidth(null) + "x" + doubleBuffer.getHeight(null));
             }
@@ -455,8 +452,7 @@ public class XViewer implements Viewer {
         bufferGraphics.clearRect(0, 0, w, h);
 
         bufferGraphics.setClip(paintArea.x, paintArea.y, paintArea.width, paintArea.height);
-        final Canvas c =
-            new AwtCanvas(bufferGraphics, renderingArea, paintArea.x, paintArea.y, paintArea.width, paintArea.height);
+        final Canvas c = new AwtCanvas(bufferGraphics, renderingArea, paintArea.x, paintArea.y, paintArea.width, paintArea.height);
         // Canvas c = new Canvas(bufferGraphics, 0, 0, w, h);
         return c;
     }
@@ -466,7 +462,8 @@ public class XViewer implements Viewer {
      */
     private Rectangle layoutViews() {
         if (!Thread.currentThread().getName().startsWith("AWT-EventQueue") && !isDotNet()) {
-            // REVIEW remove this check and exception when problem with multiple field drawing is resolved
+            // REVIEW remove this check and exception when problem with multiple
+            // field drawing is resolved
             // (Bug 1)
             throw new IsisException("Drawing with wrong thread: " + Thread.currentThread());
         }
@@ -477,8 +474,7 @@ public class XViewer implements Viewer {
         rootView.layout();
         synchronized (redrawArea) {
             if (!redrawArea.equals(NO_REDRAW)) {
-                final Rectangle r2 =
-                    new Rectangle(redrawArea.getX(), redrawArea.getY(), redrawArea.getWidth(), redrawArea.getHeight());
+                final Rectangle r2 = new Rectangle(redrawArea.getX(), redrawArea.getY(), redrawArea.getWidth(), redrawArea.getHeight());
                 redrawArea.setBounds(NO_REDRAW);
                 return r2;
             }
@@ -526,8 +522,7 @@ public class XViewer implements Viewer {
         }
     }
 
-    public void popupMenu(final View over, final Location at, final boolean forView, final boolean includeExploration,
-        final boolean includeDebug) {
+    public void popupMenu(final View over, final Location at, final boolean forView, final boolean includeExploration, final boolean includeDebug) {
         feedbackManager.setBusy(over, null);
         saveCurrentFieldEntry();
         final PopupMenuContainer menu = new PopupMenuContainer(over, at);
@@ -611,7 +606,8 @@ public class XViewer implements Viewer {
     public void setOverlayView(final View view) {
         disposeOverlayView();
         overlayView = view;
-        // TODO ensure that the view is laid out properly; hence is the right size to begin with.
+        // TODO ensure that the view is laid out properly; hence is the right
+        // size to begin with.
         // view.limitSize(rootView.getSize());
 
         final Size size = view.getRequiredSize(rootView.getSize());
@@ -632,9 +628,7 @@ public class XViewer implements Viewer {
     public void showInOverlay(final Content content, final Location location) {
         View view;
         view = Toolkit.getViewFactory().createView(new ViewRequirement(content, ViewRequirement.OPEN));
-        view =
-            new LineBorder(2, Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY2), new BackgroundBorder(
-                Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3), view));
+        view = new LineBorder(2, Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY2), new BackgroundBorder(Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3), view));
         final Size size = view.getRequiredSize(Size.createMax());
         location.subtract(size.getWidth() / 2, size.getHeight() / 2);
         view.setLocation(location);
@@ -699,8 +693,7 @@ public class XViewer implements Viewer {
         final Text text = Toolkit.getText(ColorsAndFonts.TEXT_STATUS);
         statusBarHeight = text.getLineHeight() + text.getDescent();
         rootViewSize.contractHeight(statusBarHeight);
-        statusBarArea =
-            new Bounds(insets.left, insets.top + rootViewSize.getHeight(), rootViewSize.getWidth(), statusBarHeight);
+        statusBarArea = new Bounds(insets.left, insets.top + rootViewSize.getHeight(), rootViewSize.getWidth(), statusBarHeight);
         rootView.setSize(rootViewSize);
     }
 



Mime
View raw message