summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorAhmed Ashour <asashour@yahoo.com>2017-09-27 12:44:25 +0200
committerHenri Sara <henri.sara@gmail.com>2017-09-27 13:44:25 +0300
commit9e6490d32a024333032b080efc7ba2d815c6eeed (patch)
tree39c3727bd3e5349d3a5967c4a645e8f395e5e69e /client
parent9f9efe0058397992fda43e104c90b79039d41c0f (diff)
downloadvaadin-framework-9e6490d32a024333032b080efc7ba2d815c6eeed.tar.gz
vaadin-framework-9e6490d32a024333032b080efc7ba2d815c6eeed.zip
Fix typos (#10095)
Diffstat (limited to 'client')
-rw-r--r--client/src/main/java/com/vaadin/client/ui/AbstractComponentConnector.java12
-rw-r--r--client/src/main/java/com/vaadin/client/ui/VComboBox.java21
-rw-r--r--client/src/main/java/com/vaadin/client/ui/VPanel.java2
-rw-r--r--client/src/main/java/com/vaadin/client/widgets/Overlay.java2
4 files changed, 21 insertions, 16 deletions
diff --git a/client/src/main/java/com/vaadin/client/ui/AbstractComponentConnector.java b/client/src/main/java/com/vaadin/client/ui/AbstractComponentConnector.java
index d3b595b55a..14aa93893a 100644
--- a/client/src/main/java/com/vaadin/client/ui/AbstractComponentConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/AbstractComponentConnector.java
@@ -142,11 +142,11 @@ public abstract class AbstractComponentConnector extends AbstractConnector
}
/**
- * The new default behaviour is for long taps to fire a contextclick event
- * if there's a contextclick listener attached to the component.
+ * The new default behavior is for long taps to fire a contextclick event if
+ * there's a contextclick listener attached to the component.
*
* If you do not want this in your component, override this with a blank
- * method to get rid of said behaviour.
+ * method to get rid of said behavior.
*
* @since 7.6
*/
@@ -166,11 +166,11 @@ public abstract class AbstractComponentConnector extends AbstractConnector
}
/**
- * The new default behaviour is for long taps to fire a contextclick event
- * if there's a contextclick listener attached to the component.
+ * The new default behavior is for long taps to fire a contextclick event if
+ * there's a contextclick listener attached to the component.
*
* If you do not want this in your component, override this with a blank
- * method to get rid of said behaviour.
+ * method to get rid of said behavior.
*
* Some Vaadin Components already handle the long tap as a context menu.
* This method is unnecessary for those.
diff --git a/client/src/main/java/com/vaadin/client/ui/VComboBox.java b/client/src/main/java/com/vaadin/client/ui/VComboBox.java
index c872026ac7..9ae8115d8b 100644
--- a/client/src/main/java/com/vaadin/client/ui/VComboBox.java
+++ b/client/src/main/java/com/vaadin/client/ui/VComboBox.java
@@ -236,8 +236,10 @@ public class VComboBox extends Composite implements Field, KeyDownHandler,
int result = 1;
result = prime * result + VComboBox.this.hashCode();
result = prime * result + ((key == null) ? 0 : key.hashCode());
- result = prime * result + ((caption == null) ? 0 : caption.hashCode());
- result = prime * result + ((untranslatedIconUri == null) ? 0 : untranslatedIconUri.hashCode());
+ result = prime * result
+ + ((caption == null) ? 0 : caption.hashCode());
+ result = prime * result + ((untranslatedIconUri == null) ? 0
+ : untranslatedIconUri.hashCode());
result = prime * result + ((style == null) ? 0 : style.hashCode());
return result;
}
@@ -678,7 +680,7 @@ public class VComboBox extends Composite implements Field, KeyDownHandler,
/*
* Prevent the keyboard focus from leaving the textfield by
- * preventing the default behaviour of the browser. Fixes #4285.
+ * preventing the default behavior of the browser. Fixes #4285.
*/
handleMouseDownEvent(event);
}
@@ -1262,7 +1264,8 @@ public class VComboBox extends Composite implements Field, KeyDownHandler,
int getItemOffsetHeight() {
List<MenuItem> items = getItems();
return items != null && items.size() > 0
- ? items.get(0).getOffsetHeight() : 0;
+ ? items.get(0).getOffsetHeight()
+ : 0;
}
/*
@@ -1271,7 +1274,8 @@ public class VComboBox extends Composite implements Field, KeyDownHandler,
int getItemOffsetWidth() {
List<MenuItem> items = getItems();
return items != null && items.size() > 0
- ? items.get(0).getOffsetWidth() : 0;
+ ? items.get(0).getOffsetWidth()
+ : 0;
}
/**
@@ -1300,7 +1304,8 @@ public class VComboBox extends Composite implements Field, KeyDownHandler,
// first check if there is a key match to handle items with
// identical captions
String currentKey = currentSuggestion != null
- ? currentSuggestion.getOptionKey() : "";
+ ? currentSuggestion.getOptionKey()
+ : "";
for (int i = 0; i < p; i++) {
final MenuItem potentialExactMatch = getItems().get(i);
if (currentKey.equals(getSuggestionKey(potentialExactMatch))
@@ -1381,7 +1386,7 @@ public class VComboBox extends Composite implements Field, KeyDownHandler,
} else {
/*
* Setting the selectionrange for an uneditable textbox leads to
- * unwanted behaviour when the width of the textbox is narrower
+ * unwanted behavior when the width of the textbox is narrower
* than the width of the entry: the end of the entry is shown
* instead of the beginning. (see #13477)
*
@@ -2671,7 +2676,7 @@ public class VComboBox extends Composite implements Field, KeyDownHandler,
private void handleMouseDownEvent(Event event) {
/*
* Prevent the keyboard focus from leaving the textfield by preventing
- * the default behaviour of the browser. Fixes #4285.
+ * the default behavior of the browser. Fixes #4285.
*/
if (event.getTypeInt() == Event.ONMOUSEDOWN) {
debug("VComboBox: blocking mouseDown event to avoid blur");
diff --git a/client/src/main/java/com/vaadin/client/ui/VPanel.java b/client/src/main/java/com/vaadin/client/ui/VPanel.java
index bf41ef1f9e..b930d54336 100644
--- a/client/src/main/java/com/vaadin/client/ui/VPanel.java
+++ b/client/src/main/java/com/vaadin/client/ui/VPanel.java
@@ -80,7 +80,7 @@ public class VPanel extends SimplePanel implements ShortcutActionHandlerOwner,
/*
* Make contentNode focusable only by using the setFocus() method. This
- * behaviour can be changed by invoking setTabIndex() in the serverside
+ * behavior can be changed by invoking setTabIndex() in the serverside
* implementation
*/
contentNode.setTabIndex(-1);
diff --git a/client/src/main/java/com/vaadin/client/widgets/Overlay.java b/client/src/main/java/com/vaadin/client/widgets/Overlay.java
index 78d73dd398..073b5c24d2 100644
--- a/client/src/main/java/com/vaadin/client/widgets/Overlay.java
+++ b/client/src/main/java/com/vaadin/client/widgets/Overlay.java
@@ -509,7 +509,7 @@ public class Overlay extends PopupPanel {
// Calculate proper z-index
int zIndex = -1;
try {
- // Odd behaviour with Windows Hosted Mode forces us to use
+ // Odd behavior with Windows Hosted Mode forces us to use
// this redundant try/catch block (See dev.vaadin.com #2011)
zIndex = Integer.parseInt(getElement().getStyle().getZIndex());
} catch (Exception ignore) {