summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--client/src/main/java/com/vaadin/client/DeferredWorker.java2
-rw-r--r--client/src/main/java/com/vaadin/client/ui/VMenuBar.java2
-rw-r--r--client/src/main/java/com/vaadin/client/ui/VPopupView.java2
-rw-r--r--client/src/main/java/com/vaadin/client/ui/VSlider.java2
-rw-r--r--client/src/main/java/com/vaadin/client/ui/dd/VDragAndDropManager.java2
-rw-r--r--client/src/main/java/com/vaadin/client/widget/escalator/ScrollbarBundle.java4
-rw-r--r--client/src/main/java/com/vaadin/client/widget/grid/EditorHandler.java2
-rw-r--r--client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionEvent.java2
-rw-r--r--client/src/main/java/com/vaadin/client/widgets/Escalator.java12
-rwxr-xr-xclient/src/main/java/com/vaadin/client/widgets/Grid.java4
-rw-r--r--compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java2
-rw-r--r--compatibility-client/src/main/java/com/vaadin/v7/client/ui/VSlider.java2
-rw-r--r--compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextField.java2
-rw-r--r--compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/ScrollbarBundle.java4
-rw-r--r--compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/EditorHandler.java2
-rw-r--r--compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/selection/AbstractRowHandleSelectionModel.java4
-rw-r--r--compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/selection/SelectionEvent.java2
-rw-r--r--compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/selection/SelectionModel.java2
-rw-r--r--compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Escalator.java8
-rw-r--r--compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java10
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/data/Collapsible.java2
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/data/util/IndexedContainer.java2
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java8
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java2
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/ui/CheckBox.java2
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java20
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java6
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java10
-rw-r--r--compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/DetailsConnectorChange.java4
-rw-r--r--compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/EditorClientRpc.java4
-rw-r--r--server/src/main/java/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java2
-rw-r--r--server/src/main/java/com/vaadin/ui/Grid.java4
-rw-r--r--shared/src/main/java/com/vaadin/shared/Range.java14
-rw-r--r--testbench-api/src/main/java/com/vaadin/testbench/elements/GridElement.java2
34 files changed, 77 insertions, 77 deletions
diff --git a/client/src/main/java/com/vaadin/client/DeferredWorker.java b/client/src/main/java/com/vaadin/client/DeferredWorker.java
index a234e783f6..38d22f9887 100644
--- a/client/src/main/java/com/vaadin/client/DeferredWorker.java
+++ b/client/src/main/java/com/vaadin/client/DeferredWorker.java
@@ -29,7 +29,7 @@ public interface DeferredWorker {
* Checks whether there are operations pending for this widget or connector
* that must be executed before reaching a steady state.
*
- * @returns <code>true</code> iff there are operations pending which must be
+ * @returns <code>true</code> if there are operations pending which must be
* executed before reaching a steady state
*/
public boolean isWorkPending();
diff --git a/client/src/main/java/com/vaadin/client/ui/VMenuBar.java b/client/src/main/java/com/vaadin/client/ui/VMenuBar.java
index 0687ff472e..63e0f687b1 100644
--- a/client/src/main/java/com/vaadin/client/ui/VMenuBar.java
+++ b/client/src/main/java/com/vaadin/client/ui/VMenuBar.java
@@ -1338,7 +1338,7 @@ public class VMenuBar extends SimpleFocusablePanel
* Whether {@code CTRL} was pressed
* @param shift
* Whether {@code SHIFT} was pressed
- * @return true iff the navigation event was handled
+ * @return true if the navigation event was handled
*/
public boolean handleNavigation(int keycode, boolean ctrl, boolean shift) {
diff --git a/client/src/main/java/com/vaadin/client/ui/VPopupView.java b/client/src/main/java/com/vaadin/client/ui/VPopupView.java
index 43da119c5a..e28e019b8b 100644
--- a/client/src/main/java/com/vaadin/client/ui/VPopupView.java
+++ b/client/src/main/java/com/vaadin/client/ui/VPopupView.java
@@ -433,7 +433,7 @@ public class VPopupView extends HTML
* Checks whether there are operations pending for this widget that must be
* executed before reaching a steady state.
*
- * @returns <code>true</code> iff there are operations pending which must be
+ * @returns <code>true</code> if there are operations pending which must be
* executed before reaching a steady state
* @since 7.3.4
*/
diff --git a/client/src/main/java/com/vaadin/client/ui/VSlider.java b/client/src/main/java/com/vaadin/client/ui/VSlider.java
index 86feb560b8..65aaa56ef0 100644
--- a/client/src/main/java/com/vaadin/client/ui/VSlider.java
+++ b/client/src/main/java/com/vaadin/client/ui/VSlider.java
@@ -468,7 +468,7 @@ public class VSlider extends SimpleFocusablePanel
* Whether {@code CTRL} was pressed
* @param shift
* Whether {@code SHIFT} was pressed
- * @return true iff the navigation event was handled
+ * @return true if the navigation event was handled
*/
public boolean handleNavigation(int keycode, boolean ctrl, boolean shift) {
diff --git a/client/src/main/java/com/vaadin/client/ui/dd/VDragAndDropManager.java b/client/src/main/java/com/vaadin/client/ui/dd/VDragAndDropManager.java
index 906165a499..e3b0f11a0d 100644
--- a/client/src/main/java/com/vaadin/client/ui/dd/VDragAndDropManager.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VDragAndDropManager.java
@@ -517,7 +517,7 @@ public class VDragAndDropManager {
/*
* Remove class name indicating drag source when server visit is done
- * iff server visit was not initiated. Otherwise it will be removed once
+ * if server visit was not initiated. Otherwise it will be removed once
* the server visit is done.
*/
if (!sendTransferableToServer && currentDrag != null) {
diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/ScrollbarBundle.java b/client/src/main/java/com/vaadin/client/widget/escalator/ScrollbarBundle.java
index 41bc1b5952..cadc17968d 100644
--- a/client/src/main/java/com/vaadin/client/widget/escalator/ScrollbarBundle.java
+++ b/client/src/main/java/com/vaadin/client/widget/escalator/ScrollbarBundle.java
@@ -778,7 +778,7 @@ public abstract class ScrollbarBundle implements DeferredWorker {
* In other words, this method checks whether the contents is larger than
* can visually fit in the element.
*
- * @return <code>true</code> iff the scrollbar's handle is visible
+ * @return <code>true</code> if the scrollbar's handle is visible
*/
public boolean showsScrollHandle() {
return getScrollSize() - getOffsetSize() > WidgetUtil.PIXEL_EPSILON;
@@ -876,7 +876,7 @@ public abstract class ScrollbarBundle implements DeferredWorker {
/**
* Checks whether the scrollbar bundle is locked or not.
*
- * @return <code>true</code> iff the scrollbar bundle is locked
+ * @return <code>true</code> if the scrollbar bundle is locked
*/
public boolean isLocked() {
return isLocked;
diff --git a/client/src/main/java/com/vaadin/client/widget/grid/EditorHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/EditorHandler.java
index 14467987cf..d00745c986 100644
--- a/client/src/main/java/com/vaadin/client/widget/grid/EditorHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/EditorHandler.java
@@ -122,7 +122,7 @@ public interface EditorHandler<T> {
/**
* Checks whether the request is completed or not.
*
- * @return <code>true</code> iff the request is completed
+ * @return <code>true</code> if the request is completed
*/
public boolean isCompleted();
}
diff --git a/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionEvent.java
index 707330ad34..4145919f2f 100644
--- a/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionEvent.java
@@ -160,7 +160,7 @@ public class SelectionEvent<T> extends GwtEvent<SelectionHandler> {
* Checks if this selection change event is fired during a batched
* selection/deselection operation.
*
- * @return <code>true</code> iff this event is fired during a batched
+ * @return <code>true</code> if this event is fired during a batched
* selection/deselection operation
*/
public boolean isBatchedSelection() {
diff --git a/client/src/main/java/com/vaadin/client/widgets/Escalator.java b/client/src/main/java/com/vaadin/client/widgets/Escalator.java
index fa1145d9cf..bfff4ad6ae 100644
--- a/client/src/main/java/com/vaadin/client/widgets/Escalator.java
+++ b/client/src/main/java/com/vaadin/client/widgets/Escalator.java
@@ -1740,9 +1740,9 @@ public class Escalator extends Widget
* @since 7.5.0
*
* @param tr
- * the row element to check for if it is or has elements that
- * can be frozen
- * @return <code>true</code> iff this the given element, or any of its
+ * the row element to check whether it,
+ * or any of its its descendants can be frozen
+ * @return <code>true</code> if the given element, or any of its
* descendants, can be frozen
*/
protected abstract boolean rowCanBeFrozen(TableRowElement tr);
@@ -5935,7 +5935,7 @@ public class Escalator extends Widget
* Check whether there are both columns and any row data (for either
* headers, body or footer).
*
- * @return <code>true</code> iff header, body or footer has rows && there
+ * @return <code>true</code> if header, body or footer has rows and there
* are columns
*/
private boolean hasColumnAndRowData() {
@@ -5947,7 +5947,7 @@ public class Escalator extends Widget
/**
* Check whether there are any cells in the DOM.
*
- * @return <code>true</code> iff header, body or footer has any child
+ * @return <code>true</code> if header, body or footer has any child
* elements
*/
private boolean hasSomethingInDom() {
@@ -6657,7 +6657,7 @@ public class Escalator extends Widget
*
* @param direction
* the direction of the scroll of which to check the lock status
- * @return <code>true</code> iff the direction is locked
+ * @return <code>true</code> if the direction is locked
*/
public boolean isScrollLocked(ScrollbarBundle.Direction direction) {
switch (direction) {
diff --git a/client/src/main/java/com/vaadin/client/widgets/Grid.java b/client/src/main/java/com/vaadin/client/widgets/Grid.java
index 537d864836..9b04100d48 100755
--- a/client/src/main/java/com/vaadin/client/widgets/Grid.java
+++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java
@@ -1524,7 +1524,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
* @see #editRow(int, int)
*/
public void editRow(int rowIndex) {
- // Focus the last focused column in the editor iff grid or its child
+ // Focus the last focused column in the editor if grid or its child
// was focused before the edit request
Cell focusedCell = grid.cellFocusHandler.getFocusedCell();
Element focusedElement = WidgetUtil.getFocusedElement();
@@ -9117,7 +9117,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
* @since 7.5.0
* @param rowIndex
* the index of the row for which to check details
- * @return <code>true</code> iff the details for the given row is visible
+ * @return <code>true</code> if the details for the given row is visible
* @see #setDetailsVisible(int, boolean)
*/
public boolean isDetailsVisible(int rowIndex) {
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java
index 55923f2eab..04bb24f0b9 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java
@@ -7731,7 +7731,7 @@ public class VScrollTable extends FlowPanel
* Whether {@code CTRL} was pressed
* @param shift
* Whether {@code SHIFT} was pressed
- * @return true iff the navigation event was handled
+ * @return true if the navigation event was handled
*/
protected boolean handleNavigation(int keycode, boolean ctrl,
boolean shift) {
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VSlider.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VSlider.java
index 085b1e276a..a5fdc40285 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VSlider.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VSlider.java
@@ -474,7 +474,7 @@ public class VSlider extends SimpleFocusablePanel
* Whether {@code CTRL} was pressed
* @param shift
* Whether {@code SHIFT} was pressed
- * @return true iff the navigation event was handled
+ * @return true if the navigation event was handled
*/
public boolean handleNavigation(int keycode, boolean ctrl, boolean shift) {
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextField.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextField.java
index a5e75a3c15..7c699b58ae 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextField.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextField.java
@@ -422,7 +422,7 @@ public class VTextField extends TextBoxBase implements Field, ChangeHandler,
* Updates the cursor position variable if it has changed since the last
* update.
*
- * @return true iff the value was updated
+ * @return true if the value was updated
*/
protected boolean updateCursorPosition() {
if (WidgetUtil.isAttachedAndDisplayed(this)) {
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/ScrollbarBundle.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/ScrollbarBundle.java
index 3bfae76005..cd0d4f1e38 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/ScrollbarBundle.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/ScrollbarBundle.java
@@ -780,7 +780,7 @@ public abstract class ScrollbarBundle implements DeferredWorker {
* In other words, this method checks whether the contents is larger than
* can visually fit in the element.
*
- * @return <code>true</code> iff the scrollbar's handle is visible
+ * @return <code>true</code> if the scrollbar's handle is visible
*/
public boolean showsScrollHandle() {
return getScrollSize() - getOffsetSize() > WidgetUtil.PIXEL_EPSILON;
@@ -878,7 +878,7 @@ public abstract class ScrollbarBundle implements DeferredWorker {
/**
* Checks whether the scrollbar bundle is locked or not.
*
- * @return <code>true</code> iff the scrollbar bundle is locked
+ * @return <code>true</code> if the scrollbar bundle is locked
*/
public boolean isLocked() {
return isLocked;
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/EditorHandler.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/EditorHandler.java
index 7777b821bc..7dc334fbce 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/EditorHandler.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/EditorHandler.java
@@ -107,7 +107,7 @@ public interface EditorHandler<T> {
/**
* Checks whether the request is completed or not.
*
- * @return <code>true</code> iff the request is completed
+ * @return <code>true</code> if the request is completed
*/
public boolean isCompleted();
}
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/selection/AbstractRowHandleSelectionModel.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/selection/AbstractRowHandleSelectionModel.java
index 41e85929aa..dfd6422fab 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/selection/AbstractRowHandleSelectionModel.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/selection/AbstractRowHandleSelectionModel.java
@@ -39,7 +39,7 @@ public abstract class AbstractRowHandleSelectionModel<T>
*
* @param handle
* the handle to select by
- * @return <code>true</code> iff the selection state was changed by this
+ * @return <code>true</code> if the selection state was changed by this
* call
* @throws UnsupportedOperationException
* if the selection model does not support either handles or
@@ -55,7 +55,7 @@ public abstract class AbstractRowHandleSelectionModel<T>
*
* @param handle
* the handle to deselect by
- * @return <code>true</code> iff the selection state was changed by this
+ * @return <code>true</code> if the selection state was changed by this
* call
* @throws UnsupportedOperationException
* if the selection model does not support either handles or
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/selection/SelectionEvent.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/selection/SelectionEvent.java
index 0e6bda70a7..94fb851df9 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/selection/SelectionEvent.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/selection/SelectionEvent.java
@@ -169,7 +169,7 @@ public class SelectionEvent<T> extends GwtEvent<SelectionHandler> {
* Checks if this selection change event is fired during a batched
* selection/deselection operation.
*
- * @return <code>true</code> iff this event is fired during a batched
+ * @return <code>true</code> if this event is fired during a batched
* selection/deselection operation
*/
public boolean isBatchedSelection() {
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/selection/SelectionModel.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/selection/SelectionModel.java
index 28e486242c..b4e536a14f 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/selection/SelectionModel.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/selection/SelectionModel.java
@@ -180,7 +180,7 @@ public interface SelectionModel<T> {
/**
* Checks whether or not a batch has been started.
*
- * @return <code>true</code> iff a batch has been started
+ * @return <code>true</code> if a batch has been started
*/
public boolean isBeingBatchSelected();
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Escalator.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Escalator.java
index 8cf57b54a4..94882e0507 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Escalator.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Escalator.java
@@ -1727,7 +1727,7 @@ public class Escalator extends Widget
* @param tr
* the row element to check for if it is or has elements that
* can be frozen
- * @return <code>true</code> iff this the given element, or any of its
+ * @return <code>true</code> if this the given element, or any of its
* descendants, can be frozen
*/
protected abstract boolean rowCanBeFrozen(TableRowElement tr);
@@ -5920,7 +5920,7 @@ public class Escalator extends Widget
* Check whether there are both columns and any row data (for either
* headers, body or footer).
*
- * @return <code>true</code> iff header, body or footer has rows && there
+ * @return <code>true</code> if header, body or footer has rows and there
* are columns
*/
private boolean hasColumnAndRowData() {
@@ -5932,7 +5932,7 @@ public class Escalator extends Widget
/**
* Check whether there are any cells in the DOM.
*
- * @return <code>true</code> iff header, body or footer has any child
+ * @return <code>true</code> if header, body or footer has any child
* elements
*/
private boolean hasSomethingInDom() {
@@ -6644,7 +6644,7 @@ public class Escalator extends Widget
*
* @param direction
* the direction of the scroll of which to check the lock status
- * @return <code>true</code> iff the direction is locked
+ * @return <code>true</code> if the direction is locked
*/
public boolean isScrollLocked(ScrollbarBundle.Direction direction) {
switch (direction) {
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java
index 469ecb5bba..1fa352faf2 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java
@@ -1525,7 +1525,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
* @see #editRow(int, int)
*/
public void editRow(int rowIndex) {
- // Focus the last focused column in the editor iff grid or its child
+ // Focus the last focused column in the editor if grid or its child
// was focused before the edit request
Cell focusedCell = grid.cellFocusHandler.getFocusedCell();
Element focusedElement = WidgetUtil.getFocusedElement();
@@ -7941,7 +7941,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
*
* @param row
* a row object
- * @return <code>true</code> iff the current selection changed
+ * @return <code>true</code> if the current selection changed
* @throws IllegalStateException
* if the current selection model is not an instance of
* {@link SelectionModel.Single} or {@link SelectionModel.Multi}
@@ -7966,7 +7966,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
*
* @param row
* a row object
- * @return <code>true</code> iff the current selection changed
+ * @return <code>true</code> if the current selection changed
* @throws IllegalStateException
* if the current selection model is not an instance of
* {@link SelectionModel.Single} or {@link SelectionModel.Multi}
@@ -7985,7 +7985,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
/**
* Deselect all rows using the current selection model.
*
- * @return <code>true</code> iff the current selection changed
+ * @return <code>true</code> if the current selection changed
* @throws IllegalStateException
* if the current selection model is not an instance of
* {@link SelectionModel.Single} or {@link SelectionModel.Multi}
@@ -9097,7 +9097,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
* @since 7.5.0
* @param rowIndex
* the index of the row for which to check details
- * @return <code>true</code> iff the details for the given row is visible
+ * @return <code>true</code> if the details for the given row is visible
* @see #setDetailsVisible(int, boolean)
*/
public boolean isDetailsVisible(int rowIndex) {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/Collapsible.java b/compatibility-server/src/main/java/com/vaadin/v7/data/Collapsible.java
index 8f719c8959..f87a73004f 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/Collapsible.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/Collapsible.java
@@ -74,7 +74,7 @@ public interface Collapsible extends Hierarchical, Ordered {
*
* @param itemId
* The {@link Item}'s identifier that is to be checked.
- * @return <code>true</code> iff the {@link Item} identified by
+ * @return <code>true</code> if the {@link Item} identified by
* <code>itemId</code> is currently collapsed, otherwise
* <code>false</code>.
*/
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/IndexedContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/IndexedContainer.java
index 5371584a31..f91cb783fe 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/IndexedContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/IndexedContainer.java
@@ -415,7 +415,7 @@ public class IndexedContainer
}
/**
- * Iff one item is added, gives its index.
+ * If and only if one item is added, gives its index.
*
* @return -1 if either multiple items are changed or some other change
* than add is done.
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java
index f5867ad0e3..99bc5a1f77 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java
@@ -436,7 +436,7 @@ public abstract class AbstractField<T> extends AbstractLegacyComponent
* @param newFieldValue
* the New value of the field.
* @param repaintIsNotNeeded
- * True iff caller is sure that repaint is not needed.
+ * True if caller is sure that repaint is not needed.
* @throws Property.ReadOnlyException
* @throws Converter.ConversionException
* @throws InvalidValueException
@@ -452,9 +452,9 @@ public abstract class AbstractField<T> extends AbstractLegacyComponent
* @param newFieldValue
* the New value of the field.
* @param repaintIsNotNeeded
- * True iff caller is sure that repaint is not needed.
+ * True if caller is sure that repaint is not needed.
* @param ignoreReadOnly
- * True iff if the read-only check should be ignored
+ * True if the read-only check should be ignored
* @throws Property.ReadOnlyException
* @throws Converter.ConversionException
* @throws InvalidValueException
@@ -996,7 +996,7 @@ public abstract class AbstractField<T> extends AbstractLegacyComponent
* Fields allow invalid values by default. In most cases this is wanted,
* because the field otherwise visually forget the user input immediately.
*
- * @return true iff the invalid values are allowed.
+ * @return true if invalid values are allowed.
* @see Validatable#isInvalidAllowed()
*/
@Override
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java
index 72e8c6dffb..305859534a 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java
@@ -430,7 +430,7 @@ public abstract class AbstractTextField extends AbstractField<String> implements
* Fire a "simulated" text change event before value change event if
* change is coming from the client side.
*
- * Iff there is both value change and textChangeEvent in same
+ * If there are both value change and textChangeEvent in same
* variable burst, it is a text field in non immediate mode and the
* text change event "flushed" queued value change event. In this
* case textChangeEventPending flag is already on and text change
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/CheckBox.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/CheckBox.java
index 10703d5bd2..20f388a3fe 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/CheckBox.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/CheckBox.java
@@ -201,7 +201,7 @@ public class CheckBox extends AbstractField<Boolean> {
/**
* Get the boolean value of the button state.
*
- * @return True iff the button is pressed down or checked.
+ * @return True if the button is pressed down or checked.
*
* @deprecated As of 7.0, use {@link #getValue()} instead and, if needed,
* handle null values.
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
index 2b480437cf..fdd93f56c4 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
@@ -239,7 +239,7 @@ public class Grid extends AbstractComponent
* <code>true</code> if the column was hidden,
* <code>false</code> if it became visible
* @param isUserOriginated
- * <code>true</code> iff the event was triggered by an UI
+ * <code>true</code> if the event was triggered by an UI
* interaction
*/
public ColumnVisibilityChangeEvent(Grid source, Column column,
@@ -534,7 +534,7 @@ public class Grid extends AbstractComponent
*
* @param itemId
* the id of the item for which to check details visibility
- * @return <code>true</code> iff the details are visible
+ * @return <code>true</code> if the details are visible
*/
public boolean isDetailsVisible(Object itemId) {
return openDetails.contains(itemId);
@@ -1177,7 +1177,7 @@ public class Grid extends AbstractComponent
*
* @param itemId
* the item id to check for
- * @return <code>true</code> iff the item is selected
+ * @return <code>true</code> if the item is selected
*/
boolean isSelected(Object itemId);
@@ -1294,7 +1294,7 @@ public class Grid extends AbstractComponent
/**
* Marks all the items in the current Container as selected
*
- * @return <code>true</code> iff some items were previously not
+ * @return <code>true</code> if some items were previously not
* selected
* @see #deselectAll()
*/
@@ -1303,7 +1303,7 @@ public class Grid extends AbstractComponent
/**
* Marks all the items in the current Container as deselected
*
- * @return <code>true</code> iff some items were previously selected
+ * @return <code>true</code> if some items were previously selected
* @see #selectAll()
*/
boolean deselectAll();
@@ -4135,7 +4135,7 @@ public class Grid extends AbstractComponent
*
* @since 7.5.0
* @param hidable
- * <code>true</code> iff the column may be hidable by the
+ * <code>true</code> if the column may be hidable by the
* user via UI interaction
* @return this column
*/
@@ -5872,7 +5872,7 @@ public class Grid extends AbstractComponent
*
* @param itemId
* the item id to check for
- * @return <code>true</code> iff the item is selected
+ * @return <code>true</code> if the item is selected
*/
// keep this javadoc in sync with SelectionModel.isSelected
public boolean isSelected(Object itemId) {
@@ -6963,7 +6963,7 @@ public class Grid extends AbstractComponent
/**
* Checks whether the item editor UI is enabled for this grid.
*
- * @return <code>true</code> iff the editor is enabled for this grid
+ * @return <code>true</code> if the editor is enabled for this grid
*
* @see #setEditorEnabled(boolean)
* @see #getEditedItemId()
@@ -7012,7 +7012,7 @@ public class Grid extends AbstractComponent
/**
* Returns whether an item is currently being edited in the editor.
*
- * @return true iff the editor is open
+ * @return true if the editor is open
*/
public boolean isEditorActive() {
return editorActive;
@@ -7480,7 +7480,7 @@ public class Grid extends AbstractComponent
* @since 7.5.0
* @param itemId
* the id of the item for which to check details visibility
- * @return <code>true</code> iff the details are visible
+ * @return <code>true</code> if the details are visible
*/
public boolean isDetailsVisible(Object itemId) {
return detailComponentManager.isDetailsVisible(itemId);
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
index 65613d00cc..ee38b2bcb3 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
@@ -4943,10 +4943,10 @@ public class Table extends AbstractSelect implements Action.Container,
/**
* Is sorting disabled altogether.
*
- * True iff no sortable columns are given even in the case where data source
+ * True if no sortable columns are given even in the case where data source
* would support this.
*
- * @return True iff sorting is disabled.
+ * @return True if sorting is disabled.
* @deprecated As of 7.0, use {@link #isSortEnabled()} instead
*/
@Deprecated
@@ -4967,7 +4967,7 @@ public class Table extends AbstractSelect implements Action.Container,
* Disables the sorting by the user altogether.
*
* @param sortDisabled
- * True iff sorting is disabled.
+ * True if sorting is disabled.
* @deprecated As of 7.0, use {@link #setSortEnabled(boolean)} instead
*/
@Deprecated
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java
index a6e13f73c7..ccf4d6e460 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java
@@ -295,7 +295,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
*
* @param itemId
* the item id.
- * @return true iff the item is expanded.
+ * @return true if the item is expanded.
*/
public boolean isExpanded(Object itemId) {
return expanded.contains(itemId);
@@ -306,7 +306,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
*
* @param itemId
* the item id.
- * @return True iff the expand operation succeeded
+ * @return True if the expand operation succeeded
*/
public boolean expandItem(Object itemId) {
boolean success = expandItem(itemId, true);
@@ -368,7 +368,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
* succeeds only if all expandable items are expanded.
*
* @param startItemId
- * @return True iff the expand operation succeeded
+ * @return True if the expand operation succeeded
*/
public boolean expandItemsRecursively(Object startItemId) {
@@ -397,7 +397,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
*
* @param itemId
* the item id.
- * @return True iff the collapse operation succeeded
+ * @return True if the collapse operation succeeded
*/
public boolean collapseItem(Object itemId) {
@@ -421,7 +421,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
* succeeds only if all expandable items are collapsed.
*
* @param startItemId
- * @return True iff the collapse operation succeeded
+ * @return True if the collapse operation succeeded
*/
public boolean collapseItemsRecursively(Object startItemId) {
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/DetailsConnectorChange.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/DetailsConnectorChange.java
index ff274ca432..877a558563 100644
--- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/DetailsConnectorChange.java
+++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/DetailsConnectorChange.java
@@ -168,7 +168,7 @@ public class DetailsConnectorChange implements Serializable {
* Checks whether whether the details should remain open, even if connector
* might be <code>null</code>.
*
- * @return <code>true</code> iff the details should remain open, even if
+ * @return <code>true</code> if the details should remain open, even if
* connector might be <code>null</code>
*/
public boolean isShouldStillBeVisible() {
@@ -180,7 +180,7 @@ public class DetailsConnectorChange implements Serializable {
* <code>null</code>.
*
* @param shouldStillBeVisible
- * <code>true</code> iff the details should remain open, even if
+ * <code>true</code> if the details should remain open, even if
* connector might be <code>null</code>
*/
public void setShouldStillBeVisible(boolean shouldStillBeVisible) {
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/EditorClientRpc.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/EditorClientRpc.java
index 72c7c83af6..d4e89c874f 100644
--- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/EditorClientRpc.java
+++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/EditorClientRpc.java
@@ -48,7 +48,7 @@ public interface EditorClientRpc extends ClientRpc {
* the client.
*
* @param bindSucceeded
- * <code>true</code> iff the bind action was successful
+ * <code>true</code> if the bind action was successful
*/
void confirmBind(boolean bindSucceeded);
@@ -57,7 +57,7 @@ public interface EditorClientRpc extends ClientRpc {
* the client.
*
* @param saveSucceeded
- * <code>true</code> iff the save action was successful
+ * <code>true</code> if the save action was successful
* @param errorMessage
* the error message to show the user
* @param errorColumnsIds
diff --git a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java
index 9105c85732..ccefc56af5 100644
--- a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java
@@ -60,7 +60,7 @@ public interface AcceptCriterion extends Serializable {
public void paint(PaintTarget target) throws PaintException;
/**
- * This needs to be implemented iff criterion does some lazy server side
+ * This needs to be implemented if and only if a criterion does some lazy server side
* initialization. The UIDL painted in this method will be passed to client
* side drop handler implementation. Implementation can assume that
* {@link #accept(DragAndDropEvent)} is called before this method.
diff --git a/server/src/main/java/com/vaadin/ui/Grid.java b/server/src/main/java/com/vaadin/ui/Grid.java
index ec8075c02a..ba23c92d8a 100644
--- a/server/src/main/java/com/vaadin/ui/Grid.java
+++ b/server/src/main/java/com/vaadin/ui/Grid.java
@@ -513,7 +513,7 @@ public class Grid<T> extends AbstractListing<T> implements HasComponents,
* <code>true</code> if the column was hidden,
* <code>false</code> if it became visible
* @param isUserOriginated
- * <code>true</code> iff the event was triggered by an UI
+ * <code>true</code> if the event was triggered by an UI
* interaction
*/
public ColumnVisibilityChangeEvent(Grid<?> source, Column<?, ?> column,
@@ -1726,7 +1726,7 @@ public class Grid<T> extends AbstractListing<T> implements HasComponents,
*
* @since 7.5.0
* @param hidable
- * <code>true</code> iff the column may be hidable by the
+ * <code>true</code> if the column may be hidable by the
* user via UI interaction
* @return this column
*/
diff --git a/shared/src/main/java/com/vaadin/shared/Range.java b/shared/src/main/java/com/vaadin/shared/Range.java
index 3f670ca28c..042cc527a0 100644
--- a/shared/src/main/java/com/vaadin/shared/Range.java
+++ b/shared/src/main/java/com/vaadin/shared/Range.java
@@ -141,7 +141,7 @@ public final class Range implements Serializable {
/**
* Checks whether the range has no elements between the start and end.
*
- * @return <code>true</code> iff the range contains no elements.
+ * @return <code>true</code> if the range contains no elements.
*/
public boolean isEmpty() {
return getStart() >= getEnd();
@@ -164,7 +164,7 @@ public final class Range implements Serializable {
*
* @param integer
* an integer to test for presence in this range
- * @return <code>true</code> iff <code>integer</code> is in this range
+ * @return <code>true</code> if <code>integer</code> is in this range
*/
public boolean contains(final int integer) {
return getStart() <= integer && integer < getEnd();
@@ -173,7 +173,7 @@ public final class Range implements Serializable {
/**
* Checks whether this range is a subset of another range.
*
- * @return <code>true</code> iff <code>other</code> completely wraps this
+ * @return <code>true</code> if <code>other</code> completely wraps this
* range
*/
public boolean isSubsetOf(final Range other) {
@@ -267,7 +267,7 @@ public final class Range implements Serializable {
*
* @param other
* the other range to compare against
- * @return <code>true</code> iff this range starts before the
+ * @return <code>true</code> if this range starts before the
* <code>other</code>
*/
public boolean startsBefore(final Range other) {
@@ -279,7 +279,7 @@ public final class Range implements Serializable {
*
* @param other
* the other range to compare against
- * @return <code>true</code> iff this range ends before the
+ * @return <code>true</code> if this range ends before the
* <code>other</code>
*/
public boolean endsBefore(final Range other) {
@@ -291,7 +291,7 @@ public final class Range implements Serializable {
*
* @param other
* the other range to compare against
- * @return <code>true</code> iff this range ends after the
+ * @return <code>true</code> if this range ends after the
* <code>other</code>
*/
public boolean endsAfter(final Range other) {
@@ -303,7 +303,7 @@ public final class Range implements Serializable {
*
* @param other
* the other range to compare against
- * @return <code>true</code> iff this range starts after the
+ * @return <code>true</code> if this range starts after the
* <code>other</code>
*/
public boolean startsAfter(final Range other) {
diff --git a/testbench-api/src/main/java/com/vaadin/testbench/elements/GridElement.java b/testbench-api/src/main/java/com/vaadin/testbench/elements/GridElement.java
index 8dbe10d983..9530f07de3 100644
--- a/testbench-api/src/main/java/com/vaadin/testbench/elements/GridElement.java
+++ b/testbench-api/src/main/java/com/vaadin/testbench/elements/GridElement.java
@@ -113,7 +113,7 @@ public class GridElement extends AbstractComponentElement {
*
* @param colIndex
* column index
- * @return <code>true</code> iff the field is marked with an error
+ * @return <code>true</code> if the field is marked with an error
*/
public boolean isFieldErrorMarked(int colIndex) {
return getField(colIndex).getAttribute("class").contains("error");