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 2011/05/03 09:18:38 UTC
svn commit: r1098945 [15/25] - in /incubator/isis/trunk/viewer:
bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/
bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/
bdd/common/src/main/java/org/apache/isis/viewer/bdd/commo...
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/TextParseableParameterImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/TextParseableParameterImpl.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/TextParseableParameterImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/TextParseableParameterImpl.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.view.action;
import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -36,7 +35,6 @@ import org.apache.isis.viewer.dnd.drawin
import org.apache.isis.viewer.dnd.view.Content;
import org.apache.isis.viewer.dnd.view.content.AbstractTextParsableContent;
-
public class TextParseableParameterImpl extends AbstractTextParsableContent implements TextParseableParameter {
private ObjectAdapter object;
private final ObjectAdapter[] options;
@@ -44,12 +42,8 @@ public class TextParseableParameterImpl
private final ActionHelper invocation;
private final int index;
- public TextParseableParameterImpl(
- final ParseableEntryActionParameter objectActionParameters,
- final ObjectAdapter adapter,
- final ObjectAdapter[] options,
- final int i,
- final ActionHelper invocation) {
+ public TextParseableParameterImpl(final ParseableEntryActionParameter objectActionParameters,
+ final ObjectAdapter adapter, final ObjectAdapter[] options, final int i, final ActionHelper invocation) {
this.parameter = objectActionParameters;
this.options = options;
index = i;
@@ -57,6 +51,7 @@ public class TextParseableParameterImpl
object = adapter;
}
+ @Override
public void debugDetails(final DebugBuilder debug) {
debug.appendln("name", parameter.getName());
debug.appendln("required", isRequired());
@@ -64,8 +59,10 @@ public class TextParseableParameterImpl
}
@Override
- public void entryComplete() {}
+ public void entryComplete() {
+ }
+ @Override
public String getIconName() {
return "";
}
@@ -75,14 +72,17 @@ public class TextParseableParameterImpl
return ImageFactory.getInstance().loadIcon("value", 12, null);
}
+ @Override
public ObjectAdapter getAdapter() {
return object;
}
+ @Override
public int getNoLines() {
return parameter.getNoLines();
}
+ @Override
public ObjectAdapter[] getOptions() {
return options;
}
@@ -92,14 +92,17 @@ public class TextParseableParameterImpl
return object == null;
}
+ @Override
public boolean isRequired() {
return !parameter.isOptional();
}
+ @Override
public Consent canClear() {
return Allow.DEFAULT;
}
+ @Override
public boolean canWrap() {
return parameter.canWrap();
}
@@ -119,10 +122,12 @@ public class TextParseableParameterImpl
return true;
}
+ @Override
public boolean isOptionEnabled() {
return options != null && options.length > 0;
}
+ @Override
public String title() {
return AdapterUtils.titleString(object);
}
@@ -134,29 +139,34 @@ public class TextParseableParameterImpl
return toString.toString();
}
+ @Override
public String getParameterName() {
return parameter.getName();
}
+ @Override
public ObjectSpecification getSpecification() {
return parameter.getSpecification();
}
+ @Override
public ObjectAdapter drop(final Content sourceContent) {
return null;
}
+ @Override
public Consent canDrop(final Content sourceContent) {
return Veto.DEFAULT;
}
+ @Override
public String titleString(final ObjectAdapter value) {
return titleString(value, parameter, parameter.getSpecification());
}
/**
- * @throws InvalidEntryException -
- * turns the parameter red if invalid.
+ * @throws InvalidEntryException
+ * - turns the parameter red if invalid.
*/
@Override
public void parseTextEntry(final String entryText) {
@@ -174,12 +184,13 @@ public class TextParseableParameterImpl
final ObjectSpecification parameterSpecification = parameter.getSpecification();
final ParseableFacet p = parameterSpecification.getFacet(ParseableFacet.class);
try {
- return p.parseTextEntry(object, entryText);
- } catch(IllegalArgumentException ex) {
- throw new InvalidEntryException(ex.getMessage(), ex);
+ return p.parseTextEntry(object, entryText);
+ } catch (final IllegalArgumentException ex) {
+ throw new InvalidEntryException(ex.getMessage(), ex);
}
}
+ @Override
public String getDescription() {
final String title = object == null ? "" : ": " + object.titleString();
final String specification = getSpecification().getShortIdentifier();
@@ -187,10 +198,12 @@ public class TextParseableParameterImpl
return getParameterName() + type + title + " " + parameter.getDescription();
}
+ @Override
public String getHelp() {
return null;
}
+ @Override
public String getId() {
return null;
}
@@ -200,10 +213,12 @@ public class TextParseableParameterImpl
return Allow.DEFAULT;
}
+ @Override
public int getMaximumLength() {
return parameter.getMaximumLength();
}
+ @Override
public int getTypicalLineLength() {
return parameter.getTypicalLineLength();
}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/axis/LabelAxis.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/axis/LabelAxis.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/axis/LabelAxis.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/axis/LabelAxis.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.view.axis;
import org.apache.isis.core.commons.lang.ToString;
@@ -26,7 +25,8 @@ import org.apache.isis.viewer.dnd.view.V
public class LabelAxis implements ViewAxis {
private int width;
- public LabelAxis() {}
+ public LabelAxis() {
+ }
public void accommodateWidth(final int width) {
this.width = Math.max(this.width, width);
@@ -35,9 +35,10 @@ public class LabelAxis implements ViewAx
public int getWidth() {
return width;
}
-
+
+ @Override
public String toString() {
- ToString str = new ToString(this);
+ final ToString str = new ToString(this);
str.append("width", width);
return str.toString();
}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractBorder.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractBorder.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.view.base;
import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -36,7 +35,6 @@ import org.apache.isis.viewer.dnd.view.T
import org.apache.isis.viewer.dnd.view.View;
import org.apache.isis.viewer.dnd.view.ViewAreaType;
-
public class AbstractBorder extends AbstractViewDecorator {
protected int bottom;
protected int left;
@@ -49,10 +47,10 @@ public class AbstractBorder extends Abst
}
protected Bounds contentArea() {
- return new Bounds(getLeft(), getTop(), getSize().getWidth() - getLeft() - getRight(), getSize().getHeight() - getTop()
- - getBottom());
+ return new Bounds(getLeft(), getTop(), getSize().getWidth() - getLeft() - getRight(), getSize().getHeight()
+ - getTop() - getBottom());
}
-
+
@Override
public View dragFrom(final Location location) {
location.subtract(getLeft(), getTop());
@@ -81,7 +79,7 @@ public class AbstractBorder extends Abst
}
}
- protected void clearBackground(Canvas canvas, Color color) {
+ protected void clearBackground(final Canvas canvas, final Color color) {
final Bounds bounds = getView().getBounds();
canvas.drawSolidRectangle(0, 0, bounds.getWidth(), bounds.getHeight(), color);
}
@@ -89,11 +87,12 @@ public class AbstractBorder extends Abst
@Override
public void draw(final Canvas canvas) {
if (Toolkit.debug) {
- canvas.drawDebugOutline(new Bounds(getSize()), getBaseline(), Toolkit.getColor(ColorsAndFonts.COLOR_DEBUG_BOUNDS_BORDER));
+ canvas.drawDebugOutline(new Bounds(getSize()), getBaseline(),
+ Toolkit.getColor(ColorsAndFonts.COLOR_DEBUG_BOUNDS_BORDER));
}
- int width = getSize().getWidth() - getRight();
- int height = getSize().getHeight() - getBottom();
- Canvas subcanvas = canvas.createSubcanvas(getLeft(), getTop(), width, height);
+ final int width = getSize().getWidth() - getRight();
+ final int height = getSize().getHeight() - getBottom();
+ final Canvas subcanvas = canvas.createSubcanvas(getLeft(), getTop(), width, height);
wrappedView.draw(subcanvas);
}
@@ -142,7 +141,7 @@ public class AbstractBorder extends Abst
size.extend(getLeft() + getRight(), getTop() + getBottom());
return size;
}
-
+
protected int getRight() {
return right;
}
@@ -162,14 +161,15 @@ public class AbstractBorder extends Abst
@Override
protected void debugDetails(final DebugBuilder debug) {
super.debugDetails(debug);
- debug.appendln("border", getTop() + "/" + getBottom() + " " + getLeft() + "/" + getRight() + " (top/bottom left/right)");
+ debug.appendln("border", getTop() + "/" + getBottom() + " " + getLeft() + "/" + getRight()
+ + " (top/bottom left/right)");
debug.appendln("contents", contentArea());
}
protected boolean overBorder(final Location location) {
return !contentArea().contains(location);
}
-
+
protected boolean overContent(final Location location) {
return contentArea().contains(location);
}
@@ -203,7 +203,7 @@ public class AbstractBorder extends Abst
@Override
public void mouseMoved(final Location at) {
- boolean on = overBorder(at);
+ final boolean on = overBorder(at);
if (onBorder != on) {
markDamaged();
onBorder = on;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractFieldSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractFieldSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractFieldSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractFieldSpecification.java Tue May 3 07:18:19 2011
@@ -17,34 +17,38 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.view.base;
import org.apache.isis.viewer.dnd.view.ViewRequirement;
import org.apache.isis.viewer.dnd.view.ViewSpecification;
-
public abstract class AbstractFieldSpecification implements ViewSpecification {
- public boolean canDisplay(ViewRequirement requirement) {
+ @Override
+ public boolean canDisplay(final ViewRequirement requirement) {
return requirement.isTextParseable() && requirement.isEditable();
}
+ @Override
public boolean isOpen() {
return false;
}
+ @Override
public boolean isReplaceable() {
return true;
}
+ @Override
public boolean isSubView() {
return true;
}
+ @Override
public boolean isAligned() {
return false;
}
-
+
+ @Override
public boolean isResizeable() {
return false;
}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractFocusManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractFocusManager.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractFocusManager.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractFocusManager.java Tue May 3 07:18:19 2011
@@ -17,176 +17,182 @@
* under the License.
*/
+package org.apache.isis.viewer.dnd.view.base;
-package org.apache.isis.viewer.dnd.view.base;
-
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.viewer.dnd.view.FocusManager;
import org.apache.isis.viewer.dnd.view.View;
-
-
-/**
- * Abstract focus manager that uses the set of views to move focus between from the concrete subclass.
- *
- * @see #getChildViews()
- */
-public abstract class AbstractFocusManager implements FocusManager {
- // TODO container to go in subclass ??
- protected View container;
- protected View focus;
- private final View initialFocus;
-
- public AbstractFocusManager(final View container) {
- this(container, null);
- }
-
- public AbstractFocusManager(final View container, final View initalFocus) {
- Assert.assertNotNull(container);
- this.container = container;
- this.initialFocus = initalFocus;
- focus = initalFocus;
- }
-
- /**
- * Throws a ObjectAdapterRuntimeException if the specified view is available to this focus manager.
- */
- private void checkCanFocusOn(final View view) {
- final View[] views = getChildViews();
- boolean valid = view == container.getView();
- for (int j = 0; valid == false && j < views.length; j++) {
- if (views[j] == view) {
- valid = true;
- }
- }
-
- if (!valid) {
- // throw new ObjectAdapterRuntimeException("No view " + view + " to focus on in " +
- // container.getView());
- }
- }
-
- public void focusFirstChildView() {
- final View[] views = getChildViews();
- for (int j = 0; j < views.length; j++) {
- if (views[j].canFocus()) {
- setFocus(views[j]);
- return;
- }
- }
- // no other focusable view; stick with the view we've got
- return;
- }
-
- public void focusInitialChildView() {
- if (initialFocus == null) {
- focusFirstChildView();
- } else {
- setFocus(initialFocus);
- }
- }
-
- public void focusLastChildView() {
- final View[] views = getChildViews();
- for (int j = views.length - 1; j > 0; j--) {
- if (views[j].canFocus()) {
- setFocus(views[j]);
- return;
- }
- }
- // no other focusable view; stick with the view we've got
- return;
- }
-
- public void focusNextView() {
- final View[] views = getChildViews();
- for (int i = 0; i < views.length; i++) {
- if (testView(views, i)) {
- for (int j = i + 1; j < views.length; j++) {
- if (views[j].canFocus()) {
- setFocus(views[j]);
- return;
- }
- }
- for (int j = 0; j < i; j++) {
- if (views[j].canFocus()) {
- setFocus(views[j]);
- return;
- }
- }
- // no other focusable view; stick with the view we've got
- return;
- }
- }
-
- // throw new ObjectAdapterRuntimeException();
- }
-
- private boolean testView(final View[] views, final int i) {
- final View view = views[i];
- return view == focus;
- }
-
- public void focusParentView() {
- container.getFocusManager().setFocus(container.getFocusManager().getFocus());
- }
-
- public void focusPreviousView() {
- final View[] views = getChildViews();
- if (views.length > 1) {
- for (int i = 0; i < views.length; i++) {
- if (testView(views, i)) {
- for (int j = i - 1; j >= 0; j--) {
- if (views[j].canFocus()) {
- setFocus(views[j]);
- return;
- }
- }
- for (int j = views.length - 1; j > i; j--) {
- if (views[j].canFocus()) {
- setFocus(views[j]);
- return;
- }
- }
- // no other focusable view; stick with the view we've got
- return;
- }
- }
-
- // Don't move to any view
- // throw new ObjectAdapterRuntimeException("Can't move to previous peer from " + focus);
- }
- }
-
- protected abstract View[] getChildViews();
-
- public View getFocus() {
- return focus;
- }
-
- public void setFocus(final View view) {
- checkCanFocusOn(view);
-
- if (view != null && view.canFocus()) {
- if ((focus != null) && (focus != view)) {
- focus.focusLost();
- focus.markDamaged();
- }
-
- focus = view;
- focus.focusReceived();
-
- view.markDamaged();
- }
- }
-
- @Override
- public String toString() {
- final ToString str = new ToString(this);
- str.append("container", container);
- str.append("initialFocus", initialFocus);
- str.append("focus", focus);
- return str.toString();
- }
-
-}
+
+/**
+ * Abstract focus manager that uses the set of views to move focus between from the concrete subclass.
+ *
+ * @see #getChildViews()
+ */
+public abstract class AbstractFocusManager implements FocusManager {
+ // TODO container to go in subclass ??
+ protected View container;
+ protected View focus;
+ private final View initialFocus;
+
+ public AbstractFocusManager(final View container) {
+ this(container, null);
+ }
+
+ public AbstractFocusManager(final View container, final View initalFocus) {
+ Assert.assertNotNull(container);
+ this.container = container;
+ this.initialFocus = initalFocus;
+ focus = initalFocus;
+ }
+
+ /**
+ * Throws a ObjectAdapterRuntimeException if the specified view is available to this focus manager.
+ */
+ private void checkCanFocusOn(final View view) {
+ final View[] views = getChildViews();
+ boolean valid = view == container.getView();
+ for (int j = 0; valid == false && j < views.length; j++) {
+ if (views[j] == view) {
+ valid = true;
+ }
+ }
+
+ if (!valid) {
+ // throw new ObjectAdapterRuntimeException("No view " + view + " to focus on in " +
+ // container.getView());
+ }
+ }
+
+ @Override
+ public void focusFirstChildView() {
+ final View[] views = getChildViews();
+ for (final View view : views) {
+ if (view.canFocus()) {
+ setFocus(view);
+ return;
+ }
+ }
+ // no other focusable view; stick with the view we've got
+ return;
+ }
+
+ @Override
+ public void focusInitialChildView() {
+ if (initialFocus == null) {
+ focusFirstChildView();
+ } else {
+ setFocus(initialFocus);
+ }
+ }
+
+ @Override
+ public void focusLastChildView() {
+ final View[] views = getChildViews();
+ for (int j = views.length - 1; j > 0; j--) {
+ if (views[j].canFocus()) {
+ setFocus(views[j]);
+ return;
+ }
+ }
+ // no other focusable view; stick with the view we've got
+ return;
+ }
+
+ @Override
+ public void focusNextView() {
+ final View[] views = getChildViews();
+ for (int i = 0; i < views.length; i++) {
+ if (testView(views, i)) {
+ for (int j = i + 1; j < views.length; j++) {
+ if (views[j].canFocus()) {
+ setFocus(views[j]);
+ return;
+ }
+ }
+ for (int j = 0; j < i; j++) {
+ if (views[j].canFocus()) {
+ setFocus(views[j]);
+ return;
+ }
+ }
+ // no other focusable view; stick with the view we've got
+ return;
+ }
+ }
+
+ // throw new ObjectAdapterRuntimeException();
+ }
+
+ private boolean testView(final View[] views, final int i) {
+ final View view = views[i];
+ return view == focus;
+ }
+
+ @Override
+ public void focusParentView() {
+ container.getFocusManager().setFocus(container.getFocusManager().getFocus());
+ }
+
+ @Override
+ public void focusPreviousView() {
+ final View[] views = getChildViews();
+ if (views.length > 1) {
+ for (int i = 0; i < views.length; i++) {
+ if (testView(views, i)) {
+ for (int j = i - 1; j >= 0; j--) {
+ if (views[j].canFocus()) {
+ setFocus(views[j]);
+ return;
+ }
+ }
+ for (int j = views.length - 1; j > i; j--) {
+ if (views[j].canFocus()) {
+ setFocus(views[j]);
+ return;
+ }
+ }
+ // no other focusable view; stick with the view we've got
+ return;
+ }
+ }
+
+ // Don't move to any view
+ // throw new ObjectAdapterRuntimeException("Can't move to previous peer from " + focus);
+ }
+ }
+
+ protected abstract View[] getChildViews();
+
+ @Override
+ public View getFocus() {
+ return focus;
+ }
+
+ @Override
+ public void setFocus(final View view) {
+ checkCanFocusOn(view);
+
+ if (view != null && view.canFocus()) {
+ if ((focus != null) && (focus != view)) {
+ focus.focusLost();
+ focus.markDamaged();
+ }
+
+ focus = view;
+ focus.focusReceived();
+
+ view.markDamaged();
+ }
+ }
+
+ @Override
+ public String toString() {
+ final ToString str = new ToString(this);
+ str.append("container", container);
+ str.append("initialFocus", initialFocus);
+ str.append("focus", focus);
+ return str.toString();
+ }
+
+}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java Tue May 3 07:18:19 2011
@@ -17,13 +17,10 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.view.base;
import java.util.Enumeration;
-import org.apache.log4j.Logger;
-
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -73,7 +70,7 @@ import org.apache.isis.viewer.dnd.view.c
import org.apache.isis.viewer.dnd.view.content.RootObject;
import org.apache.isis.viewer.dnd.view.option.OpenViewOption;
import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
-
+import org.apache.log4j.Logger;
public abstract class AbstractView implements View {
private static final Logger LOG = Logger.getLogger(AbstractView.class);
@@ -89,7 +86,7 @@ public abstract class AbstractView imple
private int y;
private int height;
private int width;
-
+
protected AbstractView(final Content content) {
this(content, null);
}
@@ -127,8 +124,8 @@ public abstract class AbstractView imple
@Override
public boolean contains(final View view) {
final View[] subviews = getSubviews();
- for (int i = 0; i < subviews.length; i++) {
- if (subviews[i] == view || (subviews[i] != null && subviews[i].contains(view))) {
+ for (final View subview : subviews) {
+ if (subview == view || (subview != null && subview.contains(view))) {
return true;
}
}
@@ -142,8 +139,8 @@ public abstract class AbstractView imple
}
final View[] subviews = getSubviews();
- for (int i = 0; i < subviews.length; i++) {
- if (subviews[i] != null && subviews[i].containsFocus()) {
+ for (final View subview : subviews) {
+ if (subview != null && subview.containsFocus()) {
return true;
}
}
@@ -191,14 +188,15 @@ public abstract class AbstractView imple
debug.appendln("Self", getView());
debug.appendln("Parent's size", getParent() == null ? new Size() : getParent().getSize());
- debug.appendln("Size w/in parent", getView().getRequiredSize(getParent() == null ? new Size() : getParent().getSize()));
+ debug.appendln("Size w/in parent",
+ getView().getRequiredSize(getParent() == null ? new Size() : getParent().getSize()));
debug.appendln("Location w/in parent", getView().getLocation());
debug.appendln("Changable", canChangeValue());
debug.appendln("Focus", (canFocus() ? "focusable" : "non-focusable"));
debug.appendln("Has focus", hasFocus());
debug.appendln("Contains focus", containsFocus());
debug.appendln("Focus manager", getFocusManager());
- debug.appendln("State", getState());
+ debug.appendln("State", getState());
debug.appendln("Axes", getViewAxes());
appendDebug(debug);
@@ -224,8 +222,9 @@ public abstract class AbstractView imple
debug.appendln(getSpecification().getName().toUpperCase());
debugStructure(debug);
}
-
- protected void appendDebug(final DebugBuilder debug) {}
+
+ protected void appendDebug(final DebugBuilder debug) {
+ }
@Override
public void debugStructure(final DebugBuilder b) {
@@ -236,10 +235,9 @@ public abstract class AbstractView imple
b.appendln("Location", getAbsoluteLocation());
final View views[] = getSubviews();
b.indent();
- for (int i = 0; i < views.length; i++) {
- final View subview = views[i];
+ for (final View subview : views) {
b.appendln();
- ViewSpecification spec = subview.getSpecification();
+ final ViewSpecification spec = subview.getSpecification();
b.appendln(spec == null ? "none" : spec.getName().toUpperCase());
b.appendln("View", subview);
subview.debugStructure(b);
@@ -249,23 +247,25 @@ public abstract class AbstractView imple
@Override
public void dispose() {
- View parent = getParent();
+ final View parent = getParent();
if (parent != null) {
parent.removeView(getView());
}
}
@Override
- public void drag(final InternalDrag drag) {}
+ public void drag(final InternalDrag drag) {
+ }
@Override
- public void drag(final ContentDrag contentDrag) {}
+ public void drag(final ContentDrag contentDrag) {
+ }
@Override
- public void drag(ViewDrag drag) {
+ public void drag(final ViewDrag drag) {
getViewManager().getSpy().addTrace(this, "view drag", drag);
}
-
+
@Override
public void dragCancel(final InternalDrag drag) {
getFeedbackManager().showDefaultCursor();
@@ -283,10 +283,12 @@ public abstract class AbstractView imple
}
@Override
- public void dragIn(final ContentDrag drag) {}
+ public void dragIn(final ContentDrag drag) {
+ }
@Override
- public void dragOut(final ContentDrag drag) {}
+ public void dragOut(final ContentDrag drag) {
+ }
@Override
public DragEvent dragStart(final DragStart drag) {
@@ -300,12 +302,13 @@ public abstract class AbstractView imple
}
@Override
- public void dragTo(final InternalDrag drag) {}
+ public void dragTo(final InternalDrag drag) {
+ }
/**
* Clears the background of this view to the given color (call from the {@link #draw(Canvas)} method.
*/
- protected void clearBackground(Canvas canvas, Color color) {
+ protected void clearBackground(final Canvas canvas, final Color color) {
final Bounds bounds = getBounds();
canvas.drawSolidRectangle(0, 0, bounds.getWidth(), bounds.getHeight(), color);
}
@@ -313,13 +316,14 @@ public abstract class AbstractView imple
@Override
public void draw(final Canvas canvas) {
if (Toolkit.debug) {
- canvas.drawDebugOutline(new Bounds(getSize()), getBaseline(), Toolkit
- .getColor(ColorsAndFonts.COLOR_DEBUG_BOUNDS_VIEW));
+ canvas.drawDebugOutline(new Bounds(getSize()), getBaseline(),
+ Toolkit.getColor(ColorsAndFonts.COLOR_DEBUG_BOUNDS_VIEW));
}
}
@Override
- public void drop(final ContentDrag drag) {}
+ public void drop(final ContentDrag drag) {
+ }
/**
* No default behaviour, views can only be dropped on workspace
@@ -330,7 +334,8 @@ public abstract class AbstractView imple
}
@Override
- public void editComplete(boolean moveFocus, boolean toNextField) {}
+ public void editComplete(final boolean moveFocus, final boolean toNextField) {
+ }
@Override
public void entered() {
@@ -344,7 +349,8 @@ public abstract class AbstractView imple
}
@Override
- public void exited() {}
+ public void exited() {
+ }
@Override
public void firstClick(final Click click) {
@@ -356,14 +362,16 @@ public abstract class AbstractView imple
}
@Override
- public void focusLost() {}
+ public void focusLost() {
+ }
@Override
- public void focusReceived() {}
+ public void focusReceived() {
+ }
@Override
public Location getAbsoluteLocation() {
- View parent = getParent();
+ final View parent = getParent();
if (parent == null) {
return getLocation();
} else {
@@ -453,12 +461,12 @@ public abstract class AbstractView imple
public final View getView() {
return viewRoot;
}
-
+
@Override
public Axes getViewAxes() {
return new Axes();
}
-
+
@Override
public Viewer getViewManager() {
return Toolkit.getViewer();
@@ -493,31 +501,36 @@ public abstract class AbstractView imple
}
@Override
- public void invalidateContent() {}
+ public void invalidateContent() {
+ }
@Override
public void invalidateLayout() {
- View parent = getParent();
+ final View parent = getParent();
if (parent != null) {
parent.invalidateLayout();
}
}
@Override
- public void keyPressed(final KeyboardAction key) {}
+ public void keyPressed(final KeyboardAction key) {
+ }
@Override
- public void keyReleased(KeyboardAction action) {}
+ public void keyReleased(final KeyboardAction action) {
+ }
@Override
- public void keyTyped(KeyboardAction action) {}
+ public void keyTyped(final KeyboardAction action) {
+ }
@Override
- public void layout() {}
+ public void layout() {
+ }
/**
- * Limits the bounds of the this view (when being moved or dropped) so it never extends outside the
- * specified bounds e.g. outside of a parent view
+ * Limits the bounds of the this view (when being moved or dropped) so it never extends outside the specified bounds
+ * e.g. outside of a parent view
*/
public void limitBoundsWithin(final Bounds containerBounds) {
final Bounds contentBounds = getView().getBounds();
@@ -558,7 +571,7 @@ public abstract class AbstractView imple
@Override
public void markDamaged(final Bounds bounds) {
- View parent = getParent();
+ final View parent = getParent();
if (parent == null) {
getViewManager().markDamaged(bounds);
} else {
@@ -644,7 +657,8 @@ public abstract class AbstractView imple
}
@Override
- public void refresh() {}
+ public void refresh() {
+ }
@Override
public void removeView(final View view) {
@@ -694,7 +708,8 @@ public abstract class AbstractView imple
parent = parentView.getView();
}
- public void setMaximumSize(final Size size) {}
+ public void setMaximumSize(final Size size) {
+ }
@Override
public void setSize(final Size size) {
@@ -713,7 +728,7 @@ public abstract class AbstractView imple
@Deprecated
protected void setViewAxis(final ViewAxis viewAxis) {
- // this.viewAxis = viewAxis;
+ // this.viewAxis = viewAxis;
}
@Override
@@ -730,17 +745,19 @@ public abstract class AbstractView imple
}
}
- @Override
+ @Override
public String toString() {
final String name = getClass().getName();
return name.substring(name.lastIndexOf('.') + 1) + getId() + ":" + getState() + ":" + getContent();
}
@Override
- public void update(final ObjectAdapter object) {}
+ public void update(final ObjectAdapter object) {
+ }
@Override
- public void updateView() {}
+ public void updateView() {
+ }
@Override
public ViewAreaType viewAreaType(final Location location) {
@@ -815,9 +832,9 @@ public abstract class AbstractView imple
public void execute(final Workspace workspace, final View view, final Location at) {
Properties.setStringOption("view.object-default", getSpecification().getName());
/*
- Options viewOptions = Properties.getViewConfigurationOptions(getSpecification());
- getView().saveOptions(viewOptions);
- */
+ * Options viewOptions = Properties.getViewConfigurationOptions(getSpecification());
+ * getView().saveOptions(viewOptions);
+ */
}
});
}
@@ -827,9 +844,9 @@ public abstract class AbstractView imple
public void execute(final Workspace workspace, final View view, final Location at) {
Properties.setStringOption("view.collection-default", getSpecification().getName());
/*
- Options viewOptions = Properties.getViewConfigurationOptions(getSpecification());
- getView().saveOptions(viewOptions);
- */
+ * Options viewOptions = Properties.getViewConfigurationOptions(getSpecification());
+ * getView().saveOptions(viewOptions);
+ */
}
});
}
@@ -839,48 +856,45 @@ public abstract class AbstractView imple
public void execute(final Workspace workspace, final View view, final Location at) {
Properties.setStringOption("view.icon-default", getSpecification().getName());
/*
- Options viewOptions = Properties.getViewConfigurationOptions(getSpecification());
- getView().saveOptions(viewOptions);
- */
+ * Options viewOptions = Properties.getViewConfigurationOptions(getSpecification());
+ * getView().saveOptions(viewOptions);
+ */
}
});
}
if (getContent() instanceof RootObject || getContent() instanceof RootCollection) {
- options.add(new UserActionAbstract("Use as default view for " + getContent().getSpecification().getSingularName(), ActionType.USER) {
+ options.add(new UserActionAbstract("Use as default view for "
+ + getContent().getSpecification().getSingularName(), ActionType.USER) {
@Override
public void execute(final Workspace workspace, final View view, final Location at) {
- Options viewOptions = Properties.getViewConfigurationOptions(getSpecification());
+ final Options viewOptions = Properties.getViewConfigurationOptions(getSpecification());
getView().saveOptions(viewOptions);
-
- // Options viewOptions =
- ObjectSpecification specification = content.getSpecification();
- Options settingsOptions = Properties.getDefaultViewOptions(specification);
+
+ // Options viewOptions =
+ final ObjectSpecification specification = content.getSpecification();
+ final Options settingsOptions = Properties.getDefaultViewOptions(specification);
settingsOptions.addOption("spec", getSpecification().getName());
}
});
}
/*
- options.add(new UserActionAbstract("Create new specification", UserAction.USER) {
- // TODO probably needs to be a replace with new view specification
- public void execute(final Workspace workspace, final View view, final Location at) {
- UserViewSpecification newSpec = new UserViewSpecification(getView());
- Options viewOptions = Properties.getViewConfigurationOptions(newSpec);
- getView().saveOptions(viewOptions);
-
- viewOptions = Properties.getUserViewSpecificationOptions(newSpec);
- viewOptions.addOption("wrapped-specification", getSpecification().getClass().getName());
-
- Toolkit.getViewFactory().addSpecification(newSpec);
- }
- });
- */
+ * options.add(new UserActionAbstract("Create new specification", UserAction.USER) { // TODO probably needs to
+ * be a replace with new view specification public void execute(final Workspace workspace, final View view,
+ * final Location at) { UserViewSpecification newSpec = new UserViewSpecification(getView()); Options
+ * viewOptions = Properties.getViewConfigurationOptions(newSpec); getView().saveOptions(viewOptions);
+ *
+ * viewOptions = Properties.getUserViewSpecificationOptions(newSpec);
+ * viewOptions.addOption("wrapped-specification", getSpecification().getClass().getName());
+ *
+ * Toolkit.getViewFactory().addSpecification(newSpec); } });
+ */
options.add(new UserActionAbstract("Save specification", ActionType.USER) {
@Override
public void execute(final Workspace workspace, final View view, final Location at) {
- Options viewOptions = Properties.getViewConfigurationOptions(getSpecification());
+ final Options viewOptions = Properties.getViewConfigurationOptions(getSpecification());
getView().saveOptions(viewOptions);
-
+
Toolkit.getViewFactory().addSpecification(getSpecification());
}
});
@@ -890,10 +904,11 @@ public abstract class AbstractView imple
}
private void createOpenAsSubmenu(final UserActionSet options, final Content content) {
- ViewRequirement requirements = new ViewRequirement(content, ViewRequirement.OPEN | ViewRequirement.EXPANDABLE);
+ final ViewRequirement requirements =
+ new ViewRequirement(content, ViewRequirement.OPEN | ViewRequirement.EXPANDABLE);
final Enumeration possibleViews = Toolkit.getViewFactory().availableViews(requirements);
if (possibleViews.hasMoreElements()) {
- UserActionSet submenu = options.addNewActionSet("Open as");
+ final UserActionSet submenu = options.addNewActionSet("Open as");
while (possibleViews.hasMoreElements()) {
final ViewSpecification specification = (ViewSpecification) possibleViews.nextElement();
final UserActionAbstract viewAs = new OpenViewOption(specification);
@@ -903,10 +918,10 @@ public abstract class AbstractView imple
}
private void createCreateViewSubmenu(final UserActionSet options, final Content content) {
- ViewRequirement requirements = new ViewRequirement(content, ViewRequirement.OPEN);
+ final ViewRequirement requirements = new ViewRequirement(content, ViewRequirement.OPEN);
final Enumeration possibleViews = Toolkit.getViewFactory().availableDesigns(requirements);
if (possibleViews.hasMoreElements()) {
- UserActionSet submenu = options.addNewActionSet("Create view from");
+ final UserActionSet submenu = options.addNewActionSet("Create view from");
while (possibleViews.hasMoreElements()) {
final ViewSpecification specification = (ViewSpecification) possibleViews.nextElement();
final UserActionAbstract viewAs = new UserActionAbstract(specification.getName(), ActionType.USER) {
@@ -915,9 +930,9 @@ public abstract class AbstractView imple
ViewSpecification newSpec;
try {
newSpec = specification.getClass().newInstance();
- } catch (InstantiationException e) {
+ } catch (final InstantiationException e) {
throw new ViewerException(e);
- } catch (IllegalAccessException e) {
+ } catch (final IllegalAccessException e) {
throw new ViewerException(e);
}
@@ -929,16 +944,16 @@ public abstract class AbstractView imple
LOG.debug("open view " + newView);
workspace.addWindow(newView, new Placement(view));
workspace.markDamaged();
-
+
Options viewOptions = Properties.getViewConfigurationOptions(newSpec);
newView.saveOptions(viewOptions);
viewOptions = Properties.getUserViewSpecificationOptions(newSpec.getName());
viewOptions.addOption("design", specification.getClass().getName());
-
+
Toolkit.getViewFactory().addSpecification(newSpec);
}
};
-
+
submenu.add(viewAs);
}
}
@@ -951,10 +966,11 @@ public abstract class AbstractView imple
}
@Override
- public void loadOptions(Options viewOptions) {}
+ public void loadOptions(final Options viewOptions) {
+ }
@Override
- public void saveOptions(Options viewOptions) {
-// viewOptions.addOption("spec", getSpecification().getClass().getName());
+ public void saveOptions(final Options viewOptions) {
+ // viewOptions.addOption("spec", getSpecification().getClass().getName());
}
}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractViewDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractViewDecorator.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractViewDecorator.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractViewDecorator.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.view.base;
import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -49,7 +48,6 @@ import org.apache.isis.viewer.dnd.view.V
import org.apache.isis.viewer.dnd.view.Viewer;
import org.apache.isis.viewer.dnd.view.Workspace;
-
public abstract class AbstractViewDecorator implements View {
protected View wrappedView;
@@ -58,30 +56,37 @@ public abstract class AbstractViewDecora
wrappedView.setView(this);
}
+ @Override
public void addView(final View view) {
wrappedView.addView(view);
}
-
+
+ @Override
public Consent canChangeValue() {
return wrappedView.canChangeValue();
}
+ @Override
public boolean canFocus() {
return wrappedView.canFocus();
}
+ @Override
public boolean contains(final View view) {
return wrappedView.contains(view);
}
+ @Override
public boolean containsFocus() {
return wrappedView.containsFocus();
}
+ @Override
public void contentMenuOptions(final UserActionSet menuOptions) {
wrappedView.contentMenuOptions(menuOptions);
}
+ @Override
public final void debug(final DebugBuilder debug) {
debug.append("Decorator: ");
debug.indent();
@@ -101,294 +106,363 @@ public abstract class AbstractViewDecora
debug.appendln(name.substring(name.lastIndexOf('.') + 1));
}
+ @Override
public void debugStructure(final DebugBuilder debug) {
wrappedView.debugStructure(debug);
}
+ @Override
public void dispose() {
wrappedView.dispose();
}
+ @Override
public void drag(final ContentDrag contentDrag) {
wrappedView.drag(contentDrag);
}
+ @Override
public void drag(final InternalDrag drag) {
wrappedView.drag(drag);
}
-
- public void drag(ViewDrag drag) {
+
+ @Override
+ public void drag(final ViewDrag drag) {
wrappedView.drag(drag);
}
+ @Override
public void dragCancel(final InternalDrag drag) {
wrappedView.dragCancel(drag);
}
+ @Override
public View dragFrom(final Location location) {
return wrappedView.dragFrom(location);
}
+ @Override
public void dragIn(final ContentDrag drag) {
wrappedView.dragIn(drag);
}
+ @Override
public void dragOut(final ContentDrag drag) {
wrappedView.dragOut(drag);
}
+ @Override
public DragEvent dragStart(final DragStart drag) {
return wrappedView.dragStart(drag);
}
+ @Override
public void dragTo(final InternalDrag drag) {
wrappedView.dragTo(drag);
}
+ @Override
public void draw(final Canvas canvas) {
wrappedView.draw(canvas);
}
+ @Override
public void drop(final ContentDrag drag) {
wrappedView.drop(drag);
}
+ @Override
public void drop(final ViewDrag drag) {
wrappedView.drop(drag);
}
- public void editComplete(boolean moveFocus, boolean toNextField) {
+ @Override
+ public void editComplete(final boolean moveFocus, final boolean toNextField) {
wrappedView.editComplete(moveFocus, toNextField);
}
+ @Override
public void entered() {
wrappedView.entered();
}
+ @Override
public void exited() {
wrappedView.exited();
}
+ @Override
public void firstClick(final Click click) {
wrappedView.firstClick(click);
}
+ @Override
public void focusLost() {
wrappedView.focusLost();
}
+ @Override
public void focusReceived() {
wrappedView.focusReceived();
}
+ @Override
public Location getAbsoluteLocation() {
return wrappedView.getAbsoluteLocation();
}
+ @Override
public int getBaseline() {
return wrappedView.getBaseline();
}
+ @Override
public Bounds getBounds() {
return new Bounds(getLocation(), getSize());
}
+ @Override
public Content getContent() {
return wrappedView.getContent();
}
+ @Override
public FocusManager getFocusManager() {
return wrappedView.getFocusManager();
}
+ @Override
public int getId() {
return wrappedView.getId();
}
+ @Override
public Location getLocation() {
return wrappedView.getLocation();
}
+ @Override
public Padding getPadding() {
return wrappedView.getPadding();
}
+ @Override
public View getParent() {
return wrappedView.getParent();
}
- public Size getRequiredSize(Size availableSpace) {
+ @Override
+ public Size getRequiredSize(final Size availableSpace) {
return wrappedView.getRequiredSize(availableSpace);
}
+ @Override
public Size getSize() {
return wrappedView.getSize();
}
+ @Override
public ViewSpecification getSpecification() {
return wrappedView.getSpecification();
}
+ @Override
public ViewState getState() {
return wrappedView.getState();
}
+ @Override
public View[] getSubviews() {
return wrappedView.getSubviews();
}
+ @Override
public View getView() {
return wrappedView.getView();
}
+ @Override
public Axes getViewAxes() {
return wrappedView.getViewAxes();
}
+ @Override
public Viewer getViewManager() {
return wrappedView.getViewManager();
}
+ @Override
public Feedback getFeedbackManager() {
return wrappedView.getFeedbackManager();
}
+ @Override
public Workspace getWorkspace() {
return wrappedView.getWorkspace();
}
+ @Override
public boolean hasFocus() {
return wrappedView.hasFocus();
}
+ @Override
public View identify(final Location mouseLocation) {
return wrappedView.identify(mouseLocation);
}
+ @Override
public void invalidateContent() {
wrappedView.invalidateContent();
}
+ @Override
public void invalidateLayout() {
wrappedView.invalidateLayout();
}
+ @Override
public void keyPressed(final KeyboardAction key) {
wrappedView.keyPressed(key);
}
- public void keyReleased(KeyboardAction action) {
+ @Override
+ public void keyReleased(final KeyboardAction action) {
wrappedView.keyReleased(action);
}
- public void keyTyped(KeyboardAction action) {
+ @Override
+ public void keyTyped(final KeyboardAction action) {
wrappedView.keyTyped(action);
}
+ @Override
public void layout() {
wrappedView.layout();
}
+ @Override
public void limitBoundsWithin(final Size size) {
wrappedView.limitBoundsWithin(size);
}
+ @Override
public void markDamaged() {
wrappedView.markDamaged();
}
+ @Override
public void markDamaged(final Bounds bounds) {
wrappedView.markDamaged(bounds);
}
+ @Override
public void mouseDown(final Click click) {
wrappedView.mouseDown(click);
}
+ @Override
public void mouseMoved(final Location at) {
wrappedView.mouseMoved(at);
}
+ @Override
public void mouseUp(final Click click) {
wrappedView.mouseUp(click);
}
+ @Override
public void objectActionResult(final ObjectAdapter result, final Placement placement) {
wrappedView.objectActionResult(result, placement);
}
+ @Override
public View pickupContent(final Location location) {
return wrappedView.pickupContent(location);
}
+ @Override
public View pickupView(final Location location) {
return wrappedView.pickupView(location);
}
+ @Override
public void print(final Canvas canvas) {
wrappedView.print(canvas);
}
+ @Override
public void refresh() {
wrappedView.refresh();
}
+ @Override
public void removeView(final View view) {
wrappedView.removeView(view);
}
+ @Override
public void replaceView(final View toReplace, final View replacement) {
wrappedView.replaceView(toReplace, replacement);
}
-
+
protected void replaceWrappedView(final View withReplacement) {
- View root = getView();
- View parent = getParent();
+ final View root = getView();
+ final View parent = getParent();
parent.markDamaged();
getViewManager().removeFromNotificationList(root);
- for (View view : root.getSubviews()) {
+ for (final View view : root.getSubviews()) {
view.dispose();
- }
+ }
wrappedView = withReplacement;
wrappedView.setView(root);
wrappedView.setParent(parent);
getViewManager().addToNotificationList(withReplacement);
-
+
wrappedView.invalidateContent();
}
-
+
+ @Override
public void secondClick(final Click click) {
wrappedView.secondClick(click);
}
+ @Override
public void setBounds(final Bounds bounds) {
wrappedView.setBounds(bounds);
}
+ @Override
public void setFocusManager(final FocusManager focusManager) {
wrappedView.setFocusManager(focusManager);
}
-
+
+ @Override
public void setLocation(final Location point) {
wrappedView.setLocation(point);
}
+ @Override
public void setParent(final View view) {
wrappedView.setParent(view);
}
+ @Override
public void setSize(final Size size) {
wrappedView.setSize(size);
}
+ @Override
public void setView(final View view) {
wrappedView.setView(view);
}
+ @Override
public View subviewFor(final Location location) {
return wrappedView.subviewFor(location);
}
+ @Override
public void thirdClick(final Click click) {
wrappedView.thirdClick(click);
}
@@ -399,27 +473,33 @@ public abstract class AbstractViewDecora
return name.substring(name.lastIndexOf('.') + 1) + "/" + wrappedView;
}
+ @Override
public void update(final ObjectAdapter object) {
wrappedView.update(object);
}
+ @Override
public void updateView() {
wrappedView.updateView();
}
+ @Override
public ViewAreaType viewAreaType(final Location mouseLocation) {
return wrappedView.viewAreaType(mouseLocation);
}
+ @Override
public void viewMenuOptions(final UserActionSet menuOptions) {
wrappedView.viewMenuOptions(menuOptions);
}
-
- public void loadOptions(Options viewOptions) {
+
+ @Override
+ public void loadOptions(final Options viewOptions) {
wrappedView.loadOptions(viewOptions);
}
- public void saveOptions(Options viewOptions) {
+ @Override
+ public void saveOptions(final Options viewOptions) {
wrappedView.saveOptions(viewOptions);
}
}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AwtImage.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AwtImage.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AwtImage.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AwtImage.java Tue May 3 07:18:19 2011
@@ -17,13 +17,11 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.view.base;
import org.apache.isis.viewer.dnd.drawing.Image;
import org.apache.isis.viewer.dnd.drawing.Size;
-
public class AwtImage implements Image {
java.awt.Image iconImage;
@@ -35,14 +33,17 @@ public class AwtImage implements Image {
this.iconImage = iconImage;
}
+ @Override
public int getHeight() {
return iconImage.getHeight(null);
}
+ @Override
public int getWidth() {
return iconImage.getWidth(null);
}
+ @Override
public Size getSize() {
return new Size(getWidth(), getHeight());
}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/BlankView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/BlankView.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/BlankView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/BlankView.java Tue May 3 07:18:19 2011
@@ -17,16 +17,14 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.view.base;
import org.apache.isis.viewer.dnd.drawing.Size;
import org.apache.isis.viewer.dnd.view.Content;
import org.apache.isis.viewer.dnd.view.content.NullContent;
-
public class BlankView extends AbstractView {
- private Size size;
+ private final Size size;
public BlankView() {
this(new NullContent());
@@ -36,14 +34,15 @@ public class BlankView extends AbstractV
super(content);
size = new Size(100, 50);
}
-
+
public BlankView(final Content content, final Size size) {
super(content);
this.size = size;
}
-
- public Size getRequiredSize(Size availableSpace) {
- Size requiredSize = new Size(size);
+
+ @Override
+ public Size getRequiredSize(final Size availableSpace) {
+ final Size requiredSize = new Size(size);
requiredSize.limitSize(availableSpace);
return requiredSize;
}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/DragViewOutline.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/DragViewOutline.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/DragViewOutline.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/DragViewOutline.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.view.base;
import org.apache.isis.viewer.dnd.drawing.Bounds;
@@ -27,7 +26,6 @@ import org.apache.isis.viewer.dnd.drawin
import org.apache.isis.viewer.dnd.view.Toolkit;
import org.apache.isis.viewer.dnd.view.View;
-
public class DragViewOutline extends AbstractView {
private final int thickness = 5;
private final Size size;
@@ -45,12 +43,13 @@ public class DragViewOutline extends Abs
final Bounds r = getBounds();
for (int i = 0; i < thickness; i++) {
- canvas.drawRectangle(i, i, r.getWidth() - i * 2 - 1, r.getHeight() - i * 2 - 1, Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY1));
+ canvas.drawRectangle(i, i, r.getWidth() - i * 2 - 1, r.getHeight() - i * 2 - 1,
+ Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY1));
}
}
@Override
- public Size getRequiredSize(Size availableSpace) {
+ public Size getRequiredSize(final Size availableSpace) {
return new Size(size);
}
}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/FieldErrorView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/FieldErrorView.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/FieldErrorView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/FieldErrorView.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.view.base;
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
@@ -33,12 +32,10 @@ import org.apache.isis.viewer.dnd.view.V
import org.apache.isis.viewer.dnd.view.ViewRequirement;
import org.apache.isis.viewer.dnd.view.ViewSpecification;
-
/**
- * Displays an error message in place of a normal field when a problem occurs, usually due to a programming
- * error, and the normal field cannot be created. A example of this is where value field is declared in an
- * ObjectAdapter, but the programmer forgot to instantiate the value object, causing null to be returned
- * instead, which is an illegal value.
+ * Displays an error message in place of a normal field when a problem occurs, usually due to a programming error, and
+ * the normal field cannot be created. A example of this is where value field is declared in an ObjectAdapter, but the
+ * programmer forgot to instantiate the value object, causing null to be returned instead, which is an illegal value.
*/
public class FieldErrorView extends AbstractView {
@@ -54,9 +51,12 @@ public class FieldErrorView extends Abst
super.draw(canvas);
final Size size = getSize();
- canvas.drawSolidRectangle(0, 0, size.getWidth() - 1, size.getHeight() - 1, Toolkit.getColor(ColorsAndFonts.COLOR_WHITE));
- canvas.drawRectangle(0, 0, size.getWidth() - 1, size.getHeight() - 1, Toolkit.getColor(ColorsAndFonts.COLOR_BLACK));
- canvas.drawText(error, 14, 20, Toolkit.getColor(ColorsAndFonts.COLOR_INVALID), Toolkit.getText(ColorsAndFonts.TEXT_NORMAL));
+ canvas.drawSolidRectangle(0, 0, size.getWidth() - 1, size.getHeight() - 1,
+ Toolkit.getColor(ColorsAndFonts.COLOR_WHITE));
+ canvas.drawRectangle(0, 0, size.getWidth() - 1, size.getHeight() - 1,
+ Toolkit.getColor(ColorsAndFonts.COLOR_BLACK));
+ canvas.drawText(error, 14, 20, Toolkit.getColor(ColorsAndFonts.COLOR_INVALID),
+ Toolkit.getText(ColorsAndFonts.TEXT_NORMAL));
}
@Override
@@ -65,7 +65,7 @@ public class FieldErrorView extends Abst
}
@Override
- public Size getRequiredSize(Size availableSpace) {
+ public Size getRequiredSize(final Size availableSpace) {
return new Size(250, 30);
}
@@ -75,34 +75,42 @@ public class FieldErrorView extends Abst
}
public static class Specification implements ViewSpecification {
- public boolean canDisplay(ViewRequirement requirement) {
+ @Override
+ public boolean canDisplay(final ViewRequirement requirement) {
return true;
}
- public View createView(final Content content, Axes axes, int sequence) {
+ @Override
+ public View createView(final Content content, final Axes axes, final int sequence) {
throw new NotYetImplementedException();
}
+ @Override
public String getName() {
return "Field Error";
}
+ @Override
public boolean isAligned() {
return false;
}
+ @Override
public boolean isSubView() {
return false;
}
-
+
+ @Override
public boolean isResizeable() {
return false;
}
+ @Override
public boolean isReplaceable() {
return false;
}
+ @Override
public boolean isOpen() {
return false;
}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/IconGraphic.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/IconGraphic.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/IconGraphic.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/IconGraphic.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.view.base;
import org.apache.isis.core.commons.lang.ToString;
@@ -33,12 +32,11 @@ import org.apache.isis.viewer.dnd.view.C
import org.apache.isis.viewer.dnd.view.Toolkit;
import org.apache.isis.viewer.dnd.view.View;
-
/*
* TODO why does this pass out the baseline, and then expect it back when doing the drawing?
*/
public class IconGraphic {
- private int baseline;
+ private final int baseline;
protected final Content content;
protected Image icon;
protected final int iconHeight;
@@ -65,8 +63,8 @@ public class IconGraphic {
public void draw(final Canvas canvas, final int x, final int baseline) {
final int y = baseline - this.baseline + 1;
if (Toolkit.debug) {
- canvas.drawDebugOutline(new Bounds(new Location(x, y), getSize()), getBaseline(), Toolkit
- .getColor(ColorsAndFonts.COLOR_DEBUG_BOUNDS_DRAW));
+ canvas.drawDebugOutline(new Bounds(new Location(x, y), getSize()), getBaseline(),
+ Toolkit.getColor(ColorsAndFonts.COLOR_DEBUG_BOUNDS_DRAW));
}
final Image icon = icon();
if (icon == null) {
@@ -89,8 +87,8 @@ public class IconGraphic {
protected Image icon() {
final String iconName = content.getIconName();
/*
- * If the graphic is based on a name provided by the object then the icon could be changed at any
- * time, so we won't lazily load it.
+ * If the graphic is based on a name provided by the object then the icon could be changed at any time, so we
+ * won't lazily load it.
*/
if (icon != null && (iconName == null || iconName.equals(lastIconName))) {
return icon;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/Layout.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/Layout.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/Layout.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/Layout.java Tue May 3 07:18:19 2011
@@ -17,16 +17,13 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.view.base;
import org.apache.isis.viewer.dnd.drawing.Size;
import org.apache.isis.viewer.dnd.view.View;
public interface Layout {
- Size getRequiredSize(final View view);
+ Size getRequiredSize(final View view);
void layout(final View view, final Size maximumSize);
}
-
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/NonBuildingSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/NonBuildingSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/NonBuildingSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/NonBuildingSpecification.java Tue May 3 07:18:19 2011
@@ -17,55 +17,61 @@
* under the License.
*/
+package org.apache.isis.viewer.dnd.view.base;
-package org.apache.isis.viewer.dnd.view.base;
-
import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
import org.apache.isis.viewer.dnd.view.Axes;
import org.apache.isis.viewer.dnd.view.Content;
import org.apache.isis.viewer.dnd.view.View;
import org.apache.isis.viewer.dnd.view.ViewRequirement;
import org.apache.isis.viewer.dnd.view.ViewSpecification;
-
-
-public class NonBuildingSpecification implements ViewSpecification {
- private final String name;
-
- public NonBuildingSpecification(final View view) {
- final String name = view.getClass().getName();
- this.name = name.substring(name.lastIndexOf('.') + 1);
- }
-
- public View createView(final Content content, Axes axes, int sequence) {
- throw new UnexpectedCallException();
- }
-
- public String getName() {
- return name;
- }
-
- public boolean isAligned() {
- return false;
- }
-
- public boolean isOpen() {
- return true;
- }
-
- public boolean isReplaceable() {
- return false;
- }
-
- public boolean isResizeable() {
- return false;
- }
-
- public boolean isSubView() {
- return false;
- }
-
- public boolean canDisplay(ViewRequirement requirement) {
- return false;
- }
-
-}
+
+public class NonBuildingSpecification implements ViewSpecification {
+ private final String name;
+
+ public NonBuildingSpecification(final View view) {
+ final String name = view.getClass().getName();
+ this.name = name.substring(name.lastIndexOf('.') + 1);
+ }
+
+ @Override
+ public View createView(final Content content, final Axes axes, final int sequence) {
+ throw new UnexpectedCallException();
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public boolean isAligned() {
+ return false;
+ }
+
+ @Override
+ public boolean isOpen() {
+ return true;
+ }
+
+ @Override
+ public boolean isReplaceable() {
+ return false;
+ }
+
+ @Override
+ public boolean isResizeable() {
+ return false;
+ }
+
+ @Override
+ public boolean isSubView() {
+ return false;
+ }
+
+ @Override
+ public boolean canDisplay(final ViewRequirement requirement) {
+ return false;
+ }
+
+}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/NullView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/NullView.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/NullView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/NullView.java Tue May 3 07:18:19 2011
@@ -17,20 +17,18 @@
* under the License.
*/
+package org.apache.isis.viewer.dnd.view.base;
-package org.apache.isis.viewer.dnd.view.base;
-
import org.apache.isis.viewer.dnd.view.content.NullContent;
-
-
-public class NullView extends AbstractView {
- public NullView() {
- super(new NullContent(""));
- }
-
- @Override
- public String toString() {
- final String name = getClass().getName();
- return name.substring(name.lastIndexOf('.') + 1) + getId();
- }
-}
+
+public class NullView extends AbstractView {
+ public NullView() {
+ super(new NullContent(""));
+ }
+
+ @Override
+ public String toString() {
+ final String name = getClass().getName();
+ return name.substring(name.lastIndexOf('.') + 1) + getId();
+ }
+}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/ObjectView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/ObjectView.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/ObjectView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/ObjectView.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.view.base;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -41,7 +40,6 @@ import org.apache.isis.viewer.dnd.view.V
import org.apache.isis.viewer.dnd.view.Workspace;
import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
-
public abstract class ObjectView extends AbstractView {
public ObjectView(final Content content, final ViewSpecification specification) {
@@ -85,8 +83,8 @@ public abstract class ObjectView extends
}
/**
- * Called when a dragged object is dropped onto this view. The default behaviour implemented here calls
- * the action method on the target, passing the source object in as the only parameter.
+ * Called when a dragged object is dropped onto this view. The default behaviour implemented here calls the action
+ * method on the target, passing the source object in as the only parameter.
*/
@Override
public void drop(final ContentDrag drag) {
@@ -145,11 +143,11 @@ public abstract class ObjectView extends
});
}
-
- /////////////////////////////////////////////////////////////////////////////
+
+ // ///////////////////////////////////////////////////////////////////////////
// Dependencies (from context)
- /////////////////////////////////////////////////////////////////////////////
-
+ // ///////////////////////////////////////////////////////////////////////////
+
private static PersistenceSession getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/TextView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/TextView.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/TextView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/TextView.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.view.base;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -30,7 +29,6 @@ import org.apache.isis.viewer.dnd.view.C
import org.apache.isis.viewer.dnd.view.Toolkit;
import org.apache.isis.viewer.dnd.view.ViewSpecification;
-
public class TextView extends AbstractView {
private final Text style = Toolkit.getText(ColorsAndFonts.TEXT_NORMAL);
private final Color color = Toolkit.getColor(ColorsAndFonts.COLOR_BLACK);
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/UserViewSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/UserViewSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/UserViewSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/UserViewSpecification.java Tue May 3 07:18:19 2011
@@ -17,11 +17,8 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.view.base;
-import java.util.Date;
-
import org.apache.isis.core.runtime.userprofile.Options;
import org.apache.isis.viewer.dnd.util.Properties;
import org.apache.isis.viewer.dnd.view.Axes;
@@ -33,55 +30,59 @@ import org.apache.isis.viewer.dnd.view.V
public class UserViewSpecification implements ViewSpecification {
private final ViewSpecification specification;
- private String name;
+ private final String name;
- public UserViewSpecification(ViewSpecification specification, String name) {
+ public UserViewSpecification(final ViewSpecification specification, final String name) {
this.specification = specification;
this.name = name;
}
-/*
- public UserViewSpecification(View view) {
- specification = view.getSpecification();
- Options copyOptions = new Options();
- view.saveOptions(copyOptions);
- name = specification.getName() + " " + new Date().getSeconds();
-
- // view.setSpecification(this);
- // view.loadOptions(copyOptions);
- }
-*/
- public boolean canDisplay(ViewRequirement requirement) {
+
+ /*
+ * public UserViewSpecification(View view) { specification = view.getSpecification(); Options copyOptions = new
+ * Options(); view.saveOptions(copyOptions); name = specification.getName() + " " + new Date().getSeconds();
+ *
+ * // view.setSpecification(this); // view.loadOptions(copyOptions); }
+ */
+ @Override
+ public boolean canDisplay(final ViewRequirement requirement) {
return specification.canDisplay(requirement);
}
+ @Override
public String getName() {
return name;
}
+ @Override
public boolean isAligned() {
return specification.isAligned();
}
+ @Override
public boolean isOpen() {
return specification.isOpen();
}
+ @Override
public boolean isReplaceable() {
return specification.isReplaceable();
}
+ @Override
public boolean isResizeable() {
return specification.isResizeable();
}
+ @Override
public boolean isSubView() {
return specification.isSubView();
}
- public View createView(Content content, Axes axes, int sequence) {
- View createView = specification.createView(content, axes, sequence);
+ @Override
+ public View createView(final Content content, final Axes axes, final int sequence) {
+ final View createView = specification.createView(content, axes, sequence);
- Options viewOptions = Properties.getViewConfigurationOptions(this);
+ final Options viewOptions = Properties.getViewConfigurationOptions(this);
createView.loadOptions(viewOptions);
return createView;
}
@@ -91,5 +92,3 @@ public class UserViewSpecification imple
}
}
-
-