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 [23/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/viewer/basic/WorkspaceSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/WorkspaceSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/WorkspaceSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/WorkspaceSpecification.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.viewer.basic;
 
 import org.apache.isis.viewer.dnd.service.PerspectiveContent;
@@ -31,25 +30,25 @@ import org.apache.isis.viewer.dnd.view.W
 import org.apache.isis.viewer.dnd.view.base.Layout;
 import org.apache.isis.viewer.dnd.view.composite.ViewBuilder;
 
-
 public class WorkspaceSpecification implements CompositeViewSpecification {
     ApplicationWorkspaceBuilder builder = new ApplicationWorkspaceBuilder();
 
-    public View createView(final Content content, Axes axes, int sequence) {
+    @Override
+    public View createView(final Content content, final Axes axes, final int sequence) {
         Workspace workspace;
         workspace = new ApplicationWorkspace(content, axes, this, createLayout(content, axes), builder);
         // workspace.setFocusManager(new WorkspaceFocusManager());
         return workspace;
     }
 
-    public Layout createLayout(Content content, Axes axes) {
-        return  new ApplicationWorkspaceBuilder.ApplicationLayout();
+    public Layout createLayout(final Content content, final Axes axes) {
+        return new ApplicationWorkspaceBuilder.ApplicationLayout();
     }
-    
-    public void createAxes(Content content, Axes axes) {
+
+    public void createAxes(final Content content, final Axes axes) {
     }
-    
-    public ViewAxis axis(Content content) {
+
+    public ViewAxis axis(final Content content) {
         return null;
     }
 
@@ -57,31 +56,38 @@ public class WorkspaceSpecification impl
         return builder;
     }
 
+    @Override
     public String getName() {
         return "Root Workspace";
     }
 
+    @Override
     public boolean isAligned() {
         return false;
     }
 
+    @Override
     public boolean isOpen() {
         return true;
     }
 
+    @Override
     public boolean isReplaceable() {
         return false;
     }
-    
+
+    @Override
     public boolean isResizeable() {
         return false;
     }
 
+    @Override
     public boolean isSubView() {
         return false;
     }
 
-    public boolean canDisplay(ViewRequirement requirement) {
+    @Override
+    public boolean canDisplay(final ViewRequirement requirement) {
         return requirement.isFor(PerspectiveContent.class);
     }
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/WrappedTextFieldSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/WrappedTextFieldSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/WrappedTextFieldSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/WrappedTextFieldSpecification.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.viewer.basic;
 
 import org.apache.isis.viewer.dnd.field.WrappedTextField;
@@ -29,20 +28,21 @@ import org.apache.isis.viewer.dnd.view.b
 import org.apache.isis.viewer.dnd.view.border.TextFieldResizeBorder;
 import org.apache.isis.viewer.dnd.view.content.TextParseableContent;
 
-
 public class WrappedTextFieldSpecification extends AbstractFieldSpecification {
     @Override
-    public boolean canDisplay(ViewRequirement requirement) {
-        return requirement.isTextParseable()                 && ((TextParseableContent) requirement.getContent()).getNoLines() > 1;
+    public boolean canDisplay(final ViewRequirement requirement) {
+        return requirement.isTextParseable() && ((TextParseableContent) requirement.getContent()).getNoLines() > 1;
     }
 
-    public View createView(final Content content, Axes axes, int sequence) {
+    @Override
+    public View createView(final Content content, final Axes axes, final int sequence) {
         final WrappedTextField wrappedTextField = new WrappedTextField((TextParseableContent) content, this, true);
         wrappedTextField.setNoLines(((TextParseableContent) content).getNoLines());
         wrappedTextField.setWrapping(((TextParseableContent) content).canWrap());
         return new TextFieldResizeBorder(wrappedTextField);
     }
 
+    @Override
     public String getName() {
         return "Wrapped Text Field";
     }

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/ContentDragTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/ContentDragTest.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/ContentDragTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/ContentDragTest.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd;
 
 import junit.framework.TestCase;
@@ -26,7 +25,6 @@ import org.apache.isis.viewer.dnd.drawin
 import org.apache.isis.viewer.dnd.interaction.ContentDragImpl;
 import org.apache.isis.viewer.dnd.view.ContentDrag;
 
-
 public class ContentDragTest extends TestCase {
 
     @Override
@@ -45,8 +43,7 @@ public class ContentDragTest extends Tes
         final DummyView targetView = new DummyView();
         targetView.setupAbsoluteLocation(new Location(100, 100));
 
-//        drag.drag(targetView, new Location(120, 120), 0);
-//        assertEquals(new Location(20, 20), drag.getTargetLocation());
+        // drag.drag(targetView, new Location(120, 120), 0);
+        // assertEquals(new Location(20, 20), drag.getTargetLocation());
     }
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyCanvas.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyCanvas.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyCanvas.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyCanvas.java Tue May  3 07:18:19 2011
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.viewer.dnd;
 
-package org.apache.isis.viewer.dnd;
-
 import org.apache.isis.viewer.dnd.drawing.Bounds;
 import org.apache.isis.viewer.dnd.drawing.Canvas;
 import org.apache.isis.viewer.dnd.drawing.Color;
@@ -27,79 +26,110 @@ import org.apache.isis.viewer.dnd.drawin
 import org.apache.isis.viewer.dnd.drawing.Location;
 import org.apache.isis.viewer.dnd.drawing.Shape;
 import org.apache.isis.viewer.dnd.drawing.Text;
-
-
-public class DummyCanvas implements Canvas {
-
-    public DummyCanvas() {
-        super();
-    }
-
-    public Canvas createSubcanvas() {
-        return null;
-    }
-
-    public Canvas createSubcanvas(final Bounds bounds) {
-        return null;
-    }
-
-    public Canvas createSubcanvas(final int x, final int y, final int width, final int height) {
-        return null;
-    }
-
-    public void draw3DRectangle(
-            final int x,
-            final int y,
-            final int width,
-            final int height,
-            final Color color,
-            final boolean raised) {}
-
-    public void drawImage(final Image icon, final int x, final int y) {}
-
-    public void drawImage(final Image icon, final int x, final int y, final int width, final int height) {}
-
-    public void drawLine(final int x, final int y, final int x2, final int y2, final Color color) {}
-
-    public void drawLine(final Location start, final int xExtent, final int yExtent, final Color color) {}
-
-    public void drawOval(final int x, final int y, final int width, final int height, final Color color) {}
-
-    public void drawRectangle(final int x, final int y, final int width, final int height, final Color color) {}
-
-    public void drawRectangleAround(final Bounds bounds, 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) {}
-
-    public void drawShape(final Shape shape, final Color color) {}
-
-    public void drawShape(final Shape shape, final int x, final int y, final Color color) {}
-
-    public void drawSolidOval(final int x, final int y, final int width, final int height, final Color color) {}
-
-    public void drawSolidRectangle(final int x, final int y, final int width, final int height, final Color color) {}
-
-    public void drawSolidShape(final Shape shape, final Color color) {}
-
-    public void drawSolidShape(final Shape shape, final int x, final int y, final Color color) {}
-
-    public void drawText(final String text, final int x, final int y, 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) {}
-
-    public void offset(final int x, final int y) {}
-
-    public boolean overlaps(final Bounds bounds) {
-        return false;
-    }
-
-    public void drawDebugOutline(final Bounds bounds, final int baseline, final Color color) {}
-
-}
+
+public class DummyCanvas implements Canvas {
+
+    public DummyCanvas() {
+        super();
+    }
+
+    @Override
+    public Canvas createSubcanvas() {
+        return null;
+    }
+
+    @Override
+    public Canvas createSubcanvas(final Bounds bounds) {
+        return null;
+    }
+
+    @Override
+    public Canvas createSubcanvas(final int x, final int y, final int width, final int height) {
+        return null;
+    }
+
+    @Override
+    public void draw3DRectangle(final int x, final int y, final int width, final int height, final Color color,
+        final boolean raised) {
+    }
+
+    @Override
+    public void drawImage(final Image icon, final int x, final int y) {
+    }
+
+    @Override
+    public void drawImage(final Image icon, final int x, final int y, final int width, final int height) {
+    }
+
+    @Override
+    public void drawLine(final int x, final int y, final int x2, final int y2, final Color color) {
+    }
+
+    @Override
+    public void drawLine(final Location start, final int xExtent, final int yExtent, final Color color) {
+    }
+
+    @Override
+    public void drawOval(final int x, final int y, final int width, final int height, final Color color) {
+    }
+
+    @Override
+    public void drawRectangle(final int x, final int y, final int width, final int height, final Color color) {
+    }
+
+    @Override
+    public void drawRectangleAround(final Bounds bounds, final Color color) {
+    }
+
+    @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) {
+    }
+
+    @Override
+    public void drawShape(final Shape shape, final Color color) {
+    }
+
+    @Override
+    public void drawShape(final Shape shape, final int x, final int y, final Color color) {
+    }
+
+    @Override
+    public void drawSolidOval(final int x, final int y, final int width, final int height, final Color color) {
+    }
+
+    @Override
+    public void drawSolidRectangle(final int x, final int y, final int width, final int height, final Color color) {
+    }
+
+    @Override
+    public void drawSolidShape(final Shape shape, final Color color) {
+    }
+
+    @Override
+    public void drawSolidShape(final Shape shape, final int x, final int y, final Color color) {
+    }
+
+    @Override
+    public void drawText(final String text, final int x, final int y, final Color color, final Text style) {
+    }
+
+    @Override
+    public void drawText(final String text, final int x, final int y, final int maxWidth, final Color color,
+        final Text style) {
+    }
+
+    @Override
+    public void offset(final int x, final int y) {
+    }
+
+    @Override
+    public boolean overlaps(final Bounds bounds) {
+        return false;
+    }
+
+    @Override
+    public void drawDebugOutline(final Bounds bounds, final int baseline, final Color color) {
+    }
+
+}

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyContent.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyContent.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd;
 
 import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -30,62 +29,77 @@ import org.apache.isis.viewer.dnd.drawin
 import org.apache.isis.viewer.dnd.view.Content;
 import org.apache.isis.viewer.dnd.view.UserActionSet;
 
-
 public class DummyContent implements Content {
 
     private String iconName;
     private String title;
     private String windowTitle;
 
+    @Override
     public Consent canDrop(final Content sourceContent) {
         return Veto.DEFAULT;
     }
 
-    public void debugDetails(final DebugBuilder debug) {}
+    @Override
+    public void debugDetails(final DebugBuilder debug) {
+    }
 
+    @Override
     public ObjectAdapter drop(final Content sourceContent) {
         return null;
     }
 
+    @Override
     public String getIconName() {
         return iconName;
     }
 
+    @Override
     public Image getIconPicture(final int iconHeight) {
         throw new NotYetImplementedException();
     }
 
+    @Override
     public ObjectAdapter getAdapter() {
         return null;
     }
 
+    @Override
     public ObjectSpecification getSpecification() {
         return null;
     }
 
+    @Override
     public boolean isCollection() {
         return false;
     }
 
+    @Override
     public boolean isObject() {
         return false;
     }
 
+    @Override
     public boolean isPersistable() {
         return false;
     }
 
+    @Override
     public boolean isTransient() {
         return false;
     }
 
+    @Override
     public boolean isTextParseable() {
         return false;
     }
 
-    public void contentMenuOptions(final UserActionSet options) {}
+    @Override
+    public void contentMenuOptions(final UserActionSet options) {
+    }
 
-    public void parseTextEntry(final String entryText) {}
+    public void parseTextEntry(final String entryText) {
+    }
 
     public void setupIconName(final String iconName) {
         this.iconName = iconName;
@@ -99,32 +113,41 @@ public class DummyContent implements Con
         this.windowTitle = windowTitle;
     }
 
+    @Override
     public String title() {
         return title;
     }
 
+    @Override
     public String windowTitle() {
         return windowTitle;
     }
 
+    @Override
     public String getDescription() {
         return null;
     }
 
+    @Override
     public String getId() {
         return null;
     }
 
-    public void viewMenuOptions(final UserActionSet options) {}
+    @Override
+    public void viewMenuOptions(final UserActionSet options) {
+    }
 
+    @Override
     public String getHelp() {
         return null;
     }
 
+    @Override
     public ObjectAdapter[] getOptions() {
         return null;
     }
 
+    @Override
     public boolean isOptionEnabled() {
         return false;
     }

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyView.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyView.java Tue May  3 07:18:19 2011
@@ -17,11 +17,10 @@
  *  under the License.
  */
 
+package org.apache.isis.viewer.dnd;
+
+import java.util.Vector;
 
-package org.apache.isis.viewer.dnd;
-
-import java.util.Vector;
-
 import org.apache.isis.core.commons.debug.DebugBuilder;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
@@ -54,402 +53,485 @@ import org.apache.isis.viewer.dnd.view.V
 import org.apache.isis.viewer.dnd.view.Viewer;
 import org.apache.isis.viewer.dnd.view.Workspace;
 import org.apache.isis.viewer.dnd.view.base.Layout;
-
-
-public class DummyView implements View {
-    private Size requiredSize = new Size(100, 10);
-    private Size size;
-    private View parent;
-    private View view;
-    private Location location = new Location(0, 0);
-    private Location absoluteLocation;
-    private Content content;
-    private ViewSpecification specification;
-    public int invlidateLayout;
-    public int invalidateContent;
-    private ViewState state = new ViewState();
-    private final Vector subviews = new Vector();
-    private boolean allowSubviewsToBeAdded;
-    private Axes axes = new Axes();
-
-    public DummyView() {
-        setView(this);
-    }
-    
-    public DummyView(int width, int height) {
-        this();
-        setupRequiredSize(new Size(width, height));
-    }
-
-    public Size getRequiredSize(Size availableSpace) {
-        return new Size(requiredSize);
-    }
-
-    public Consent canChangeValue() {
-        return Veto.DEFAULT;
-    }
-
-    public boolean canFocus() {
-        return false;
-    }
-
-    public boolean contains(final View view) {
-        return false;
-    }
-
-    public boolean containsFocus() {
-        return false;
-    }
-
-    public void contentMenuOptions(final UserActionSet menuOptions) {
-        throw new NotYetImplementedException();
-    }
-
-    public void debug(final DebugBuilder debug) {
-        throw new NotYetImplementedException();
-    }
-
-    public void debugStructure(final DebugBuilder b) {
-        throw new NotYetImplementedException();
-    }
-
-    public void dispose() {
-        Workspace workspace = getWorkspace();
-        if (workspace != null) {
-            workspace.removeView(this);
-        }
-    }
-
-    public void drag(final InternalDrag drag) {
-        throw new NotYetImplementedException();
-    }
-
-    public void drag(ViewDrag drag) {
-        throw new NotYetImplementedException();
-    }
-    
-    public void dragCancel(final InternalDrag drag) {
-        throw new NotYetImplementedException();
-    }
-
-    public View dragFrom(final Location location) {
-        throw new NotYetImplementedException();
-    }
-
-    public void drag(final ContentDrag contentDrag) {
-        throw new NotYetImplementedException();
-    }
-
-    public void dragIn(final ContentDrag drag) {
-        throw new NotYetImplementedException();
-    }
-
-    public void dragOut(final ContentDrag drag) {
-        throw new NotYetImplementedException();
-    }
-
-    public DragEvent dragStart(final DragStart drag) {
-        throw new NotYetImplementedException();
-    }
-
-    public void dragTo(final InternalDrag drag) {
-        throw new NotYetImplementedException();
-    }
-
-    public void draw(final Canvas canvas) {
-        throw new NotYetImplementedException();
-    }
-
-    public void drop(final ContentDrag drag) {
-        throw new NotYetImplementedException();
-    }
-
-    public void drop(final ViewDrag drag) {
-        throw new NotYetImplementedException();
-    }
-
-    public void editComplete(boolean moveFocus, boolean toNextField) {
-        throw new NotYetImplementedException();
-    }
-
-    public void entered() {
-        throw new NotYetImplementedException();
-    }
-
-    public void exited() {
-        throw new NotYetImplementedException();
-    }
-
-    public void firstClick(final Click click) {
-        throw new NotYetImplementedException();
-    }
-
-    public void focusLost() {
-        throw new NotYetImplementedException();
-    }
-
-    public void focusReceived() {
-        throw new NotYetImplementedException();
-    }
-
-    public Location getAbsoluteLocation() {
-        return absoluteLocation;
-    }
-
-    public int getBaseline() {
-        return 0;
-    }
-
-    public Bounds getBounds() {
-        return new Bounds(location, size);
-    }
-
-    public Content getContent() {
-        return content;
-    }
-
-    public FocusManager getFocusManager() {
-        throw new NotYetImplementedException();
-    }
-
-    public int getId() {
-        return 0;
-    }
-
-    public Location getLocation() {
-        return location;
-    }
-
-    public Padding getPadding() {
-        return new Padding();
-    }
-
-    public View getParent() {
-        return parent;
-    }
-
-    public Size getSize() {
-        return size;
-    }
-
-    public ViewSpecification getSpecification() {
-        return specification;
-    }
-
-    public ViewState getState() {
-        return state ;
-    }
-    
-    public void addView(final View view) {
-        if(allowSubviewsToBeAdded) {
-            subviews.add(view);
-        }  else {
-            throw new IsisException("Can't add view. Do you need to set the allowSubviewsToBeAdded flag?");
-        }
-    }
-
-    public void removeView(final View view) {
-        if(allowSubviewsToBeAdded) {
-            subviews.remove(view);
-        }  else {
-            throw new IsisException("Can't remove view. Do you need to set the allowSubviewsToBeAdded flag?");
-        }
-    }
-
-    public View[] getSubviews() {
-        return (View[]) subviews.toArray(new View[subviews.size()]);
-    }
-
-    public View getView() {
-        return view;
-    }
-
-    public Viewer getViewManager() {
-        throw new NotYetImplementedException();
-    }
-
-    public Feedback getFeedbackManager() {
-        throw new NotYetImplementedException();
-    }
-
-    public Workspace getWorkspace() {
-        return getParent() == null ? null : getParent().getWorkspace();
-    }
-
-    public boolean hasFocus() {
-        return false;
-    }
-
-    public View identify(final Location mouseLocation) {
-        throw new NotYetImplementedException();
-    }
-
-    public void invalidateContent() {
-        invalidateContent++;
-    }
-
-    public void invalidateLayout() {
-        invlidateLayout++;
-    }
-
-    public void keyPressed(final KeyboardAction key) {
-        throw new NotYetImplementedException();
-    }
-
-    public void keyReleased(KeyboardAction action) {
-        throw new NotYetImplementedException();
-    }
-
-    public void keyTyped(KeyboardAction action) {
-        throw new NotYetImplementedException();
-    }
-
-    public void layout() {
-    }
-
-    public void limitBoundsWithin(final Size size) {
-        throw new NotYetImplementedException();
-    }
-
-    public void markDamaged() {
-        throw new NotYetImplementedException();
-    }
-
-    public void markDamaged(final Bounds bounds) {
-    }
-
-    public void mouseDown(final Click click) {
-        throw new NotYetImplementedException();
-    }
-
-    public void mouseMoved(final Location location) {
-        throw new NotYetImplementedException();
-    }
-
-    public void objectActionResult(final ObjectAdapter result, final Placement placement) {
-        throw new NotYetImplementedException();
-    }
-
-    public View pickupContent(final Location location) {
-        return null;
-    }
-
-    public View pickupView(final Location location) {
-        throw new NotYetImplementedException();
-    }
-
-    public void print(final Canvas canvas) {
-        throw new NotYetImplementedException();
-    }
-
-    public void refresh() {
-        throw new NotYetImplementedException();
-    }
-
-    public void replaceView(final View toReplace, final View replacement) {
-        throw new NotYetImplementedException();
-    }
-
-    public void secondClick(final Click click) {
-        throw new NotYetImplementedException();
-    }
-
-    public void setBounds(final Bounds bounds) {
-        throw new NotYetImplementedException();
-    }
-
-    public void setFocusManager(final FocusManager focusManager) {
-        throw new NotYetImplementedException();
-    }
-
-    public void setLayout(Layout layout) {
-        throw new NotYetImplementedException();
-    }
-
-    public void setLocation(final Location location) {
-        this.location = location;
-    }
-
-    public void setParent(final View view) {
-        parent = view.getView();
-    }
-
-    public void setSize(final Size size) {
-        this.size = size;
-    }
-
-    public void setView(final View view) {
-        this.view = view;
-    }
-
-    public View subviewFor(final Location location) {
-        for (View view : getSubviews()) {
-            if (view.getBounds().contains(location)) {
-                return view;
-            }
-        }
-        return null;
-    }
-
-    public void thirdClick(final Click click) {
-        throw new NotYetImplementedException();
-    }
-
-    public void update(final ObjectAdapter object) {
-        throw new NotYetImplementedException();
-    }
-
-    public void updateView() {
-        throw new NotYetImplementedException();
-    }
-
-    public ViewAreaType viewAreaType(final Location mouseLocation) {
-        throw new NotYetImplementedException();
-    }
-
-    public void viewMenuOptions(final UserActionSet menuOptions) {
-        throw new NotYetImplementedException();
-    }
-
-    public void setupLocation(final Location location) {
-        this.location = location;
-    }
-
-    public void setupAbsoluteLocation(final Location location) {
-        this.absoluteLocation = location;
-    }
-
-    public void setupContent(final Content content) {
-        this.content = content;
-    }
-
-    public void setupRequiredSize(final Size size) {
-        this.requiredSize = size;
-    }
-
-    public void setupSpecification(ViewSpecification specification) {
-        this.specification = specification;
-    }
-    
-    public void setupSubviews(View[] views) {
-        for (View view : views) {
-            subviews.add(view);
-        }
-    }
-
-    public void mouseUp(Click click) {
-        throw new NotYetImplementedException();
-    }
-
-    public Axes getViewAxes() {
-        return axes;
-    }
-
-    public void setupAllowSubviewsToBeAdded(boolean allowSubviewsToBeAdded) {
-        this.allowSubviewsToBeAdded = allowSubviewsToBeAdded;
-    }
-
-    public void loadOptions(Options viewOptions) {}
-    
-    public void saveOptions(Options viewOptions) {}
-}
+
+public class DummyView implements View {
+    private Size requiredSize = new Size(100, 10);
+    private Size size;
+    private View parent;
+    private View view;
+    private Location location = new Location(0, 0);
+    private Location absoluteLocation;
+    private Content content;
+    private ViewSpecification specification;
+    public int invlidateLayout;
+    public int invalidateContent;
+    private final ViewState state = new ViewState();
+    private final Vector subviews = new Vector();
+    private boolean allowSubviewsToBeAdded;
+    private final Axes axes = new Axes();
+
+    public DummyView() {
+        setView(this);
+    }
+
+    public DummyView(final int width, final int height) {
+        this();
+        setupRequiredSize(new Size(width, height));
+    }
+
+    @Override
+    public Size getRequiredSize(final Size availableSpace) {
+        return new Size(requiredSize);
+    }
+
+    @Override
+    public Consent canChangeValue() {
+        return Veto.DEFAULT;
+    }
+
+    @Override
+    public boolean canFocus() {
+        return false;
+    }
+
+    @Override
+    public boolean contains(final View view) {
+        return false;
+    }
+
+    @Override
+    public boolean containsFocus() {
+        return false;
+    }
+
+    @Override
+    public void contentMenuOptions(final UserActionSet menuOptions) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void debug(final DebugBuilder debug) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void debugStructure(final DebugBuilder b) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void dispose() {
+        final Workspace workspace = getWorkspace();
+        if (workspace != null) {
+            workspace.removeView(this);
+        }
+    }
+
+    @Override
+    public void drag(final InternalDrag drag) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void drag(final ViewDrag drag) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void dragCancel(final InternalDrag drag) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public View dragFrom(final Location location) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void drag(final ContentDrag contentDrag) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void dragIn(final ContentDrag drag) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void dragOut(final ContentDrag drag) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public DragEvent dragStart(final DragStart drag) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void dragTo(final InternalDrag drag) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void draw(final Canvas canvas) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void drop(final ContentDrag drag) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void drop(final ViewDrag drag) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void editComplete(final boolean moveFocus, final boolean toNextField) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void entered() {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void exited() {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void firstClick(final Click click) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void focusLost() {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void focusReceived() {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public Location getAbsoluteLocation() {
+        return absoluteLocation;
+    }
+
+    @Override
+    public int getBaseline() {
+        return 0;
+    }
+
+    @Override
+    public Bounds getBounds() {
+        return new Bounds(location, size);
+    }
+
+    @Override
+    public Content getContent() {
+        return content;
+    }
+
+    @Override
+    public FocusManager getFocusManager() {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public int getId() {
+        return 0;
+    }
+
+    @Override
+    public Location getLocation() {
+        return location;
+    }
+
+    @Override
+    public Padding getPadding() {
+        return new Padding();
+    }
+
+    @Override
+    public View getParent() {
+        return parent;
+    }
+
+    @Override
+    public Size getSize() {
+        return size;
+    }
+
+    @Override
+    public ViewSpecification getSpecification() {
+        return specification;
+    }
+
+    @Override
+    public ViewState getState() {
+        return state;
+    }
+
+    @Override
+    public void addView(final View view) {
+        if (allowSubviewsToBeAdded) {
+            subviews.add(view);
+        } else {
+            throw new IsisException("Can't add view. Do you need to set the allowSubviewsToBeAdded flag?");
+        }
+    }
+
+    @Override
+    public void removeView(final View view) {
+        if (allowSubviewsToBeAdded) {
+            subviews.remove(view);
+        } else {
+            throw new IsisException("Can't remove view. Do you need to set the allowSubviewsToBeAdded flag?");
+        }
+    }
+
+    @Override
+    public View[] getSubviews() {
+        return (View[]) subviews.toArray(new View[subviews.size()]);
+    }
+
+    @Override
+    public View getView() {
+        return view;
+    }
+
+    @Override
+    public Viewer getViewManager() {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public Feedback getFeedbackManager() {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public Workspace getWorkspace() {
+        return getParent() == null ? null : getParent().getWorkspace();
+    }
+
+    @Override
+    public boolean hasFocus() {
+        return false;
+    }
+
+    @Override
+    public View identify(final Location mouseLocation) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void invalidateContent() {
+        invalidateContent++;
+    }
+
+    @Override
+    public void invalidateLayout() {
+        invlidateLayout++;
+    }
+
+    @Override
+    public void keyPressed(final KeyboardAction key) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void keyReleased(final KeyboardAction action) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void keyTyped(final KeyboardAction action) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void layout() {
+    }
+
+    @Override
+    public void limitBoundsWithin(final Size size) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void markDamaged() {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void markDamaged(final Bounds bounds) {
+    }
+
+    @Override
+    public void mouseDown(final Click click) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void mouseMoved(final Location location) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void objectActionResult(final ObjectAdapter result, final Placement placement) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public View pickupContent(final Location location) {
+        return null;
+    }
+
+    @Override
+    public View pickupView(final Location location) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void print(final Canvas canvas) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void refresh() {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void replaceView(final View toReplace, final View replacement) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void secondClick(final Click click) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void setBounds(final Bounds bounds) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void setFocusManager(final FocusManager focusManager) {
+        throw new NotYetImplementedException();
+    }
+
+    public void setLayout(final Layout layout) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void setLocation(final Location location) {
+        this.location = location;
+    }
+
+    @Override
+    public void setParent(final View view) {
+        parent = view.getView();
+    }
+
+    @Override
+    public void setSize(final Size size) {
+        this.size = size;
+    }
+
+    @Override
+    public void setView(final View view) {
+        this.view = view;
+    }
+
+    @Override
+    public View subviewFor(final Location location) {
+        for (final View view : getSubviews()) {
+            if (view.getBounds().contains(location)) {
+                return view;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public void thirdClick(final Click click) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void update(final ObjectAdapter object) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void updateView() {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public ViewAreaType viewAreaType(final Location mouseLocation) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public void viewMenuOptions(final UserActionSet menuOptions) {
+        throw new NotYetImplementedException();
+    }
+
+    public void setupLocation(final Location location) {
+        this.location = location;
+    }
+
+    public void setupAbsoluteLocation(final Location location) {
+        this.absoluteLocation = location;
+    }
+
+    public void setupContent(final Content content) {
+        this.content = content;
+    }
+
+    public void setupRequiredSize(final Size size) {
+        this.requiredSize = size;
+    }
+
+    public void setupSpecification(final ViewSpecification specification) {
+        this.specification = specification;
+    }
+
+    public void setupSubviews(final View[] views) {
+        for (final View view : views) {
+            subviews.add(view);
+        }
+    }
+
+    @Override
+    public void mouseUp(final Click click) {
+        throw new NotYetImplementedException();
+    }
+
+    @Override
+    public Axes getViewAxes() {
+        return axes;
+    }
+
+    public void setupAllowSubviewsToBeAdded(final boolean allowSubviewsToBeAdded) {
+        this.allowSubviewsToBeAdded = allowSubviewsToBeAdded;
+    }
+
+    @Override
+    public void loadOptions(final Options viewOptions) {
+    }
+
+    @Override
+    public void saveOptions(final Options viewOptions) {
+    }
+}

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyViewSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyViewSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyViewSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyViewSpecification.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd;
 
 import org.apache.isis.viewer.dnd.drawing.Size;
@@ -31,47 +30,56 @@ public class DummyViewSpecification impl
 
     private Size size;
 
-    public DummyViewSpecification() {}
+    public DummyViewSpecification() {
+    }
 
-    public DummyViewSpecification(Size size) {
+    public DummyViewSpecification(final Size size) {
         this.size = size;
     }
 
-    public View createView(final Content content, Axes axes, int sequence) {
-        DummyView dummyView = new DummyView();
+    @Override
+    public View createView(final Content content, final Axes axes, final int sequence) {
+        final DummyView dummyView = new DummyView();
         dummyView.setupRequiredSize(new Size(size));
         return dummyView;
     }
 
+    @Override
     public String getName() {
         return null;
     }
 
+    @Override
     public boolean isAligned() {
         return false;
     }
 
+    @Override
     public boolean isOpen() {
         return false;
     }
 
+    @Override
     public boolean isReplaceable() {
         return false;
     }
-    
+
+    @Override
     public boolean isResizeable() {
         return false;
     }
 
+    @Override
     public boolean isSubView() {
         return false;
     }
 
-    public boolean canDisplay(ViewRequirement requirement) {
+    @Override
+    public boolean canDisplay(final ViewRequirement requirement) {
         return false;
     }
-    
-    public void setupCreatedViewsSize(Size size) {
+
+    public void setupCreatedViewsSize(final Size size) {
         this.size = size;
     }
 

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyWorkspaceView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyWorkspaceView.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyWorkspaceView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyWorkspaceView.java Tue May  3 07:18:19 2011
@@ -17,54 +17,64 @@
  *  under the License.
  */
 
+package org.apache.isis.viewer.dnd;
 
-package org.apache.isis.viewer.dnd;
-
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.viewer.dnd.view.Placement;
 import org.apache.isis.viewer.dnd.view.View;
 import org.apache.isis.viewer.dnd.view.Workspace;
-
-
-public class DummyWorkspaceView extends DummyView implements Workspace {
-
-    public DummyWorkspaceView() {
-        setupAllowSubviewsToBeAdded(true);
-    }
-
-    public View addIconFor(final ObjectAdapter adapter, Placement placement) {
-        return createAndAddView();
-    }
-
-    private DummyView createAndAddView() {
-        final DummyView view = new DummyView();
-        addView(view);
-        return view;
-    }
-
-    public View addWindowFor(final ObjectAdapter object, Placement placement) {
-        return createAndAddView();
-    }
-
-    public View createSubviewFor(final ObjectAdapter object, final boolean asIcon) {
-        return createAndAddView();
-    }
-
-    public void lower(final View view) {}
-
-    public void raise(final View view) {}
-
-    public void removeViewsFor(final ObjectAdapter object) {}
-
-    @Override
-    public Workspace getWorkspace() {
-        return this;
-    }
-
-    public void removeObject(final ObjectAdapter object) {}
-
-    public void addDialog(View dialog, Placement placement) {}
-
-    public void addWindow(View window, Placement placement) {}
-
-}
+
+public class DummyWorkspaceView extends DummyView implements Workspace {
+
+    public DummyWorkspaceView() {
+        setupAllowSubviewsToBeAdded(true);
+    }
+
+    @Override
+    public View addIconFor(final ObjectAdapter adapter, final Placement placement) {
+        return createAndAddView();
+    }
+
+    private DummyView createAndAddView() {
+        final DummyView view = new DummyView();
+        addView(view);
+        return view;
+    }
+
+    @Override
+    public View addWindowFor(final ObjectAdapter object, final Placement placement) {
+        return createAndAddView();
+    }
+
+    public View createSubviewFor(final ObjectAdapter object, final boolean asIcon) {
+        return createAndAddView();
+    }
+
+    @Override
+    public void lower(final View view) {
+    }
+
+    @Override
+    public void raise(final View view) {
+    }
+
+    public void removeViewsFor(final ObjectAdapter object) {
+    }
+
+    @Override
+    public Workspace getWorkspace() {
+        return this;
+    }
+
+    public void removeObject(final ObjectAdapter object) {
+    }
+
+    @Override
+    public void addDialog(final View dialog, final Placement placement) {
+    }
+
+    @Override
+    public void addWindow(final View window, final Placement placement) {
+    }
+
+}

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/InternalDragTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/InternalDragTest.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/InternalDragTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/InternalDragTest.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd;
 
 import junit.framework.TestCase;
@@ -26,7 +25,6 @@ import org.apache.isis.viewer.dnd.drawin
 import org.apache.isis.viewer.dnd.interaction.SimpleInternalDrag;
 import org.apache.isis.viewer.dnd.view.InternalDrag;
 
-
 public class InternalDragTest extends TestCase {
     public static void main(final String[] args) {
         junit.textui.TestRunner.run(InternalDragTest.class);
@@ -39,7 +37,7 @@ public class InternalDragTest extends Te
         final InternalDrag id = new SimpleInternalDrag(view, new Location(100, 110));
         assertEquals(new Location(70, 50), id.getLocation());
 
-//        id.drag(null, new Location(110, 130), 0);
-//        assertEquals(new Location(80, 70), id.getLocation());
+        // id.drag(null, new Location(110, 130), 0);
+        // assertEquals(new Location(80, 70), id.getLocation());
     }
 }

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/TestToolkit.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/TestToolkit.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/TestToolkit.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/TestToolkit.java Tue May  3 07:18:19 2011
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd;
 
 import java.util.Enumeration;
@@ -47,7 +46,6 @@ import org.apache.isis.viewer.dnd.view.V
 import org.apache.isis.viewer.dnd.viewer.basic.NullColor;
 import org.apache.isis.viewer.dnd.viewer.drawing.DummyText;
 
-
 public class TestToolkit extends Toolkit {
 
     public static void createInstance() {
@@ -56,205 +54,316 @@ public class TestToolkit extends Toolkit
         }
     }
 
-    private TestToolkit() {}
+    private TestToolkit() {
+    }
 
     @Override
     protected void init() {
         colorsAndFonts = new ColorsAndFonts() {
 
+            @Override
             public int defaultBaseline() {
                 return 0;
             }
 
+            @Override
             public int defaultFieldHeight() {
                 return 0;
             }
 
+            @Override
             public Color getColor(final int rgbColor) {
                 return null;
             }
 
+            @Override
             public Color getColor(final String name) {
                 return new NullColor();
             }
 
+            @Override
             public Text getText(final String name) {
                 return new DummyText();
             }
 
-            public void init() {}
+            @Override
+            public void init() {
+            }
         };
 
         viewer = new Viewer() {
 
-            public void addToNotificationList(final View view) {}
+            @Override
+            public void addToNotificationList(final View view) {
+            }
 
-            public void clearAction() {}
+            @Override
+            public void clearAction() {
+            }
 
-            public void clearOverlayView() {}
+            @Override
+            public void clearOverlayView() {
+            }
 
-            public void clearOverlayView(final View view) {}
+            @Override
+            public void clearOverlayView(final View view) {
+            }
 
-            public void disposeUnneededViews() {}
+            @Override
+            public void disposeUnneededViews() {
+            }
 
+            @Override
             public Object getClipboard(final Class<?> class1) {
                 return null;
             }
 
+            @Override
             public InteractionSpy getSpy() {
                 return null;
             }
 
             UndoStack undoStack = new UndoStack();
 
+            @Override
             public UndoStack getUndoStack() {
                 return undoStack;
             }
 
+            @Override
             public boolean hasFocus(final View view) {
                 return false;
             }
 
+            @Override
             public boolean isRunningAsExploration() {
                 return false;
             }
 
+            @Override
             public boolean isRunningAsPrototype() {
                 return false;
             }
 
-            public void markDamaged(final Bounds bounds) {}
+            @Override
+            public void markDamaged(final Bounds bounds) {
+            }
 
-            public void removeFromNotificationList(final View view) {}
+            @Override
+            public void removeFromNotificationList(final View view) {
+            }
 
-            public void scheduleRepaint() {}
+            @Override
+            public void scheduleRepaint() {
+            }
 
-            public void saveCurrentFieldEntry() {}
+            @Override
+            public void saveCurrentFieldEntry() {
+            }
 
+            @Override
             public String selectFilePath(final String title, final String directory) {
                 return null;
             }
 
-            public void setBackground(final Background background) {}
+            @Override
+            public void setBackground(final Background background) {
+            }
 
-            public void setClipboard(final String clip, final Class<?> class1) {}
+            @Override
+            public void setClipboard(final String clip, final Class<?> class1) {
+            }
 
-            public void setKeyboardFocus(final View view) {}
+            @Override
+            public void setKeyboardFocus(final View view) {
+            }
 
-            public void setOverlayView(final View view) {}
+            @Override
+            public void setOverlayView(final View view) {
+            }
 
-            public void showInOverlay(Content content, Location location) {}
+            @Override
+            public void showInOverlay(final Content content, final Location location) {
+            }
+
+            @Override
+            public void showDebugFrame(final DebuggableWithTitle[] info, final Location at) {
+            }
 
-            public void showDebugFrame(DebuggableWithTitle[] info, Location at) {}
-            
+            @Override
             public Size getOverlaySize() {
                 return null;
             }
 
-            public void saveOpenObjects() {}
+            @Override
+            public void saveOpenObjects() {
+            }
 
         };
 
         feedbackManager = new Feedback() {
 
-            public void showArrowCursor() {}
+            @Override
+            public void showArrowCursor() {
+            }
 
-            public void showCrosshairCursor() {}
+            @Override
+            public void showCrosshairCursor() {
+            }
 
-            public void showDefaultCursor() {}
+            @Override
+            public void showDefaultCursor() {
+            }
 
-            public void showException(final Throwable e) {}
+            @Override
+            public void showException(final Throwable e) {
+            }
 
-            public void showHandCursor() {}
+            @Override
+            public void showHandCursor() {
+            }
 
-            public void showMoveCursor() {}
+            @Override
+            public void showMoveCursor() {
+            }
 
-            public void showResizeDownCursor() {}
+            @Override
+            public void showResizeDownCursor() {
+            }
 
-            public void showResizeDownLeftCursor() {}
+            @Override
+            public void showResizeDownLeftCursor() {
+            }
 
-            public void showResizeDownRightCursor() {}
+            @Override
+            public void showResizeDownRightCursor() {
+            }
 
-            public void showResizeLeftCursor() {}
+            @Override
+            public void showResizeLeftCursor() {
+            }
 
-            public void showResizeRightCursor() {}
+            @Override
+            public void showResizeRightCursor() {
+            }
 
-            public void showResizeUpCursor() {}
+            @Override
+            public void showResizeUpCursor() {
+            }
 
-            public void showResizeUpLeftCursor() {}
+            @Override
+            public void showResizeUpLeftCursor() {
+            }
 
-            public void showResizeUpRightCursor() {}
+            @Override
+            public void showResizeUpRightCursor() {
+            }
 
-            public void showTextCursor() {}
+            @Override
+            public void showTextCursor() {
+            }
 
-            public void addMessage(final String string) {}
+            @Override
+            public void addMessage(final String string) {
+            }
 
-            public void clearAction() {}
+            @Override
+            public void clearAction() {
+            }
 
-            public void clearBusy(final View view) {}
+            @Override
+            public void clearBusy(final View view) {
+            }
 
-            public void clearError() {}
+            @Override
+            public void clearError() {
+            }
 
+            @Override
             public String getStatusBarOutput() {
                 return null;
             }
 
+            @Override
             public boolean isBusy(final View view) {
                 return false;
             }
 
-            public void setAction(final String string) {}
+            @Override
+            public void setAction(final String string) {
+            }
 
-            public void setBusy(final View view, final BackgroundTask task) {}
+            @Override
+            public void setBusy(final View view, final BackgroundTask task) {
+            }
 
-            public void setError(final String string) {}
+            @Override
+            public void setError(final String string) {
+            }
 
-            public void setViewDetail(final String string) {}
+            @Override
+            public void setViewDetail(final String string) {
+            }
 
-            public void showBusyState(final View view) {}
+            @Override
+            public void showBusyState(final View view) {
+            }
 
-            public void showMessagesAndWarnings() {}
+            @Override
+            public void showMessagesAndWarnings() {
+            }
         };
-        
+
         viewFactory = new GlobalViewFactory() {
 
-            public Enumeration<ViewSpecification> availableViews(ViewRequirement viewRequirement) {
+            @Override
+            public Enumeration<ViewSpecification> availableViews(final ViewRequirement viewRequirement) {
                 throw new UnexpectedCallException();
             }
 
-            public View createDialog(Content content) {
+            @Override
+            public View createDialog(final Content content) {
                 throw new UnexpectedCallException();
             }
 
-            public DragEvent createDragContentOutline(View view, Location location) {
+            @Override
+            public DragEvent createDragContentOutline(final View view, final Location location) {
                 throw new UnexpectedCallException();
             }
 
-            public View createDragViewOutline(View view) {
+            @Override
+            public View createDragViewOutline(final View view) {
                 throw new UnexpectedCallException();
             }
 
-            public View createMinimizedView(View view) {
+            @Override
+            public View createMinimizedView(final View view) {
                 throw new UnexpectedCallException();
             }
 
-            public View createView(ViewRequirement requirement) {
+            @Override
+            public View createView(final ViewRequirement requirement) {
                 return new DummyView();
             }
 
-            public void debugData(DebugBuilder debug) {}
+            @Override
+            public void debugData(final DebugBuilder debug) {
+            }
 
+            @Override
             public String debugTitle() {
                 throw new UnexpectedCallException();
             }
 
-            public void addSpecification(ViewSpecification spec) {}
+            @Override
+            public void addSpecification(final ViewSpecification spec) {
+            }
 
-            public Enumeration<ViewSpecification> availableDesigns(ViewRequirement viewRequirement) {
+            @Override
+            public Enumeration<ViewSpecification> availableDesigns(final ViewRequirement viewRequirement) {
                 return null;
             }
-            
+
         };
     }
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/ViewManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/ViewManagerTest.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/ViewManagerTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/ViewManagerTest.java Tue May  3 07:18:19 2011
@@ -17,13 +17,11 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd;
 
 import junit.framework.TestCase;
 import junit.textui.TestRunner;
 
-
 public class ViewManagerTest extends TestCase {
     // private final static Component COMPONENT = new Component() {
     // };
@@ -32,11 +30,12 @@ public class ViewManagerTest extends Tes
         TestRunner.run(ViewManagerTest.class);
     }
 
-    public void testNone() {}
+    public void testNone() {
+    }
 
     /*
-     * public void testMouseClick() { MockWorkspace workspace = new MockWorkspace(null); MockView view = new
-     * MockView(); workspace.setupIdentifyView(view);
+     * public void testMouseClick() { MockWorkspace workspace = new MockWorkspace(null); MockView view = new MockView();
+     * workspace.setupIdentifyView(view);
      * 
      * ViewManager manager = new ViewManager(workspace, null);
      * 
@@ -47,8 +46,8 @@ public class ViewManagerTest extends Tes
      * 
      * view.verify(); }
      * 
-     * public void testPopupMouseClick() { MockWorkspace workspace = new MockWorkspace(null); MockView view =
-     * new MockView(); workspace.setupIdentifyView(view);
+     * public void testPopupMouseClick() { MockWorkspace workspace = new MockWorkspace(null); MockView view = new
+     * MockView(); workspace.setupIdentifyView(view);
      * 
      * MockPopupMenu popup = new MockPopupMenu(); ViewManager manager = new ViewManager(workspace, popup);
      * 
@@ -65,7 +64,7 @@ public class ViewManagerTest extends Tes
      * 
      * popup.setExpectedFirstClickCalls(1); }
      * 
-     * private MouseEvent createMouseEvent(final int x, final int y, final int count, final int button) {
-     * return new MouseEvent(COMPONENT, 0, 0, button, x, y, count, false); }
+     * private MouseEvent createMouseEvent(final int x, final int y, final int count, final int button) { return new
+     * MouseEvent(COMPONENT, 0, 0, button, x, y, count, false); }
      */
 }

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/ConfigurableListViewSpecificationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/ConfigurableListViewSpecificationTest.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/ConfigurableListViewSpecificationTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/ConfigurableListViewSpecificationTest.java Tue May  3 07:18:19 2011
@@ -17,95 +17,97 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.configurable;
 
+import static org.junit.Assert.assertTrue;
+
 import java.util.Enumeration;
 
+import org.apache.isis.viewer.dnd.TestToolkit;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.ViewRequirement;
+import org.apache.isis.viewer.dnd.view.collection.CollectionContent;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.junit.Before;
 import org.junit.Test;
-import org.apache.isis.viewer.dnd.TestToolkit;
-import org.apache.isis.viewer.dnd.configurable.GridListSpecification;
-import org.apache.isis.viewer.dnd.view.Content;
-import org.apache.isis.viewer.dnd.view.ViewRequirement;
-import org.apache.isis.viewer.dnd.view.collection.CollectionContent;
-
-import static org.junit.Assert.assertTrue;
-
 
 public class ConfigurableListViewSpecificationTest {
     private GridListSpecification viewSpecification;
     private CollectionContent collectionContent;
     private Mockery context;
-    
+
     @Before
     public void setup() {
         Logger.getRootLogger().setLevel(Level.OFF);
         TestToolkit.createInstance();
-        
+
         viewSpecification = new GridListSpecification();
-        
+
         context = new Mockery();
         collectionContent = context.mock(CollectionContent.class);
-        context.checking(new Expectations() {{
-            one(collectionContent).isCollection();
-            will(returnValue(true));
-        }});
+        context.checking(new Expectations() {
+            {
+                one(collectionContent).isCollection();
+                will(returnValue(true));
+            }
+        });
     }
 
     @Test
     public void requiresOpenCollection() throws Exception {
-        ViewRequirement requirement = new ViewRequirement(collectionContent, ViewRequirement.OPEN);
+        final ViewRequirement requirement = new ViewRequirement(collectionContent, ViewRequirement.OPEN);
         assertTrue(viewSpecification.canDisplay(requirement));
     }
 
     @Test
     public void requiresOpenObject() throws Exception {
-        ViewRequirement requirement = new ViewRequirement(collectionContent, ViewRequirement.OPEN);
+        final ViewRequirement requirement = new ViewRequirement(collectionContent, ViewRequirement.OPEN);
         assertTrue(viewSpecification.canDisplay(requirement));
     }
 
     @Test
     public void requiresClosedCollection() throws Exception {
         final Content objectContent = context.mock(Content.class, "object");
-        context.checking(new Expectations() {{
-            one(objectContent).isCollection();
-            will(returnValue(false));
-        }});
-        ViewRequirement requirement = new ViewRequirement(objectContent, ViewRequirement.CLOSED);
+        context.checking(new Expectations() {
+            {
+                one(objectContent).isCollection();
+                will(returnValue(false));
+            }
+        });
+        final ViewRequirement requirement = new ViewRequirement(objectContent, ViewRequirement.CLOSED);
         assertTrue(!viewSpecification.canDisplay(requirement));
     }
-    
- //   @Test
+
+    // @Test
     public void testname() throws Exception {
-        context.checking(new Expectations() {{
-            one(collectionContent).allElements();
-            will(returnValue(new Enumeration() {
-                public boolean hasMoreElements() {
-                    return false;
-                }
-
-                public Object nextElement() {
-                    return null;
-                }}));
-        }});
+        context.checking(new Expectations() {
+            {
+                one(collectionContent).allElements();
+                will(returnValue(new Enumeration() {
+                    @Override
+                    public boolean hasMoreElements() {
+                        return false;
+                    }
+
+                    @Override
+                    public Object nextElement() {
+                        return null;
+                    }
+                }));
+            }
+        });
 
         /*
-         * TODO Fails trying to load user profile form NO system. 
-        View view = viewSpecification.createView(collectionContent, new Axes(), 0);
-        Axes axes = view.getViewAxes();
-        GridLayout axis = axes.getAxis(GridLayout.class);
-        assertEquals(1, axis.getSize());
-        
-        
-        ConfigurationAxis configurationAxis = axes.getAxis(ConfigurationAxis.class);
-        assertNotNull(configurationAxis);
-        */
+         * TODO Fails trying to load user profile form NO system. View view =
+         * viewSpecification.createView(collectionContent, new Axes(), 0); Axes axes = view.getViewAxes(); GridLayout
+         * axis = axes.getAxis(GridLayout.class); assertEquals(1, axis.getSize());
+         * 
+         * 
+         * ConfigurationAxis configurationAxis = axes.getAxis(ConfigurationAxis.class);
+         * assertNotNull(configurationAxis);
+         */
     }
 }
-
-

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelTest.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelTest.java Tue May  3 07:18:19 2011
@@ -17,25 +17,20 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.configurable;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.junit.Before;
-import org.junit.Test;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNull;
+
 import org.apache.isis.viewer.dnd.DummyView;
 import org.apache.isis.viewer.dnd.TestToolkit;
-import org.apache.isis.viewer.dnd.configurable.Panel;
 import org.apache.isis.viewer.dnd.configurable.PanelView.Position;
 import org.apache.isis.viewer.dnd.drawing.Location;
 import org.apache.isis.viewer.dnd.drawing.Size;
-
-import static org.junit.Assert.*;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNull;
-
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.junit.Before;
+import org.junit.Test;
 
 public class PanelTest {
 
@@ -79,24 +74,24 @@ public class PanelTest {
     public void totalSizeIsWidthPlusMaxHeigth() throws Exception {
         assertEquals(new Size(350, 120), panel.getRequiredSize(Size.createMax()));
     }
-    
+
     @Test
     public void addingToSouth() throws Exception {
         panel = new Panel();
         panel.addView(view1, Position.East);
         panel.addView(view2, Position.South);
         panel.addView(view3, Position.South);
-        
+
         assertEquals(new Size(200, 340), panel.getRequiredSize(Size.createMax()));
     }
 
     @Test
     public void addingToEast() throws Exception {
         panel.addView(view3, Position.East);
-        
+
         assertEquals(new Size(500, 120), panel.getRequiredSize(Size.createMax()));
     }
-    
+
     @Test
     public void secondPanelLocatedToRightOfFirst() throws Exception {
         panel.layout(Size.createMax());
@@ -118,7 +113,7 @@ public class PanelTest {
         panel.addView(view3, null);
         assertEquals(new Size(500, 120), panel.getRequiredSize(Size.createMax()));
     }
-    
+
     @Test
     public void addingThirdPanelToBottomIncreasesHeight() throws Exception {
         panel.addView(view3, Position.South);
@@ -127,13 +122,14 @@ public class PanelTest {
 
     @Test
     public void addingFouthPanelToLeftIncreasesWidth() throws Exception {
-        DummyView view4 = new DummyView();
+        final DummyView view4 = new DummyView();
         view4.setupRequiredSize(new Size(50, 100));
-        
+
         panel.addView(view3, Position.South);
         panel.addView(view4, Position.East);
         assertEquals(new Size(400, 240), panel.getRequiredSize(Size.createMax()));
     }
+
     @Test
     public void addingThirdPanelToNorthIncreasesHeight() throws Exception {
         panel.addView(view3, Position.North);
@@ -158,4 +154,3 @@ public class PanelTest {
         assertEquals(new Location(0, 120), view3.getLocation());
     }
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewDropTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewDropTest.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewDropTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewDropTest.java Tue May  3 07:18:19 2011
@@ -17,39 +17,35 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.configurable;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
 import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
 import org.apache.isis.runtimes.dflt.runtime.testsystem.TestProxyConfiguration;
 import org.apache.isis.viewer.dnd.DummyContent;
 import org.apache.isis.viewer.dnd.DummyView;
 import org.apache.isis.viewer.dnd.DummyViewSpecification;
 import org.apache.isis.viewer.dnd.TestToolkit;
-import org.apache.isis.viewer.dnd.configurable.PanelView;
 import org.apache.isis.viewer.dnd.configurable.PanelView.Position;
 import org.apache.isis.viewer.dnd.drawing.Location;
 import org.apache.isis.viewer.dnd.drawing.Size;
 import org.apache.isis.viewer.dnd.view.Content;
 import org.apache.isis.viewer.dnd.view.View;
 import org.apache.isis.viewer.dnd.view.ViewDrag;
-import org.apache.isis.viewer.dnd.view.ViewSpecification;
-
-import static org.junit.Assert.assertEquals;
-
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.junit.Before;
+import org.junit.Test;
 
 public class PanelViewDropTest {
 
     private PanelView view;
     private DummyContent content;
     private Position position;
-    private DummyView sourceView = new DummyView();
+    private final DummyView sourceView = new DummyView();
 
     @Before
     public void setup() {
@@ -57,16 +53,17 @@ public class PanelViewDropTest {
         TestToolkit.createInstance();
         IsisContext.setConfiguration(new TestProxyConfiguration());
 
-
         content = new DummyContent();
 
         view = new PanelView(content, new DummyViewSpecification()) {
-            public void addView(Content content, Position position) {
+            @Override
+            public void addView(final Content content, final Position position) {
                 PanelViewDropTest.this.position = position;
             }
-            
+
+            @Override
             public synchronized View[] getSubviews() {
-                return new View[] {sourceView};
+                return new View[] { sourceView };
             }
         };
         view.setSize(new Size(200, 100));
@@ -130,13 +127,13 @@ public class PanelViewDropTest {
     }
 
     private ViewDrag dragTo(final Location location) {
-        Mockery context = new Mockery();
+        final Mockery context = new Mockery();
         final ViewDrag drag = context.mock(ViewDrag.class);
         context.checking(new Expectations() {
             {
                 exactly(3).of(drag).getSourceView();
                 will(returnValue(sourceView));
-                
+
                 atLeast(1).of(drag).getLocation();
                 will(returnValue(location));
             }
@@ -145,4 +142,3 @@ public class PanelViewDropTest {
     }
 
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewTest.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewTest.java Tue May  3 07:18:19 2011
@@ -17,25 +17,22 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.configurable;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
 import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
 import org.apache.isis.runtimes.dflt.runtime.testsystem.TestProxyConfiguration;
 import org.apache.isis.viewer.dnd.DummyContent;
 import org.apache.isis.viewer.dnd.DummyViewSpecification;
 import org.apache.isis.viewer.dnd.TestToolkit;
-import org.apache.isis.viewer.dnd.configurable.PanelView;
 import org.apache.isis.viewer.dnd.configurable.PanelView.Position;
 import org.apache.isis.viewer.dnd.drawing.Location;
 import org.apache.isis.viewer.dnd.drawing.Size;
-
-import static org.junit.Assert.assertEquals;
-
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.junit.Before;
+import org.junit.Test;
 
 public class PanelViewTest {
 
@@ -76,6 +73,4 @@ public class PanelViewTest {
         assertEquals(new Location(200, 0), view.getSubviews()[1].getLocation());
     }
 
-
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/toolbar/ToolbarTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/toolbar/ToolbarTest.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/toolbar/ToolbarTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/toolbar/ToolbarTest.java Tue May  3 07:18:19 2011
@@ -17,26 +17,23 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.toolbar;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
 import org.apache.isis.runtimes.dflt.objectstores.dflt.testsystem.TestProxySystemII;
 import org.apache.isis.viewer.dnd.DummyView;
 import org.apache.isis.viewer.dnd.TestToolkit;
 import org.apache.isis.viewer.dnd.drawing.Location;
 import org.apache.isis.viewer.dnd.drawing.Size;
-import org.apache.isis.viewer.dnd.toolbar.ToolbarView;
 import org.apache.isis.viewer.dnd.view.View;
 import org.apache.isis.viewer.dnd.view.content.NullContent;
 import org.apache.isis.viewer.dnd.view.look.LookFactory;
-
-import static org.junit.Assert.assertEquals;
-
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
 
 public class ToolbarTest {
 
@@ -70,29 +67,29 @@ public class ToolbarTest {
     @Ignore("having problems with test classpath - TestProxySystemII can't find JavaReflectorInstaller, for some reason")
     @Test
     public void requiredSizeForButtonsLessThanMaximumWidth() throws Exception {
-        Size size = toolbar.getRequiredSize(Size.createMax());
+        final Size size = toolbar.getRequiredSize(Size.createMax());
         assertEquals(new Size(View.HPADDING + (100 + View.HPADDING) * 3, 10 + View.VPADDING), size);
     }
 
     @Ignore("having problems with test classpath - TestProxySystemII can't find JavaReflectorInstaller, for some reason")
     @Test
     public void requiredSizeForButtonsGreaterThanMaximumWidth() throws Exception {
-        Size size = toolbar.getRequiredSize(new Size(250, 100));
+        final Size size = toolbar.getRequiredSize(new Size(250, 100));
         assertEquals(new Size(View.HPADDING * 3 + 220, (10 + View.VPADDING) * 2), size);
     }
 
     @Ignore("having problems with test classpath - TestProxySystemII can't find JavaReflectorInstaller, for some reason")
     @Test
     public void requiredSizeForButtonsJustGreaterThanMaximumWidth() throws Exception {
-        int width = View.HPADDING + (100 + View.HPADDING) * 3;
-        Size size = toolbar.getRequiredSize(new Size(width + 1, 100));
+        final int width = View.HPADDING + (100 + View.HPADDING) * 3;
+        final Size size = toolbar.getRequiredSize(new Size(width + 1, 100));
         assertEquals(new Size(width, 10 + View.VPADDING), size);
     }
 
     @Ignore("having problems with test classpath - TestProxySystemII can't find JavaReflectorInstaller, for some reason")
     @Test
     public void requiredSizeForButtonsSameAsMaximumWidth() throws Exception {
-        Size size = toolbar.getRequiredSize(new Size(View.HPADDING + (100 + View.HPADDING) * 3, 100));
+        final Size size = toolbar.getRequiredSize(new Size(View.HPADDING + (100 + View.HPADDING) * 3, 100));
         assertEquals(new Size(View.HPADDING * 3 + 220, (10 + View.VPADDING) * 2), size);
     }
 
@@ -110,18 +107,16 @@ public class ToolbarTest {
     public void layoutLocationForButtonsLessThanMaximumWidth() throws Exception {
         toolbar.doLayout(Size.createMax());
         assertEquals(new Location(View.HPADDING, 0), button1.getLocation());
-        assertEquals(new Location(View.HPADDING * 2 + 120 , 0), button2.getLocation());
-        assertEquals(new Location(View.HPADDING * 3 + 220 , 0), button3.getLocation());
+        assertEquals(new Location(View.HPADDING * 2 + 120, 0), button2.getLocation());
+        assertEquals(new Location(View.HPADDING * 3 + 220, 0), button3.getLocation());
     }
 
-
     @Ignore("having problems with test classpath - TestProxySystemII can't find JavaReflectorInstaller, for some reason")
     @Test
     public void layoutLocationForButtonsGreaterThanMaximumWidth() throws Exception {
         toolbar.doLayout(new Size(250, 100));
         assertEquals(new Location(View.HPADDING, 0), button1.getLocation());
-        assertEquals(new Location(View.HPADDING * 2 + 120 , 0), button2.getLocation());
+        assertEquals(new Location(View.HPADDING * 2 + 120, 0), button2.getLocation());
         assertEquals(new Location(View.HPADDING, 13), button3.getLocation());
     }
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/util/PropertiesTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/util/PropertiesTest.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/util/PropertiesTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/util/PropertiesTest.java Tue May  3 07:18:19 2011
@@ -17,31 +17,26 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.util;
 
+import static org.junit.Assert.assertEquals;
+
+import org.apache.isis.core.runtime.userprofile.Options;
+import org.apache.isis.runtimes.dflt.objectstores.dflt.testsystem.TestProxySystemII;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.apache.isis.core.runtime.userprofile.Options;
-import org.apache.isis.runtimes.dflt.objectstores.dflt.testsystem.TestProxySystemII;
-import org.apache.isis.viewer.dnd.util.Properties;
-
-import static org.junit.Assert.*;
-
 
 public class PropertiesTest {
 
-	@Ignore("having problems with test classpath - TestProxySystemII can't find JavaReflectorInstaller, for some reason")
+    @Ignore("having problems with test classpath - TestProxySystemII can't find JavaReflectorInstaller, for some reason")
     @Test
     public void getOptionsCreatesNewOptionsSet() throws Exception {
         Logger.getRootLogger().setLevel(Level.OFF);
         new TestProxySystemII().init();
-        
-        Options options = Properties.getOptions("test");
+
+        final Options options = Properties.getOptions("test");
         assertEquals(false, options.names().hasNext());
     }
 }
-
-

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewTest.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewTest.java Tue May  3 07:18:19 2011
@@ -17,23 +17,20 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view.composite;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.junit.Before;
-import org.junit.Test;
-import org.apache.isis.viewer.dnd.DummyView;
-import org.apache.isis.viewer.dnd.TestToolkit;
-import org.apache.isis.viewer.dnd.drawing.Size;
-import org.apache.isis.viewer.dnd.view.composite.CompositeView;
-import org.apache.isis.viewer.dnd.view.content.NullContent;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import org.apache.isis.viewer.dnd.DummyView;
+import org.apache.isis.viewer.dnd.TestToolkit;
+import org.apache.isis.viewer.dnd.drawing.Size;
+import org.apache.isis.viewer.dnd.view.content.NullContent;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.junit.Before;
+import org.junit.Test;
 
 public class CompositeViewTest {
 
@@ -49,21 +46,27 @@ public class CompositeViewTest {
         TestToolkit.createInstance();
 
         view = new CompositeView(new NullContent(), null) {
+            @Override
             protected void buildNewView() {
                 newBuildCount++;
             }
 
+            @Override
             protected void buildModifiedView() {
                 modifiedBuildCount++;
             }
 
-            protected void buildView() {}
+            @Override
+            protected void buildView() {
+            }
 
-            protected void doLayout(Size maximumSize) {
+            @Override
+            protected void doLayout(final Size maximumSize) {
                 layoutCount++;
             }
 
-            public Size requiredSize(Size availableSpace) {
+            @Override
+            public Size requiredSize(final Size availableSpace) {
                 return null;
             }
         };
@@ -186,4 +189,3 @@ public class CompositeViewTest {
         assertEquals(1, modifiedBuildCount);
     }
 }
-

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/CursorPositionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/CursorPositionTest.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/CursorPositionTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/CursorPositionTest.java Tue May  3 07:18:19 2011
@@ -17,14 +17,10 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view.text;
 
-import org.apache.isis.viewer.dnd.view.text.CursorPosition;
-
 import junit.framework.TestCase;
 
-
 public class CursorPositionTest extends TestCase {
 
     public static void main(final String[] args) {

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/CursorPostionStub.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/CursorPostionStub.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/CursorPostionStub.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/CursorPostionStub.java Tue May  3 07:18:19 2011
@@ -17,11 +17,8 @@
  *  under the License.
  */
 
-
 package org.apache.isis.viewer.dnd.view.text;
 
-import org.apache.isis.viewer.dnd.view.text.CursorPosition;
-import org.apache.isis.viewer.dnd.view.text.TextContent;
 
 public class CursorPostionStub extends CursorPosition {
     public CursorPostionStub(final TextContent content, final int line, final int afterCharacter) {



Mime
View raw message