incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1098945 [14/25] - in /incubator/isis/trunk/viewer: bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/ bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/ bdd/common/src/main/java/org/apache/isis/viewer/bdd/commo...
Date Tue, 03 May 2011 07:18:38 GMT
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Drag.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Drag.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Drag.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Drag.java Tue May  3 07:18:19 2011
@@ -17,11 +17,10 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 /**
  * Details a drag event - from drag start to drop,
  */
-public interface Drag {}
-
+public interface Drag {
+}

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/DragEvent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/DragEvent.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/DragEvent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/DragEvent.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 import org.apache.isis.viewer.dnd.drawing.Location;
@@ -33,5 +32,3 @@ public interface DragEvent {
     View getOverlay();
 
 }
-
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/DragStart.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/DragStart.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/DragStart.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/DragStart.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 import org.apache.isis.viewer.dnd.drawing.Location;
@@ -32,4 +31,3 @@ public interface DragStart extends Drag 
 
     boolean isCtrl();
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Feedback.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Feedback.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Feedback.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Feedback.java Tue May  3 07:18:19 2011
@@ -17,10 +17,8 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
-
 public interface Feedback {
 
     void showException(final Throwable e);
@@ -78,4 +76,3 @@ public interface Feedback {
     void showBusyState(View view);
 
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/FocusManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/FocusManager.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/FocusManager.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/FocusManager.java Tue May  3 07:18:19 2011
@@ -17,40 +17,38 @@
  *  under the License.
  */
 
+package org.apache.isis.viewer.dnd.view;
 
-package org.apache.isis.viewer.dnd.view;
-
-
-/**
- * Details where to move the focus to.
- */
-public interface FocusManager {
-    /**
-     * The next view within the container to move the focus to; move to next field.
-     */
-    void focusNextView();
-
-    /**
-     * The previous view within the container to move the focus to; move to previous field.
-     */
-    void focusPreviousView();
-
-    /**
-     * The parent view within the container to move the focus to; move up to containing view in the hierachy.
-     */
-    void focusParentView();
-
-    /**
-     * The first child view within the container to move the focus to; move down to the first view within the
-     * current view.
-     */
-    void focusFirstChildView();
-
-    void focusLastChildView();
-
-    void focusInitialChildView();
-
-    View getFocus();
-
-    void setFocus(View view);
-}
+/**
+ * Details where to move the focus to.
+ */
+public interface FocusManager {
+    /**
+     * The next view within the container to move the focus to; move to next field.
+     */
+    void focusNextView();
+
+    /**
+     * The previous view within the container to move the focus to; move to previous field.
+     */
+    void focusPreviousView();
+
+    /**
+     * The parent view within the container to move the focus to; move up to containing view in the hierachy.
+     */
+    void focusParentView();
+
+    /**
+     * The first child view within the container to move the focus to; move down to the first view within the current
+     * view.
+     */
+    void focusFirstChildView();
+
+    void focusLastChildView();
+
+    void focusInitialChildView();
+
+    View getFocus();
+
+    void setFocus(View view);
+}

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/GlobalViewFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/GlobalViewFactory.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/GlobalViewFactory.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/GlobalViewFactory.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 import java.util.Enumeration;
@@ -25,7 +24,6 @@ import java.util.Enumeration;
 import org.apache.isis.core.commons.debug.DebuggableWithTitle;
 import org.apache.isis.viewer.dnd.drawing.Location;
 
-
 /*
  * TODO this factory should always create views, not provide specifications; alternatively, this should be
  * called something else and always return the specification The caller would then need to call the create
@@ -33,13 +31,13 @@ import org.apache.isis.viewer.dnd.drawin
  * the Axis is never used.
  */
 public interface GlobalViewFactory extends DebuggableWithTitle {
-    
+
     void addSpecification(ViewSpecification spec);
-    
+
     Enumeration<ViewSpecification> availableViews(ViewRequirement viewRequirement);
-    
+
     Enumeration<ViewSpecification> availableDesigns(ViewRequirement viewRequirement);
-    
+
     View createDragViewOutline(View view);
 
     DragEvent createDragContentOutline(View view, Location location);
@@ -50,4 +48,3 @@ public interface GlobalViewFactory exten
 
     View createView(ViewRequirement requirement);
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/InteractionSpy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/InteractionSpy.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/InteractionSpy.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/InteractionSpy.java Tue May  3 07:18:19 2011
@@ -17,13 +17,11 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 import org.apache.isis.viewer.dnd.drawing.Bounds;
 import org.apache.isis.viewer.dnd.drawing.Location;
 
-
 public class InteractionSpy {
     private int actionCount;
     private String damagedArea;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/InteractionSpyWindow.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/InteractionSpyWindow.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/InteractionSpyWindow.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/InteractionSpyWindow.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 public interface InteractionSpyWindow {
@@ -28,4 +27,3 @@ public interface InteractionSpyWindow {
 
     void open();
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/InternalDrag.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/InternalDrag.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/InternalDrag.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/InternalDrag.java Tue May  3 07:18:19 2011
@@ -17,12 +17,10 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 import org.apache.isis.viewer.dnd.drawing.Location;
 
-
 /**
  * Details a drag event that is internal to view.
  */

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/KeyboardAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/KeyboardAction.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/KeyboardAction.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/KeyboardAction.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 public interface KeyboardAction {
@@ -29,7 +28,7 @@ public interface KeyboardAction {
     public final static int PREVIOUS_WINDOW = 5;
 
     int getKeyCode();
-    
+
     char getKeyChar();
 
     int getModifiers();
@@ -38,4 +37,3 @@ public interface KeyboardAction {
 
     boolean isConsumed();
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Look.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Look.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Look.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Look.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 public interface Look {
@@ -25,5 +24,3 @@ public interface Look {
 
     String getName();
 }
-
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/MenuOptions.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/MenuOptions.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/MenuOptions.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/MenuOptions.java Tue May  3 07:18:19 2011
@@ -17,13 +17,10 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
-
 public interface MenuOptions {
 
     public abstract void menuOptions(final UserActionSet options);
 
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ObjectContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ObjectContent.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ObjectContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ObjectContent.java Tue May  3 07:18:19 2011
@@ -17,13 +17,11 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Consent;
 
-
 public interface ObjectContent extends Content {
 
     Consent canClear();
@@ -37,4 +35,3 @@ public interface ObjectContent extends C
     void setObject(final ObjectAdapter object);
 
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Placement.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Placement.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Placement.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Placement.java Tue May  3 07:18:19 2011
@@ -17,17 +17,15 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 import org.apache.isis.viewer.dnd.drawing.Location;
 import org.apache.isis.viewer.dnd.drawing.Size;
 
-
 /**
- * Used to determine the placement of a new view on the workspace. It can be: an absolute placement given a
- * Location; a position relative to a given view; or in the center. A relative placement uses the
- * PlacementStrategy to determine an optimum location.
+ * Used to determine the placement of a new view on the workspace. It can be: an absolute placement given a Location; a
+ * position relative to a given view; or in the center. A relative placement uses the PlacementStrategy to determine an
+ * optimum location.
  */
 public class Placement {
     private static final int ABSOLUTE = 1;
@@ -38,19 +36,19 @@ public class Placement {
     private final View relativeTo;
     private final int position;
 
-    public Placement(Location location) {
+    public Placement(final Location location) {
         this.location = location;
         relativeTo = null;
         position = ABSOLUTE;
     }
 
-    public Placement(View relativeTo) {
+    public Placement(final View relativeTo) {
         this.relativeTo = relativeTo.getView();
         location = null;
         position = RELATIVE;
     }
 
-    public Placement(int position) {
+    public Placement(final int position) {
         this.relativeTo = null;
         location = null;
         this.position = position;
@@ -66,19 +64,18 @@ public class Placement {
 
     public void position(final Workspace workspace, final View view) {
         switch (position) {
-        case ABSOLUTE:
-            view.setLocation(location);
-            break;
-
-        case RELATIVE:
-            view.setLocation(placementStrategy.determinePlacement(workspace, relativeTo, view));
-            break;
-
-        case CENTER:
-            view.setLocation(center(workspace, view));
-            break;
+            case ABSOLUTE:
+                view.setLocation(location);
+                break;
+
+            case RELATIVE:
+                view.setLocation(placementStrategy.determinePlacement(workspace, relativeTo, view));
+                break;
+
+            case CENTER:
+                view.setLocation(center(workspace, view));
+                break;
         }
     }
 
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/PlacementStrategy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/PlacementStrategy.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/PlacementStrategy.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/PlacementStrategy.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 import org.apache.isis.viewer.dnd.drawing.Location;
@@ -30,5 +29,3 @@ import org.apache.isis.viewer.dnd.drawin
 public interface PlacementStrategy {
     Location determinePlacement(Workspace workspace, final View relativeToView, final View view);
 }
-
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/PlacementStrategyImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/PlacementStrategyImpl.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/PlacementStrategyImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/PlacementStrategyImpl.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 import org.apache.isis.viewer.dnd.drawing.Location;
@@ -27,22 +26,24 @@ import org.apache.isis.viewer.dnd.drawin
 public class PlacementStrategyImpl implements PlacementStrategy {
     private static final int PADDING = 10;
 
-    public Location determinePlacement(Workspace workspace, final View relativeToView, final View newView) {
+    @Override
+    public Location determinePlacement(final Workspace workspace, final View relativeToView, final View newView) {
         if (relativeToView == null) {
             return new Location();
         }
 
-        Size workspaceSize = workspace.getSize();
-        View rootView = rootView(workspace, relativeToView);
-        Location rootViewLocation = rootView.getLocation();
-        Size rootViewSize = rootView.getSize();
-        Location newLocation = new Location(rootViewLocation);
-        Size requiredSize = newView.getView().getRequiredSize(Size.createMax());
+        final Size workspaceSize = workspace.getSize();
+        final View rootView = rootView(workspace, relativeToView);
+        final Location rootViewLocation = rootView.getLocation();
+        final Size rootViewSize = rootView.getSize();
+        final Location newLocation = new Location(rootViewLocation);
+        final Size requiredSize = newView.getView().getRequiredSize(Size.createMax());
 
-        if (rootViewLocation.getX() + rootViewSize.getWidth() + PADDING + requiredSize.getWidth() < workspaceSize.getWidth()) {
+        if (rootViewLocation.getX() + rootViewSize.getWidth() + PADDING + requiredSize.getWidth() < workspaceSize
+            .getWidth()) {
             newLocation.add(rootViewSize.getWidth() + PADDING, 0);
         } else if (rootViewLocation.getY() + rootViewSize.getHeight() + PADDING + requiredSize.getHeight() < workspaceSize
-                .getHeight()) {
+            .getHeight()) {
             newLocation.add(0, rootViewSize.getHeight() + PADDING);
         } else if (requiredSize.getWidth() + PADDING < rootViewLocation.getX()) {
             newLocation.subtract(requiredSize.getWidth() + PADDING, 0);
@@ -52,19 +53,20 @@ public class PlacementStrategyImpl imple
             newLocation.add(PADDING * 6, PADDING * 6);
         }
 
-        int maxSpaceToLeft = workspaceSize.getWidth() - requiredSize.getWidth();
-        int maxSpaceAbove = workspaceSize.getHeight() - requiredSize.getHeight();
+        final int maxSpaceToLeft = workspaceSize.getWidth() - requiredSize.getWidth();
+        final int maxSpaceAbove = workspaceSize.getHeight() - requiredSize.getHeight();
 
         ensureWidth(newLocation, maxSpaceToLeft);
         ensureHeight(newLocation, maxSpaceAbove);
-        
-        Location firstAttempt = new Location(newLocation);
 
-        while (workspace.subviewFor(newLocation) != null && workspace.subviewFor(newLocation).getLocation().equals(newLocation)) {
+        final Location firstAttempt = new Location(newLocation);
+
+        while (workspace.subviewFor(newLocation) != null
+            && workspace.subviewFor(newLocation).getLocation().equals(newLocation)) {
             newLocation.add(PADDING * 4, PADDING * 4);
             ensureWidth(newLocation, maxSpaceToLeft);
             ensureHeight(newLocation, maxSpaceAbove);
-            
+
             if (newLocation.equals(firstAttempt)) {
                 break;
             }
@@ -72,26 +74,25 @@ public class PlacementStrategyImpl imple
         return newLocation;
     }
 
-    private void ensureHeight(Location ofLocation, int availableHeight) {
-        int yoffset = availableHeight - ofLocation.getY();
+    private void ensureHeight(final Location ofLocation, final int availableHeight) {
+        final int yoffset = availableHeight - ofLocation.getY();
         if (yoffset < 0) {
             ofLocation.add(0, yoffset);
             ofLocation.setY(Math.max(0, ofLocation.getY()));
         }
     }
 
-    private void ensureWidth(Location ofLocation, int availableWifth) {
-        int xoffset = availableWifth - ofLocation.getX();
+    private void ensureWidth(final Location ofLocation, final int availableWifth) {
+        final int xoffset = availableWifth - ofLocation.getX();
         if (xoffset < 0) {
             ofLocation.add(xoffset, 0);
             ofLocation.setX(Math.max(0, ofLocation.getX()));
         }
     }
 
-    private View rootView(View workspace, View relativeTo) {
-        View parent = relativeTo.getParent().getView();
+    private View rootView(final View workspace, final View relativeTo) {
+        final View parent = relativeTo.getParent().getView();
         return parent == null || parent == workspace ? relativeTo : rootView(workspace, parent);
     }
 
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Selectable.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Selectable.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Selectable.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Selectable.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 public interface Selectable {
@@ -27,5 +26,3 @@ public interface Selectable {
     void setSelectedNode(View selectedView);
 
 }
-
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ShutdownListener.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ShutdownListener.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ShutdownListener.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ShutdownListener.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 public interface ShutdownListener {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/SubviewDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/SubviewDecorator.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/SubviewDecorator.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/SubviewDecorator.java Tue May  3 07:18:19 2011
@@ -17,13 +17,10 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
-
 public interface SubviewDecorator {
     ViewAxis createAxis(Content content);
 
     View decorate(Axes axes, View view);
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Toolkit.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Toolkit.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Toolkit.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Toolkit.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 import org.apache.isis.core.commons.exceptions.IsisException;
@@ -25,7 +24,6 @@ import org.apache.isis.viewer.dnd.drawin
 import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
 import org.apache.isis.viewer.dnd.drawing.Text;
 
-
 public abstract class Toolkit {
     public static boolean debug = false;
     private static Toolkit instance;
@@ -95,4 +93,3 @@ public abstract class Toolkit {
     protected abstract void init();
 
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/UndoStack.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/UndoStack.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/UndoStack.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/UndoStack.java Tue May  3 07:18:19 2011
@@ -17,14 +17,12 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 import java.util.Vector;
 
-
 public class UndoStack {
-    
+
     private final Vector<Command> commands = new Vector<Command>();
 
     public void add(final Command command) {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/UserAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/UserAction.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/UserAction.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/UserAction.java Tue May  3 07:18:19 2011
@@ -17,16 +17,14 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.viewer.dnd.drawing.Location;
 
-
 public interface UserAction {
-	
+
     /**
      * Returns the type of action: user, exploration, debug, or a set.
      */

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/UserActionSet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/UserActionSet.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/UserActionSet.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/UserActionSet.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -32,9 +31,9 @@ public interface UserActionSet extends U
     void addObjectMenuOptions(ObjectAdapter object);
 
     void addCreateOptions(ObjectSpecification specification);
-    
+
     UserActionSet addNewActionSet(String name);
-    
+
     UserActionSet addNewActionSet(String name, ActionType type);
 
     UserAction[] getUserActions();
@@ -43,5 +42,3 @@ public interface UserActionSet extends U
 
     void setColor(Color color);
 }
-
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/View.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/View.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/View.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/View.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -32,14 +31,13 @@ import org.apache.isis.viewer.dnd.drawin
 import org.apache.isis.viewer.dnd.drawing.Size;
 import org.apache.isis.viewer.dnd.util.Properties;
 
-
 public interface View extends Cloneable, OptionsClient {
     /** Horizontal padding (||) between two components */
-    public static final int HPADDING = IsisContext.getConfiguration()
-            .getInteger(Properties.PROPERTY_BASE + "hpadding", 3);
+    public static final int HPADDING = IsisContext.getConfiguration().getInteger(Properties.PROPERTY_BASE + "hpadding",
+        3);
     /** Vertical padding (=) between two components */
-    public static final int VPADDING = IsisContext.getConfiguration()
-            .getInteger(Properties.PROPERTY_BASE + "vpadding", 3);
+    public static final int VPADDING = IsisContext.getConfiguration().getInteger(Properties.PROPERTY_BASE + "vpadding",
+        3);
 
     void addView(View view);
 
@@ -58,8 +56,8 @@ public interface View extends Cloneable,
     boolean containsFocus();
 
     /**
-     * Called when the popup menu is being populated for this view. Any content options that need to appear on
-     * the menu should be added to the <code>menuOptions</code> object.
+     * Called when the popup menu is being populated for this view. Any content options that need to appear on the menu
+     * should be added to the <code>menuOptions</code> object.
      */
     void contentMenuOptions(UserActionSet menuOptions);
 
@@ -68,42 +66,41 @@ public interface View extends Cloneable,
     void debugStructure(DebugBuilder debug);
 
     /**
-     * Called when a view is no longer needed and its resources can be disposed of. Dissociates this view from
-     * its parent, and removes itself from the list of views that need to be updated.
+     * Called when a view is no longer needed and its resources can be disposed of. Dissociates this view from its
+     * parent, and removes itself from the list of views that need to be updated.
      * 
      * @see #removeView(View)
      */
     void dispose();
 
     /**
-     * Called as mouse is dragged within and without this view. This only occurs when no content or view is
-     * being dragged.
+     * Called as mouse is dragged within and without this view. This only occurs when no content or view is being
+     * dragged.
      */
     void drag(InternalDrag drag);
 
     void drag(ViewDrag drag);
-    
+
     void dragCancel(InternalDrag drag);
 
     View dragFrom(Location location);
 
     /**
-     * Called as the content being dragged is dragged into this view. This only occurs when view contents are
-     * being dragged, and not when views themselves are being dragged.
+     * Called as the content being dragged is dragged into this view. This only occurs when view contents are being
+     * dragged, and not when views themselves are being dragged.
      */
     void dragIn(ContentDrag drag);
 
     /**
-     * Called as the content being dragged is dragged out of this view. This only occurs when view contents
-     * are being dragged, and not when views themselves are being dragged.
+     * Called as the content being dragged is dragged out of this view. This only occurs when view contents are being
+     * dragged, and not when views themselves are being dragged.
      */
     void dragOut(ContentDrag drag);
 
     DragEvent dragStart(DragStart drag);
 
     /**
-     * Called as the drag ends within and without this view. This only occurs when no content or view is being
-     * dragged.
+     * Called as the drag ends within and without this view. This only occurs when no content or view is being dragged.
      */
     void dragTo(InternalDrag drag);
 
@@ -113,33 +110,32 @@ public interface View extends Cloneable,
     void draw(Canvas canvas);
 
     /**
-     * Called as another view's contents (the source) is dropped on this view's contents (the target). The
-     * source view can be obtained from the ViewDrag object.
+     * Called as another view's contents (the source) is dropped on this view's contents (the target). The source view
+     * can be obtained from the ViewDrag object.
      */
     void drop(ContentDrag drag);
 
     /**
-     * Called as another view (the source) is dropped on this view (the target). The source view can be
-     * obtained from the ViewDrag object.
+     * Called as another view (the source) is dropped on this view (the target). The source view can be obtained from
+     * the ViewDrag object.
      */
     void drop(ViewDrag drag);
 
     /**
-     * Indicates that editing has been completed and the entry should be saved. Will be called by the view
-     * manager when other action place within the parent.
+     * Indicates that editing has been completed and the entry should be saved. Will be called by the view manager when
+     * other action place within the parent.
      * 
      * @param moveFocus
      *            flags that focus should be moved from this field after the entry has been processed.
      * @param toNextField
-     *            flags that the focus should be moved to the next field (if <code>true</code>) or to the
-     *            previous field (if <code>false</code>). This parameter is ignored if the moveFocus parameter
-     *            is <code>false</code>.
+     *            flags that the focus should be moved to the next field (if <code>true</code>) or to the previous field
+     *            (if <code>false</code>). This parameter is ignored if the moveFocus parameter is <code>false</code>.
      */
     void editComplete(boolean moveFocus, boolean toNextField);
 
     /**
-     * Called as the mouse crosses the bounds, and ends up inside, of this view. Is also called as the mouse
-     * returns into this view from a contained view.
+     * Called as the mouse crosses the bounds, and ends up inside, of this view. Is also called as the mouse returns
+     * into this view from a contained view.
      */
     void entered();
 
@@ -216,7 +212,7 @@ public interface View extends Cloneable,
     Viewer getViewManager();
 
     Axes getViewAxes();
-    
+
     Feedback getFeedbackManager();
 
     Workspace getWorkspace();
@@ -226,18 +222,16 @@ public interface View extends Cloneable,
     View identify(Location mouseLocation);
 
     /**
-     * Flags that the views do not properly represent the content, and hence it needs rebuilding. Contrast
-     * this with invalidateLayout(), which deals with an a complete view, but one that is not showing
-     * properly.
+     * Flags that the views do not properly represent the content, and hence it needs rebuilding. Contrast this with
+     * invalidateLayout(), which deals with an a complete view, but one that is not showing properly.
      * 
      * @see #invalidateLayout()
      */
     void invalidateContent();
 
     /**
-     * Flags that the views are possibly not displaying the content fully - too small, wrong place etc -
-     * although views exists for all the content. Contrast this with invalidateContent(), which deals with an
-     * incomplete view.
+     * Flags that the views are possibly not displaying the content fully - too small, wrong place etc - although views
+     * exists for all the content. Contrast this with invalidateContent(), which deals with an incomplete view.
      * 
      * @see #invalidateContent()
      */
@@ -254,17 +248,16 @@ public interface View extends Cloneable,
     void keyReleased(KeyboardAction action);
 
     /**
-     * Called when the user presses a non-control key (i.e. data entry keys and not shift, up-arrow etc). Such
-     * a key press will result in a prior call to <code>keyPressed</code> and a subsequent call to
-     * <code>keyReleased</code>.
+     * Called when the user presses a non-control key (i.e. data entry keys and not shift, up-arrow etc). Such a key
+     * press will result in a prior call to <code>keyPressed</code> and a subsequent call to <code>keyReleased</code>.
      */
     void keyTyped(KeyboardAction action);
 
     void layout();
 
     /**
-     * Limits the bounds of this view (normally when being moved or dropped) so it never extends beyond the
-     * bounds of a view of the specified size.
+     * Limits the bounds of this view (normally when being moved or dropped) so it never extends beyond the bounds of a
+     * view of the specified size.
      */
     void limitBoundsWithin(Size size);
 
@@ -273,8 +266,8 @@ public interface View extends Cloneable,
     void markDamaged(Bounds bounds);
 
     /**
-     * Called as the mouse button is pressed down within this view. Does nothing; should be overriden when
-     * needed. the position relative to the top-left of this view
+     * Called as the mouse button is pressed down within this view. Does nothing; should be overriden when needed. the
+     * position relative to the top-left of this view
      */
     void mouseDown(Click click);
 
@@ -287,8 +280,8 @@ public interface View extends Cloneable,
     void mouseMoved(Location location);
 
     /**
-     * Called as the mouse button is released within this view (assuming that it was pressed in this view).
-     * Does nothing; should be overridden when needed.
+     * Called as the mouse button is released within this view (assuming that it was pressed in this view). Does
+     * nothing; should be overridden when needed.
      */
     void mouseUp(Click click);
 
@@ -337,20 +330,20 @@ public interface View extends Cloneable,
     void setLocation(Location point);
 
     void setParent(View view);
-    
+
     void setSize(Size size);
 
     void setView(View view);
 
     /**
-     * Identifies the subview that contains the specified location within its bounds. Returns null if no
-     * subview exists for that location.
+     * Identifies the subview that contains the specified location within its bounds. Returns null if no subview exists
+     * for that location.
      */
     View subviewFor(Location location);
 
     /**
-     * Called when the user triple-clicks the mouse buttone within this view. This method will have been
-     * preceded by a call to <code>doubleClick</code>.
+     * Called when the user triple-clicks the mouse buttone within this view. This method will have been preceded by a
+     * call to <code>doubleClick</code>.
      */
     void thirdClick(Click click);
 
@@ -362,21 +355,19 @@ public interface View extends Cloneable,
     void updateView();
 
     /**
-     * Determines if the user is invoking an action relating to this view, rather than to whatever this view
-     * represents.
+     * Determines if the user is invoking an action relating to this view, rather than to whatever this view represents.
      * 
      * @param mouseLocation
-     * @return true if the user is targeting the view itself, false if the user is targeting what is being
-     *         represented
+     * @return true if the user is targeting the view itself, false if the user is targeting what is being represented
      */
     ViewAreaType viewAreaType(Location mouseLocation);
 
     /**
-     * Called when the popup menu is being populated for this view. Any view options that need to appear on
-     * the menu should be added to the <code>menuOptions</code> object.
+     * Called when the popup menu is being populated for this view. Any view options that need to appear on the menu
+     * should be added to the <code>menuOptions</code> object.
      */
     void viewMenuOptions(UserActionSet menuOptions);
 
     void drag(ContentDrag contentDrag);
-    
+
 }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewAreaType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewAreaType.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewAreaType.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewAreaType.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 public class ViewAreaType {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewAxis.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewAxis.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewAxis.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewAxis.java Tue May  3 07:18:19 2011
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
-public interface ViewAxis {}
+public interface ViewAxis {
+}

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewDrag.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewDrag.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewDrag.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewDrag.java Tue May  3 07:18:19 2011
@@ -17,29 +17,25 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 import org.apache.isis.viewer.dnd.drawing.Location;
 
-
 /**
- * Details a drag event that affects a view. The target of a ViewDrag is always the workspace of the source
- * view.
+ * Details a drag event that affects a view. The target of a ViewDrag is always the workspace of the source view.
  * 
  * <p>
- * An overlay view, as returned by the pickup() method on the source view, is moved by this drag objects so
- * its location follows the pointer by an offset equivalent to the mouse location within the view.
+ * An overlay view, as returned by the pickup() method on the source view, is moved by this drag objects so its location
+ * follows the pointer by an offset equivalent to the mouse location within the view.
  */
 public interface ViewDrag extends Drag {
 
     View getSourceView();
 
     Location getLocation();
-    
+
     Location getViewDropLocation();
 
     void subtract(int left, int top);
 
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewFactory.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewFactory.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewFactory.java Tue May  3 07:18:19 2011
@@ -17,14 +17,12 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
-
 public interface ViewFactory {
     /**
-     * Create a new view to this specification for the specified context, and using the specified axis if
-     * specified (which can be null).
+     * Create a new view to this specification for the specified context, and using the specified axis if specified
+     * (which can be null).
      */
 
     View createView(Content content, Axes axes, int sequence);

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewRequirement.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewRequirement.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewRequirement.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewRequirement.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 import org.apache.isis.core.commons.ensure.Assert;
@@ -25,18 +24,17 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
-
 public class ViewRequirement {
     public static final int NONE = 0;
     public static final int CLOSED = 0x01;
-//    public static final int SUMMARY = 0x02;
+    // public static final int SUMMARY = 0x02;
     public static final int OPEN = 0x04;
-    
+
     public static final int EDITABLE = 0x10;
-    
+
     public static final int FIXED = 0x100;
     public static final int EXPANDABLE = 0x200;
-    
+
     public static final int ROOT = 0x1000;
     public static final int SUBVIEW = 0x2000;
 
@@ -44,8 +42,8 @@ public class ViewRequirement {
 
     private final Content content;
     private final int status;
-    
-    public ViewRequirement(Content content, int status) {
+
+    public ViewRequirement(final Content content, int status) {
         Assert.assertNotNull(content);
         this.content = content;
         this.status = status;
@@ -56,7 +54,7 @@ public class ViewRequirement {
         return content;
     }
 
-    public boolean is(int status) {
+    public boolean is(final int status) {
         return (this.status & status) == status;
     }
 
@@ -67,19 +65,19 @@ public class ViewRequirement {
     public boolean isOpen() {
         return is(OPEN);
     }
-    
+
     public boolean isFixed() {
         return is(FIXED);
     }
-    
+
     public boolean isExpandable() {
         return is(EXPANDABLE);
     }
-    
+
     public boolean isSubview() {
         return is(SUBVIEW);
     }
-    
+
     public boolean isEditable() {
         return is(EDITABLE);
     }
@@ -101,7 +99,7 @@ public class ViewRequirement {
         return content.isTextParseable();
     }
 
-    public boolean isFor(Class<?> cls) {
+    public boolean isFor(final Class<?> cls) {
         return cls.isAssignableFrom(content.getClass());
     }
 
@@ -109,8 +107,8 @@ public class ViewRequirement {
         return content.getAdapter() != null;
     }
 
-    public boolean isForValueType(Class<? extends Facet> cls) {
-        ObjectSpecification specification = content.getSpecification();
+    public boolean isForValueType(final Class<? extends Facet> cls) {
+        final ObjectSpecification specification = content.getSpecification();
         return specification != null && specification.containsFacet(cls);
     }
 
@@ -123,5 +121,3 @@ public class ViewRequirement {
     }
 
 }
-
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewSpecification.java Tue May  3 07:18:19 2011
@@ -17,11 +17,8 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
-
-
 /**
  * Describes a view, and how it is built.
  */
@@ -30,14 +27,13 @@ public interface ViewSpecification exten
     String getName();
 
     /**
-     * Determines if the view created to this specification can display the specified type. Returns true if it
-     * can.
+     * Determines if the view created to this specification can display the specified type. Returns true if it can.
      */
     boolean canDisplay(ViewRequirement requirement);
 
     /**
-     * Indicates whether views to this specification are open - displaying the attributes of the content
-     * object - or are closed - display only the title of the content object.
+     * Indicates whether views to this specification are open - displaying the attributes of the content object - or are
+     * closed - display only the title of the content object.
      */
     boolean isOpen();
 
@@ -51,14 +47,14 @@ public interface ViewSpecification exten
     boolean isSubView();
 
     /**
-     * Return true if the generated views are to have their sizes adjusted so they are consistent with
-     * surrounding views.
+     * Return true if the generated views are to have their sizes adjusted so they are consistent with surrounding
+     * views.
      */
     // TODO rename
     boolean isAligned();
-    
+
     /**
-     * Indicates if this view can handled being resized.  If it can't then the viewer can put it in a scroll border. 
+     * Indicates if this view can handled being resized. If it can't then the viewer can put it in a scroll border.
      */
     boolean isResizeable();
 }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewState.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewState.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewState.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewState.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 public class ViewState implements Cloneable {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewUpdateNotifier.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewUpdateNotifier.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewUpdateNotifier.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/ViewUpdateNotifier.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 import org.apache.isis.core.commons.debug.DebuggableWithTitle;
@@ -33,5 +32,3 @@ public interface ViewUpdateNotifier exte
     void removeViewsForDisposedObjects();
 
 }
-
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Viewer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Viewer.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Viewer.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Viewer.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 import org.apache.isis.core.commons.debug.DebuggableWithTitle;
@@ -26,7 +25,6 @@ import org.apache.isis.viewer.dnd.drawin
 import org.apache.isis.viewer.dnd.drawing.Location;
 import org.apache.isis.viewer.dnd.drawing.Size;
 
-
 public interface Viewer {
 
     void markDamaged(final Bounds bounds);
@@ -34,7 +32,7 @@ public interface Viewer {
     boolean hasFocus(final View view);
 
     UndoStack getUndoStack();
-    
+
     Size getOverlaySize();
 
     void saveCurrentFieldEntry();
@@ -42,6 +40,7 @@ public interface Viewer {
     void setKeyboardFocus(final View view);
 
     boolean isRunningAsExploration();
+
     boolean isRunningAsPrototype();
 
     void clearAction();

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Workspace.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Workspace.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Workspace.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Workspace.java Tue May  3 07:18:19 2011
@@ -17,22 +17,20 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 
-
 public interface Workspace extends View {
 
     View addIconFor(ObjectAdapter adapter, Placement placement);
 
     View addWindowFor(ObjectAdapter object, Placement placement);
-    
+
     void addWindow(View window, Placement placement);
-    
+
     void addDialog(View dialog, Placement placement);
-    
+
     /**
      * Lower the specified view so it is below all the other views.
      */

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/AbstractObjectOption.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/AbstractObjectOption.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/AbstractObjectOption.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/AbstractObjectOption.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view.action;
 
 import org.apache.isis.core.commons.lang.ToString;
@@ -31,7 +30,6 @@ import org.apache.isis.runtimes.dflt.run
 import org.apache.isis.viewer.dnd.view.View;
 import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
 
-
 public abstract class AbstractObjectOption extends UserActionAbstract {
     protected final ObjectAction action;
     protected final ObjectAdapter target;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ActionContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ActionContent.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ActionContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ActionContent.java Tue May  3 07:18:19 2011
@@ -17,14 +17,12 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view.action;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.viewer.dnd.view.Content;
 
-
 public interface ActionContent extends Content {
     public Consent disabled();
 
@@ -38,5 +36,6 @@ public interface ActionContent extends C
 
     public ObjectAdapter getParameterObject(final int index);
 
+    @Override
     public String getDescription();
 }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ActionHelper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ActionHelper.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ActionHelper.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ActionHelper.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view.action;
 
 import java.util.List;
@@ -30,7 +29,6 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.OneToOneActionParameter;
 import org.apache.isis.core.metamodel.spec.feature.ParseableEntryActionParameter;
 
-
 public class ActionHelper {
 
     public static ActionHelper createInstance(final ObjectAdapter target, final ObjectAction action) {
@@ -66,23 +64,19 @@ public class ActionHelper {
         }
 
         /*
-         * int[] maxLength = action.getParameterMaxLengths(); int[] typicalLength =
-         * action.getParameterTypicalLengths(); int[] noLines = action.getParameterNoLines(); boolean[]
-         * canWrap = action.canParametersWrap();
+         * int[] maxLength = action.getParameterMaxLengths(); int[] typicalLength = action.getParameterTypicalLengths();
+         * int[] noLines = action.getParameterNoLines(); boolean[] canWrap = action.canParametersWrap();
          */
         return new ActionHelper(target, action, parameters, defaultValues, options);
     }
+
     private final ObjectAction action;
     private final ObjectAdapter[] parameters;
     private final ObjectAdapter target;
     private final ObjectAdapter[][] options;
 
-    private ActionHelper(
-            final ObjectAdapter target,
-            final ObjectAction action,
-            final ObjectAdapter[] parameters,
-            final ObjectAdapter[] defaultValues,
-            final ObjectAdapter[][] options) {
+    private ActionHelper(final ObjectAdapter target, final ObjectAction action, final ObjectAdapter[] parameters,
+        final ObjectAdapter[] defaultValues, final ObjectAdapter[][] options) {
         this.target = target;
         this.action = action;
         this.parameters = parameters;
@@ -96,12 +90,13 @@ public class ActionHelper {
             final ObjectAdapter adapter = parameters[i];
             final ObjectSpecification specification = parameters2.get(i).getSpecification();
             if (specification.isParseable()) {
-                final ParseableEntryActionParameter parseableEntryActionParameter = (ParseableEntryActionParameter) parameters2.get(i);
-                parameterContents[i] = new TextParseableParameterImpl(parseableEntryActionParameter, adapter, options[i], i,
-                        this);
+                final ParseableEntryActionParameter parseableEntryActionParameter =
+                    (ParseableEntryActionParameter) parameters2.get(i);
+                parameterContents[i] =
+                    new TextParseableParameterImpl(parseableEntryActionParameter, adapter, options[i], i, this);
             } else {
-                parameterContents[i] = new ObjectParameterImpl((OneToOneActionParameter) parameters2.get(i), adapter, options[i],
-                        i, this);
+                parameterContents[i] =
+                    new ObjectParameterImpl((OneToOneActionParameter) parameters2.get(i), adapter, options[i], i, this);
             }
         }
 
@@ -150,9 +145,9 @@ public class ActionHelper {
         return getTarget().getIconName();
     }
 
-    private static boolean hasValues(ObjectAdapter[] values) {
+    private static boolean hasValues(final ObjectAdapter[] values) {
         if (values != null) {
-            for (ObjectAdapter adapter : values) {
+            for (final ObjectAdapter adapter : values) {
                 if (adapter != null) {
                     return true;
                 }
@@ -161,9 +156,9 @@ public class ActionHelper {
         return false;
     }
 
-    private static boolean hasValues(ObjectAdapter[][] values) {
+    private static boolean hasValues(final ObjectAdapter[][] values) {
         if (values != null) {
-            for (ObjectAdapter[] adapters : values) {
+            for (final ObjectAdapter[] adapters : values) {
                 if (hasValues(adapters)) {
                     return true;
                 }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/BackgroundWork.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/BackgroundWork.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/BackgroundWork.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/BackgroundWork.java Tue May  3 07:18:19 2011
@@ -17,14 +17,12 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view.action;
 
-import org.apache.log4j.Logger;
 import org.apache.isis.core.commons.exceptions.IsisApplicationException;
 import org.apache.isis.viewer.dnd.view.BackgroundTask;
 import org.apache.isis.viewer.dnd.view.View;
-
+import org.apache.log4j.Logger;
 
 public final class BackgroundWork {
     private static final Logger LOG = Logger.getLogger(BackgroundTask.class);
@@ -33,7 +31,7 @@ public final class BackgroundWork {
         private final View view;
         private final BackgroundTask task;
 
-        public BackgroundThread(View view, BackgroundTask task) {
+        public BackgroundThread(final View view, final BackgroundTask task) {
             super("nof-background");
             this.view = view;
             this.task = task;
@@ -50,9 +48,9 @@ public final class BackgroundWork {
                 LOG.debug("running background thread for task " + task);
                 task.execute();
 
-            } catch (Throwable e) {
+            } catch (final Throwable e) {
                 if (!(e instanceof IsisApplicationException)) {
-                    String message = "Error while running background task " + task.getName();
+                    final String message = "Error while running background task " + task.getName();
                     LOG.error(message, e);
                 }
                 view.getFeedbackManager().showException(e);
@@ -76,6 +74,7 @@ public final class BackgroundWork {
         t.start();
     }
 
-    private BackgroundWork() {}
+    private BackgroundWork() {
+    }
 
 }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/CollectionActionContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/CollectionActionContent.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/CollectionActionContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/CollectionActionContent.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view.action;
 
 import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -29,7 +28,6 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.viewer.dnd.view.Content;
 import org.apache.isis.viewer.dnd.view.collection.AbstractCollectionContent;
 
-
 public class CollectionActionContent extends AbstractCollectionContent implements ActionContent {
     private final ActionHelper invocation;
     private final ParameterContent[] parameters;
@@ -44,20 +42,23 @@ public class CollectionActionContent ext
         debug.appendln("action", getActionName());
         debug.appendln("target", getAdapter());
         String parameterSet = "";
-        for (int i = 0; i < parameters.length; i++) {
-            parameterSet += parameters[i];
+        for (final ParameterContent parameter : parameters) {
+            parameterSet += parameter;
         }
         debug.appendln("parameters", parameterSet);
     }
 
+    @Override
     public Consent canDrop(final Content sourceContent) {
         return Veto.DEFAULT;
     }
 
+    @Override
     public Consent disabled() {
         return invocation.disabled();
     }
 
+    @Override
     public ObjectAdapter drop(final Content sourceContent) {
         throw new NotYetImplementedException();
     }
@@ -67,10 +68,12 @@ public class CollectionActionContent ext
         throw new NotYetImplementedException();
     }
 
+    @Override
     public ObjectAdapter execute() {
         return invocation.invoke();
     }
 
+    @Override
     public String getActionName() {
         return invocation.getName();
     }
@@ -85,42 +88,52 @@ public class CollectionActionContent ext
         return invocation.getDescription();
     }
 
+    @Override
     public String getHelp() {
         return invocation.getHelp();
     }
 
+    @Override
     public String getIconName() {
         return getAdapter().getIconName();
     }
 
+    @Override
     public String getId() {
         return invocation.getName();
     }
 
+    @Override
     public ObjectAdapter getAdapter() {
         return invocation.getTarget();
     }
 
+    @Override
     public int getNoParameters() {
         return parameters.length;
     }
 
+    @Override
     public ParameterContent getParameterContent(final int index) {
         return parameters[index];
     }
 
+    @Override
     public ObjectAdapter getParameterObject(final int index) {
         return invocation.getParameter(index);
     }
 
+    @Override
     public ObjectSpecification getSpecification() {
         return getAdapter().getSpecification();
     }
 
+    @Override
     public boolean isTransient() {
         return true;
     }
 
+    @Override
     public String title() {
         return getAdapter().titleString();
     }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/DialoggedObjectOption.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/DialoggedObjectOption.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/DialoggedObjectOption.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/DialoggedObjectOption.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view.action;
 
 import org.apache.isis.core.commons.ensure.Assert;
@@ -33,17 +32,16 @@ import org.apache.isis.viewer.dnd.view.T
 import org.apache.isis.viewer.dnd.view.View;
 import org.apache.isis.viewer.dnd.view.Workspace;
 
-
 /**
- * Options for an underlying object determined dynamically by looking for methods starting with action, veto
- * and option for specifying the action, vetoing the option and giving the option an name respectively.
+ * Options for an underlying object determined dynamically by looking for methods starting with action, veto and option
+ * for specifying the action, vetoing the option and giving the option an name respectively.
  */
 public class DialoggedObjectOption extends AbstractObjectOption {
     public static DialoggedObjectOption createOption(final ObjectAction action, final ObjectAdapter object) {
         final int paramCount = action.getParameterCount();
         Assert.assertTrue("Only for actions taking one or more params", paramCount > 0);
         if (!action.isVisible(IsisContext.getAuthenticationSession(), object).isAllowed()
-                || !action.isVisible(IsisContext.getAuthenticationSession(), object).isAllowed()) {
+            || !action.isVisible(IsisContext.getAuthenticationSession(), object).isAllowed()) {
             return null;
         }
 
@@ -58,10 +56,12 @@ public class DialoggedObjectOption exten
     @Override
     public void execute(final Workspace workspace, final View view, final Location at) {
         BackgroundWork.runTaskInBackground(view, new BackgroundTask() {
+            @Override
             public void execute() {
                 final ActionHelper helper = ActionHelper.createInstance(target, action);
                 Content content;
-                if (target == null && action.getOnType().isService() || target != null && target.getSpecification().isNotCollection()) {
+                if (target == null && action.getOnType().isService() || target != null
+                    && target.getSpecification().isNotCollection()) {
                     content = new ObjectActionContent(helper);
                 } else if (target.getSpecification().isCollection()) {
                     content = new CollectionActionContent(helper);
@@ -72,10 +72,12 @@ public class DialoggedObjectOption exten
                 workspace.addDialog(dialog, new Placement(view));
             }
 
+            @Override
             public String getDescription() {
                 return "Preparing action " + getName() + " on  " + view.getContent().getAdapter();
             }
 
+            @Override
             public String getName() {
                 return "Preparing action " + action.getName();
             }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ImmediateObjectOption.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ImmediateObjectOption.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ImmediateObjectOption.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ImmediateObjectOption.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view.action;
 
 import org.apache.isis.core.commons.ensure.Assert;
@@ -31,10 +30,9 @@ import org.apache.isis.viewer.dnd.view.P
 import org.apache.isis.viewer.dnd.view.View;
 import org.apache.isis.viewer.dnd.view.Workspace;
 
-
 /**
- * Options for an underlying object determined dynamically by looking for methods starting with action, veto
- * and option for specifying the action, vetoing the option and giving the option an name respectively.
+ * Options for an underlying object determined dynamically by looking for methods starting with action, veto and option
+ * for specifying the action, vetoing the option and giving the option an name respectively.
  */
 public class ImmediateObjectOption extends AbstractObjectOption {
 
@@ -70,6 +68,7 @@ public class ImmediateObjectOption exten
     @Override
     public void execute(final Workspace workspace, final View view, final Location at) {
         BackgroundWork.runTaskInBackground(view, new BackgroundTask() {
+            @Override
             public void execute() {
                 ObjectAdapter result;
                 result = action.execute(target, null);
@@ -78,10 +77,12 @@ public class ImmediateObjectOption exten
                 view.getFeedbackManager().showMessagesAndWarnings();
             }
 
+            @Override
             public String getDescription() {
                 return "Running action " + getName() + " on  " + view.getContent().getAdapter();
             }
 
+            @Override
             public String getName() {
                 return "ObjectAction " + action.getName();
             }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ObjectActionContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ObjectActionContent.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ObjectActionContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ObjectActionContent.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view.action;
 
 import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -28,7 +27,6 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.viewer.dnd.view.content.AbstractObjectContent;
 
-
 /**
  * Links an action on an object to a view.
  */
@@ -56,24 +54,28 @@ public class ObjectActionContent extends
         throw new IsisException("Invalid call");
     }
 
+    @Override
     public void debugDetails(final DebugBuilder debug) {
         debug.appendln("action", getActionName());
         debug.appendln("target", getAdapter());
         String parameterSet = "";
-        for (int i = 0; i < parameters.length; i++) {
-            parameterSet += parameters[i];
+        for (final ParameterContent parameter : parameters) {
+            parameterSet += parameter;
         }
         debug.appendln("parameters", parameterSet);
     }
 
+    @Override
     public Consent disabled() {
         return actionHelper.disabled();
     }
 
+    @Override
     public ObjectAdapter execute() {
         return actionHelper.invoke();
     }
 
+    @Override
     public String getActionName() {
         return actionHelper.getName();
     }
@@ -83,10 +85,12 @@ public class ObjectActionContent extends
         return actionHelper.getIconName();
     }
 
+    @Override
     public ObjectAdapter getAdapter() {
         return actionHelper.getTarget();
     }
 
+    @Override
     public int getNoParameters() {
         return parameters.length;
     }
@@ -96,14 +100,17 @@ public class ObjectActionContent extends
         return actionHelper.getTarget();
     }
 
+    @Override
     public ParameterContent getParameterContent(final int index) {
         return parameters[index];
     }
 
+    @Override
     public ObjectAdapter getParameterObject(final int index) {
         return actionHelper.getParameter(index);
     }
 
+    @Override
     public ObjectSpecification getSpecification() {
         return getObject().getSpecification();
     }
@@ -121,6 +128,7 @@ public class ObjectActionContent extends
         return true;
     }
 
+    @Override
     public boolean isTransient() {
         return true;
     }
@@ -130,6 +138,7 @@ public class ObjectActionContent extends
         throw new IsisException("Invalid call");
     }
 
+    @Override
     public String title() {
         return actionHelper.title();
     }
@@ -139,22 +148,27 @@ public class ObjectActionContent extends
         return getActionName();
     }
 
+    @Override
     public String getId() {
         return actionHelper.getName();
     }
 
+    @Override
     public String getDescription() {
         return actionHelper.getDescription();
     }
 
+    @Override
     public String getHelp() {
         return actionHelper.getHelp();
     }
 
+    @Override
     public ObjectAdapter[] getOptions() {
         return null;
     }
 
+    @Override
     public boolean isOptionEnabled() {
         return false;
     }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ObjectParameter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ObjectParameter.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ObjectParameter.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ObjectParameter.java Tue May  3 07:18:19 2011
@@ -17,13 +17,11 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view.action;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Consent;
 
-
 public interface ObjectParameter extends ParameterContent {
 
     Consent canSet(final ObjectAdapter dragSource);
@@ -31,4 +29,3 @@ public interface ObjectParameter extends
     void setObject(final ObjectAdapter object);
 
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ObjectParameterImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ObjectParameterImpl.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ObjectParameterImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ObjectParameterImpl.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view.action;
 
 import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -35,7 +34,6 @@ import org.apache.isis.viewer.dnd.view.W
 import org.apache.isis.viewer.dnd.view.content.AbstractObjectContent;
 import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
 
-
 public class ObjectParameterImpl extends AbstractObjectContent implements ObjectParameter {
     private final ObjectAdapter adapter;
     private final ActionHelper invocation;
@@ -43,12 +41,8 @@ public class ObjectParameterImpl extends
     private final ObjectAdapter[] optionAdapters;
     private final OneToOneActionParameter objectActionParameter;
 
-    public ObjectParameterImpl(
-            final OneToOneActionParameter objectActionParameter,
-            final ObjectAdapter adapter,
-            final ObjectAdapter[] optionAdapters,
-            final int i,
-            final ActionHelper invocation) {
+    public ObjectParameterImpl(final OneToOneActionParameter objectActionParameter, final ObjectAdapter adapter,
+        final ObjectAdapter[] optionAdapters, final int i, final ActionHelper invocation) {
         this.objectActionParameter = objectActionParameter;
         this.optionAdapters = optionAdapters;
         this.index = i;
@@ -85,12 +79,14 @@ public class ObjectParameterImpl extends
         setObject(null);
     }
 
+    @Override
     public void debugDetails(final DebugBuilder debug) {
         debug.appendln("name", getParameterName());
         debug.appendln("required", isRequired());
         debug.appendln("object", adapter);
     }
 
+    @Override
     public ObjectAdapter getAdapter() {
         return adapter;
     }
@@ -100,6 +96,7 @@ public class ObjectParameterImpl extends
         return adapter;
     }
 
+    @Override
     public ObjectAdapter[] getOptions() {
         return optionAdapters;
     }
@@ -109,6 +106,7 @@ public class ObjectParameterImpl extends
         return true;
     }
 
+    @Override
     public boolean isRequired() {
         return !objectActionParameter.isOptional();
     }
@@ -118,10 +116,12 @@ public class ObjectParameterImpl extends
         return false;
     }
 
+    @Override
     public boolean isOptionEnabled() {
         return optionAdapters != null && optionAdapters.length > 0;
     }
 
+    @Override
     public boolean isTransient() {
         return adapter != null && adapter.isTransient();
     }
@@ -151,6 +151,7 @@ public class ObjectParameterImpl extends
         invocation.setParameter(index, object);
     }
 
+    @Override
     public String title() {
         return adapter == null ? "" : adapter.titleString();
     }
@@ -165,14 +166,17 @@ public class ObjectParameterImpl extends
         return toString.toString();
     }
 
+    @Override
     public String getParameterName() {
         return objectActionParameter.getName();
     }
 
+    @Override
     public ObjectSpecification getSpecification() {
         return objectActionParameter.getSpecification();
     }
 
+    @Override
     public String getDescription() {
         final String title = adapter == null ? "" : ": " + adapter.titleString();
         final String name = getParameterName();
@@ -182,10 +186,12 @@ public class ObjectParameterImpl extends
         return name + type + title + " " + objectActionParameter.getDescription();
     }
 
+    @Override
     public String getHelp() {
         return invocation.getHelp();
     }
 
+    @Override
     public String getId() {
         return null;
     }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/OptionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/OptionFactory.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/OptionFactory.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/OptionFactory.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view.action;
 
 import java.util.List;
@@ -37,8 +36,9 @@ public class OptionFactory {
     public static void addCreateOptions(final ObjectSpecification specification, final UserActionSet options) {
         // TODO do the same as addObjectMenuOptions and collect together all the
         // actions for all the types
-        List<ObjectAction> actions = specification.getServiceActionsReturning(ActionType.USER, ActionType.EXPLORATION,
-                ActionType.PROTOTYPE, ActionType.DEBUG);
+        final List<ObjectAction> actions =
+            specification.getServiceActionsReturning(ActionType.USER, ActionType.EXPLORATION, ActionType.PROTOTYPE,
+                ActionType.DEBUG);
         menuOptions(actions, null, options);
     }
 
@@ -47,15 +47,16 @@ public class OptionFactory {
             return;
         }
 
-        ObjectSpecification noSpec = adapter.getSpecification();
-        menuOptions(noSpec.getObjectActions(ActionType.USER, ActionType.EXPLORATION,
-        		ActionType.PROTOTYPE, ActionType.DEBUG), adapter, options);
+        final ObjectSpecification noSpec = adapter.getSpecification();
+        menuOptions(
+            noSpec.getObjectActions(ActionType.USER, ActionType.EXPLORATION, ActionType.PROTOTYPE, ActionType.DEBUG),
+            adapter, options);
 
         // TODO: this looks like a bit of a hack; can we improve it by looking at the facets?
         if (adapter.getObject() instanceof ObjectList) {
             return;
         }
-        Oid oid = adapter.getOid();
+        final Oid oid = adapter.getOid();
         if (oid != null && oid.isTransient()) {
             return;
         }
@@ -66,7 +67,8 @@ public class OptionFactory {
         options.add(new DisposeObjectOption());
     }
 
-    private static void menuOptions(final List<ObjectAction> actions, final ObjectAdapter target, final UserActionSet menuOptionSet) {
+    private static void menuOptions(final List<ObjectAction> actions, final ObjectAdapter target,
+        final UserActionSet menuOptionSet) {
         for (int i = 0; i < actions.size(); i++) {
             UserAction option = null;
             if (actions.get(i).getActions().size() > 0) {
@@ -78,7 +80,7 @@ public class OptionFactory {
                 if (noOfParameters == 0) {
                     option = ImmediateObjectOption.createOption(actions.get(i), target);
                 } else if (actions.get(i).isContributed() && noOfParameters == 1 && target != null
-                        && target.getSpecification().isOfType(actions.get(i).getParameters().get(0).getSpecification())) {
+                    && target.getSpecification().isOfType(actions.get(i).getParameters().get(0).getSpecification())) {
                     option = ImmediateObjectOption.createServiceOption(actions.get(i), target);
                 } else {
                     option = DialoggedObjectOption.createOption(actions.get(i), target);
@@ -90,4 +92,3 @@ public class OptionFactory {
         }
     }
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ParameterContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ParameterContent.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ParameterContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ParameterContent.java Tue May  3 07:18:19 2011
@@ -17,12 +17,10 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view.action;
 
 import org.apache.isis.viewer.dnd.view.Content;
 
-
 public interface ParameterContent extends Content {
 
     String getParameterName();

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/TextParseableParameter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/TextParseableParameter.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/TextParseableParameter.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/TextParseableParameter.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view.action;
 
 import org.apache.isis.viewer.dnd.view.content.TextParseableContent;
@@ -25,4 +24,3 @@ import org.apache.isis.viewer.dnd.view.c
 public interface TextParseableParameter extends ParameterContent, TextParseableContent {
 
 }
-



Mime
View raw message