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 [12/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/histogram/HistogramBar.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/histogram/HistogramBar.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/histogram/HistogramBar.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/histogram/HistogramBar.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.histogram;
import org.apache.isis.viewer.dnd.drawing.Canvas;
@@ -29,26 +28,27 @@ import org.apache.isis.viewer.dnd.view.T
import org.apache.isis.viewer.dnd.view.ViewSpecification;
import org.apache.isis.viewer.dnd.view.base.ObjectView;
-
class HistogramBar extends ObjectView {
- private static final int colors[] = new int[] {0xccccff, 0x99ff99, 0xffccff};
+ private static final int colors[] = new int[] { 0xccccff, 0x99ff99, 0xffccff };
private final HistogramAxis histogramAxis;
- protected HistogramBar(Content content, HistogramAxis histogramAxis, ViewSpecification specification) {
+ protected HistogramBar(final Content content, final HistogramAxis histogramAxis,
+ final ViewSpecification specification) {
super(content, specification);
this.histogramAxis = histogramAxis;
}
- public void draw(Canvas canvas) {
+ @Override
+ public void draw(final Canvas canvas) {
super.draw(canvas);
int y = 0;
- int height = (getSize().getHeight() - 5) / histogramAxis.getNoBars();
- Text text = Toolkit.getText(ColorsAndFonts.TEXT_LABEL);
- Color color = Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY1);
+ final int height = (getSize().getHeight() - 5) / histogramAxis.getNoBars();
+ final Text text = Toolkit.getText(ColorsAndFonts.TEXT_LABEL);
+ final Color color = Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY1);
canvas.drawText(getContent().title(), 0, height / 2 + text.getAscent() / 2, color, text);
for (int i = 0; i < histogramAxis.getNoBars(); i++) {
- double length = (getSize().getWidth() - 160) * histogramAxis.getLengthFor(getContent(), i);
+ final double length = (getSize().getWidth() - 160) * histogramAxis.getLengthFor(getContent(), i);
canvas.drawSolidRectangle(160, y, (int) length, height, Toolkit.getColor(colors[i % colors.length]));
canvas.drawRectangle(160, y, (int) length, height, Toolkit.getColor(ColorsAndFonts.COLOR_BLACK));
y += height + 2;
@@ -56,4 +56,3 @@ class HistogramBar extends ObjectView {
}
}
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/histogram/HistogramLayout.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/histogram/HistogramLayout.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/histogram/HistogramLayout.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/histogram/HistogramLayout.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.histogram;
import org.apache.isis.viewer.dnd.drawing.Location;
@@ -25,32 +24,32 @@ import org.apache.isis.viewer.dnd.drawin
import org.apache.isis.viewer.dnd.view.View;
import org.apache.isis.viewer.dnd.view.base.Layout;
-
public class HistogramLayout implements Layout {
- private int width = 500;
- private int barHeight = 24;
+ private final int width = 500;
+ private final int barHeight = 24;
- public void layout(View view, Size maximumSize) {
- HistogramAxis axis = view.getViewAxes().getAxis(HistogramAxis.class);
+ @Override
+ public void layout(final View view, final Size maximumSize) {
+ final HistogramAxis axis = view.getViewAxes().getAxis(HistogramAxis.class);
axis.determineMaximum(view.getContent());
- int noBars = axis.getNoBars();
- int height = barHeight * noBars;
- View[] subviews = view.getSubviews();
+ final int noBars = axis.getNoBars();
+ final int height = barHeight * noBars;
+ final View[] subviews = view.getSubviews();
int y = View.VPADDING;
- for (View bar : subviews) {
+ for (final View bar : subviews) {
bar.setSize(new Size(width, height));
bar.setLocation(new Location(View.HPADDING, y));
y += height;
}
}
- public Size getRequiredSize(View view) {
- HistogramAxis axis = view.getViewAxes().getAxis(HistogramAxis.class);
- int noBars = axis.getNoBars();
- View[] subviews = view.getSubviews();
- int graphHeight = subviews.length * barHeight * noBars + View.VPADDING * 2;
- return new Size(width + View.HPADDING * 2 , graphHeight);
+ @Override
+ public Size getRequiredSize(final View view) {
+ final HistogramAxis axis = view.getViewAxes().getAxis(HistogramAxis.class);
+ final int noBars = axis.getNoBars();
+ final View[] subviews = view.getSubviews();
+ final int graphHeight = subviews.length * barHeight * noBars + View.VPADDING * 2;
+ return new Size(width + View.HPADDING * 2, graphHeight);
}
}
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/histogram/HistogramSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/histogram/HistogramSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/histogram/HistogramSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/histogram/HistogramSpecification.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.histogram;
import java.util.List;
@@ -34,14 +33,13 @@ import org.apache.isis.viewer.dnd.view.c
import org.apache.isis.viewer.dnd.view.composite.CollectionElementBuilder;
import org.apache.isis.viewer.dnd.view.composite.CompositeViewSpecification;
-
public class HistogramSpecification extends CompositeViewSpecification {
- static List<? extends ObjectAssociation> availableFields(CollectionContent content) {
+ static List<? extends ObjectAssociation> availableFields(final CollectionContent content) {
List<? extends ObjectAssociation> associationList;
associationList = content.getElementSpecification().getAssociations(new Filter<ObjectAssociation>() {
@Override
- public boolean accept(ObjectAssociation t) {
+ public boolean accept(final ObjectAssociation t) {
return NumberAdapters.contains(t);
}
});
@@ -51,24 +49,25 @@ public class HistogramSpecification exte
public HistogramSpecification() {
builder = new CollectionElementBuilder(new ViewFactory() {
@Override
- public View createView(Content content, Axes axes, int sequence) {
+ public View createView(final Content content, final Axes axes, final int sequence) {
return new HistogramBar(content, axes.getAxis(HistogramAxis.class), HistogramSpecification.this);
}
});
}
@Override
- public Layout createLayout(Content content, Axes axes) {
+ public Layout createLayout(final Content content, final Axes axes) {
return new HistogramLayout();
}
@Override
- public boolean canDisplay(ViewRequirement requirement) {
- return requirement.isCollection() && requirement.isOpen() && availableFields((CollectionContent) requirement.getContent()).size() > 0;
+ public boolean canDisplay(final ViewRequirement requirement) {
+ return requirement.isCollection() && requirement.isOpen()
+ && availableFields((CollectionContent) requirement.getContent()).size() > 0;
}
-
+
@Override
- public void createAxes(Content content, Axes axes) {
+ public void createAxes(final Content content, final Axes axes) {
super.createAxes(content, axes);
axes.add(new HistogramAxis(content));
}
@@ -99,4 +98,3 @@ public class HistogramSpecification exte
}
}
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/histogram/NumberAdapters.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/histogram/NumberAdapters.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/histogram/NumberAdapters.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/histogram/NumberAdapters.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.histogram;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -28,7 +27,6 @@ import org.apache.isis.core.progmodel.fa
import org.apache.isis.core.progmodel.facets.value.longs.DoubleFloatingPointValueFacet;
import org.apache.isis.core.progmodel.facets.value.money.MoneyValueFacet;
-
public class NumberAdapters {
static interface Converter {
double value(ObjectAdapter value);
@@ -36,39 +34,41 @@ public class NumberAdapters {
static {
new Converter() {
- public double value(ObjectAdapter arg0) {
+ @Override
+ public double value(final ObjectAdapter arg0) {
return 0;
}
};
}
- public static boolean contains(ObjectAssociation t) {
+ public static boolean contains(final ObjectAssociation t) {
return t.getSpecification().containsFacet(IntegerValueFacet.class)
- || t.getSpecification().containsFacet(DoubleFloatingPointValueFacet.class)
- || t.getSpecification().containsFacet(FloatingPointValueFacet.class)
- || t.getSpecification().containsFacet(MoneyValueFacet.class);
+ || t.getSpecification().containsFacet(DoubleFloatingPointValueFacet.class)
+ || t.getSpecification().containsFacet(FloatingPointValueFacet.class)
+ || t.getSpecification().containsFacet(MoneyValueFacet.class);
}
- public static double doubleValue(ObjectAssociation field, ObjectAdapter value) {
- ObjectSpecification specification = value.getSpecification();
+ public static double doubleValue(final ObjectAssociation field, final ObjectAdapter value) {
+ final ObjectSpecification specification = value.getSpecification();
- IntegerValueFacet intValueFacet = specification.getFacet(IntegerValueFacet.class);
+ final IntegerValueFacet intValueFacet = specification.getFacet(IntegerValueFacet.class);
if (intValueFacet != null) {
return intValueFacet.integerValue(value).doubleValue();
}
- DoubleFloatingPointValueFacet doubleValueFacet = specification.getFacet(DoubleFloatingPointValueFacet.class);
+ final DoubleFloatingPointValueFacet doubleValueFacet =
+ specification.getFacet(DoubleFloatingPointValueFacet.class);
if (doubleValueFacet != null) {
return doubleValueFacet.doubleValue(value).doubleValue();
}
- FloatingPointValueFacet floatValueFacet = specification.getFacet(FloatingPointValueFacet.class);
+ final FloatingPointValueFacet floatValueFacet = specification.getFacet(FloatingPointValueFacet.class);
if (floatValueFacet != null) {
return floatValueFacet.floatValue(value).doubleValue();
}
- MoneyValueFacet moneyValueFacet = specification.getFacet(MoneyValueFacet.class);
+ final MoneyValueFacet moneyValueFacet = specification.getFacet(MoneyValueFacet.class);
if (moneyValueFacet != null) {
return moneyValueFacet.getAmount(value);
}
@@ -77,4 +77,3 @@ public class NumberAdapters {
}
}
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/icon/Icon.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/icon/Icon.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/icon/Icon.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/icon/Icon.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.icon;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -35,7 +34,6 @@ import org.apache.isis.viewer.dnd.view.b
import org.apache.isis.viewer.dnd.view.text.ObjectTitleText;
import org.apache.isis.viewer.dnd.view.text.TitleText;
-
public class Icon extends ObjectView {
private IconGraphic icon;
private boolean isVertical;
@@ -65,11 +63,11 @@ public class Icon extends ObjectView {
x += View.HPADDING;
y = icon.getBaseline();
}
- int maxWidth = getSize().getWidth() - x;
+ final int maxWidth = getSize().getWidth() - x;
title.draw(canvas, x, y, maxWidth);
-
+
if (getState().isActive()) {
- Image busyImage = ImageFactory.getInstance().loadIcon("busy", 16, null);
+ final Image busyImage = ImageFactory.getInstance().loadIcon("busy", 16, null);
canvas.drawImage(busyImage, icon.getSize().getWidth() - 16 - 4, 4);
}
@@ -77,7 +75,7 @@ public class Icon extends ObjectView {
private void ensureHasIcon() {
if (icon == null) {
- // icon = selectedGraphic;
+ // icon = selectedGraphic;
}
}
@@ -102,9 +100,9 @@ public class Icon extends ObjectView {
}
@Override
- public Size getRequiredSize(Size availableSpace) {
+ public Size getRequiredSize(final Size availableSpace) {
if (icon == null) {
- // icon = unselectedGraphic;
+ // icon = unselectedGraphic;
}
final Size size = icon.getSize();
@@ -125,7 +123,7 @@ public class Icon extends ObjectView {
public void setSelectedGraphic(final IconGraphic selectedGraphic) {
this.selectedGraphic = selectedGraphic;
if (unselectedGraphic == null) {
- unselectedGraphic = selectedGraphic;
+ unselectedGraphic = selectedGraphic;
icon = selectedGraphic;
}
}
@@ -138,8 +136,8 @@ public class Icon extends ObjectView {
}
/**
- * Set up the graphic to be used when displaying the icon and the icon is unselected. If this returns null
- * the graphic will not be changed when the icon becomes unselected.
+ * Set up the graphic to be used when displaying the icon and the icon is unselected. If this returns null the
+ * graphic will not be changed when the icon becomes unselected.
*/
public void setUnselectedGraphic(final IconGraphic unselectedGraphic) {
this.unselectedGraphic = unselectedGraphic;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/icon/IconElementFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/icon/IconElementFactory.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/icon/IconElementFactory.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/icon/IconElementFactory.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.icon;
import org.apache.isis.viewer.dnd.view.Axes;
@@ -27,34 +26,35 @@ import org.apache.isis.viewer.dnd.view.V
import org.apache.isis.viewer.dnd.view.ViewSpecification;
import org.apache.isis.viewer.dnd.view.base.BlankView;
-
public class IconElementFactory implements ViewFactory {
- private ViewSpecification objectSpec;
- private ViewSpecification collectionSpec;
- private boolean createViewsForEmptyContent;
-
+ private final ViewSpecification objectSpec;
+ private final ViewSpecification collectionSpec;
+ private final boolean createViewsForEmptyContent;
+
public IconElementFactory() {
this(null, null, false);
}
-
- public IconElementFactory(ViewSpecification objectSpec, ViewSpecification collectionSpec, boolean createViewsForEmptyContent) {
+
+ public IconElementFactory(final ViewSpecification objectSpec, final ViewSpecification collectionSpec,
+ final boolean createViewsForEmptyContent) {
this.objectSpec = this.objectSpec == null ? new SubviewIconSpecification() : objectSpec;
this.collectionSpec = this.collectionSpec == null ? new SubviewIconSpecification() : collectionSpec;
this.createViewsForEmptyContent = createViewsForEmptyContent;
}
- public View createView(final Content content, Axes axes, int sequence) {
+ @Override
+ public View createView(final Content content, final Axes axes, final int sequence) {
if (content.isObject()) {
if (content.getAdapter() == null) {
return createViewsForEmptyContent ? new BlankView(content) : null;
} else {
- return objectSpec.createView(content, axes, -1);
+ return objectSpec.createView(content, axes, -1);
}
- } else if (content.isCollection()) {
- return collectionSpec.createView(content, axes, -1);
- } else {
- // TODO decide what to do with values: use factory, use another SubviewSpec, or ignore always
- return null;
- }
+ } else if (content.isCollection()) {
+ return collectionSpec.createView(content, axes, -1);
+ } else {
+ // TODO decide what to do with values: use factory, use another SubviewSpec, or ignore always
+ return null;
+ }
}
}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/icon/IconSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/icon/IconSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/icon/IconSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/icon/IconSpecification.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.icon;
import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
@@ -31,7 +30,6 @@ import org.apache.isis.viewer.dnd.view.V
import org.apache.isis.viewer.dnd.view.base.IconGraphic;
import org.apache.isis.viewer.dnd.view.text.ObjectTitleText;
-
public class IconSpecification implements ViewSpecification {
private final boolean isSubView;
private final boolean isReplaceable;
@@ -45,11 +43,13 @@ public class IconSpecification implement
this.isReplaceable = isReplaceable;
}
- public boolean canDisplay(ViewRequirement requirement) {
+ @Override
+ public boolean canDisplay(final ViewRequirement requirement) {
return requirement.isClosed() && requirement.isObject() && requirement.hasReference();
}
-
- public View createView(final Content content, Axes axes, int sequence) {
+
+ @Override
+ public View createView(final Content content, final Axes axes, final int sequence) {
final Text style = Toolkit.getText(ColorsAndFonts.TEXT_NORMAL);
final Icon icon = new Icon(content, this);
icon.setTitle(new ObjectTitleText(icon, style));
@@ -57,18 +57,22 @@ public class IconSpecification implement
return icon;
}
+ @Override
public String getName() {
return "Icon";
}
+ @Override
public boolean isSubView() {
return isSubView;
}
+ @Override
public boolean isReplaceable() {
return isReplaceable;
}
-
+
+ @Override
public boolean isResizeable() {
return false;
}
@@ -77,10 +81,12 @@ public class IconSpecification implement
return subview;
}
+ @Override
public boolean isOpen() {
return false;
}
+ @Override
public boolean isAligned() {
return false;
}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/icon/LargeIconSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/icon/LargeIconSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/icon/LargeIconSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/icon/LargeIconSpecification.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.icon;
import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
@@ -32,24 +31,26 @@ import org.apache.isis.viewer.dnd.view.b
import org.apache.isis.viewer.dnd.view.border.ObjectBorder;
import org.apache.isis.viewer.dnd.view.text.ObjectTitleText;
-
public class LargeIconSpecification implements ViewSpecification {
private static final int DEFAULT_SIZE = 64;
- private int size;
+ private final int size;
public LargeIconSpecification() {
this(DEFAULT_SIZE);
}
-
- LargeIconSpecification(int size) {
+
+ LargeIconSpecification(final int size) {
this.size = size;
}
-
- public boolean canDisplay(ViewRequirement requirement) {
- return requirement.isClosed() && requirement.isObject() && requirement.hasReference() && requirement.isSubview();
+
+ @Override
+ public boolean canDisplay(final ViewRequirement requirement) {
+ return requirement.isClosed() && requirement.isObject() && requirement.hasReference()
+ && requirement.isSubview();
}
-
- public View createView(final Content content, Axes axes, int sequence) {
+
+ @Override
+ public View createView(final Content content, final Axes axes, final int sequence) {
final Text style = Toolkit.getText(ColorsAndFonts.TEXT_NORMAL);
final Icon icon = new Icon(content, this);
icon.setTitle(new ObjectTitleText(icon, style));
@@ -58,26 +59,32 @@ public class LargeIconSpecification impl
return new ObjectBorder(icon);
}
+ @Override
public String getName() {
return "Image";
}
+ @Override
public boolean isSubView() {
return true;
}
+ @Override
public boolean isReplaceable() {
return false;
}
-
+
+ @Override
public boolean isResizeable() {
return false;
}
+ @Override
public boolean isOpen() {
return false;
}
+ @Override
public boolean isAligned() {
return false;
}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/icon/RootIconSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/icon/RootIconSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/icon/RootIconSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/icon/RootIconSpecification.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.icon;
import org.apache.isis.viewer.dnd.drawing.Location;
@@ -33,7 +32,6 @@ import org.apache.isis.viewer.dnd.view.b
import org.apache.isis.viewer.dnd.view.border.ObjectBorder;
import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
-
class IconOpenAction extends AbstractViewDecorator {
protected IconOpenAction(final View wrappedView) {
super(wrappedView);
@@ -62,18 +60,19 @@ class IconOpenAction extends AbstractVie
}
public class RootIconSpecification extends IconSpecification {
-
+
@Override
- public boolean canDisplay(ViewRequirement requirement) {
+ public boolean canDisplay(final ViewRequirement requirement) {
return super.canDisplay(requirement) && requirement.is(ViewRequirement.ROOT);
}
-
+
@Override
- public View createView(final Content content, Axes axes, int sequence) {
+ public View createView(final Content content, final Axes axes, final int sequence) {
final View icon = super.createView(content, axes, sequence);
return new ObjectBorder(new IconOpenAction(icon));
}
-
+
+ @Override
public boolean isReplaceable() {
return false;
}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/icon/SubviewIconSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/icon/SubviewIconSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/icon/SubviewIconSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/icon/SubviewIconSpecification.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.icon;
import org.apache.isis.viewer.dnd.view.Axes;
@@ -29,27 +28,24 @@ import org.apache.isis.viewer.dnd.view.b
import org.apache.isis.viewer.dnd.view.field.OneToOneField;
import org.apache.isis.viewer.dnd.view.lookup.OpenObjectDropDownBorder;
-
public class SubviewIconSpecification extends IconSpecification {
private static final ViewSpecification spec = new IconSpecification();
@Override
- public boolean canDisplay(ViewRequirement requirement) {
- return super.canDisplay(requirement) && requirement.is(ViewRequirement.CLOSED) && requirement.is(ViewRequirement.SUBVIEW);
+ public boolean canDisplay(final ViewRequirement requirement) {
+ return super.canDisplay(requirement) && requirement.is(ViewRequirement.CLOSED)
+ && requirement.is(ViewRequirement.SUBVIEW);
}
@Override
- public View createView(final Content content, Axes axes, int sequence) {
+ public View createView(final Content content, final Axes axes, final int sequence) {
final View view = super.createView(content, axes, sequence);
/*
- boolean isEditable = content instanceof OneToOneField && ((OneToOneField) content).isEditable().isAllowed();
- boolean hasOptions = content.isOptionEnabled();
- if (isEditable && hasOptions) {
- return new OpenObjectDropDownBorder(view, spec);
- }
- return view;
- */
-
+ * boolean isEditable = content instanceof OneToOneField && ((OneToOneField) content).isEditable().isAllowed();
+ * boolean hasOptions = content.isOptionEnabled(); if (isEditable && hasOptions) { return new
+ * OpenObjectDropDownBorder(view, spec); } return view;
+ */
+
if (content instanceof OneToOneField && ((OneToOneField) content).isEditable().isVetoed()) {
return new ObjectBorder(view);
} else {
@@ -59,7 +55,7 @@ public class SubviewIconSpecification ex
return new ObjectBorder(view);
}
}
-
+
}
}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/ClickImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/ClickImpl.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/ClickImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/ClickImpl.java Tue May 3 07:18:19 2011
@@ -17,14 +17,12 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.interaction;
import org.apache.isis.viewer.dnd.drawing.Location;
import org.apache.isis.viewer.dnd.drawing.Offset;
import org.apache.isis.viewer.dnd.view.Click;
-
/**
* Describes a mouse click event.
*/
@@ -34,6 +32,7 @@ public class ClickImpl extends PointerEv
/**
* Creates a new click event object.
+ *
* @param mouseLocation
* the location of the mouse relative to the viewer
* @param modifiers
@@ -46,10 +45,12 @@ public class ClickImpl extends PointerEv
this.locationWithinViewer = new Location(mouseLocation);
}
+ @Override
public Location getLocation() {
return location;
}
+ @Override
public Location getLocationWithinViewer() {
return locationWithinViewer;
}
@@ -57,6 +58,7 @@ public class ClickImpl extends PointerEv
/**
* Translate the location of this event by the specified offset.
*/
+ @Override
public void subtract(final int x, final int y) {
location.subtract(x, y);
}
@@ -74,8 +76,8 @@ public class ClickImpl extends PointerEv
subtract(offset.getDeltaX(), offset.getDeltaY());
}
+ @Override
public void subtract(final Location location) {
subtract(location.getX(), location.getY());
}
}
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/ContentDragImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/ContentDragImpl.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/ContentDragImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/ContentDragImpl.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.interaction;
import org.apache.isis.viewer.dnd.drawing.Location;
@@ -27,7 +26,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 class ContentDragImpl extends DragImpl implements ContentDrag {
private final View dragView;
private Location location;
@@ -39,9 +37,9 @@ public class ContentDragImpl extends Dra
private final View source;
/**
- * Creates a new drag event. The source view has its pickup(), and then, exited() methods called on it.
- * The view returned by the pickup method becomes this event overlay view, which is moved continuously so
- * that it tracks the pointer,
+ * Creates a new drag event. The source view has its pickup(), and then, exited() methods called on it. The view
+ * returned by the pickup method becomes this event overlay view, which is moved continuously so that it tracks the
+ * pointer,
*
* @param source
* the view over which the pointer was when this event started
@@ -117,6 +115,7 @@ public class ContentDragImpl extends Dra
return dragView;
}
+ @Override
public View getSource() {
return source;
}
@@ -124,10 +123,12 @@ public class ContentDragImpl extends Dra
/**
* Returns the Content object from the source view.
*/
+ @Override
public Content getSourceContent() {
return sourceContent;
}
+ @Override
public Location getTargetLocation() {
final Location location = new Location(this.location);
location.subtract(target.getAbsoluteLocation());
@@ -137,6 +138,7 @@ public class ContentDragImpl extends Dra
return location;
}
+ @Override
public Location getOffset() {
return offset;
}
@@ -144,6 +146,7 @@ public class ContentDragImpl extends Dra
/**
* Returns the current target view.
*/
+ @Override
public View getTargetView() {
return target;
}
@@ -153,6 +156,7 @@ public class ContentDragImpl extends Dra
return "ContentDrag [" + super.toString() + "]";
}
- public void subtract(final int left, final int top) {}
+ @Override
+ public void subtract(final int left, final int top) {
+ }
}
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/DragImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/DragImpl.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/DragImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/DragImpl.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.interaction;
import org.apache.isis.viewer.dnd.drawing.Location;
@@ -33,20 +32,22 @@ public abstract class DragImpl extends P
/**
* Indicates the drag has been cancelled; no action should be taken.
*/
+ @Override
public abstract void cancel(final Viewer viewer);
/**
* Indicates that the drag state has changed.
*/
+ @Override
public abstract void drag(final View target, final Location location, final int mods);
/**
* Indicates the drag has properly ended (the mouse button has been released)
*
*/
+ @Override
public abstract void end(final Viewer viewer);
+ @Override
public abstract View getOverlay();
}
-
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/DragStartImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/DragStartImpl.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/DragStartImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/DragStartImpl.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.interaction;
import org.apache.isis.core.commons.lang.ToString;
@@ -25,7 +24,6 @@ import org.apache.isis.viewer.dnd.drawin
import org.apache.isis.viewer.dnd.drawing.Offset;
import org.apache.isis.viewer.dnd.view.DragStart;
-
public class DragStartImpl extends PointerEvent implements DragStart {
private final Location location;
@@ -34,14 +32,17 @@ public class DragStartImpl extends Point
this.location = location;
}
+ @Override
public Location getLocation() {
return location;
}
+ @Override
public void subtract(final Location location) {
this.location.subtract(location);
}
+ @Override
public void subtract(final int x, final int y) {
location.subtract(x, y);
}
@@ -58,5 +59,3 @@ public class DragStartImpl extends Point
return str.toString();
}
}
-
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/KeyboardActionImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/KeyboardActionImpl.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/KeyboardActionImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/KeyboardActionImpl.java Tue May 3 07:18:19 2011
@@ -17,13 +17,12 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.interaction;
import org.apache.isis.viewer.dnd.view.KeyboardAction;
public class KeyboardActionImpl implements KeyboardAction {
-
+
final int keyCode;
final int modifiers;
private boolean isConsumed;
@@ -34,26 +33,29 @@ public class KeyboardActionImpl implemen
isConsumed = false;
}
+ @Override
public int getKeyCode() {
return keyCode;
}
+ @Override
public char getKeyChar() {
return (char) keyCode;
}
-
+
+ @Override
public int getModifiers() {
return modifiers;
}
+ @Override
public boolean isConsumed() {
return isConsumed;
}
+ @Override
public void consume() {
isConsumed = true;
}
}
-
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/PointerEvent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/PointerEvent.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/PointerEvent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/PointerEvent.java Tue May 3 07:18:19 2011
@@ -17,12 +17,10 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.interaction;
import java.awt.event.InputEvent;
-
/**
* Details an event involving the pointer, such as a click or drag.
*/
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/SimpleInternalDrag.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/SimpleInternalDrag.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/SimpleInternalDrag.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/SimpleInternalDrag.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.interaction;
import org.apache.isis.core.commons.lang.ToString;
@@ -28,24 +27,23 @@ import org.apache.isis.viewer.dnd.view.I
import org.apache.isis.viewer.dnd.view.View;
import org.apache.isis.viewer.dnd.view.Viewer;
-
-public class SimpleInternalDrag extends DragImpl implements InternalDrag {
+public class SimpleInternalDrag extends DragImpl implements InternalDrag {
private final Location location;
// TODO replace Location with Offset
private final Location offset;
private final View view;
/**
- * Creates a new drag event. The source view has its pickup(), and then, exited() methods called on it.
- * The view returned by the pickup method becomes this event overlay view, which is moved continuously so
- * that it tracks the pointer,
+ * Creates a new drag event. The source view has its pickup(), and then, exited() methods called on it. The view
+ * returned by the pickup method becomes this event overlay view, which is moved continuously so that it tracks the
+ * pointer,
*
* @param view
* the view over which the pointer was when this event started
* @param location
* the location within the viewer (the Frame/Applet/Window etc)
*
- * TODO combine the two constructors
+ * TODO combine the two constructors
*/
public SimpleInternalDrag(final View view, final Location location) {
this.view = view;
@@ -55,7 +53,8 @@ public class SimpleInternalDrag extends
final Padding targetPadding = view.getPadding();
final Padding containerPadding = view.getView().getPadding();
- offset.add(containerPadding.getLeft() - targetPadding.getLeft(), containerPadding.getTop() - targetPadding.getTop());
+ offset.add(containerPadding.getLeft() - targetPadding.getLeft(),
+ containerPadding.getTop() - targetPadding.getTop());
this.location.subtract(offset);
}
@@ -69,7 +68,8 @@ public class SimpleInternalDrag extends
final Padding targetPadding = view.getPadding();
final Padding containerPadding = view.getView().getPadding();
- offset.add(containerPadding.getLeft() - targetPadding.getLeft(), containerPadding.getTop() - targetPadding.getTop());
+ offset.add(containerPadding.getLeft() - targetPadding.getLeft(),
+ containerPadding.getTop() - targetPadding.getTop());
this.location.subtract(offset);
}
@@ -95,6 +95,7 @@ public class SimpleInternalDrag extends
/**
* Gets the location of the pointer relative to the view.
*/
+ @Override
public Location getLocation() {
return new Location(location);
}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/ViewDragImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/ViewDragImpl.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/ViewDragImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/interaction/ViewDragImpl.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.interaction;
import org.apache.isis.viewer.dnd.drawing.Location;
@@ -27,7 +26,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 class ViewDragImpl extends DragImpl implements ViewDrag {
private Location location;
/**
@@ -40,9 +38,9 @@ public class ViewDragImpl extends DragIm
private final Workspace viewsWorkspace;
/**
- * Creates a new drag event. The source view has its pickup(), and then, exited() methods called on it.
- * The view returned by the pickup method becomes this event overlay view, which is moved continuously so
- * that it tracks the pointer.
+ * Creates a new drag event. The source view has its pickup(), and then, exited() methods called on it. The view
+ * returned by the pickup method becomes this event overlay view, which is moved continuously so that it tracks the
+ * pointer.
*
* @param view
* the view over which the pointer was when this event started
@@ -55,8 +53,9 @@ public class ViewDragImpl extends DragIm
viewsWorkspace = view.getWorkspace();
}
- /**getView().getAbsoluteLocation().getX(), -getView().getAbsoluteLocation().getY()
- * Cancel drag by changing cursor back to pointer.
+ /**
+ * getView().getAbsoluteLocation().getX(), -getView().getAbsoluteLocation().getY() Cancel drag by changing cursor
+ * back to pointer.
*/
@Override
public void cancel(final Viewer viewer) {
@@ -79,8 +78,8 @@ public class ViewDragImpl extends DragIm
this.location = location;
if (overlayView != null) {
overlayView.markDamaged();
- updateDraggingLocation();
- // this.location.subtract(target.getAbsoluteLocation());
+ updateDraggingLocation();
+ // this.location.subtract(target.getAbsoluteLocation());
viewsWorkspace.getViewManager().getSpy().addTrace(target, " over", getLocation());
targetView = target;
target.drag(this);
@@ -102,14 +101,17 @@ public class ViewDragImpl extends DragIm
return overlayView;
}
+ @Override
public Location getLocation() {
return location;
}
+ @Override
public View getSourceView() {
return sourceView;
}
-
+
+ @Override
public Location getViewDropLocation() {
final Location viewLocation = new Location(location);
viewLocation.subtract(overlayOffset);
@@ -132,9 +134,9 @@ public class ViewDragImpl extends DragIm
overlayView.limitBoundsWithin(viewsWorkspace.getSize());
}
+ @Override
public void subtract(final int x, final int y) {
location.subtract(x, y);
}
}
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/list/InternalCollectionBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/list/InternalCollectionBorder.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/list/InternalCollectionBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/list/InternalCollectionBorder.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.list;
import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -42,10 +41,10 @@ import org.apache.isis.viewer.dnd.view.b
import org.apache.isis.viewer.dnd.view.composite.CompositeViewDecorator;
import org.apache.isis.viewer.dnd.view.field.OneToManyField;
-
public class InternalCollectionBorder extends AbstractBorder {
public static class Factory implements CompositeViewDecorator {
- public View decorate(View child, Axes axes) {
+ @Override
+ public View decorate(final View child, final Axes axes) {
return new InternalCollectionBorder(child);
}
}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/list/InternalCollectionIconGraphic.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/list/InternalCollectionIconGraphic.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/list/InternalCollectionIconGraphic.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/list/InternalCollectionIconGraphic.java Tue May 3 07:18:19 2011
@@ -17,14 +17,12 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.list;
import org.apache.isis.viewer.dnd.drawing.Text;
import org.apache.isis.viewer.dnd.view.View;
import org.apache.isis.viewer.dnd.view.base.IconGraphic;
-
public class InternalCollectionIconGraphic extends IconGraphic {
public InternalCollectionIconGraphic(final View view, final Text text) {
@@ -32,8 +30,8 @@ public class InternalCollectionIconGraph
}
/*
- * protected Image iconPicture(ObjectAdapter object) { final InternalCollection cls = (InternalCollection)
- * object; final ObjectSpecification spec = cls.getElementSpecification(); Image icon =
- * loadIcon(spec, ""); if(icon == null) { icon = loadIcon(spec, ""); } return icon; }
+ * protected Image iconPicture(ObjectAdapter object) { final InternalCollection cls = (InternalCollection) object;
+ * final ObjectSpecification spec = cls.getElementSpecification(); Image icon = loadIcon(spec, ""); if(icon == null)
+ * { icon = loadIcon(spec, ""); } return icon; }
*/
}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/list/InternalListSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/list/InternalListSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/list/InternalListSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/list/InternalListSpecification.java Tue May 3 07:18:19 2011
@@ -17,20 +17,18 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.list;
import org.apache.isis.viewer.dnd.view.ViewRequirement;
-
public class InternalListSpecification extends SimpleListSpecification {
-
+
public InternalListSpecification() {
addViewDecorator(new InternalCollectionBorder.Factory());
}
@Override
- public boolean canDisplay(ViewRequirement requirement) {
+ public boolean canDisplay(final ViewRequirement requirement) {
return super.canDisplay(requirement) && requirement.is(ViewRequirement.SUBVIEW);
}
}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/list/SimpleListSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/list/SimpleListSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/list/SimpleListSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/list/SimpleListSpecification.java Tue May 3 07:18:19 2011
@@ -17,24 +17,23 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.list;
import org.apache.isis.viewer.dnd.icon.IconElementFactory;
import org.apache.isis.viewer.dnd.view.ViewFactory;
import org.apache.isis.viewer.dnd.view.composite.AbstractCollectionViewSpecification;
-
// TODO use the superclass instead
public class SimpleListSpecification extends AbstractCollectionViewSpecification {
-
+
+ @Override
protected ViewFactory createElementFactory() {
return new IconElementFactory();
}
+ @Override
public String getName() {
return "List";
}
-
}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/PerspectiveContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/PerspectiveContent.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/PerspectiveContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/PerspectiveContent.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.service;
import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -30,38 +29,44 @@ import org.apache.isis.viewer.dnd.drawin
import org.apache.isis.viewer.dnd.view.Content;
import org.apache.isis.viewer.dnd.view.content.AbstractContent;
-
public class PerspectiveContent extends AbstractContent {
private final PerspectiveEntry perspective;
- public PerspectiveContent(PerspectiveEntry perspective) {
+ public PerspectiveContent(final PerspectiveEntry perspective) {
this.perspective = perspective;
}
+ @Override
public void debugDetails(final DebugBuilder debug) {
debug.appendln("perspective", perspective);
}
+ @Override
public ObjectAdapter getAdapter() {
return null;
}
+ @Override
public String getDescription() {
return null;
}
+ @Override
public String getHelp() {
return "";
}
+ @Override
public String getId() {
return "";
}
+ @Override
public ObjectAdapter[] getOptions() {
return null;
}
+ @Override
public ObjectSpecification getSpecification() {
return null;
}
@@ -71,14 +76,17 @@ public class PerspectiveContent extends
return false;
}
+ @Override
public boolean isOptionEnabled() {
return false;
}
+ @Override
public boolean isTransient() {
return false;
}
+ @Override
public String title() {
return perspective.getTitle();
}
@@ -93,23 +101,28 @@ public class PerspectiveContent extends
return perspective.getTitle();
}
- public Consent canDrop(Content sourceContent) {
+ @Override
+ public Consent canDrop(final Content sourceContent) {
return Veto.DEFAULT;
}
- public ObjectAdapter drop(Content sourceContent) {
+ @Override
+ public ObjectAdapter drop(final Content sourceContent) {
return null;
}
+ @Override
public String getIconName() {
return "icon";
}
- public Image getIconPicture(int iconHeight) {
+ @Override
+ public Image getIconPicture(final int iconHeight) {
return null;
}
- public void parseTextEntry(String entryText) {}
+ public void parseTextEntry(final String entryText) {
+ }
public PerspectiveEntry getPerspective() {
return perspective;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceBorder.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceBorder.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.service;
import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -31,7 +30,6 @@ import org.apache.isis.viewer.dnd.view.V
import org.apache.isis.viewer.dnd.view.ViewState;
import org.apache.isis.viewer.dnd.view.base.AbstractBorder;
-
public class ServiceBorder extends AbstractBorder {
private static final int BORDER = 13;
@@ -79,8 +77,8 @@ public class ServiceBorder extends Abstr
canvas.drawRectangle(i, i, xExtent - 2 * i, s.getHeight() - 2 * i, color);
}
canvas.drawLine(xExtent - BORDER, left, xExtent - BORDER, left + s.getHeight(), color);
- canvas.drawSolidRectangle(xExtent - BORDER + 1, left, BORDER - 2, s.getHeight() - 2 * left, Toolkit
- .getColor(ColorsAndFonts.COLOR_SECONDARY3));
+ canvas.drawSolidRectangle(xExtent - BORDER + 1, left, BORDER - 2, s.getHeight() - 2 * left,
+ Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3));
}
}
}
@@ -103,7 +101,7 @@ public class ServiceBorder extends Abstr
@Override
public void secondClick(final Click click) {
- // ignore - prevents the super class opening a view
+ // ignore - prevents the super class opening a view
}
@Override
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceIcon.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceIcon.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceIcon.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceIcon.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.service;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -40,7 +39,6 @@ import org.apache.isis.viewer.dnd.view.b
import org.apache.isis.viewer.dnd.view.option.CloseViewOption;
import org.apache.isis.viewer.dnd.view.text.ObjectTitleText;
-
public class ServiceIcon extends Icon {
private final static int ICON_SIZE;
private final static int LARGE_ICON_SIZE = 34;
@@ -83,7 +81,6 @@ public class ServiceIcon extends Icon {
@Override
public DragEvent dragStart(final DragStart drag) {
- return Toolkit.getViewFactory().createDragContentOutline(this, drag.getLocation());
+ return Toolkit.getViewFactory().createDragContentOutline(this, drag.getLocation());
}
}
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceIconSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceIconSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceIconSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceIconSpecification.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.service;
import org.apache.isis.viewer.dnd.icon.Icon;
@@ -27,40 +26,46 @@ import org.apache.isis.viewer.dnd.view.V
import org.apache.isis.viewer.dnd.view.ViewRequirement;
import org.apache.isis.viewer.dnd.view.ViewSpecification;
-
public class ServiceIconSpecification implements ViewSpecification {
- public boolean canDisplay(ViewRequirement requirement) {
+ @Override
+ public boolean canDisplay(final ViewRequirement requirement) {
return requirement.isFor(ServiceObject.class) && requirement.getSpecification().isService();
}
- public View createView(final Content content, Axes axes, int sequence) {
+ @Override
+ public View createView(final Content content, final Axes axes, final int sequence) {
final Icon icon = new ServiceIcon(content, this);
return new ServiceBorder(icon);
}
+ @Override
public String getName() {
return "Service Icon";
}
+ @Override
public boolean isAligned() {
return false;
}
+ @Override
public boolean isOpen() {
return false;
}
+ @Override
public boolean isReplaceable() {
return false;
}
-
+
+ @Override
public boolean isResizeable() {
return false;
}
+ @Override
public boolean isSubView() {
return false;
}
}
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceObject.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceObject.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceObject.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.service;
import java.util.Arrays;
@@ -37,7 +36,6 @@ import org.apache.isis.viewer.dnd.view.C
import org.apache.isis.viewer.dnd.view.UserActionSet;
import org.apache.isis.viewer.dnd.view.content.AbstractContent;
-
public class ServiceObject extends AbstractContent {
private final ObjectAdapter adapter;
@@ -72,7 +70,7 @@ public class ServiceObject extends Abstr
final String specName = getSpecification().getSingularName();
final String objectTitle = getObject().titleString();
return specName + (specName.equalsIgnoreCase(objectTitle) ? "" : ": " + objectTitle) + " "
- + getSpecification().getDescription();
+ + getSpecification().getDescription();
}
@Override
@@ -135,28 +133,30 @@ public class ServiceObject extends Abstr
@Override
public Consent canDrop(final Content sourceContent) {
- ObjectAction action = actionFor(sourceContent);
+ final ObjectAction action = actionFor(sourceContent);
if (action == null) {
return Veto.DEFAULT;
} else {
- ObjectAdapter source = sourceContent.getAdapter();
- final Consent parameterSetValid = action.isProposedArgumentSetValid(adapter, new ObjectAdapter[] { source });
+ final ObjectAdapter source = sourceContent.getAdapter();
+ final Consent parameterSetValid =
+ action.isProposedArgumentSetValid(adapter, new ObjectAdapter[] { source });
parameterSetValid.setDescription("Execute '" + action.getName() + "' with " + source.titleString());
return parameterSetValid;
}
- }
+ }
private ObjectAction actionFor(final Content sourceContent) {
ObjectAction action;
- action = adapter.getSpecification().getObjectAction(ActionType.USER, null,
- Arrays.asList( sourceContent.getSpecification() ));
+ action =
+ adapter.getSpecification().getObjectAction(ActionType.USER, null,
+ Arrays.asList(sourceContent.getSpecification()));
return action;
}
@Override
public ObjectAdapter drop(final Content sourceContent) {
- ObjectAction action = actionFor(sourceContent);
- ObjectAdapter source = sourceContent.getAdapter();
+ final ObjectAction action = actionFor(sourceContent);
+ final ObjectAdapter source = sourceContent.getAdapter();
return action.execute(adapter, new ObjectAdapter[] { source });
}
@@ -179,6 +179,7 @@ public class ServiceObject extends Abstr
}
@Override
- public void viewMenuOptions(final UserActionSet options) {}
+ public void viewMenuOptions(final UserActionSet options) {
+ }
}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/AbstractTableSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/AbstractTableSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/AbstractTableSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/AbstractTableSpecification.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.table;
import java.util.List;
@@ -37,7 +36,6 @@ import org.apache.isis.viewer.dnd.view.c
import org.apache.isis.viewer.dnd.view.composite.CompositeViewSpecification;
import org.apache.isis.viewer.dnd.view.composite.StackLayout;
-
public abstract class AbstractTableSpecification extends CompositeViewSpecification {
public AbstractTableSpecification() {
@@ -46,41 +44,42 @@ public abstract class AbstractTableSpeci
// TODO do directly without specification
@Override
- public View createView(Content content, Axes axes, int sequence) {
- //ViewSpecification rowSpecification = new SubviewIconSpecification();
+ public View createView(final Content content, final Axes axes, final int sequence) {
+ // ViewSpecification rowSpecification = new SubviewIconSpecification();
return rowSpecification.createView(content, axes, -1);
}
});
addSubviewDecorator(new TableRowBorder.Factory());
-
+
addViewDecorator(new CompositeViewDecorator() {
@Override
- public View decorate(View view, Axes axes) {
+ public View decorate(final View view, final Axes axes) {
axes.getAxis(TableAxis.class).setRoot(view);
return view;
- }});
+ }
+ });
}
@Override
- public Layout createLayout(Content content, Axes axes) {
+ public Layout createLayout(final Content content, final Axes axes) {
return new StackLayout();
}
-
+
@Override
- public void createAxes(Content content, Axes axes) {
+ public void createAxes(final Content content, final Axes axes) {
axes.add(new TableAxisImpl((CollectionContent) content), TableAxis.class);
}
@Override
- public boolean canDisplay(ViewRequirement requirement) {
+ public boolean canDisplay(final ViewRequirement requirement) {
if (!requirement.isCollection() || !requirement.isOpen()) {
return false;
} else {
- CollectionContent collectionContent = (CollectionContent) requirement.getContent();
+ final CollectionContent collectionContent = (CollectionContent) requirement.getContent();
final ObjectSpecification elementSpecification = collectionContent.getElementSpecification();
- final List<ObjectAssociation> fields = elementSpecification
- .getAssociations(ObjectAssociationFilters.STATICALLY_VISIBLE_ASSOCIATIONS);
+ final List<ObjectAssociation> fields =
+ elementSpecification.getAssociations(ObjectAssociationFilters.STATICALLY_VISIBLE_ASSOCIATIONS);
for (int i = 0; i < fields.size(); i++) {
if (fields.get(i).isOneToOneAssociation()) {
return true;
@@ -89,15 +88,12 @@ public abstract class AbstractTableSpeci
return false;
}
}
-/*
- protected View decorateView(View view) {
- TableAxis tableAxis = (TableAxis) view.getViewAxisForChildren();
- tableAxis.setRoot(view);
- return view;
- // return doCreateView(table, content, axis);
- }
- protected abstract View doCreateView(final View table, final Content content, final ViewAxis axis);
- */
+
+ /*
+ * protected View decorateView(View view) { TableAxis tableAxis = (TableAxis) view.getViewAxisForChildren();
+ * tableAxis.setRoot(view); return view; // return doCreateView(table, content, axis); } protected abstract View
+ * doCreateView(final View table, final Content content, final ViewAxis axis);
+ */
@Override
public String getName() {
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/ColumnWidthStrategy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/ColumnWidthStrategy.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/ColumnWidthStrategy.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/ColumnWidthStrategy.java Tue May 3 07:18:19 2011
@@ -17,12 +17,10 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.table;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-
public interface ColumnWidthStrategy {
int getMinimumWidth(int i, ObjectAssociation specification);
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/DefaultColumnWidthStrategy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/DefaultColumnWidthStrategy.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/DefaultColumnWidthStrategy.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/DefaultColumnWidthStrategy.java Tue May 3 07:18:19 2011
@@ -17,12 +17,10 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.table;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-
public class DefaultColumnWidthStrategy implements ColumnWidthStrategy {
private final int minimum;
@@ -45,14 +43,17 @@ public class DefaultColumnWidthStrategy
this.maximum = maximum;
}
+ @Override
public int getMinimumWidth(final int i, final ObjectAssociation specification) {
return minimum;
}
+ @Override
public int getPreferredWidth(final int i, final ObjectAssociation specification) {
return preferred;
}
+ @Override
public int getMaximumWidth(final int i, final ObjectAssociation specification) {
return maximum;
}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/InternalTableSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/InternalTableSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/InternalTableSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/InternalTableSpecification.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.table;
import org.apache.isis.viewer.dnd.view.Axes;
@@ -29,11 +28,11 @@ import org.apache.isis.viewer.dnd.view.c
import org.apache.isis.viewer.dnd.view.composite.StackLayout;
import org.apache.isis.viewer.dnd.viewer.basic.TableFocusManager;
-
public class InternalTableSpecification extends AbstractTableSpecification {
public InternalTableSpecification() {
addViewDecorator(new CompositeViewDecorator() {
- public View decorate(View view, Axes axes) {
+ @Override
+ public View decorate(final View view, final Axes axes) {
final ScrollBorder scrollingView = new ScrollBorder(view);
// note - the next call needs to be after the creation of the window border
// so that it exists when the header is set up
@@ -41,37 +40,31 @@ public class InternalTableSpecification
scrollingView.setFocusManager(new TableFocusManager(scrollingView));
return scrollingView;
- }});
-
+ }
+ });
+
}
-
- public Layout createLayout(Content content, Axes axes) {
+
+ @Override
+ public Layout createLayout(final Content content, final Axes axes) {
return new StackLayout();
}
-
+
// TODO remove
/*
- @Override
- public View doCreateView(final View view, final Content content, final ViewAxis axis) {
- final ScrollBorder scrollingView = new ScrollBorder(view);
- // note - the next call needs to be after the creation of the window border
- // so that it exists when the header is set up
- scrollingView.setTopHeader(new TableHeader(content));
- scrollingView.setFocusManager(new TableFocusManager(scrollingView));
- return scrollingView;
- }
-
- protected View decorateView(View view) {
- super.decorateView(view);
-
- final ScrollBorder scrollingView = new ScrollBorder(view);
- // note - the next call needs to be after the creation of the window border
- // so that it exists when the header is set up
- scrollingView.setTopHeader(new TableHeader(view.getContent()));
- scrollingView.setFocusManager(new TableFocusManager(scrollingView));
- return scrollingView;
- }
- */
+ * @Override public View doCreateView(final View view, final Content content, final ViewAxis axis) { final
+ * ScrollBorder scrollingView = new ScrollBorder(view); // note - the next call needs to be after the creation of
+ * the window border // so that it exists when the header is set up scrollingView.setTopHeader(new
+ * TableHeader(content)); scrollingView.setFocusManager(new TableFocusManager(scrollingView)); return scrollingView;
+ * }
+ *
+ * protected View decorateView(View view) { super.decorateView(view);
+ *
+ * final ScrollBorder scrollingView = new ScrollBorder(view); // note - the next call needs to be after the creation
+ * of the window border // so that it exists when the header is set up scrollingView.setTopHeader(new
+ * TableHeader(view.getContent())); scrollingView.setFocusManager(new TableFocusManager(scrollingView)); return
+ * scrollingView; }
+ */
@Override
public String getName() {
return "Table";
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TableAxis.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TableAxis.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TableAxis.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TableAxis.java Tue May 3 07:18:19 2011
@@ -17,29 +17,27 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.table;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.viewer.dnd.view.View;
import org.apache.isis.viewer.dnd.view.ViewAxis;
-
public interface TableAxis extends ViewAxis {
void ensureOffset(final int offset);
/**
- * Returns the number of the column found at the specificied position, ignoring the columns two borders.
- * Returns 0 for the first column, 1 for second column, etc.
+ * Returns the number of the column found at the specificied position, ignoring the columns two borders. Returns 0
+ * for the first column, 1 for second column, etc.
*
* If over the column border then returns -1.
*/
int getColumnAt(final int xPosition);
/**
- * Returns 0 for left side of first column, 1 for right side of first column, 2 for right side of second
- * column, etc.
+ * Returns 0 for left side of first column, 1 for right side of first column, 2 for right side of second column,
+ * etc.
*
* If no column border is identified then returns -1.
*/
@@ -67,4 +65,3 @@ public interface TableAxis extends ViewA
void setWidth(final int index, final int width);
}
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TableAxisImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TableAxisImpl.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TableAxisImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TableAxisImpl.java Tue May 3 07:18:19 2011
@@ -17,13 +17,10 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.table;
import java.util.List;
-import com.google.common.collect.Lists;
-
import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
@@ -32,6 +29,8 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.viewer.dnd.view.View;
import org.apache.isis.viewer.dnd.view.collection.CollectionContent;
+import com.google.common.collect.Lists;
+
public class TableAxisImpl implements TableAxis {
private final List<ObjectAssociation> columns;
private final String[] columnName;
@@ -39,11 +38,11 @@ public class TableAxisImpl implements Ta
private View table;
private final int[] widths;
- public TableAxisImpl(CollectionContent content) {
+ public TableAxisImpl(final CollectionContent content) {
// TODO create axis first, then after view built set up the axis details?
final ObjectSpecification elementSpecification = (content).getElementSpecification();
- final List<ObjectAssociation> accessibleFields = elementSpecification
- .getAssociations(ObjectAssociationFilters.STATICALLY_VISIBLE_ASSOCIATIONS);
+ final List<ObjectAssociation> accessibleFields =
+ elementSpecification.getAssociations(ObjectAssociationFilters.STATICALLY_VISIBLE_ASSOCIATIONS);
this.columns = tableFields(accessibleFields, content);
widths = new int[columns.size()];
@@ -57,18 +56,18 @@ public class TableAxisImpl implements Ta
}
/*
- * public TableAxis(final ObjectAssociation[] columns) { this.columns = columns; widths = new
- * int[columns.length]; columnName = new String[columns.length]; for (int i = 0; i < widths.length; i++) {
- * columnName[i] = columns[i].getName(); } }
+ * public TableAxis(final ObjectAssociation[] columns) { this.columns = columns; widths = new int[columns.length];
+ * columnName = new String[columns.length]; for (int i = 0; i < widths.length; i++) { columnName[i] =
+ * columns[i].getName(); } }
*/
- private List<ObjectAssociation> tableFields(final List<ObjectAssociation> viewFields, final CollectionContent content) {
+ private List<ObjectAssociation> tableFields(final List<ObjectAssociation> viewFields,
+ final CollectionContent content) {
for (int i = 0; i < viewFields.size(); i++) {
- //final ObjectAssociation objectAssociation = viewFields[i];
+ // final ObjectAssociation objectAssociation = viewFields[i];
// TODO reinstate check to skip unsuitable types
/*
* if (viewFields[i].getSpecification().isOfType(
- * IsisContext.getSpecificationLoader().loadSpecification(ImageValue.class))) { continue;
- * }
+ * IsisContext.getSpecificationLoader().loadSpecification(ImageValue.class))) { continue; }
*/
// if (!objectAssociation.isVisible(IsisContext.getAuthenticationSession(),
@@ -95,8 +94,8 @@ public class TableAxisImpl implements Ta
}
/**
- * Returns the number of the column found at the specificied position, ignoring the columns two borders.
- * Returns 0 for the first column, 1 for second column, etc.
+ * Returns the number of the column found at the specificied position, ignoring the columns two borders. Returns 0
+ * for the first column, 1 for second column, etc.
*
* If over the column border then returns -1.
*/
@@ -117,8 +116,8 @@ public class TableAxisImpl implements Ta
}
/**
- * Returns 0 for left side of first column, 1 for right side of first column, 2 for right side of second
- * column, etc.
+ * Returns 0 for left side of first column, 1 for right side of first column, 2 for right side of second column,
+ * etc.
*
* If no column border is identified then returns -1.
*/
@@ -175,8 +174,8 @@ public class TableAxisImpl implements Ta
@Override
public void invalidateLayout() {
final View[] rows = table.getSubviews();
- for (int i = 0; i < rows.length; i++) {
- rows[i].invalidateLayout();
+ for (final View row : rows) {
+ row.invalidateLayout();
}
table.invalidateLayout();
}
@@ -205,12 +204,10 @@ public class TableAxisImpl implements Ta
@Override
public String toString() {
- ToString str = new ToString(this);
+ final ToString str = new ToString(this);
str.append("columns", columnName.length);
str.append("header offset", rowHeaderOffet);
str.append("table", table);
return str.toString();
}
}
-
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TableCellBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TableCellBuilder.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TableCellBuilder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TableCellBuilder.java Tue May 3 07:18:19 2011
@@ -17,10 +17,8 @@
* under the License.
*/
+package org.apache.isis.viewer.dnd.table;
- package org.apache.isis.viewer.dnd.table;
-
-import org.apache.log4j.Logger;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
import org.apache.isis.core.commons.exceptions.UnknownTypeException;
@@ -48,7 +46,7 @@ import org.apache.isis.viewer.dnd.view.c
import org.apache.isis.viewer.dnd.view.field.OneToOneFieldImpl;
import org.apache.isis.viewer.dnd.view.field.TextParseableFieldImpl;
import org.apache.isis.viewer.dnd.viewer.basic.UnlinedTextFieldSpecification;
-
+import org.apache.log4j.Logger;
class TableCellBuilder extends AbstractViewBuilder {
private static final Logger LOG = Logger.getLogger(TableCellBuilder.class);
@@ -65,7 +63,7 @@ class TableCellBuilder extends AbstractV
}
@Override
- public void build(final View view, Axes axes) {
+ public void build(final View view, final Axes axes) {
Assert.assertEquals("ensure the view is complete decorated view", view.getView(), view);
final Content content = view.getContent();
@@ -79,7 +77,7 @@ class TableCellBuilder extends AbstractV
}
private void updateBuild(final ObjectAdapter object, final View view, final Axes axes) {
- final TableAxis viewAxis = (TableAxis) axes.getAxis(TableAxis.class);
+ final TableAxis viewAxis = axes.getAxis(TableAxis.class);
LOG.debug("update view " + view + " for " + object);
final View[] subviews = view.getSubviews();
@@ -92,12 +90,12 @@ class TableCellBuilder extends AbstractV
// 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 visiblityChange = !field.isVisible(IsisContext.getAuthenticationSession(), object)
- .isAllowed()
+ final boolean visiblityChange =
+ !field.isVisible(IsisContext.getAuthenticationSession(), object).isAllowed()
^ (subview instanceof BlankView);
final ObjectAdapter adapter = subview.getContent().getAdapter();
- final boolean valueChange = value != null && value.getObject() != null
- && !value.getObject().equals(adapter.getObject());
+ final boolean valueChange =
+ value != null && value.getObject() != null && !value.getObject().equals(adapter.getObject());
if (visiblityChange || valueChange) {
final View fieldView = createFieldView(view, axes, object, field, value);
@@ -126,7 +124,7 @@ class TableCellBuilder extends AbstractV
}
private void initialBuild(final ObjectAdapter object, final View view, final Axes axes) {
- final TableAxis viewAxis = (TableAxis) axes.getAxis(TableAxis.class);
+ final TableAxis viewAxis = axes.getAxis(TableAxis.class);
LOG.debug("build view " + view + " for " + object);
final int len = viewAxis.getColumnCount();
final ObjectSpecification spec = object.getSpecification();
@@ -139,12 +137,8 @@ class TableCellBuilder extends AbstractV
}
}
- private View createFieldView(
- final View view,
- final Axes axes,
- final ObjectAdapter object,
- final ObjectAssociation field,
- final ObjectAdapter value) {
+ private View createFieldView(final View view, final Axes axes, final ObjectAdapter object,
+ final ObjectAssociation field, final ObjectAdapter value) {
if (field == null) {
throw new NullPointerException();
}
@@ -168,8 +162,8 @@ class TableCellBuilder extends AbstractV
}
if (((TextParseableContent) content).getNoLines() > 0) {
/*
- * TODO remove this after introducing constraints into view specs that allow the parent
- * view to specify what kind of subviews it can deal
+ * TODO remove this after introducing constraints into view specs that allow the parent view to
+ * specify what kind of subviews it can deal
*/
if (fieldSpecification.containsFacet(BooleanValueFacet.class)) {
@@ -185,7 +179,8 @@ class TableCellBuilder extends AbstractV
if (!field.isVisible(IsisContext.getAuthenticationSession(), object).isAllowed()) {
return new BlankView(content);
}
- return factory.createView(new ViewRequirement(content, ViewRequirement.CLOSED | ViewRequirement.SUBVIEW));
+ return factory
+ .createView(new ViewRequirement(content, ViewRequirement.CLOSED | ViewRequirement.SUBVIEW));
}