summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2015-03-20 12:20:10 +0200
committerLeif Åstrand <leif@vaadin.com>2015-03-20 12:27:49 +0000
commit27e0595fdb784891eda15a7b02f899d5d358b0d1 (patch)
tree33d91f3390bb47843176ffbc1be75eac304439b1
parent4a52ec0b7ad95a4b44a70be9ce9386f6cde1192b (diff)
downloadvaadin-framework-27e0595fdb784891eda15a7b02f899d5d358b0d1.tar.gz
vaadin-framework-27e0595fdb784891eda15a7b02f899d5d358b0d1.zip
Fix various small issues discovered while reviewing API
Change-Id: I196e490d5c5ae77ba895e0fca1b0d9160b6a7855
-rw-r--r--client/src/com/vaadin/client/widget/grid/AutoScroller.java8
-rw-r--r--client/src/com/vaadin/client/widget/grid/DetailsGenerator.java1
-rw-r--r--client/src/com/vaadin/client/widget/grid/events/ColumnReorderHandler.java1
-rw-r--r--client/src/com/vaadin/client/widgets/Escalator.java2
-rw-r--r--client/src/com/vaadin/client/widgets/Grid.java2
-rw-r--r--server/src/com/vaadin/ui/Grid.java4
-rw-r--r--shared/src/com/vaadin/shared/ui/grid/DetailsConnectorChange.java2
7 files changed, 10 insertions, 10 deletions
diff --git a/client/src/com/vaadin/client/widget/grid/AutoScroller.java b/client/src/com/vaadin/client/widget/grid/AutoScroller.java
index f7c80df623..773dc012c8 100644
--- a/client/src/com/vaadin/client/widget/grid/AutoScroller.java
+++ b/client/src/com/vaadin/client/widget/grid/AutoScroller.java
@@ -75,7 +75,7 @@ public class AutoScroller {
public enum ScrollAxis {
VERTICAL, HORIZONTAL
- };
+ }
/** The maximum number of pixels per second to autoscroll. */
private static final int SCROLL_TOP_SPEED_PX_SEC = 500;
@@ -508,10 +508,10 @@ public class AutoScroller {
* Defaults to 100px.
*
* @param px
- * the height/width for the auto scroll area depending on
+ * the pixel height/width for the auto scroll area depending on
* direction
*/
- public void setScrollAreaPX(int px) {
+ public void setScrollArea(int px) {
scrollAreaPX = px;
}
@@ -522,7 +522,7 @@ public class AutoScroller {
*
* @return size in pixels
*/
- public int getScrollAreaPX() {
+ public int getScrollArea() {
return scrollAreaPX;
}
diff --git a/client/src/com/vaadin/client/widget/grid/DetailsGenerator.java b/client/src/com/vaadin/client/widget/grid/DetailsGenerator.java
index 309e3f1ea3..103bf96291 100644
--- a/client/src/com/vaadin/client/widget/grid/DetailsGenerator.java
+++ b/client/src/com/vaadin/client/widget/grid/DetailsGenerator.java
@@ -42,6 +42,5 @@ public interface DetailsGenerator {
* @return the details for the given row, or <code>null</code> to leave the
* details empty.
*/
- // TODO: provide a row object instead of index (maybe, needs discussion?)
Widget getDetails(int rowIndex);
}
diff --git a/client/src/com/vaadin/client/widget/grid/events/ColumnReorderHandler.java b/client/src/com/vaadin/client/widget/grid/events/ColumnReorderHandler.java
index e4f258088f..4733ed8bc0 100644
--- a/client/src/com/vaadin/client/widget/grid/events/ColumnReorderHandler.java
+++ b/client/src/com/vaadin/client/widget/grid/events/ColumnReorderHandler.java
@@ -33,7 +33,6 @@ public interface ColumnReorderHandler<T> extends EventHandler {
* A column reorder event, fired by Grid when the columns of the Grid have
* been reordered.
*
- * @since
* @param event
* column reorder event
*/
diff --git a/client/src/com/vaadin/client/widgets/Escalator.java b/client/src/com/vaadin/client/widgets/Escalator.java
index 0d65dda611..75b797eb1f 100644
--- a/client/src/com/vaadin/client/widgets/Escalator.java
+++ b/client/src/com/vaadin/client/widgets/Escalator.java
@@ -4494,7 +4494,7 @@ public class Escalator extends Widget implements RequiresResize,
* The meaning of each value may differ depending on the context it is being
* used in. Check that particular method's JavaDoc.
*/
- public enum SpacerInclusionStrategy {
+ private enum SpacerInclusionStrategy {
/** A representation of "the entire spacer". */
COMPLETE,
diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java
index e9288a7ece..9821591b91 100644
--- a/client/src/com/vaadin/client/widgets/Grid.java
+++ b/client/src/com/vaadin/client/widgets/Grid.java
@@ -3385,7 +3385,7 @@ public class Grid<T> extends ResizeComposite implements
dragElement.addClassName("dragged-column-header");
// start the auto scroll handler
- autoScroller.setScrollAreaPX(60);
+ autoScroller.setScrollArea(60);
autoScroller.start(startingEvent, ScrollAxis.HORIZONTAL,
autoScrollerCallback);
return true;
diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java
index 4488789406..4a52dba173 100644
--- a/server/src/com/vaadin/ui/Grid.java
+++ b/server/src/com/vaadin/ui/Grid.java
@@ -194,13 +194,15 @@ public class Grid extends AbstractComponent implements SelectionNotifier,
/**
* Constructor for a column visibility change event.
*
+ * @param source
+ * the grid from which this event originates
* @param column
* the column that changed its visibility
* @param isUserOriginated
* <code>true</code> iff the event was triggered by an UI
* interaction
*/
- public ColumnVisibilityChangeEvent(Component source, Column column,
+ public ColumnVisibilityChangeEvent(Grid source, Column column,
boolean isUserOriginated) {
super(source);
this.column = column;
diff --git a/shared/src/com/vaadin/shared/ui/grid/DetailsConnectorChange.java b/shared/src/com/vaadin/shared/ui/grid/DetailsConnectorChange.java
index 40f4541fb1..5b80f27b1e 100644
--- a/shared/src/com/vaadin/shared/ui/grid/DetailsConnectorChange.java
+++ b/shared/src/com/vaadin/shared/ui/grid/DetailsConnectorChange.java
@@ -21,7 +21,7 @@ import com.vaadin.shared.Connector;
/**
* A description of an indexing modification for a connector. This is used by
- * Grid by internal bookkeeping updates.
+ * Grid for internal bookkeeping updates.
*
* @since
* @author Vaadin Ltd