You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2012/01/22 09:05:57 UTC
svn commit: r1234460 [7/30] - in /incubator/isis/trunk/framework/viewer:
bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/
bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/
bdd/common/src/main/java/org/apache/isis/viewer/...
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/BackgroundBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/BackgroundBorder.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/BackgroundBorder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/BackgroundBorder.java Sun Jan 22 08:05:17 2012
@@ -27,7 +27,8 @@ import org.apache.isis.viewer.dnd.view.V
import org.apache.isis.viewer.dnd.view.base.AbstractBorder;
/**
- * A background border provides a coloured background to a view of a specified colour.
+ * A background border provides a coloured background to a view of a specified
+ * colour.
*/
public class BackgroundBorder extends AbstractBorder {
private Color background;
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/BorderDrawing.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/BorderDrawing.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/BorderDrawing.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/BorderDrawing.java Sun Jan 22 08:05:17 2012
@@ -31,8 +31,7 @@ public interface BorderDrawing {
public abstract void layoutControls(final Size size, View[] controls);
- public abstract void draw(final Canvas canvas, Size s, boolean hasFocus, final ViewState state, View[] controls,
- String title);
+ public abstract void draw(final Canvas canvas, Size s, boolean hasFocus, final ViewState state, View[] controls, String title);
public abstract void drawTransientMarker(Canvas canvas, Size size);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/DisposedObjectBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/DisposedObjectBorder.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/DisposedObjectBorder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/DisposedObjectBorder.java Sun Jan 22 08:05:17 2012
@@ -69,8 +69,7 @@ public class DisposedObjectBorder extend
}
for (int i = 0; i < 15; i++) {
canvas.drawLine(left, top + i, left + i, top, color);
- canvas.drawLine(w - left - right - 1, s.getHeight() - top - i - 1, w - left - right - i - 1, s.getHeight()
- - top - 1, color);
+ canvas.drawLine(w - left - right - 1, s.getHeight() - top - i - 1, w - left - right - i - 1, s.getHeight() - top - 1, color);
}
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/DragViewBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/DragViewBorder.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/DragViewBorder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/DragViewBorder.java Sun Jan 22 08:05:17 2012
@@ -35,8 +35,8 @@ import org.apache.isis.viewer.dnd.view.b
import org.apache.isis.viewer.dnd.view.base.DragViewOutline;
/**
- * A drag view border provides a line and handle that appears when the mouse moves over the contained view and allows
- * the view to be dragged.
+ * A drag view border provides a line and handle that appears when the mouse
+ * moves over the contained view and allows the view to be dragged.
*/
public class DragViewBorder extends AbstractBorder {
private final int handleWidth = 14;
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/DroppableLabelBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/DroppableLabelBorder.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/DroppableLabelBorder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/DroppableLabelBorder.java Sun Jan 22 08:05:17 2012
@@ -63,7 +63,8 @@ public class DroppableLabelBorder extend
@Override
public ViewAreaType viewAreaType(final Location location) {
if (overBorder(location)) {
- return ViewAreaType.CONTENT; // used to ensure menu options for contained object are shown
+ return ViewAreaType.CONTENT; // used to ensure menu options for
+ // contained object are shown
} else {
return super.viewAreaType(location);
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/IconBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/IconBorder.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/IconBorder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/IconBorder.java Sun Jan 22 08:05:17 2012
@@ -102,8 +102,7 @@ public class IconBorder extends Abstract
int x = left - 2;
if (Toolkit.debug) {
- canvas.drawDebugOutline(new Bounds(getSize()), baseline,
- Toolkit.getColor(ColorsAndFonts.COLOR_DEBUG_BOUNDS_DRAW));
+ canvas.drawDebugOutline(new Bounds(getSize()), baseline, Toolkit.getColor(ColorsAndFonts.COLOR_DEBUG_BOUNDS_DRAW));
}
// icon & title
@@ -119,7 +118,8 @@ public class IconBorder extends Abstract
@Override
public int getBaseline() {
- return baseline; // wrappedView.getBaseline() + baseline + titlebarHeight;
+ return baseline; // wrappedView.getBaseline() + baseline +
+ // titlebarHeight;
}
@Override
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/LineBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/LineBorder.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/LineBorder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/LineBorder.java Sun Jan 22 08:05:17 2012
@@ -75,7 +75,8 @@ public class LineBorder extends Abstract
final Size s = getSize();
final int width = s.getWidth();
for (int i = 0; i < left - padding; i++) {
- // canvas.drawRectangle(i, i, width - 2 * i, s.getHeight() - 2 * i, color);
+ // canvas.drawRectangle(i, i, width - 2 * i, s.getHeight() - 2 * i,
+ // color);
canvas.drawRoundedRectangle(i, i, width - 2 * i, s.getHeight() - 2 * i, arcRadius, arcRadius, color);
}
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ObjectBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ObjectBorder.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ObjectBorder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ObjectBorder.java Sun Jan 22 08:05:17 2012
@@ -102,8 +102,7 @@ public class ObjectBorder extends Abstra
final int y = 0;
final Image icon = ImageFactory.getInstance().loadIcon("transient", 8, null);
if (icon == null) {
- canvas.drawText("*", x, y + Toolkit.getText(ColorsAndFonts.TEXT_NORMAL).getAscent(),
- Toolkit.getColor(ColorsAndFonts.COLOR_BLACK), Toolkit.getText(ColorsAndFonts.TEXT_NORMAL));
+ canvas.drawText("*", x, y + Toolkit.getText(ColorsAndFonts.TEXT_NORMAL).getAscent(), Toolkit.getColor(ColorsAndFonts.COLOR_BLACK), Toolkit.getText(ColorsAndFonts.TEXT_NORMAL));
} else {
canvas.drawImage(icon, x, y, 12, 12);
}
@@ -121,8 +120,7 @@ public class ObjectBorder extends Abstra
canvas.drawRectangle(i, i, xExtent - 2 * i, s.getHeight() - 2 * i, color);
}
canvas.drawLine(xExtent - BORDER, top, xExtent - BORDER, top + s.getHeight(), color);
- canvas.drawSolidRectangle(xExtent - BORDER + 1, top, BORDER - 2, s.getHeight() - 2 * top,
- Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3));
+ canvas.drawSolidRectangle(xExtent - BORDER + 1, top, BORDER - 2, s.getHeight() - 2 * top, Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3));
}
}
}
@@ -144,17 +142,22 @@ public class ObjectBorder extends Abstra
}
/*
- * @Override public void viewMenuOptions(final UserActionSet options) { super.viewMenuOptions(options); Content
- * content = getContent(); UserActionSet suboptions = options.addNewActionSet("Replace with");
- * replaceOptions(Toolkit.getViewFactory().availableViews(new ViewRequirement(content, ViewRequirement.OPEN |
+ * @Override public void viewMenuOptions(final UserActionSet options) {
+ * super.viewMenuOptions(options); Content content = getContent();
+ * UserActionSet suboptions = options.addNewActionSet("Replace with");
+ * replaceOptions(Toolkit.getViewFactory().availableViews(new
+ * ViewRequirement(content, ViewRequirement.OPEN |
* ViewRequirement.REPLACEABLE | ViewRequirement.SUBVIEW)), suboptions);
- * replaceOptions(Toolkit.getViewFactory().availableViews(new ViewRequirement(content, ViewRequirement.CLOSED |
+ * replaceOptions(Toolkit.getViewFactory().availableViews(new
+ * ViewRequirement(content, ViewRequirement.CLOSED |
* ViewRequirement.REPLACEABLE | ViewRequirement.SUBVIEW)), suboptions); }
*
- * protected void replaceOptions(final Enumeration possibleViews, final UserActionSet options) { if
- * (possibleViews.hasMoreElements()) { while (possibleViews.hasMoreElements()) { final ViewSpecification
- * specification = (ViewSpecification) possibleViews.nextElement(); if (specification != getSpecification()) {
- * options.add(new ReplaceViewOption(specification) { protected void replace(View view, View withReplacement) {
+ * protected void replaceOptions(final Enumeration possibleViews, final
+ * UserActionSet options) { if (possibleViews.hasMoreElements()) { while
+ * (possibleViews.hasMoreElements()) { final ViewSpecification specification
+ * = (ViewSpecification) possibleViews.nextElement(); if (specification !=
+ * getSpecification()) { options.add(new ReplaceViewOption(specification) {
+ * protected void replace(View view, View withReplacement) {
* replaceWrappedView(withReplacement); } }); } } } }
*/
@Override
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeBorder.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeBorder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeBorder.java Sun Jan 22 08:05:17 2012
@@ -51,8 +51,7 @@ public abstract class ResizeBorder exten
// TODO allow a minimum and maximum sizes to be specified and then ensure
// the user doesn't go outside them.
- public ResizeBorder(final View view, final int allowDirections, final int widthOnMovingSides,
- final int widthOnStaticSides) {
+ public ResizeBorder(final View view, final int allowDirections, final int widthOnMovingSides, final int widthOnStaticSides) {
super(view);
this.allowDirections = allowDirections;
top = canExtend(UP) ? widthOnMovingSides : widthOnStaticSides;
@@ -67,8 +66,7 @@ public abstract class ResizeBorder exten
super.debugDetails(debug);
debug.appendln("width", width == 0 ? "no change" : Integer.toString(width));
debug.appendln("height ", height == 0 ? "no change" : Integer.toString(height));
- debug.appendln("resizable ", (canExtend(UP) ? "Up " : "") + (canExtend(DOWN) ? "Down " : "")
- + (canExtend(LEFT) ? "Left " : "") + (canExtend(RIGHT) ? "Right " : ""));
+ debug.appendln("resizable ", (canExtend(UP) ? "Up " : "") + (canExtend(DOWN) ? "Down " : "") + (canExtend(LEFT) ? "Left " : "") + (canExtend(RIGHT) ? "Right " : ""));
}
@Override
@@ -170,37 +168,38 @@ public abstract class ResizeBorder exten
}
/**
- * Detects whether the point is on the resize border, and if so changes the cursor to show it can be resized.
+ * Detects whether the point is on the resize border, and if so changes the
+ * cursor to show it can be resized.
*/
@Override
public void mouseMoved(final Location at) {
final int onBorder = onBorder(at);
if (this.onBorder != onBorder) {
switch (onBorder) {
- case ResizeDrag.RIGHT:
- getFeedbackManager().showResizeRightCursor();
- resizing = true;
- markDamaged();
- break;
-
- case ResizeDrag.BOTTOM:
- getFeedbackManager().showResizeDownCursor();
- resizing = true;
- markDamaged();
- break;
-
- case ResizeDrag.BOTTOM_RIGHT:
- getFeedbackManager().showResizeDownRightCursor();
- resizing = true;
- markDamaged();
- break;
-
- default:
- getFeedbackManager().showDefaultCursor();
- super.mouseMoved(at);
- resizing = false;
- markDamaged();
- break;
+ case ResizeDrag.RIGHT:
+ getFeedbackManager().showResizeRightCursor();
+ resizing = true;
+ markDamaged();
+ break;
+
+ case ResizeDrag.BOTTOM:
+ getFeedbackManager().showResizeDownCursor();
+ resizing = true;
+ markDamaged();
+ break;
+
+ case ResizeDrag.BOTTOM_RIGHT:
+ getFeedbackManager().showResizeDownRightCursor();
+ resizing = true;
+ markDamaged();
+ break;
+
+ default:
+ getFeedbackManager().showDefaultCursor();
+ super.mouseMoved(at);
+ resizing = false;
+ markDamaged();
+ break;
}
UI_LOG.debug("on resize border " + onBorder + " " + resizing);
}
@@ -219,10 +218,8 @@ public abstract class ResizeBorder exten
private int onBorder(final Location at) {
final Bounds area = contentArea();
- final boolean right =
- canExtend(RIGHT) && at.getX() >= area.getWidth() && at.getX() <= area.getWidth() + getRight();
- final boolean bottom =
- canExtend(DOWN) && at.getY() >= area.getHeight() && at.getY() <= area.getHeight() + getBottom();
+ final boolean right = canExtend(RIGHT) && at.getX() >= area.getWidth() && at.getX() <= area.getWidth() + getRight();
+ final boolean bottom = canExtend(DOWN) && at.getY() >= area.getHeight() && at.getY() <= area.getHeight() + getBottom();
final int status;
if (right && bottom) {
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeDrag.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeDrag.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeDrag.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeDrag.java Sun Jan 22 08:05:17 2012
@@ -37,7 +37,8 @@ public class ResizeDrag extends DragImpl
public static final int TOP_LEFT = 5;
public static final int TOP_RIGHT = 6;
/**
- * the location of the corner opposite the pointer that will form the resizing rectangle.
+ * the location of the corner opposite the pointer that will form the
+ * resizing rectangle.
*/
private final Location anchor;
private final int direction;
@@ -50,8 +51,7 @@ public class ResizeDrag extends DragImpl
this(view, resizeArea, direction, null, null);
}
- public ResizeDrag(final View view, final Bounds resizeArea, final int direction, final Size minimumSize,
- final Size maximumSize) {
+ public ResizeDrag(final View view, final Bounds resizeArea, final int direction, final Size minimumSize, final Size maximumSize) {
this.view = view;
this.direction = direction;
this.anchor = resizeArea.getLocation();
@@ -70,44 +70,44 @@ public class ResizeDrag extends DragImpl
public void drag(final View target, final Location location, final int mods) {
switch (direction) {
- case TOP:
- extendUpward(location);
- break;
-
- case BOTTOM:
- extendDownward(location);
- break;
-
- case LEFT:
- extendLeft(location);
- break;
-
- case RIGHT:
- extendRight(location);
- break;
-
- case TOP_RIGHT:
- extendRight(location);
- extendUpward(location);
- break;
-
- case BOTTOM_RIGHT:
- extendRight(location);
- extendDownward(location);
- break;
-
- case TOP_LEFT:
- extendLeft(location);
- extendUpward(location);
- break;
-
- case BOTTOM_LEFT:
- extendLeft(location);
- extendDownward(location);
- break;
+ case TOP:
+ extendUpward(location);
+ break;
+
+ case BOTTOM:
+ extendDownward(location);
+ break;
+
+ case LEFT:
+ extendLeft(location);
+ break;
+
+ case RIGHT:
+ extendRight(location);
+ break;
+
+ case TOP_RIGHT:
+ extendRight(location);
+ extendUpward(location);
+ break;
+
+ case BOTTOM_RIGHT:
+ extendRight(location);
+ extendDownward(location);
+ break;
+
+ case TOP_LEFT:
+ extendLeft(location);
+ extendUpward(location);
+ break;
+
+ case BOTTOM_LEFT:
+ extendLeft(location);
+ extendDownward(location);
+ break;
- default:
- break;
+ default:
+ break;
}
}
@@ -118,19 +118,22 @@ public class ResizeDrag extends DragImpl
}
/*
- * public ViewResizeOutline(View forView, int direction) { this(forView, direction, forView.getAbsoluteLocation(),
- * forView.getSize()); }
+ * public ViewResizeOutline(View forView, int direction) { this(forView,
+ * direction, forView.getAbsoluteLocation(), forView.getSize()); }
*
- * public ViewResizeOutline(View forView, int direction, Location location, Size size) { super(forView.getContent(),
- * null, null);
+ * public ViewResizeOutline(View forView, int direction, Location location,
+ * Size size) { super(forView.getContent(), null, null);
*
- * Logger.getLogger(getClass()).debug("drag outline for " + forView); setLocation(location); setSize(size);
+ * Logger.getLogger(getClass()).debug("drag outline for " + forView);
+ * setLocation(location); setSize(size);
*
- * Logger.getLogger(getClass()).debug("drag outline initial size " + getSize() + " " + forView.getSize());
+ * Logger.getLogger(getClass()).debug("drag outline initial size " +
+ * getSize() + " " + forView.getSize());
*
* origin = getBounds();
*
- * switch (direction) { case TOP: getViewManager().showResizeUpCursor(); break;
+ * switch (direction) { case TOP: getViewManager().showResizeUpCursor();
+ * break;
*
* case BOTTOM: getViewManager().showResizeDownCursor(); break;
*
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ScrollBarRender.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ScrollBarRender.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ScrollBarRender.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ScrollBarRender.java Sun Jan 22 08:05:17 2012
@@ -22,6 +22,5 @@ package org.apache.isis.viewer.dnd.view.
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);
+ void draw(Canvas canvas, boolean isHorizontal, int x, int y, int width, int height, int scrollPosition, int visibleAmount);
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ScrollBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ScrollBorder.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ScrollBorder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ScrollBorder.java Sun Jan 22 08:05:17 2012
@@ -44,10 +44,11 @@ import org.apache.isis.viewer.dnd.view.b
import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
/**
- * A scroll border provides a window on a larger view, providing scrollbars as a way of moving the visible part of that
- * view around the actual visible viewing area. To achieve this the view is divided up into five main areas, not all of
- * which are used. In the centre is the viewing area of the underlying view. At the bottom and to the right... At the
- * top and to the left are headers that
+ * A scroll border provides a window on a larger view, providing scrollbars as a
+ * way of moving the visible part of that view around the actual visible viewing
+ * area. To achieve this the view is divided up into five main areas, not all of
+ * which are used. In the centre is the viewing area of the underlying view. At
+ * the bottom and to the right... At the top and to the left are headers that
*/
public class ScrollBorder extends AbstractViewDecorator {
private static ScrollBarRender render;
@@ -80,8 +81,9 @@ public class ScrollBorder extends Abstra
}
/**
- * Note - the leftHeader, if it is specified, view must be the same height as the content view and the rightHeader,
- * if it is specified, must be the same width.
+ * Note - the leftHeader, if it is specified, view must be the same height
+ * as the content view and the rightHeader, if it is specified, must be the
+ * same width.
*/
public ScrollBorder(final View content, final View leftHeader, final View topHeader) {
super(content);
@@ -183,35 +185,35 @@ public class ScrollBorder extends Abstra
@Override
public void drag(final InternalDrag drag) {
switch (dragArea) {
- case NORTH:
- drag.getLocation().subtract(offset().getDeltaX(), top);
- topHeader.drag(drag);
- break;
-
- case WEST:
- drag.getLocation().subtract(left, offset().getDeltaY());
- leftHeader.drag(drag);
- break;
-
- case CENTER:
- drag.getLocation().subtract(offset());
- wrappedView.drag(drag);
- break;
-
- case SOUTH:
- final int x = drag.getLocation().getX() - left;
- horizontalScrollBar.setPostion(x - offsetToThumbEdge);
- markDamaged();
- break;
-
- case EAST:
- final int y = drag.getLocation().getY() - top;
- verticalScrollBar.setPostion(y - offsetToThumbEdge);
- markDamaged();
- break;
+ case NORTH:
+ drag.getLocation().subtract(offset().getDeltaX(), top);
+ topHeader.drag(drag);
+ break;
+
+ case WEST:
+ drag.getLocation().subtract(left, offset().getDeltaY());
+ leftHeader.drag(drag);
+ break;
+
+ case CENTER:
+ drag.getLocation().subtract(offset());
+ wrappedView.drag(drag);
+ break;
+
+ case SOUTH:
+ final int x = drag.getLocation().getX() - left;
+ horizontalScrollBar.setPostion(x - offsetToThumbEdge);
+ markDamaged();
+ break;
+
+ case EAST:
+ final int y = drag.getLocation().getY() - top;
+ verticalScrollBar.setPostion(y - offsetToThumbEdge);
+ markDamaged();
+ break;
- default:
- return;
+ default:
+ return;
}
}
@@ -220,68 +222,68 @@ public class ScrollBorder extends Abstra
final int area = adjust(drag);
dragArea = area;
switch (dragArea) {
- case NORTH:
- return topHeader.dragStart(drag);
+ case NORTH:
+ return topHeader.dragStart(drag);
- case WEST:
- return leftHeader.dragStart(drag);
+ case WEST:
+ return leftHeader.dragStart(drag);
- case CENTER:
- return wrappedView.dragStart(drag);
+ case CENTER:
+ return wrappedView.dragStart(drag);
- case SOUTH:
- return dragStartSouth(drag);
+ case SOUTH:
+ return dragStartSouth(drag);
- case EAST:
- return dragStartEast(drag);
+ case EAST:
+ return dragStartEast(drag);
- default:
- return null;
+ default:
+ return null;
}
}
@Override
public void dragCancel(final InternalDrag drag) {
switch (dragArea) {
- case NORTH:
- drag.getLocation().subtract(offset().getDeltaX(), top);
- topHeader.dragCancel(drag);
- break;
-
- case WEST:
- drag.getLocation().subtract(left, offset().getDeltaY());
- leftHeader.dragCancel(drag);
- break;
-
- case CENTER:
- drag.getLocation().subtract(offset());
- wrappedView.dragCancel(drag);
- break;
+ case NORTH:
+ drag.getLocation().subtract(offset().getDeltaX(), top);
+ topHeader.dragCancel(drag);
+ break;
+
+ case WEST:
+ drag.getLocation().subtract(left, offset().getDeltaY());
+ leftHeader.dragCancel(drag);
+ break;
+
+ case CENTER:
+ drag.getLocation().subtract(offset());
+ wrappedView.dragCancel(drag);
+ break;
}
}
@Override
public void dragTo(final InternalDrag drag) {
switch (dragArea) {
- case NORTH:
- drag.getLocation().subtract(offset().getDeltaX(), top);
- topHeader.dragTo(drag);
- break;
-
- case WEST:
- drag.getLocation().subtract(left, offset().getDeltaY());
- leftHeader.dragTo(drag);
- break;
-
- case CENTER:
- drag.getLocation().subtract(offset());
- wrappedView.dragTo(drag);
- break;
-
- case SOUTH:
- case EAST:
- default:
- // ignore
+ case NORTH:
+ drag.getLocation().subtract(offset().getDeltaX(), top);
+ topHeader.dragTo(drag);
+ break;
+
+ case WEST:
+ drag.getLocation().subtract(left, offset().getDeltaY());
+ leftHeader.dragTo(drag);
+ break;
+
+ case CENTER:
+ drag.getLocation().subtract(offset());
+ wrappedView.dragTo(drag);
+ break;
+
+ case SOUTH:
+ case EAST:
+ default:
+ // ignore
}
}
@@ -290,14 +292,14 @@ public class ScrollBorder extends Abstra
public View dragFrom(final Location location) {
adjust(location);
switch (dragArea) {
- case NORTH:
- return topHeader.dragFrom(location);
+ case NORTH:
+ return topHeader.dragFrom(location);
- case WEST:
- return leftHeader.dragFrom(location);
+ case WEST:
+ return leftHeader.dragFrom(location);
- case CENTER:
- return wrappedView.dragFrom(location);
+ case CENTER:
+ return wrappedView.dragFrom(location);
}
return null;
@@ -307,24 +309,24 @@ public class ScrollBorder extends Abstra
public void dragIn(final ContentDrag drag) {
adjust(drag);
switch (dragArea) {
- case NORTH:
- topHeader.dragIn(drag);
- break;
-
- case WEST:
- leftHeader.dragIn(drag);
- break;
-
- case CENTER:
- wrappedView.dragIn(drag);
- break;
-
- case SOUTH:
- case EAST:
- default:
- System.out.println(this + " ignored");
+ case NORTH:
+ topHeader.dragIn(drag);
+ break;
+
+ case WEST:
+ leftHeader.dragIn(drag);
+ break;
+
+ case CENTER:
+ wrappedView.dragIn(drag);
+ break;
+
+ case SOUTH:
+ case EAST:
+ default:
+ System.out.println(this + " ignored");
- // ignore
+ // ignore
}
}
@@ -332,22 +334,22 @@ public class ScrollBorder extends Abstra
public void dragOut(final ContentDrag drag) {
adjust(drag);
switch (dragArea) {
- case NORTH:
- topHeader.dragOut(drag);
- break;
-
- case WEST:
- leftHeader.dragOut(drag);
- break;
-
- case CENTER:
- wrappedView.dragOut(drag);
- break;
-
- case SOUTH:
- case EAST:
- default:
- // ignore
+ case NORTH:
+ topHeader.dragOut(drag);
+ break;
+
+ case WEST:
+ leftHeader.dragOut(drag);
+ break;
+
+ case CENTER:
+ wrappedView.dragOut(drag);
+ break;
+
+ case SOUTH:
+ case EAST:
+ default:
+ // ignore
}
}
@@ -355,7 +357,8 @@ public class ScrollBorder extends Abstra
final Location location = drag.getLocation();
final int y = location.getY();
if (verticalScrollBar.isOnThumb(y)) {
- // offset is the distance from the left/top of the thumb to the pointer
+ // offset is the distance from the left/top of the thumb to the
+ // pointer
offsetToThumbEdge = y - verticalScrollBar.getPosition();
return new SimpleInternalDrag(this, new Offset(super.getAbsoluteLocation()));
} else {
@@ -404,8 +407,7 @@ public class ScrollBorder extends Abstra
contentCanvas.offset(-x, -y);
if (Toolkit.debug) {
- canvas.drawRectangle(contents.getX(), contents.getY(), contents.getWidth(), contents.getHeight(),
- Toolkit.getColor(ColorsAndFonts.COLOR_DEBUG_BOUNDS_DRAW));
+ canvas.drawRectangle(contents.getX(), contents.getY(), contents.getWidth(), contents.getHeight(), Toolkit.getColor(ColorsAndFonts.COLOR_DEBUG_BOUNDS_DRAW));
}
// drawContent(canvas, contentWidth, contentHeight);
@@ -413,58 +415,64 @@ public class ScrollBorder extends Abstra
if (Toolkit.debug) {
final Size size = getSize();
- canvas.drawRectangle(0, 0, size.getWidth(), size.getHeight(),
- Toolkit.getColor(ColorsAndFonts.COLOR_DEBUG_BOUNDS_VIEW));
- canvas.drawLine(0, size.getHeight() / 2, size.getWidth() - 1, size.getHeight() / 2,
- Toolkit.getColor(ColorsAndFonts.COLOR_DEBUG_BOUNDS_VIEW));
- canvas.drawLine(0, getBaseline(), size.getWidth() - 1, getBaseline(),
- Toolkit.getColor(ColorsAndFonts.COLOR_DEBUG_BASELINE));
+ canvas.drawRectangle(0, 0, size.getWidth(), size.getHeight(), Toolkit.getColor(ColorsAndFonts.COLOR_DEBUG_BOUNDS_VIEW));
+ canvas.drawLine(0, size.getHeight() / 2, size.getWidth() - 1, size.getHeight() / 2, Toolkit.getColor(ColorsAndFonts.COLOR_DEBUG_BOUNDS_VIEW));
+ canvas.drawLine(0, getBaseline(), size.getWidth() - 1, getBaseline(), Toolkit.getColor(ColorsAndFonts.COLOR_DEBUG_BASELINE));
}
}
// TODO merge these two methods
- private void drawVerticalScrollBar(final Canvas canvas, final int contentWidth, final int contentHeight,
- final Color color) {
+ private void drawVerticalScrollBar(final Canvas canvas, final int contentWidth, final int contentHeight, final Color color) {
final int verticalVisibleAmount = verticalScrollBar.getVisibleAmount();
final int verticalScrollPosition = verticalScrollBar.getPosition();
if (right > 0 && (verticalScrollPosition > top || verticalVisibleAmount < contentHeight)) {
final int x = contentWidth + left;
- render.draw(canvas, false, x, top, SCROLLBAR_WIDTH, contentHeight, verticalScrollPosition,
- verticalVisibleAmount);
+ render.draw(canvas, false, x, top, SCROLLBAR_WIDTH, contentHeight, verticalScrollPosition, verticalVisibleAmount);
/*
- * canvas.drawSolidRectangle(x + 1, top, SCROLLBAR_WIDTH - 1, contentHeight,
- * Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3)); canvas.drawSolidRectangle(x + 1, top +
- * verticalScrollPosition, SCROLLBAR_WIDTH - 2, verticalVisibleAmount, color); canvas.drawRectangle(x, top,
- * SCROLLBAR_WIDTH, contentHeight, Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY2));
- * canvas.drawRectangle(x + 1, top + verticalScrollPosition, SCROLLBAR_WIDTH - 2, verticalVisibleAmount,
- * Toolkit .getColor(ColorsAndFonts.COLOR_SECONDARY1));
+ * canvas.drawSolidRectangle(x + 1, top, SCROLLBAR_WIDTH - 1,
+ * contentHeight,
+ * Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3));
+ * canvas.drawSolidRectangle(x + 1, top + verticalScrollPosition,
+ * SCROLLBAR_WIDTH - 2, verticalVisibleAmount, color);
+ * canvas.drawRectangle(x, top, SCROLLBAR_WIDTH, contentHeight,
+ * Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY2));
+ * canvas.drawRectangle(x + 1, top + verticalScrollPosition,
+ * SCROLLBAR_WIDTH - 2, verticalVisibleAmount, Toolkit
+ * .getColor(ColorsAndFonts.COLOR_SECONDARY1));
*
- * DrawingUtil.drawHatching(canvas, x + 3, top + verticalScrollPosition + 4, SCROLLBAR_WIDTH - 6,
- * verticalVisibleAmount - 8, Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY1),
+ * DrawingUtil.drawHatching(canvas, x + 3, top +
+ * verticalScrollPosition + 4, SCROLLBAR_WIDTH - 6,
+ * verticalVisibleAmount - 8,
+ * Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY1),
* Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY3));
*/
}
}
- private void drawHorizontalScrollBar(final Canvas canvas, final int contentWidth, final int contentHeight,
- final Color color) {
+ private void drawHorizontalScrollBar(final Canvas canvas, final int contentWidth, final int contentHeight, final Color color) {
final int horizontalScrollPosition = horizontalScrollBar.getPosition();
final int horizontalVisibleAmount = horizontalScrollBar.getVisibleAmount();
if (bottom > 0 && (horizontalScrollPosition > left || horizontalVisibleAmount < contentWidth)) {
final int x = 0; // left + horizontalScrollPosition;
final int y = contentHeight + top;
- render.draw(canvas, true, x, y, contentWidth, SCROLLBAR_WIDTH, horizontalScrollPosition,
- horizontalVisibleAmount);
+ render.draw(canvas, true, x, y, contentWidth, SCROLLBAR_WIDTH, horizontalScrollPosition, horizontalVisibleAmount);
/*
- * canvas.drawSolidRectangle(left, y + 1, contentWidth, SCROLLBAR_WIDTH - 1,
- * Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3)); canvas.drawSolidRectangle(x, y + 1,
- * horizontalVisibleAmount, SCROLLBAR_WIDTH - 2, color); canvas.drawRectangle(left, y, contentWidth,
- * SCROLLBAR_WIDTH, Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY2 )); canvas.drawRectangle(x, y + 1,
- * horizontalVisibleAmount, SCROLLBAR_WIDTH - 2, Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY1));
+ * canvas.drawSolidRectangle(left, y + 1, contentWidth,
+ * SCROLLBAR_WIDTH - 1,
+ * Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3));
+ * canvas.drawSolidRectangle(x, y + 1, horizontalVisibleAmount,
+ * SCROLLBAR_WIDTH - 2, color); canvas.drawRectangle(left, y,
+ * contentWidth, SCROLLBAR_WIDTH,
+ * Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY2 ));
+ * canvas.drawRectangle(x, y + 1, horizontalVisibleAmount,
+ * SCROLLBAR_WIDTH - 2,
+ * Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY1));
*
- * DrawingUtil.drawHatching(canvas, x + 5, y + 3, horizontalVisibleAmount - 10, SCROLLBAR_WIDTH - 6, Toolkit
- * .getColor(ColorsAndFonts.COLOR_PRIMARY1), Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY3));
+ * DrawingUtil.drawHatching(canvas, x + 5, y + 3,
+ * horizontalVisibleAmount - 10, SCROLLBAR_WIDTH - 6, Toolkit
+ * .getColor(ColorsAndFonts.COLOR_PRIMARY1),
+ * Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY3));
*/
}
}
@@ -473,29 +481,30 @@ public class ScrollBorder extends Abstra
public void firstClick(final Click click) {
final int area = adjust(click);
switch (area) {
- case NORTH:
- topHeader.firstClick(click);
- break;
-
- case WEST:
- leftHeader.firstClick(click);
- break;
-
- case CENTER:
- wrappedView.firstClick(click);
- break;
-
- case SOUTH:
- // TODO allow modified click to move thumb to the pointer, rather than paging.
- horizontalScrollBar.firstClick(click.getLocation().getX(), click.button3());
- break;
-
- case EAST:
- verticalScrollBar.firstClick(click.getLocation().getY(), click.button3());
- break;
+ case NORTH:
+ topHeader.firstClick(click);
+ break;
+
+ case WEST:
+ leftHeader.firstClick(click);
+ break;
+
+ case CENTER:
+ wrappedView.firstClick(click);
+ break;
+
+ case SOUTH:
+ // TODO allow modified click to move thumb to the pointer, rather
+ // than paging.
+ horizontalScrollBar.firstClick(click.getLocation().getX(), click.button3());
+ break;
+
+ case EAST:
+ verticalScrollBar.firstClick(click.getLocation().getY(), click.button3());
+ break;
- default:
- break;
+ default:
+ break;
}
}
@@ -537,25 +546,25 @@ public class ScrollBorder extends Abstra
final int area = adjust(location);
switch (area) {
- case NORTH:
- return topHeader.identify(location);
+ case NORTH:
+ return topHeader.identify(location);
- case WEST:
- return leftHeader.identify(location);
+ case WEST:
+ return leftHeader.identify(location);
- case CENTER:
- return wrappedView.identify(location);
+ case CENTER:
+ return wrappedView.identify(location);
- case SOUTH:
- getViewManager().getSpy().addTrace(this, "over scroll bar area", viewportArea());
- return getView();
+ case SOUTH:
+ getViewManager().getSpy().addTrace(this, "over scroll bar area", viewportArea());
+ return getView();
- case EAST:
- getViewManager().getSpy().addTrace(this, "over scroll bar area", viewportArea());
- return getView();
+ case EAST:
+ getViewManager().getSpy().addTrace(this, "over scroll bar area", viewportArea());
+ return getView();
- default:
- return null;
+ default:
+ return null;
}
}
@@ -569,8 +578,8 @@ public class ScrollBorder extends Abstra
@Override
public void markDamaged(final Bounds bounds) {
/*
- * TODO this only works for the main content area, not for the headers. how do we figure out which area to
- * adjust for?
+ * TODO this only works for the main content area, not for the headers.
+ * how do we figure out which area to adjust for?
*/
final Offset offset = offset();
bounds.translate(-offset.getDeltaX(), -offset.getDeltaY());
@@ -582,37 +591,33 @@ public class ScrollBorder extends Abstra
public void mouseMoved(final Location location) {
final int area = adjust(location);
switch (area) {
- case NORTH:
- topHeader.mouseMoved(location);
- break;
-
- case WEST:
- leftHeader.mouseMoved(location);
- break;
-
- case CENTER:
- // location.add(offset());
- // location.move(-left, -top);
- wrappedView.mouseMoved(location);
- break;
-
- case SOUTH:
- case EAST:
- default:
- break;
+ case NORTH:
+ topHeader.mouseMoved(location);
+ break;
+
+ case WEST:
+ leftHeader.mouseMoved(location);
+ break;
+
+ case CENTER:
+ // location.add(offset());
+ // location.move(-left, -top);
+ wrappedView.mouseMoved(location);
+ break;
+
+ case SOUTH:
+ case EAST:
+ default:
+ break;
}
}
private Offset offset() {
final Bounds contents = viewportArea();
final int width = contents.getWidth();
- final int x =
- width == 0 ? 0 : horizontalScrollBar.getPosition()
- * wrappedView.getRequiredSize(Size.createMax()).getWidth() / width;
+ final int x = width == 0 ? 0 : horizontalScrollBar.getPosition() * wrappedView.getRequiredSize(Size.createMax()).getWidth() / width;
final int height = contents.getHeight();
- final int y =
- height == 0 ? 0 : verticalScrollBar.getPosition()
- * wrappedView.getRequiredSize(Size.createMax()).getHeight() / height;
+ final int y = height == 0 ? 0 : verticalScrollBar.getPosition() * wrappedView.getRequiredSize(Size.createMax()).getHeight() / height;
return new Offset(x, y);
}
@@ -626,34 +631,35 @@ public class ScrollBorder extends Abstra
}
/**
- * Moves the scrollbar to beginning or the end when a double click occurs on that side.
+ * Moves the scrollbar to beginning or the end when a double click occurs on
+ * that side.
*/
@Override
public void secondClick(final Click click) {
final int area = adjust(click);
switch (area) {
- case NORTH:
- topHeader.secondClick(click);
- break;
-
- case WEST:
- leftHeader.secondClick(click);
- break;
-
- case CENTER:
- wrappedView.secondClick(click);
- break;
-
- case SOUTH:
- horizontalScrollBar.secondClick(click.getLocation().getX());
- break;
-
- case EAST:
- verticalScrollBar.secondClick(click.getLocation().getY());
- break;
+ case NORTH:
+ topHeader.secondClick(click);
+ break;
+
+ case WEST:
+ leftHeader.secondClick(click);
+ break;
+
+ case CENTER:
+ wrappedView.secondClick(click);
+ break;
+
+ case SOUTH:
+ horizontalScrollBar.secondClick(click.getLocation().getX());
+ break;
+
+ case EAST:
+ verticalScrollBar.secondClick(click.getLocation().getY());
+ break;
- default:
- break;
+ default:
+ break;
}
}
@@ -661,23 +667,23 @@ public class ScrollBorder extends Abstra
public void thirdClick(final Click click) {
final int area = adjust(click);
switch (area) {
- case NORTH:
- topHeader.thirdClick(click);
- break;
-
- case WEST:
- leftHeader.thirdClick(click);
- break;
-
- case CENTER:
- wrappedView.thirdClick(click);
- break;
-
- case SOUTH:
- case EAST:
- default:
- // ignore
- break;
+ case NORTH:
+ topHeader.thirdClick(click);
+ break;
+
+ case WEST:
+ leftHeader.thirdClick(click);
+ break;
+
+ case CENTER:
+ wrappedView.thirdClick(click);
+ break;
+
+ case SOUTH:
+ case EAST:
+ default:
+ // ignore
+ break;
}
}
@@ -737,19 +743,19 @@ public class ScrollBorder extends Abstra
public ViewAreaType viewAreaType(final Location location) {
final int area = adjust(location);
switch (area) {
- case NORTH:
- return topHeader.viewAreaType(location);
+ case NORTH:
+ return topHeader.viewAreaType(location);
- case WEST:
- return leftHeader.viewAreaType(location);
+ case WEST:
+ return leftHeader.viewAreaType(location);
- case CENTER:
- return wrappedView.viewAreaType(location);
+ case CENTER:
+ return wrappedView.viewAreaType(location);
- case SOUTH:
- case EAST:
- default:
- return ViewAreaType.INTERNAL;
+ case SOUTH:
+ case EAST:
+ default:
+ return ViewAreaType.INTERNAL;
}
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SelectedBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SelectedBorder.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SelectedBorder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SelectedBorder.java Sun Jan 22 08:05:17 2012
@@ -45,8 +45,7 @@ public class SelectedBorder extends Abst
public void draw(final Canvas canvas) {
if (axis.isSelected(getView())) {
final Size size = getSize();
- canvas.drawSolidRectangle(left, right, size.getWidth() - left - right, size.getHeight() - top - bottom,
- Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY3));
+ canvas.drawSolidRectangle(left, right, size.getWidth() - left - right, size.getHeight() - top - bottom, Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY3));
}
super.draw(canvas);
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/TextFieldResizeBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/TextFieldResizeBorder.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/TextFieldResizeBorder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/TextFieldResizeBorder.java Sun Jan 22 08:05:17 2012
@@ -30,8 +30,7 @@ import org.apache.isis.viewer.dnd.view.T
import org.apache.isis.viewer.dnd.view.View;
public class TextFieldResizeBorder extends ResizeBorder {
- public static final int BORDER_WIDTH = IsisContext.getConfiguration().getInteger(
- Properties.PROPERTY_BASE + "field-resize-border", 5);
+ public static final int BORDER_WIDTH = IsisContext.getConfiguration().getInteger(Properties.PROPERTY_BASE + "field-resize-border", 5);
public TextFieldResizeBorder(final View view) {
super(view, RIGHT + DOWN, 1, 1);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ViewResizeBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ViewResizeBorder.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ViewResizeBorder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ViewResizeBorder.java Sun Jan 22 08:05:17 2012
@@ -27,8 +27,7 @@ import org.apache.isis.viewer.dnd.view.V
// TODO enhance so the direction of resizing can be specified (could limit to width on right, height on bottom, or width/height from corner
public class ViewResizeBorder extends ResizeBorder {
- public static final int BORDER_WIDTH = IsisContext.getConfiguration().getInteger(
- Properties.PROPERTY_BASE + "tree-resize-border", 7);
+ public static final int BORDER_WIDTH = IsisContext.getConfiguration().getInteger(Properties.PROPERTY_BASE + "tree-resize-border", 7);
private static ResizeViewRender render;
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java Sun Jan 22 08:05:17 2012
@@ -116,21 +116,23 @@ public abstract class AbstractCollection
// TODO find all collection actions, and make them available
// not valid ObjectOption.menuOptions((ObjectAdapter) object, options);
/*
- * Action[] actions = collection.getSpecification().getObjectActions(Action.USER);
+ * Action[] actions =
+ * collection.getSpecification().getObjectActions(Action.USER);
*
- * for (int i = 0; i < actions.length; i++) { final Action action = actions[i]; AbstractUserAction option;
- * option = new AbstractUserAction(actions[i].getId()) { public void execute(final Workspace workspace, final
- * View view, final Location at) { ObjectAdapter result = collection.execute(action, new ObjectAdapter[0]);
- * at.add(20, 20); workspace.addOpenViewFor(result, at); } };
+ * for (int i = 0; i < actions.length; i++) { final Action action =
+ * actions[i]; AbstractUserAction option; option = new
+ * AbstractUserAction(actions[i].getId()) { public void execute(final
+ * Workspace workspace, final View view, final Location at) {
+ * ObjectAdapter result = collection.execute(action, new
+ * ObjectAdapter[0]); at.add(20, 20); workspace.addOpenViewFor(result,
+ * at); } };
*
* if (option != null) { options.add(option); } }
*/
options.add(new UserActionAbstract("Clear resolved", ActionType.DEBUG) {
@Override
public Consent disabled(final View component) {
- return ConsentAbstract.allowIf(collection == null
- || collection.getResolveState() != ResolveState.TRANSIENT
- || collection.getResolveState() == ResolveState.GHOST);
+ return ConsentAbstract.allowIf(collection == null || collection.getResolveState() != ResolveState.TRANSIENT || collection.getResolveState() == ResolveState.GHOST);
}
@Override
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionElement.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionElement.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionElement.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionElement.java Sun Jan 22 08:05:17 2012
@@ -71,8 +71,7 @@ public class CollectionElement extends A
@Override
public String getDescription() {
- return getSpecification().getSingularName() + ": " + getObject().titleString() + " "
- + getSpecification().getDescription();
+ return getSpecification().getSingularName() + ": " + getObject().titleString() + " " + getSpecification().getDescription();
}
@Override
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/RootCollection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/RootCollection.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/RootCollection.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/RootCollection.java Sun Jan 22 08:05:17 2012
@@ -108,7 +108,8 @@ public class RootCollection extends Abst
@Override
public Image getIconPicture(final int iconHeight) {
- // return ImageFactory.getInstance().loadObjectIcon(getSpecification(), "", iconHeight);
+ // return ImageFactory.getInstance().loadObjectIcon(getSpecification(),
+ // "", iconHeight);
return ImageFactory.getInstance().loadIcon("root-collection", iconHeight, null);
}
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/SimpleCollectionSorter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/SimpleCollectionSorter.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/SimpleCollectionSorter.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/SimpleCollectionSorter.java Sun Jan 22 08:05:17 2012
@@ -19,7 +19,6 @@
package org.apache.isis.viewer.dnd.view.collection;
-import java.util.Enumeration;
import java.util.Vector;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -37,8 +36,8 @@ public class SimpleCollectionSorter impl
final ObjectAdapter element = elements[j];
order.init(element);
int i = 0;
- for (final Enumeration<ObjectAdapter> f = sorted.elements(); f.hasMoreElements();) {
- final ObjectAdapter sortedElement = (ObjectAdapter) f.nextElement();
+ for (final ObjectAdapter objectAdapter : sorted) {
+ final ObjectAdapter sortedElement = objectAdapter;
if (sortedElement != null && (order.compare(sortedElement) > 0 ^ reverse)) {
sorted.insertElementAt(element, i);
continue outer;
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CollectionElementBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CollectionElementBuilder.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CollectionElementBuilder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CollectionElementBuilder.java Sun Jan 22 08:05:17 2012
@@ -54,8 +54,7 @@ public class CollectionElementBuilder ex
Assert.assertEquals(view.getView(), view);
final Content content = view.getContent();
- final OneToManyAssociation field =
- content instanceof OneToManyField ? ((OneToManyField) content).getOneToManyAssociation() : null;
+ final OneToManyAssociation field = content instanceof OneToManyField ? ((OneToManyField) content).getOneToManyAssociation() : null;
LOG.debug("rebuild view " + view + " for " + content);
@@ -66,8 +65,9 @@ public class CollectionElementBuilder ex
// addViewAxes(view);
/*
- * remove all subviews from the view and then work through the elements of the collection adding in a view for
- * each element. Where a subview for the that element already exists it should be reused.
+ * remove all subviews from the view and then work through the elements
+ * of the collection adding in a view for each element. Where a subview
+ * for the that element already exists it should be reused.
*/
final View[] subviews = view.getSubviews();
final ObjectAdapter[] existingElements = new ObjectAdapter[subviews.length];
@@ -93,7 +93,8 @@ public class CollectionElementBuilder ex
elementContent = new CollectionElement(element);
} else {
final ObjectAdapter obj = ((OneToManyField) view.getContent()).getParent();
- // ObjectAdapter obj = view.getParent().getContent().getAdapter();
+ // ObjectAdapter obj =
+ // view.getParent().getContent().getAdapter();
final ObjectAdapter parent = obj;
elementContent = new OneToManyFieldElementImpl(parent, element, field);
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ColumnLayout.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ColumnLayout.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ColumnLayout.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ColumnLayout.java Sun Jan 22 08:05:17 2012
@@ -25,9 +25,11 @@ import org.apache.isis.viewer.dnd.view.V
import org.apache.isis.viewer.dnd.view.base.Layout;
/**
- * A column layout places component views side by side. Each component is given the space it request. A components width
- * will be give a consistent width if that component's view specification's <code>isAligned</code> method returns
- * <code>true</code>, or the layout's <code>fixedWidth</code> flag is set (via the two parameter constructor).
+ * A column layout places component views side by side. Each component is given
+ * the space it request. A components width will be give a consistent width if
+ * that component's view specification's <code>isAligned</code> method returns
+ * <code>true</code>, or the layout's <code>fixedWidth</code> flag is set (via
+ * the two parameter constructor).
*/
public class ColumnLayout implements Layout {
private final boolean fixedWidth;
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java Sun Jan 22 08:05:17 2012
@@ -111,19 +111,16 @@ public abstract class CompositeView exte
}
if (canvas.overlaps(bounds)) {
// Canvas subCanvas = canvas.createSubcanvas();
- final Canvas subCanvas =
- canvas.createSubcanvas(bounds.getX(), bounds.getY(), bounds.getWidth() - 0, bounds.getSize()
- .getHeight());
- // subCanvas.offset(subview.getBounds().getX(), subview.getBounds().getY());
+ final Canvas subCanvas = canvas.createSubcanvas(bounds.getX(), bounds.getY(), bounds.getWidth() - 0, bounds.getSize().getHeight());
+ // subCanvas.offset(subview.getBounds().getX(),
+ // subview.getBounds().getY());
if (Toolkit.debug) {
LOG.debug("-- repainting " + subview);
LOG.debug("subcanvas " + subCanvas);
}
subview.draw(subCanvas);
if (Toolkit.debug) {
- canvas.drawRectangle(subview.getBounds().getX(), subview.getBounds().getY(), subview.getBounds()
- .getWidth() - 1, subview.getBounds().getHeight() - 1, Toolkit
- .getColor(ColorsAndFonts.COLOR_DEBUG_BOUNDS_BORDER));
+ canvas.drawRectangle(subview.getBounds().getX(), subview.getBounds().getY(), subview.getBounds().getWidth() - 1, subview.getBounds().getHeight() - 1, Toolkit.getColor(ColorsAndFonts.COLOR_DEBUG_BOUNDS_BORDER));
}
}
}
@@ -154,12 +151,15 @@ public abstract class CompositeView exte
protected abstract Size requiredSize(Size availableSpace);
/**
- * Gets the set of subviews for this container. If the container is marked as not being built yet (ie
- * {@link #buildInvalid} is <tt>true</tt> ), then a view building process is initiated and the flag is cleared.
- * During this build process the {@link #buildView()} method is called and then each subview is asked for its
- * subview so that the build process can recurse down the tree if it needs to.
+ * Gets the set of subviews for this container. If the container is marked
+ * as not being built yet (ie {@link #buildInvalid} is <tt>true</tt> ), then
+ * a view building process is initiated and the flag is cleared. During this
+ * build process the {@link #buildView()} method is called and then each
+ * subview is asked for its subview so that the build process can recurse
+ * down the tree if it needs to.
*
- * This method is synchronised so that two threads do not try to build the same view at the same time
+ * This method is synchronised so that two threads do not try to build the
+ * same view at the same time
*/
@Override
public synchronized View[] getSubviews() {
@@ -197,7 +197,8 @@ public abstract class CompositeView exte
/**
* @deprecated
*/
- // TODO call two different methods instead: buildNewView and buildModifiedView
+ // TODO call two different methods instead: buildNewView and
+ // buildModifiedView
@Deprecated
protected abstract void buildView();
@@ -242,8 +243,9 @@ public abstract class CompositeView exte
protected abstract void doLayout(Size maximumSize);
/**
- * When the specified size is different to the current size the the layout of this component is marked as invalid,
- * forcing its components to re-laid out in turn.
+ * When the specified size is different to the current size the the layout
+ * of this component is marked as invalid, forcing its components to re-laid
+ * out in turn.
*/
@Override
public void setSize(final Size size) {
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewUsingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewUsingBuilder.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewUsingBuilder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewUsingBuilder.java Sun Jan 22 08:05:17 2012
@@ -32,8 +32,7 @@ public class CompositeViewUsingBuilder e
private final Layout layout;
private final Axes axes = new Axes();
- public CompositeViewUsingBuilder(final Content content, final ViewSpecification specification, final Axes axes,
- final Layout layout, final ViewBuilder builder) {
+ public CompositeViewUsingBuilder(final Content content, final ViewSpecification specification, final Axes axes, final Layout layout, final ViewBuilder builder) {
super(content, specification);
this.layout = layout;
this.builder = builder;
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/GridLayoutControlBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/GridLayoutControlBorder.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/GridLayoutControlBorder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/GridLayoutControlBorder.java Sun Jan 22 08:05:17 2012
@@ -92,8 +92,7 @@ public class GridLayoutControlBorder ext
super.loadOptions(viewOptions);
final GridLayout layout = getViewAxes().getAxis(GridLayout.class);
- layout.setOrientation(viewOptions.getString("orientation", "columns").equals("columns") ? GridLayout.COLUMNS
- : GridLayout.ROWS);
+ layout.setOrientation(viewOptions.getString("orientation", "columns").equals("columns") ? GridLayout.COLUMNS : GridLayout.ROWS);
layout.setSize(viewOptions.getInteger("size", 1));
}
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/IconGridViewSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/IconGridViewSpecification.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/IconGridViewSpecification.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/IconGridViewSpecification.java Sun Jan 22 08:05:17 2012
@@ -42,10 +42,13 @@ public class IconGridViewSpecification e
public View createView(final Content content, final Axes axes, final int sequence) {
final View icon = new ImageViewSpecification().createView(content, axes, sequence);
/*
- * Icon icon = new Icon(content, IconGridViewSpecification.this); Text textStyle =
- * Toolkit.getText(ColorsAndFonts.TEXT_NORMAL); icon.setTitle(new ObjectTitleText(icon, textStyle));
- * icon.setSelectedGraphic(new IconGraphic(icon, 68)); icon.setUnselectedGraphic(new IconGraphic(icon,
- * 60)); icon.setVertical(true);
+ * Icon icon = new Icon(content,
+ * IconGridViewSpecification.this); Text textStyle =
+ * Toolkit.getText(ColorsAndFonts.TEXT_NORMAL);
+ * icon.setTitle(new ObjectTitleText(icon, textStyle));
+ * icon.setSelectedGraphic(new IconGraphic(icon, 68));
+ * icon.setUnselectedGraphic(new IconGraphic(icon, 60));
+ * icon.setVertical(true);
*
* // return icon;
*/
@@ -74,8 +77,11 @@ public class IconGridViewSpecification e
/*
* private static final ObjectSpecification BOOK_SPECIFICATION =
- * IsisContext.getSpecificationLoader().loadSpecification("org.apache.isis.example.library.dom.Book"); public
- * boolean canDisplay(ViewRequirement requirement) { return super.canDisplay(requirement) &&
- * requirement.getAdapter().getTypeOfFacet().valueSpec() == BOOK_SPECIFICATION; }
+ * IsisContext.getSpecificationLoader().loadSpecification(
+ * "org.apache.isis.example.library.dom.Book"); public boolean
+ * canDisplay(ViewRequirement requirement) { return
+ * super.canDisplay(requirement) &&
+ * requirement.getAdapter().getTypeOfFacet().valueSpec() ==
+ * BOOK_SPECIFICATION; }
*/
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/MasterDetailPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/MasterDetailPanel.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/MasterDetailPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/MasterDetailPanel.java Sun Jan 22 08:05:17 2012
@@ -42,8 +42,7 @@ public class MasterDetailPanel extends C
private final ViewSpecification leftHandSideSpecification;
private final Axes axes;
- public MasterDetailPanel(final Content content, final ViewSpecification specification,
- final ViewSpecification leftHandSideSpecification) {
+ public MasterDetailPanel(final Content content, final ViewSpecification specification, final ViewSpecification leftHandSideSpecification) {
super(content, specification);
this.leftHandSideSpecification = leftHandSideSpecification;
axes = new Axes();
@@ -76,16 +75,23 @@ public class MasterDetailPanel extends C
}
} else if (content instanceof ObjectContent) {
/*
- * TODO provide a view that shows first useful object (not redisplaying parent)
+ * TODO provide a view that shows first useful object (not
+ * redisplaying parent)
*
- * ObjectAssociation[] associations = content.getSpecification().getAssociations(); for (int i = 0; i <
- * associations.length; i++) { ObjectAssociation assoc = associations[i]; if
- * (assoc.isOneToManyAssociation()) { ObjectAdapter collection = assoc.get(content.getAdapter()); final
- * Content collectionContent = Toolkit.getContentFactory().createRootContent(collection);
- * setSelectedNode(collectionContent); break; } else if (assoc.isOneToOneAssociation() &&
- * !((OneToOneAssociation)assoc).getSpecification().isParseable()) { ObjectAdapter object =
- * assoc.get(content.getAdapter()); if (object == null) { continue; } final Content objectContent =
- * Toolkit.getContentFactory().createRootContent(object); setSelectedNode(objectContent); break; } }
+ * ObjectAssociation[] associations =
+ * content.getSpecification().getAssociations(); for (int i = 0; i <
+ * associations.length; i++) { ObjectAssociation assoc =
+ * associations[i]; if (assoc.isOneToManyAssociation()) {
+ * ObjectAdapter collection = assoc.get(content.getAdapter()); final
+ * Content collectionContent =
+ * Toolkit.getContentFactory().createRootContent(collection);
+ * setSelectedNode(collectionContent); break; } else if
+ * (assoc.isOneToOneAssociation() &&
+ * !((OneToOneAssociation)assoc).getSpecification().isParseable()) {
+ * ObjectAdapter object = assoc.get(content.getAdapter()); if
+ * (object == null) { continue; } final Content objectContent =
+ * Toolkit.getContentFactory().createRootContent(object);
+ * setSelectedNode(objectContent); break; } }
*/
setSelectedNode(content);
}
@@ -99,8 +105,7 @@ public class MasterDetailPanel extends C
final View left = subviews[0];
final View right = subviews[1];
final Size leftPanelRequiredSize = left.getRequiredSize(new Size(availableSpace));
- final Size rightPanelRequiredSize =
- right == null ? new Size() : right.getRequiredSize(new Size(availableSpace));
+ final Size rightPanelRequiredSize = right == null ? new Size() : right.getRequiredSize(new Size(availableSpace));
// combine the two sizes
final Size totalSize = new Size(leftPanelRequiredSize);
@@ -109,8 +114,8 @@ public class MasterDetailPanel extends C
if (totalSize.getWidth() > availableSpace.getWidth()) {
/*
- * If the combined width is greater than the available then we need to divide the space between the two
- * sides and recalculate
+ * If the combined width is greater than the available then we need
+ * to divide the space between the two sides and recalculate
*/
if (rightPanelRequiredSize.getWidth() <= MINIMUM_WIDTH) {
leftPanelRequiredSize.setWidth(availableSpace.getWidth() - rightPanelRequiredSize.getWidth());
@@ -121,19 +126,24 @@ public class MasterDetailPanel extends C
rightPanelRequiredSize.setWidth(rightPanelRequiredSize.getWidth() * availableWidth / requiredWidth);
}
/*
- * final int leftWidth = Math.max(MINIMUM_WIDTH, leftPanelRequiredSize.getWidth()); final int rightWidth =
- * rightPanelRequiredSize.getWidth(); final int totalWidth = leftWidth + rightWidth;
+ * final int leftWidth = Math.max(MINIMUM_WIDTH,
+ * leftPanelRequiredSize.getWidth()); final int rightWidth =
+ * rightPanelRequiredSize.getWidth(); final int totalWidth =
+ * leftWidth + rightWidth;
*
- * final int bestWidth = (int) (1.0 * leftWidth / totalWidth * availableWidth); final Size maximumSizeLeft =
- * new Size(bestWidth, maximumSize.getHeight()); leftPanelRequiredSize =
+ * final int bestWidth = (int) (1.0 * leftWidth / totalWidth *
+ * availableWidth); final Size maximumSizeLeft = new Size(bestWidth,
+ * maximumSize.getHeight()); leftPanelRequiredSize =
* left.getRequiredSize(maximumSizeLeft);
*
- * final Size maximumSizeRight = new Size(availableWidth - leftPanelRequiredSize.getWidth(),
- * maximumSize.getHeight()); rightPanelRequiredSize = right.getRequiredSize(maximumSizeRight);
+ * final Size maximumSizeRight = new Size(availableWidth -
+ * leftPanelRequiredSize.getWidth(), maximumSize.getHeight());
+ * rightPanelRequiredSize = right.getRequiredSize(maximumSizeRight);
*/
}
- // combinedSize.setHeight(Math.min(combinedSize.getHeight(), maximumSize.getHeight()));
+ // combinedSize.setHeight(Math.min(combinedSize.getHeight(),
+ // maximumSize.getHeight()));
// totalSize.limitSize(availableSpace);
left.setSize(new Size(leftPanelRequiredSize.getWidth(), totalSize.getHeight()));
@@ -159,8 +169,8 @@ public class MasterDetailPanel extends C
if (leftPanelRequiredSize.getWidth() + rightPanelRequiredSize.getWidth() > availableSpace.getWidth()) {
/*
- * If the combined width is greater than the available then we need to divide the space between the two
- * sides and recalculate
+ * If the combined width is greater than the available then we need
+ * to divide the space between the two sides and recalculate
*/
final int availableWidth = availableSpace.getWidth();
@@ -172,8 +182,7 @@ public class MasterDetailPanel extends C
final Size maximumSizeLeft = new Size(bestWidth, availableSpace.getHeight());
leftPanelRequiredSize = left.getRequiredSize(maximumSizeLeft);
- final Size maximumSizeRight =
- new Size(availableWidth - leftPanelRequiredSize.getWidth(), availableSpace.getHeight());
+ final Size maximumSizeRight = new Size(availableWidth - leftPanelRequiredSize.getWidth(), availableSpace.getHeight());
rightPanelRequiredSize = right == null ? new Size() : right.getRequiredSize(maximumSizeRight);
}
@@ -195,17 +204,20 @@ public class MasterDetailPanel extends C
}
private void setSelectedNode(final Content content) {
- final ViewRequirement requirement =
- new ViewRequirement(content, ViewRequirement.OPEN | ViewRequirement.SUBVIEW | ViewRequirement.FIXED);
+ final ViewRequirement requirement = new ViewRequirement(content, ViewRequirement.OPEN | ViewRequirement.SUBVIEW | ViewRequirement.FIXED);
/*
- * final ObjectAdapter object = content.getAdapter(); final ObjectSpecification specification =
- * object.getSpecification(); final CollectionFacet facet = specification.getFacet(CollectionFacet.class); if
- * (facet != null && facet.size(object) > 0) { if (mainViewTableSpec.canDisplay(requirement)) {
- * showInRightPane(mainViewTableSpec.createView(content, axes, -1)); } else if
- * (mainViewListSpec.canDisplay(requirement)) { showInRightPane(mainViewListSpec.createView(content, axes, -1));
- * }
+ * final ObjectAdapter object = content.getAdapter(); final
+ * ObjectSpecification specification = object.getSpecification(); final
+ * CollectionFacet facet =
+ * specification.getFacet(CollectionFacet.class); if (facet != null &&
+ * facet.size(object) > 0) { if
+ * (mainViewTableSpec.canDisplay(requirement)) {
+ * showInRightPane(mainViewTableSpec.createView(content, axes, -1)); }
+ * else if (mainViewListSpec.canDisplay(requirement)) {
+ * showInRightPane(mainViewListSpec.createView(content, axes, -1)); }
*
- * } else if (specification.isObject()) { if (object != null && mainViewFormSpec.canDisplay(requirement)) {
+ * } else if (specification.isObject()) { if (object != null &&
+ * mainViewFormSpec.canDisplay(requirement)) {
* showInRightPane(mainViewFormSpec.createView(content, axes, -1)); } }
*/
final View createView = Toolkit.getViewFactory().createView(requirement);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java Sun Jan 22 08:05:17 2012
@@ -65,8 +65,7 @@ public class ObjectFieldBuilder extends
LOG.debug("build view " + view + " for " + object);
final ObjectSpecification spec = object.getSpecification();
- final Filter<ObjectAssociation> filter =
- ObjectAssociationFilters.dynamicallyVisible(IsisContext.getAuthenticationSession(), object);
+ final Filter<ObjectAssociation> filter = ObjectAssociationFilters.dynamicallyVisible(IsisContext.getAuthenticationSession(), object);
final List<ObjectAssociation> flds = spec.getAssociations(filter);
if (view.getSubviews().length == 0) {
@@ -76,8 +75,7 @@ public class ObjectFieldBuilder extends
}
}
- private void initialBuild(final View view, final Axes axes, final ObjectAdapter object,
- final List<ObjectAssociation> flds) {
+ private void initialBuild(final View view, final Axes axes, final ObjectAdapter object, final List<ObjectAssociation> flds) {
LOG.debug(" as new build");
// addViewAxes(view);
for (int f = 0; f < flds.size(); f++) {
@@ -86,23 +84,24 @@ public class ObjectFieldBuilder extends
}
}
- private void addField(final View view, final Axes axes, final ObjectAdapter object, final ObjectAssociation field,
- final int fieldNumber) {
+ private void addField(final View view, final Axes axes, final ObjectAdapter object, final ObjectAssociation field, final int fieldNumber) {
final View fieldView = createFieldView(view, axes, object, fieldNumber, field);
if (fieldView != null) {
view.addView(decorateSubview(axes, fieldView));
}
}
- private void updateBuild(final View view, final Axes axes, final ObjectAdapter object,
- final List<ObjectAssociation> flds) {
+ private void updateBuild(final View view, final Axes axes, final ObjectAdapter object, final List<ObjectAssociation> flds) {
LOG.debug(" as update build");
/*
- * 1/ To remove fields: look through views and remove any that don't exists in visible fields
+ * 1/ To remove fields: look through views and remove any that don't
+ * exists in visible fields
*
- * 2/ From remaining views, check for changes as already being done, and replace if needed
+ * 2/ From remaining views, check for changes as already being done, and
+ * replace if needed
*
- * 3/ Finally look through fields to see if there is no existing subview; and add one
+ * 3/ Finally look through fields to see if there is no existing
+ * subview; and add one
*/
View[] subviews = view.getSubviews();
@@ -132,7 +131,8 @@ public class ObjectFieldBuilder extends
} else if (field.isOneToOneAssociation()) {
final ObjectAdapter existing = subview.getContent().getAdapter();
- // if the field is parseable then it may have been modified; we need to replace what was
+ // if the field is parseable then it may have been modified; we
+ // need to replace what was
// typed in with the actual title.
if (!field.getSpecification().isParseable()) {
final boolean changedValue = value != existing;
@@ -172,8 +172,7 @@ public class ObjectFieldBuilder extends
}
}
- private View createFieldView(final View view, final Axes axes, final ObjectAdapter object, final int fieldNumber,
- final ObjectAssociation field) {
+ private View createFieldView(final View view, final Axes axes, final ObjectAdapter object, final int fieldNumber, final ObjectAssociation field) {
if (field == null) {
throw new NullPointerException();
}