You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2010/11/16 19:28:54 UTC

svn commit: r1035729 [7/10] - in /incubator/isis/trunk/viewer: bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/bindings/ bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/perform/ ...

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeDrag.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeDrag.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeDrag.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeDrag.java Tue Nov 16 18:28:38 2010
@@ -18,15 +18,15 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.border;
+package org.apache.isis.viewer.dnd.view.border;
 
-import org.apache.isis.extensions.dnd.drawing.Bounds;
-import org.apache.isis.extensions.dnd.drawing.Location;
-import org.apache.isis.extensions.dnd.drawing.Size;
-import org.apache.isis.extensions.dnd.interaction.DragImpl;
-import org.apache.isis.extensions.dnd.view.InternalDrag;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.Viewer;
+import org.apache.isis.viewer.dnd.drawing.Bounds;
+import org.apache.isis.viewer.dnd.drawing.Location;
+import org.apache.isis.viewer.dnd.drawing.Size;
+import org.apache.isis.viewer.dnd.interaction.DragImpl;
+import org.apache.isis.viewer.dnd.view.InternalDrag;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.Viewer;
 
 
 public class ResizeDrag  extends DragImpl implements InternalDrag {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeViewRender.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeViewRender.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeViewRender.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeViewRender.java Tue Nov 16 18:28:38 2010
@@ -18,9 +18,9 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.border;
+package org.apache.isis.viewer.dnd.view.border;
 
-import org.apache.isis.extensions.dnd.drawing.Canvas;
+import org.apache.isis.viewer.dnd.drawing.Canvas;
 
 public interface ResizeViewRender {
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveState.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveState.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveState.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveState.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.border;
+package org.apache.isis.viewer.dnd.view.border;
 
 class SaveState {
     StringBuffer missingFields = new StringBuffer();

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveTransientObjectBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveTransientObjectBorder.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveTransientObjectBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveTransientObjectBorder.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.border;
+package org.apache.isis.viewer.dnd.view.border;
 
 import org.apache.log4j.Logger;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -28,15 +28,15 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
-import org.apache.isis.extensions.dnd.drawing.Location;
-import org.apache.isis.extensions.dnd.view.ButtonAction;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.ViewSpecification;
-import org.apache.isis.extensions.dnd.view.Workspace;
-import org.apache.isis.extensions.dnd.view.content.FieldContent;
-import org.apache.isis.extensions.dnd.view.content.RootObject;
-import org.apache.isis.extensions.dnd.view.control.AbstractButtonAction;
+import org.apache.isis.viewer.dnd.drawing.Location;
+import org.apache.isis.viewer.dnd.view.ButtonAction;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.ViewSpecification;
+import org.apache.isis.viewer.dnd.view.Workspace;
+import org.apache.isis.viewer.dnd.view.content.FieldContent;
+import org.apache.isis.viewer.dnd.view.content.RootObject;
+import org.apache.isis.viewer.dnd.view.control.AbstractButtonAction;
 
 
 public class SaveTransientObjectBorder extends ButtonBorder {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ScrollBar.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ScrollBar.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ScrollBar.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ScrollBar.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.border;
+package org.apache.isis.viewer.dnd.view.border;
 
 public class ScrollBar {
     private int maximum;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ScrollBarRender.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ScrollBarRender.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ScrollBarRender.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ScrollBarRender.java Tue Nov 16 18:28:38 2010
@@ -18,9 +18,9 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.border;
+package org.apache.isis.viewer.dnd.view.border;
 
-import org.apache.isis.extensions.dnd.drawing.Canvas;
+import org.apache.isis.viewer.dnd.drawing.Canvas;
 
 public interface ScrollBarRender {
     void draw(Canvas canvas, boolean isHorizontal, int x, int y, int width, int height, int scrollPosition, int visibleAmount);

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ScrollBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ScrollBorder.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ScrollBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ScrollBorder.java Tue Nov 16 18:28:38 2010
@@ -18,31 +18,31 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.border;
+package org.apache.isis.viewer.dnd.view.border;
 
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
-import org.apache.isis.extensions.dnd.drawing.Bounds;
-import org.apache.isis.extensions.dnd.drawing.Canvas;
-import org.apache.isis.extensions.dnd.drawing.Color;
-import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
-import org.apache.isis.extensions.dnd.drawing.Location;
-import org.apache.isis.extensions.dnd.drawing.Offset;
-import org.apache.isis.extensions.dnd.drawing.Size;
-import org.apache.isis.extensions.dnd.interaction.SimpleInternalDrag;
-import org.apache.isis.extensions.dnd.view.Click;
-import org.apache.isis.extensions.dnd.view.ContentDrag;
-import org.apache.isis.extensions.dnd.view.DragEvent;
-import org.apache.isis.extensions.dnd.view.DragStart;
-import org.apache.isis.extensions.dnd.view.InternalDrag;
-import org.apache.isis.extensions.dnd.view.Toolkit;
-import org.apache.isis.extensions.dnd.view.UserActionSet;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.ViewAreaType;
-import org.apache.isis.extensions.dnd.view.Workspace;
-import org.apache.isis.extensions.dnd.view.base.AbstractViewDecorator;
-import org.apache.isis.extensions.dnd.view.base.NullView;
-import org.apache.isis.extensions.dnd.view.option.UserActionAbstract;
+import org.apache.isis.viewer.dnd.drawing.Bounds;
+import org.apache.isis.viewer.dnd.drawing.Canvas;
+import org.apache.isis.viewer.dnd.drawing.Color;
+import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
+import org.apache.isis.viewer.dnd.drawing.Location;
+import org.apache.isis.viewer.dnd.drawing.Offset;
+import org.apache.isis.viewer.dnd.drawing.Size;
+import org.apache.isis.viewer.dnd.interaction.SimpleInternalDrag;
+import org.apache.isis.viewer.dnd.view.Click;
+import org.apache.isis.viewer.dnd.view.ContentDrag;
+import org.apache.isis.viewer.dnd.view.DragEvent;
+import org.apache.isis.viewer.dnd.view.DragStart;
+import org.apache.isis.viewer.dnd.view.InternalDrag;
+import org.apache.isis.viewer.dnd.view.Toolkit;
+import org.apache.isis.viewer.dnd.view.UserActionSet;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.ViewAreaType;
+import org.apache.isis.viewer.dnd.view.Workspace;
+import org.apache.isis.viewer.dnd.view.base.AbstractViewDecorator;
+import org.apache.isis.viewer.dnd.view.base.NullView;
+import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
 
 
 /**

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SelectObjectBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SelectObjectBorder.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SelectObjectBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SelectObjectBorder.java Tue Nov 16 18:28:38 2010
@@ -18,26 +18,26 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.border;
+package org.apache.isis.viewer.dnd.view.border;
 
 import java.awt.event.KeyEvent;
 
 import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.extensions.dnd.drawing.Canvas;
-import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
-import org.apache.isis.extensions.dnd.drawing.Location;
-import org.apache.isis.extensions.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.Click;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.KeyboardAction;
-import org.apache.isis.extensions.dnd.view.SubviewDecorator;
-import org.apache.isis.extensions.dnd.view.Toolkit;
-import org.apache.isis.extensions.dnd.view.UserActionSet;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.ViewAxis;
-import org.apache.isis.extensions.dnd.view.Workspace;
-import org.apache.isis.extensions.dnd.view.base.AbstractBorder;
-import org.apache.isis.extensions.dnd.view.option.UserActionAbstract;
+import org.apache.isis.viewer.dnd.drawing.Canvas;
+import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
+import org.apache.isis.viewer.dnd.drawing.Location;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.Click;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.KeyboardAction;
+import org.apache.isis.viewer.dnd.view.SubviewDecorator;
+import org.apache.isis.viewer.dnd.view.Toolkit;
+import org.apache.isis.viewer.dnd.view.UserActionSet;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.ViewAxis;
+import org.apache.isis.viewer.dnd.view.Workspace;
+import org.apache.isis.viewer.dnd.view.base.AbstractBorder;
+import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
 
 
 public class SelectObjectBorder extends AbstractBorder {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SelectableViewAxis.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SelectableViewAxis.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SelectableViewAxis.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SelectableViewAxis.java Tue Nov 16 18:28:38 2010
@@ -18,12 +18,12 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.border;
+package org.apache.isis.viewer.dnd.view.border;
 
 import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.ViewAxis;
-import org.apache.isis.extensions.dnd.view.Selectable;;
+import org.apache.isis.viewer.dnd.view.Selectable;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.ViewAxis;
 
 public class SelectableViewAxis implements ViewAxis {
     private View selectedView;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SelectedBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SelectedBorder.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SelectedBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SelectedBorder.java Tue Nov 16 18:28:38 2010
@@ -18,15 +18,15 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.border;
+package org.apache.isis.viewer.dnd.view.border;
 
-import org.apache.isis.extensions.dnd.drawing.Canvas;
-import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
-import org.apache.isis.extensions.dnd.drawing.Size;
-import org.apache.isis.extensions.dnd.view.Click;
-import org.apache.isis.extensions.dnd.view.Toolkit;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.base.AbstractBorder;
+import org.apache.isis.viewer.dnd.drawing.Canvas;
+import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
+import org.apache.isis.viewer.dnd.drawing.Size;
+import org.apache.isis.viewer.dnd.view.Click;
+import org.apache.isis.viewer.dnd.view.Toolkit;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.base.AbstractBorder;
 
 public class SelectedBorder extends AbstractBorder {
     private final SelectableViewAxis axis;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/TextFieldResizeBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/TextFieldResizeBorder.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/TextFieldResizeBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/TextFieldResizeBorder.java Tue Nov 16 18:28:38 2010
@@ -18,17 +18,17 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.border;
+package org.apache.isis.viewer.dnd.view.border;
 
 import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.extensions.dnd.drawing.Canvas;
-import org.apache.isis.extensions.dnd.drawing.Color;
-import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
-import org.apache.isis.extensions.dnd.drawing.Shape;
-import org.apache.isis.extensions.dnd.drawing.Size;
-import org.apache.isis.extensions.dnd.util.Properties;
-import org.apache.isis.extensions.dnd.view.Toolkit;
-import org.apache.isis.extensions.dnd.view.View;
+import org.apache.isis.viewer.dnd.drawing.Canvas;
+import org.apache.isis.viewer.dnd.drawing.Color;
+import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
+import org.apache.isis.viewer.dnd.drawing.Shape;
+import org.apache.isis.viewer.dnd.drawing.Size;
+import org.apache.isis.viewer.dnd.util.Properties;
+import org.apache.isis.viewer.dnd.view.Toolkit;
+import org.apache.isis.viewer.dnd.view.View;
 
 
 public class TextFieldResizeBorder extends ResizeBorder {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ViewResizeBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ViewResizeBorder.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ViewResizeBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ViewResizeBorder.java Tue Nov 16 18:28:38 2010
@@ -18,13 +18,13 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.border;
+package org.apache.isis.viewer.dnd.view.border;
 
 import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.extensions.dnd.drawing.Canvas;
-import org.apache.isis.extensions.dnd.drawing.Size;
-import org.apache.isis.extensions.dnd.util.Properties;
-import org.apache.isis.extensions.dnd.view.View;
+import org.apache.isis.viewer.dnd.drawing.Canvas;
+import org.apache.isis.viewer.dnd.drawing.Size;
+import org.apache.isis.viewer.dnd.util.Properties;
+import org.apache.isis.viewer.dnd.view.View;
 
 
 // TODO enhance so the direction of resizing can be specified (could limit to width on right, height on bottom, or width/height from corner

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ViewResizeOutline.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ViewResizeOutline.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ViewResizeOutline.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ViewResizeOutline.java Tue Nov 16 18:28:38 2010
@@ -18,16 +18,16 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.border;
+package org.apache.isis.viewer.dnd.view.border;
 
-import org.apache.isis.extensions.dnd.drawing.Bounds;
-import org.apache.isis.extensions.dnd.drawing.Canvas;
-import org.apache.isis.extensions.dnd.drawing.Color;
-import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
-import org.apache.isis.extensions.dnd.drawing.Size;
-import org.apache.isis.extensions.dnd.view.Toolkit;
-import org.apache.isis.extensions.dnd.view.base.AbstractView;
-import org.apache.isis.extensions.dnd.view.content.NullContent;
+import org.apache.isis.viewer.dnd.drawing.Bounds;
+import org.apache.isis.viewer.dnd.drawing.Canvas;
+import org.apache.isis.viewer.dnd.drawing.Color;
+import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
+import org.apache.isis.viewer.dnd.drawing.Size;
+import org.apache.isis.viewer.dnd.view.Toolkit;
+import org.apache.isis.viewer.dnd.view.base.AbstractView;
+import org.apache.isis.viewer.dnd.view.content.NullContent;
 
 
 public class ViewResizeOutline extends AbstractView {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.collection;
+package org.apache.isis.viewer.dnd.view.collection;
 
 import java.util.Enumeration;
 
@@ -34,14 +34,14 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
-import org.apache.isis.extensions.dnd.drawing.Image;
-import org.apache.isis.extensions.dnd.drawing.ImageFactory;
-import org.apache.isis.extensions.dnd.drawing.Location;
-import org.apache.isis.extensions.dnd.view.UserActionSet;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.Workspace;
-import org.apache.isis.extensions.dnd.view.content.AbstractContent;
-import org.apache.isis.extensions.dnd.view.option.UserActionAbstract;
+import org.apache.isis.viewer.dnd.drawing.Image;
+import org.apache.isis.viewer.dnd.drawing.ImageFactory;
+import org.apache.isis.viewer.dnd.drawing.Location;
+import org.apache.isis.viewer.dnd.view.UserActionSet;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.Workspace;
+import org.apache.isis.viewer.dnd.view.content.AbstractContent;
+import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
 
 
 public abstract class AbstractCollectionContent extends AbstractContent implements CollectionContent {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionContent.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionContent.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.collection;
+package org.apache.isis.viewer.dnd.view.collection;
 
 import java.util.Enumeration;
 
@@ -26,9 +26,9 @@ import org.apache.isis.core.commons.debu
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.extensions.dnd.drawing.Image;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.UserActionSet;
+import org.apache.isis.viewer.dnd.drawing.Image;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.UserActionSet;
 
 
 public interface CollectionContent extends Content {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionElement.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionElement.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionElement.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionElement.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.collection;
+package org.apache.isis.viewer.dnd.view.collection;
 
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.Veto;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.extensions.dnd.view.content.AbstractObjectContent;
+import org.apache.isis.viewer.dnd.view.content.AbstractObjectContent;
 
 
 public class CollectionElement extends AbstractObjectContent {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionSorter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionSorter.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionSorter.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionSorter.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.collection;
+package org.apache.isis.viewer.dnd.view.collection;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/Comparator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/Comparator.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/Comparator.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/Comparator.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.collection;
+package org.apache.isis.viewer.dnd.view.collection;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/FieldComparator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/FieldComparator.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/FieldComparator.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/FieldComparator.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.collection;
+package org.apache.isis.viewer.dnd.view.collection;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/RootCollection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/RootCollection.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/RootCollection.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/RootCollection.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.collection;
+package org.apache.isis.viewer.dnd.view.collection;
 
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
@@ -26,9 +26,9 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.Veto;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.extensions.dnd.drawing.Image;
-import org.apache.isis.extensions.dnd.drawing.ImageFactory;
-import org.apache.isis.extensions.dnd.view.Content;
+import org.apache.isis.viewer.dnd.drawing.Image;
+import org.apache.isis.viewer.dnd.drawing.ImageFactory;
+import org.apache.isis.viewer.dnd.view.Content;
 
 
 public class RootCollection extends AbstractCollectionContent {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/SimpleCollectionSorter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/SimpleCollectionSorter.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/SimpleCollectionSorter.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/SimpleCollectionSorter.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.collection;
+package org.apache.isis.viewer.dnd.view.collection;
 
 import java.util.Enumeration;
 import java.util.Vector;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/TitleComparator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/TitleComparator.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/TitleComparator.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/TitleComparator.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.collection;
+package org.apache.isis.viewer.dnd.view.collection;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/TypeComparator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/TypeComparator.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/TypeComparator.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/TypeComparator.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.collection;
+package org.apache.isis.viewer.dnd.view.collection;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/AbstractBuilderDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/AbstractBuilderDecorator.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/AbstractBuilderDecorator.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/AbstractBuilderDecorator.java Tue Nov 16 18:28:38 2010
@@ -18,12 +18,12 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.composite;
+package org.apache.isis.viewer.dnd.view.composite;
 
 
-import org.apache.isis.extensions.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.UserActionSet;
-import org.apache.isis.extensions.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.UserActionSet;
+import org.apache.isis.viewer.dnd.view.View;
 
 
 public abstract class AbstractBuilderDecorator implements ViewBuilder {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/AbstractCollectionViewSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/AbstractCollectionViewSpecification.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/AbstractCollectionViewSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/AbstractCollectionViewSpecification.java Tue Nov 16 18:28:38 2010
@@ -18,13 +18,13 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.composite;
+package org.apache.isis.viewer.dnd.view.composite;
 
-import org.apache.isis.extensions.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.ViewFactory;
-import org.apache.isis.extensions.dnd.view.ViewRequirement;
-import org.apache.isis.extensions.dnd.view.base.Layout;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.ViewFactory;
+import org.apache.isis.viewer.dnd.view.ViewRequirement;
+import org.apache.isis.viewer.dnd.view.base.Layout;
 
 
 public abstract class AbstractCollectionViewSpecification extends CompositeViewSpecification {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/AbstractViewBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/AbstractViewBuilder.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/AbstractViewBuilder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/AbstractViewBuilder.java Tue Nov 16 18:28:38 2010
@@ -18,16 +18,16 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.composite;
+package org.apache.isis.viewer.dnd.view.composite;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.isis.extensions.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.SubviewDecorator;
-import org.apache.isis.extensions.dnd.view.UserActionSet;
-import org.apache.isis.extensions.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.SubviewDecorator;
+import org.apache.isis.viewer.dnd.view.UserActionSet;
+import org.apache.isis.viewer.dnd.view.View;
 
 
 public abstract class AbstractViewBuilder implements ViewBuilder {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CollectionElementBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CollectionElementBuilder.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CollectionElementBuilder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CollectionElementBuilder.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.composite;
+package org.apache.isis.viewer.dnd.view.composite;
 
 import java.util.Enumeration;
 
@@ -26,15 +26,15 @@ import org.apache.log4j.Logger;
 import org.apache.isis.core.commons.ensure.Assert;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.extensions.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.SubviewDecorator;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.ViewFactory;
-import org.apache.isis.extensions.dnd.view.collection.CollectionContent;
-import org.apache.isis.extensions.dnd.view.collection.CollectionElement;
-import org.apache.isis.extensions.dnd.view.field.OneToManyField;
-import org.apache.isis.extensions.dnd.view.field.OneToManyFieldElementImpl;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.SubviewDecorator;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.ViewFactory;
+import org.apache.isis.viewer.dnd.view.collection.CollectionContent;
+import org.apache.isis.viewer.dnd.view.collection.CollectionElement;
+import org.apache.isis.viewer.dnd.view.field.OneToManyField;
+import org.apache.isis.viewer.dnd.view.field.OneToManyFieldElementImpl;
 
 
 public class CollectionElementBuilder extends AbstractViewBuilder {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ColumnLayout.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ColumnLayout.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ColumnLayout.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ColumnLayout.java Tue Nov 16 18:28:38 2010
@@ -18,12 +18,12 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.composite;
+package org.apache.isis.viewer.dnd.view.composite;
 
-import org.apache.isis.extensions.dnd.drawing.Location;
-import org.apache.isis.extensions.dnd.drawing.Size;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.base.Layout;
+import org.apache.isis.viewer.dnd.drawing.Location;
+import org.apache.isis.viewer.dnd.drawing.Size;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.base.Layout;
 
 
 /**

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.composite;
+package org.apache.isis.viewer.dnd.view.composite;
 
 import java.util.Vector;
 
@@ -27,19 +27,19 @@ import org.apache.isis.core.commons.debu
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.lang.ToString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.extensions.dnd.drawing.Bounds;
-import org.apache.isis.extensions.dnd.drawing.Canvas;
-import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
-import org.apache.isis.extensions.dnd.drawing.Location;
-import org.apache.isis.extensions.dnd.drawing.Padding;
-import org.apache.isis.extensions.dnd.drawing.Size;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.FocusManager;
-import org.apache.isis.extensions.dnd.view.Toolkit;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.ViewAreaType;
-import org.apache.isis.extensions.dnd.view.ViewSpecification;
-import org.apache.isis.extensions.dnd.view.base.ObjectView;
+import org.apache.isis.viewer.dnd.drawing.Bounds;
+import org.apache.isis.viewer.dnd.drawing.Canvas;
+import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
+import org.apache.isis.viewer.dnd.drawing.Location;
+import org.apache.isis.viewer.dnd.drawing.Padding;
+import org.apache.isis.viewer.dnd.drawing.Size;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.FocusManager;
+import org.apache.isis.viewer.dnd.view.Toolkit;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.ViewAreaType;
+import org.apache.isis.viewer.dnd.view.ViewSpecification;
+import org.apache.isis.viewer.dnd.view.base.ObjectView;
 
 
 public abstract class CompositeView extends ObjectView {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewDecorator.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewDecorator.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewDecorator.java Tue Nov 16 18:28:38 2010
@@ -18,10 +18,10 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.composite;
+package org.apache.isis.viewer.dnd.view.composite;
 
-import org.apache.isis.extensions.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.View;
 
 public interface CompositeViewDecorator {
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewSpecification.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewSpecification.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.composite;
+package org.apache.isis.viewer.dnd.view.composite;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,16 +26,16 @@ import java.util.List;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.userprofile.Options;
-import org.apache.isis.extensions.dnd.util.Properties;
-import org.apache.isis.extensions.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.ObjectContent;
-import org.apache.isis.extensions.dnd.view.SubviewDecorator;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.ViewAxis;
-import org.apache.isis.extensions.dnd.view.ViewSpecification;
-import org.apache.isis.extensions.dnd.view.base.Layout;
-import org.apache.isis.extensions.dnd.view.window.SubviewFocusManager;
+import org.apache.isis.viewer.dnd.util.Properties;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.ObjectContent;
+import org.apache.isis.viewer.dnd.view.SubviewDecorator;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.ViewAxis;
+import org.apache.isis.viewer.dnd.view.ViewSpecification;
+import org.apache.isis.viewer.dnd.view.base.Layout;
+import org.apache.isis.viewer.dnd.view.window.SubviewFocusManager;
 
 
 public abstract class CompositeViewSpecification implements ViewSpecification {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewUsingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewUsingBuilder.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewUsingBuilder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewUsingBuilder.java Tue Nov 16 18:28:38 2010
@@ -18,15 +18,15 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.composite;
+package org.apache.isis.viewer.dnd.view.composite;
 
 import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.extensions.dnd.drawing.Size;
-import org.apache.isis.extensions.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.UserActionSet;
-import org.apache.isis.extensions.dnd.view.ViewSpecification;
-import org.apache.isis.extensions.dnd.view.base.Layout;
+import org.apache.isis.viewer.dnd.drawing.Size;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.UserActionSet;
+import org.apache.isis.viewer.dnd.view.ViewSpecification;
+import org.apache.isis.viewer.dnd.view.base.Layout;
 
 
 public class CompositeViewUsingBuilder extends CompositeView {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/FieldLabelsDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/FieldLabelsDecorator.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/FieldLabelsDecorator.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/FieldLabelsDecorator.java Tue Nov 16 18:28:38 2010
@@ -18,16 +18,16 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.composite;
+package org.apache.isis.viewer.dnd.view.composite;
 
-import org.apache.isis.extensions.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.SubviewDecorator;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.ViewAxis;
-import org.apache.isis.extensions.dnd.view.axis.LabelAxis;
-import org.apache.isis.extensions.dnd.view.border.DroppableLabelBorder;
-import org.apache.isis.extensions.dnd.view.border.LabelBorder;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.SubviewDecorator;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.ViewAxis;
+import org.apache.isis.viewer.dnd.view.axis.LabelAxis;
+import org.apache.isis.viewer.dnd.view.border.DroppableLabelBorder;
+import org.apache.isis.viewer.dnd.view.border.LabelBorder;
 
 public class FieldLabelsDecorator implements SubviewDecorator {
     

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/GridLayout.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/GridLayout.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/GridLayout.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/GridLayout.java Tue Nov 16 18:28:38 2010
@@ -18,13 +18,13 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.composite;
+package org.apache.isis.viewer.dnd.view.composite;
 
-import org.apache.isis.extensions.dnd.drawing.Location;
-import org.apache.isis.extensions.dnd.drawing.Size;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.ViewAxis;
-import org.apache.isis.extensions.dnd.view.base.Layout;
+import org.apache.isis.viewer.dnd.drawing.Location;
+import org.apache.isis.viewer.dnd.drawing.Size;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.ViewAxis;
+import org.apache.isis.viewer.dnd.view.base.Layout;
 
 
 /**

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/GridLayoutControlBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/GridLayoutControlBorder.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/GridLayoutControlBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/GridLayoutControlBorder.java Tue Nov 16 18:28:38 2010
@@ -18,16 +18,16 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.composite;
+package org.apache.isis.viewer.dnd.view.composite;
 
 import org.apache.isis.core.runtime.userprofile.Options;
-import org.apache.isis.extensions.dnd.drawing.Location;
-import org.apache.isis.extensions.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.UserActionSet;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.Workspace;
-import org.apache.isis.extensions.dnd.view.base.AbstractBorder;
-import org.apache.isis.extensions.dnd.view.option.UserActionAbstract;
+import org.apache.isis.viewer.dnd.drawing.Location;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.UserActionSet;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.Workspace;
+import org.apache.isis.viewer.dnd.view.base.AbstractBorder;
+import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
 
 
 public class GridLayoutControlBorder extends AbstractBorder {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/IconGridViewSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/IconGridViewSpecification.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/IconGridViewSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/IconGridViewSpecification.java Tue Nov 16 18:28:38 2010
@@ -18,24 +18,24 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.composite;
+package org.apache.isis.viewer.dnd.view.composite;
 
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
-import org.apache.isis.extensions.dnd.drawing.Text;
-import org.apache.isis.extensions.dnd.icon.Icon;
-import org.apache.isis.extensions.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.Toolkit;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.ViewFactory;
-import org.apache.isis.extensions.dnd.view.ViewRequirement;
-import org.apache.isis.extensions.dnd.view.base.IconGraphic;
-import org.apache.isis.extensions.dnd.view.base.Layout;
-import org.apache.isis.extensions.dnd.view.border.IconBorder;
-import org.apache.isis.extensions.dnd.view.border.LineBorder;
-import org.apache.isis.extensions.dnd.view.text.ObjectTitleText;
+import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
+import org.apache.isis.viewer.dnd.drawing.Text;
+import org.apache.isis.viewer.dnd.icon.Icon;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.Toolkit;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.ViewFactory;
+import org.apache.isis.viewer.dnd.view.ViewRequirement;
+import org.apache.isis.viewer.dnd.view.base.IconGraphic;
+import org.apache.isis.viewer.dnd.view.base.Layout;
+import org.apache.isis.viewer.dnd.view.border.IconBorder;
+import org.apache.isis.viewer.dnd.view.border.LineBorder;
+import org.apache.isis.viewer.dnd.view.text.ObjectTitleText;
 
 public class IconGridViewSpecification extends AbstractCollectionViewSpecification {
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ImageViewSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ImageViewSpecification.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ImageViewSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ImageViewSpecification.java Tue Nov 16 18:28:38 2010
@@ -18,19 +18,19 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.composite;
+package org.apache.isis.viewer.dnd.view.composite;
 
-import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
-import org.apache.isis.extensions.dnd.drawing.Text;
-import org.apache.isis.extensions.dnd.icon.Icon;
-import org.apache.isis.extensions.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.Toolkit;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.ViewRequirement;
-import org.apache.isis.extensions.dnd.view.ViewSpecification;
-import org.apache.isis.extensions.dnd.view.base.IconGraphic;
-import org.apache.isis.extensions.dnd.view.text.ObjectTitleText;
+import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
+import org.apache.isis.viewer.dnd.drawing.Text;
+import org.apache.isis.viewer.dnd.icon.Icon;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.Toolkit;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.ViewRequirement;
+import org.apache.isis.viewer.dnd.view.ViewSpecification;
+import org.apache.isis.viewer.dnd.view.base.IconGraphic;
+import org.apache.isis.viewer.dnd.view.text.ObjectTitleText;
 
 public class ImageViewSpecification implements ViewSpecification {
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/LineBorderDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/LineBorderDecorator.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/LineBorderDecorator.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/LineBorderDecorator.java Tue Nov 16 18:28:38 2010
@@ -18,13 +18,13 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.composite;
+package org.apache.isis.viewer.dnd.view.composite;
 
-import org.apache.isis.extensions.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.SubviewDecorator;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.ViewAxis;
-import org.apache.isis.extensions.dnd.view.border.LineBorder;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.SubviewDecorator;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.ViewAxis;
+import org.apache.isis.viewer.dnd.view.border.LineBorder;
 
 public class LineBorderDecorator implements SubviewDecorator {
     
@@ -32,7 +32,7 @@ public class LineBorderDecorator impleme
         return new LineBorder(view);
     }
 
-    public ViewAxis createAxis(org.apache.isis.extensions.dnd.view.Content content) {
+    public ViewAxis createAxis(org.apache.isis.viewer.dnd.view.Content content) {
         return null;
     }
 }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/MasterDetailPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/MasterDetailPanel.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/MasterDetailPanel.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/MasterDetailPanel.java Tue Nov 16 18:28:38 2010
@@ -18,25 +18,25 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.composite;
+package org.apache.isis.viewer.dnd.view.composite;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.extensions.dnd.drawing.Location;
-import org.apache.isis.extensions.dnd.drawing.Size;
-import org.apache.isis.extensions.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.ObjectContent;
-import org.apache.isis.extensions.dnd.view.Selectable;
-import org.apache.isis.extensions.dnd.view.Toolkit;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.ViewRequirement;
-import org.apache.isis.extensions.dnd.view.ViewSpecification;
-import org.apache.isis.extensions.dnd.view.base.BlankView;
-import org.apache.isis.extensions.dnd.view.border.ScrollBorder;
-import org.apache.isis.extensions.dnd.view.border.SelectableViewAxis;
-import org.apache.isis.extensions.dnd.view.border.ViewResizeBorder;
-import org.apache.isis.extensions.dnd.view.collection.CollectionContent;
-import org.apache.isis.extensions.dnd.view.content.NullContent;
+import org.apache.isis.viewer.dnd.drawing.Location;
+import org.apache.isis.viewer.dnd.drawing.Size;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.ObjectContent;
+import org.apache.isis.viewer.dnd.view.Selectable;
+import org.apache.isis.viewer.dnd.view.Toolkit;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.ViewRequirement;
+import org.apache.isis.viewer.dnd.view.ViewSpecification;
+import org.apache.isis.viewer.dnd.view.base.BlankView;
+import org.apache.isis.viewer.dnd.view.border.ScrollBorder;
+import org.apache.isis.viewer.dnd.view.border.SelectableViewAxis;
+import org.apache.isis.viewer.dnd.view.border.ViewResizeBorder;
+import org.apache.isis.viewer.dnd.view.collection.CollectionContent;
+import org.apache.isis.viewer.dnd.view.content.NullContent;
 
 
 public class MasterDetailPanel extends CompositeView implements Selectable {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.composite;
+package org.apache.isis.viewer.dnd.view.composite;
 
 import org.apache.log4j.Logger;
 import org.apache.isis.core.commons.ensure.Assert;
@@ -30,15 +30,15 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
 import org.apache.isis.core.metamodel.util.IsisUtils;
 import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.extensions.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.ObjectContent;
-import org.apache.isis.extensions.dnd.view.SubviewDecorator;
-import org.apache.isis.extensions.dnd.view.Toolkit;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.ViewFactory;
-import org.apache.isis.extensions.dnd.view.base.FieldErrorView;
-import org.apache.isis.extensions.dnd.view.content.FieldContent;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.ObjectContent;
+import org.apache.isis.viewer.dnd.view.SubviewDecorator;
+import org.apache.isis.viewer.dnd.view.Toolkit;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.ViewFactory;
+import org.apache.isis.viewer.dnd.view.base.FieldErrorView;
+import org.apache.isis.viewer.dnd.view.content.FieldContent;
 
 
 public class ObjectFieldBuilder extends AbstractViewBuilder {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ReplaceViewBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ReplaceViewBorder.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ReplaceViewBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ReplaceViewBorder.java Tue Nov 16 18:28:38 2010
@@ -18,16 +18,16 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.composite;
+package org.apache.isis.viewer.dnd.view.composite;
 
-import org.apache.isis.extensions.dnd.drawing.Bounds;
-import org.apache.isis.extensions.dnd.drawing.Canvas;
-import org.apache.isis.extensions.dnd.form.FormSpecification;
-import org.apache.isis.extensions.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.Click;
-import org.apache.isis.extensions.dnd.view.Toolkit;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.base.AbstractBorder;
+import org.apache.isis.viewer.dnd.drawing.Bounds;
+import org.apache.isis.viewer.dnd.drawing.Canvas;
+import org.apache.isis.viewer.dnd.form.FormSpecification;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.Click;
+import org.apache.isis.viewer.dnd.view.Toolkit;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.base.AbstractBorder;
 
 public class ReplaceViewBorder extends AbstractBorder {
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/StackLayout.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/StackLayout.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/StackLayout.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/StackLayout.java Tue Nov 16 18:28:38 2010
@@ -18,12 +18,12 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.composite;
+package org.apache.isis.viewer.dnd.view.composite;
 
-import org.apache.isis.extensions.dnd.drawing.Location;
-import org.apache.isis.extensions.dnd.drawing.Size;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.base.Layout;
+import org.apache.isis.viewer.dnd.drawing.Location;
+import org.apache.isis.viewer.dnd.drawing.Size;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.base.Layout;
 
 
 /**

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/StandardFields.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/StandardFields.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/StandardFields.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/StandardFields.java Tue Nov 16 18:28:38 2010
@@ -18,16 +18,16 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.composite;
+package org.apache.isis.viewer.dnd.view.composite;
 
 import org.apache.isis.core.commons.exceptions.UnknownTypeException;
-import org.apache.isis.extensions.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.GlobalViewFactory;
-import org.apache.isis.extensions.dnd.view.Toolkit;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.ViewFactory;
-import org.apache.isis.extensions.dnd.view.ViewRequirement;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.GlobalViewFactory;
+import org.apache.isis.viewer.dnd.view.Toolkit;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.ViewFactory;
+import org.apache.isis.viewer.dnd.view.ViewRequirement;
 
 /**
  * A view factory for the components of a container

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ViewBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ViewBuilder.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ViewBuilder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ViewBuilder.java Tue Nov 16 18:28:38 2010
@@ -18,14 +18,14 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.composite;
+package org.apache.isis.viewer.dnd.view.composite;
 
 
-import org.apache.isis.extensions.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.SubviewDecorator;
-import org.apache.isis.extensions.dnd.view.UserActionSet;
-import org.apache.isis.extensions.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.SubviewDecorator;
+import org.apache.isis.viewer.dnd.view.UserActionSet;
+import org.apache.isis.viewer.dnd.view.View;
 
 
 public interface ViewBuilder {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractContent.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractContent.java Tue Nov 16 18:28:38 2010
@@ -18,10 +18,10 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.content;
+package org.apache.isis.viewer.dnd.view.content;
 
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.UserActionSet;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.UserActionSet;
 
 
 public abstract class AbstractContent implements Content {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractObjectContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractObjectContent.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractObjectContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractObjectContent.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.content;
+package org.apache.isis.viewer.dnd.view.content;
 
 import org.apache.isis.core.commons.ensure.Assert;
 import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
@@ -38,16 +38,16 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
-import org.apache.isis.extensions.dnd.drawing.Image;
-import org.apache.isis.extensions.dnd.drawing.ImageFactory;
-import org.apache.isis.extensions.dnd.drawing.Location;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.ObjectContent;
-import org.apache.isis.extensions.dnd.view.Placement;
-import org.apache.isis.extensions.dnd.view.UserActionSet;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.Workspace;
-import org.apache.isis.extensions.dnd.view.option.UserActionAbstract;
+import org.apache.isis.viewer.dnd.drawing.Image;
+import org.apache.isis.viewer.dnd.drawing.ImageFactory;
+import org.apache.isis.viewer.dnd.drawing.Location;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.ObjectContent;
+import org.apache.isis.viewer.dnd.view.Placement;
+import org.apache.isis.viewer.dnd.view.UserActionSet;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.Workspace;
+import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
 
 
 public abstract class AbstractObjectContent extends AbstractContent implements ObjectContent {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractTextParsableContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractTextParsableContent.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractTextParsableContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractTextParsableContent.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.content;
+package org.apache.isis.viewer.dnd.view.content;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Consent;
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ParseableEntryActionParameter;
 import org.apache.isis.core.progmodel.facets.object.ident.title.TitleFacet;
-import org.apache.isis.extensions.dnd.drawing.Image;
+import org.apache.isis.viewer.dnd.drawing.Image;
 
 
 public abstract class AbstractTextParsableContent extends AbstractContent {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/FieldContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/FieldContent.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/FieldContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/FieldContent.java Tue Nov 16 18:28:38 2010
@@ -18,12 +18,12 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.content;
+package org.apache.isis.viewer.dnd.view.content;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.extensions.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.Content;
 
 
 public interface FieldContent extends Content {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/NullContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/NullContent.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/NullContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/NullContent.java Tue Nov 16 18:28:38 2010
@@ -18,15 +18,15 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.content;
+package org.apache.isis.viewer.dnd.view.content;
 
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.extensions.dnd.drawing.Image;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.UserActionSet;
+import org.apache.isis.viewer.dnd.drawing.Image;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.UserActionSet;
 
 
 public class NullContent implements Content {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/RootObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/RootObject.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/RootObject.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/RootObject.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.content;
+package org.apache.isis.viewer.dnd.view.content;
 
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.Veto;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.extensions.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.Content;
 
 
 public class RootObject extends AbstractObjectContent {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/TextParseableContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/TextParseableContent.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/TextParseableContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/TextParseableContent.java Tue Nov 16 18:28:38 2010
@@ -18,11 +18,11 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.content;
+package org.apache.isis.viewer.dnd.view.content;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.extensions.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.Content;
 
 
 public interface TextParseableContent extends Content {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/AbstractButtonAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/AbstractButtonAction.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/AbstractButtonAction.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/AbstractButtonAction.java Tue Nov 16 18:28:38 2010
@@ -18,13 +18,13 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.control;
+package org.apache.isis.viewer.dnd.view.control;
 
 import org.apache.isis.core.metamodel.consent.Allow;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
-import org.apache.isis.extensions.dnd.view.ButtonAction;
-import org.apache.isis.extensions.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.ButtonAction;
+import org.apache.isis.viewer.dnd.view.View;
 
 
 public abstract class AbstractButtonAction implements ButtonAction {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/AbstractControlView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/AbstractControlView.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/AbstractControlView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/AbstractControlView.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.control;
+package org.apache.isis.viewer.dnd.view.control;
 
 import java.awt.event.KeyEvent;
 
@@ -27,33 +27,33 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.Veto;
 import org.apache.isis.core.runtime.userprofile.Options;
-import org.apache.isis.extensions.dnd.drawing.Bounds;
-import org.apache.isis.extensions.dnd.drawing.Canvas;
-import org.apache.isis.extensions.dnd.drawing.Location;
-import org.apache.isis.extensions.dnd.drawing.Padding;
-import org.apache.isis.extensions.dnd.drawing.Size;
-import org.apache.isis.extensions.dnd.view.Axes;
-import org.apache.isis.extensions.dnd.view.Click;
-import org.apache.isis.extensions.dnd.view.Content;
-import org.apache.isis.extensions.dnd.view.ContentDrag;
-import org.apache.isis.extensions.dnd.view.DragEvent;
-import org.apache.isis.extensions.dnd.view.DragStart;
-import org.apache.isis.extensions.dnd.view.Feedback;
-import org.apache.isis.extensions.dnd.view.FocusManager;
-import org.apache.isis.extensions.dnd.view.InternalDrag;
-import org.apache.isis.extensions.dnd.view.KeyboardAction;
-import org.apache.isis.extensions.dnd.view.Placement;
-import org.apache.isis.extensions.dnd.view.Toolkit;
-import org.apache.isis.extensions.dnd.view.UserAction;
-import org.apache.isis.extensions.dnd.view.UserActionSet;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.ViewAreaType;
-import org.apache.isis.extensions.dnd.view.ViewDrag;
-import org.apache.isis.extensions.dnd.view.ViewSpecification;
-import org.apache.isis.extensions.dnd.view.ViewState;
-import org.apache.isis.extensions.dnd.view.Viewer;
-import org.apache.isis.extensions.dnd.view.Workspace;
-import org.apache.isis.extensions.dnd.view.base.Layout;
+import org.apache.isis.viewer.dnd.drawing.Bounds;
+import org.apache.isis.viewer.dnd.drawing.Canvas;
+import org.apache.isis.viewer.dnd.drawing.Location;
+import org.apache.isis.viewer.dnd.drawing.Padding;
+import org.apache.isis.viewer.dnd.drawing.Size;
+import org.apache.isis.viewer.dnd.view.Axes;
+import org.apache.isis.viewer.dnd.view.Click;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.ContentDrag;
+import org.apache.isis.viewer.dnd.view.DragEvent;
+import org.apache.isis.viewer.dnd.view.DragStart;
+import org.apache.isis.viewer.dnd.view.Feedback;
+import org.apache.isis.viewer.dnd.view.FocusManager;
+import org.apache.isis.viewer.dnd.view.InternalDrag;
+import org.apache.isis.viewer.dnd.view.KeyboardAction;
+import org.apache.isis.viewer.dnd.view.Placement;
+import org.apache.isis.viewer.dnd.view.Toolkit;
+import org.apache.isis.viewer.dnd.view.UserAction;
+import org.apache.isis.viewer.dnd.view.UserActionSet;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.ViewAreaType;
+import org.apache.isis.viewer.dnd.view.ViewDrag;
+import org.apache.isis.viewer.dnd.view.ViewSpecification;
+import org.apache.isis.viewer.dnd.view.ViewState;
+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 abstract class AbstractControlView implements View {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/Button.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/Button.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/Button.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/Button.java Tue Nov 16 18:28:38 2010
@@ -18,12 +18,12 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.control;
+package org.apache.isis.viewer.dnd.view.control;
 
-import org.apache.isis.extensions.dnd.drawing.Canvas;
-import org.apache.isis.extensions.dnd.drawing.Size;
-import org.apache.isis.extensions.dnd.view.ButtonAction;
-import org.apache.isis.extensions.dnd.view.View;
+import org.apache.isis.viewer.dnd.drawing.Canvas;
+import org.apache.isis.viewer.dnd.drawing.Size;
+import org.apache.isis.viewer.dnd.view.ButtonAction;
+import org.apache.isis.viewer.dnd.view.View;
 
 
 public class Button extends AbstractControlView {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/ButtonRender.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/ButtonRender.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/ButtonRender.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/ButtonRender.java Tue Nov 16 18:28:38 2010
@@ -18,10 +18,10 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.control;
+package org.apache.isis.viewer.dnd.view.control;
 
-import org.apache.isis.extensions.dnd.drawing.Canvas;
-import org.apache.isis.extensions.dnd.drawing.Size;
+import org.apache.isis.viewer.dnd.drawing.Canvas;
+import org.apache.isis.viewer.dnd.drawing.Size;
 
 public interface ButtonRender {
 

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/CancelAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/CancelAction.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/CancelAction.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/CancelAction.java Tue Nov 16 18:28:38 2010
@@ -18,12 +18,12 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.control;
+package org.apache.isis.viewer.dnd.view.control;
 
 import org.apache.log4j.Logger;
-import org.apache.isis.extensions.dnd.drawing.Location;
-import org.apache.isis.extensions.dnd.view.View;
-import org.apache.isis.extensions.dnd.view.Workspace;
+import org.apache.isis.viewer.dnd.drawing.Location;
+import org.apache.isis.viewer.dnd.view.View;
+import org.apache.isis.viewer.dnd.view.Workspace;
 
 
 public class CancelAction extends AbstractButtonAction {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugAdapter.java?rev=1035729&r1=1035695&r2=1035729&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugAdapter.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugAdapter.java Tue Nov 16 18:28:38 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.dnd.view.debug;
+package org.apache.isis.viewer.dnd.view.debug;
 
 import org.apache.isis.core.commons.debug.DebugInfo;
 import org.apache.isis.core.commons.debug.DebugString;