summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAhmed Ashour <asashour@yahoo.com>2017-09-25 06:54:30 +0200
committerHenri Sara <henri.sara@gmail.com>2017-09-25 07:54:30 +0300
commit3c0c3e0a997f66821d037df641c435dda930a890 (patch)
tree152afe8c3340dafaa50562f1a21a3b2325583639
parent40d15b32e341a38dacc24cc3ec79ab3ff0a25a50 (diff)
downloadvaadin-framework-3c0c3e0a997f66821d037df641c435dda930a890.tar.gz
vaadin-framework-3c0c3e0a997f66821d037df641c435dda930a890.zip
Fix typos (#10071)
And use varargs in a test.
-rw-r--r--client/src/main/java/com/vaadin/client/ui/VAbstractCalendarPanel.java4
-rw-r--r--client/src/main/java/com/vaadin/client/widgets/Overlay.java2
-rw-r--r--compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendarPanel.java2
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java2
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java2
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/ui/Upload.java2
-rw-r--r--compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemTest.java2
-rw-r--r--compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQueryTest.java2
-rw-r--r--server/src/main/java/com/vaadin/server/FileDownloader.java2
-rw-r--r--server/src/main/java/com/vaadin/ui/Upload.java9
-rw-r--r--uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java4
11 files changed, 17 insertions, 16 deletions
diff --git a/client/src/main/java/com/vaadin/client/ui/VAbstractCalendarPanel.java b/client/src/main/java/com/vaadin/client/ui/VAbstractCalendarPanel.java
index f503c4689a..b1e5843125 100644
--- a/client/src/main/java/com/vaadin/client/ui/VAbstractCalendarPanel.java
+++ b/client/src/main/java/com/vaadin/client/ui/VAbstractCalendarPanel.java
@@ -903,7 +903,7 @@ public abstract class VAbstractCalendarPanel<R extends Enum<R>>
* Performs the rendering required by the {@link #renderCalendar(boolean)}.
* Subclasses may override this method to provide a custom implementation
* avoiding {@link #renderCalendar(boolean)} override. The latter method
- * contains a common logic which should not be overriden.
+ * contains a common logic which should not be overridden.
*
* @param updateDate
* The value false prevents setting the selected date of the
@@ -1485,7 +1485,7 @@ public abstract class VAbstractCalendarPanel<R extends Enum<R>>
/**
* Returns the reset key which will reset the calendar to the previous
- * selection. By default this is backspace but it can be overriden to change
+ * selection. By default this is backspace but it can be overridden to change
* the key to whatever you want.
*
* @return
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 86758e3173..78d73dd398 100644
--- a/client/src/main/java/com/vaadin/client/widgets/Overlay.java
+++ b/client/src/main/java/com/vaadin/client/widgets/Overlay.java
@@ -552,7 +552,7 @@ public class Overlay extends PopupPanel {
/**
* Returns true if we should add a shim iframe below the overlay to deal
- * with zindex issues with PDFs and applets. Can be overriden to disable
+ * with zindex issues with PDFs and applets. Can be overridden to disable
* shim iframes if they are not needed.
*
* @return true if a shim iframe should be added, false otherwise
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendarPanel.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendarPanel.java
index 21229dcb84..2c2841042d 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendarPanel.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendarPanel.java
@@ -1404,7 +1404,7 @@ public class VCalendarPanel extends FocusableFlexTable implements
/**
* Returns the reset key which will reset the calendar to the previous
- * selection. By default this is backspace but it can be overriden to change
+ * selection. By default this is backspace but it can be overridden to change
* the key to whatever you want.
*
* @return
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java
index eddd57888b..eada1aa02b 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java
@@ -628,7 +628,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
/**
* Gets the visible item ids. In Select, this returns list of all item ids,
- * but can be overriden in subclasses if they paint only part of the items
+ * but can be overridden in subclasses if they paint only part of the items
* to the terminal or null if no items is visible.
*/
public Collection<?> getVisibleItemIds() {
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 0dc1772f65..cba3dd45da 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
@@ -1432,7 +1432,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
public abstract String getStyle(Tree source, Object itemId);
}
- // Overriden so javadoc comes from Container.Hierarchical
+ // Overridden so javadoc comes from Container.Hierarchical
@Override
public boolean removeItem(Object itemId)
throws UnsupportedOperationException {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Upload.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Upload.java
index 0eeea4ac53..6ded53b3a1 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Upload.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Upload.java
@@ -194,7 +194,7 @@ public class Upload extends AbstractLegacyComponent
target.addAttribute("nextid", nextid);
- // Post file to this strean variable
+ // Post file to this stream variable
target.addVariable(this, "action", getStreamVariable());
}
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemTest.java
index a9eb3d740b..8232f9d532 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemTest.java
@@ -373,7 +373,7 @@ public class BeanItemTest {
}
@Test
- public void testOverridenGenericMethods() {
+ public void testOverriddenGenericMethods() {
BeanItem<SubClass> item = new BeanItem<SubClass>(new SubClass());
Property<?> property = item.getItemProperty("property");
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQueryTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQueryTest.java
index b32f16325d..04d357c71c 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQueryTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQueryTest.java
@@ -137,7 +137,7 @@ public class FreeformQueryTest {
public void getCount_moreComplexQuery_returnsThree() throws SQLException {
FreeformQuery query = new FreeformQuery(
"SELECT * FROM people WHERE \"NAME\" LIKE '%lle'",
- connectionPool, new String[] { "ID" });
+ connectionPool, "ID");
Assert.assertEquals(3, query.getCount());
}
diff --git a/server/src/main/java/com/vaadin/server/FileDownloader.java b/server/src/main/java/com/vaadin/server/FileDownloader.java
index 684e12dc6e..7ed2eb8bce 100644
--- a/server/src/main/java/com/vaadin/server/FileDownloader.java
+++ b/server/src/main/java/com/vaadin/server/FileDownloader.java
@@ -92,7 +92,7 @@ public class FileDownloader extends AbstractExtension {
}
/**
- * Sets whether the content type of served resources should be overriden to
+ * Sets whether the content type of served resources should be overridden to
* <code>application/octet-stream</code> to reduce the risk of a browser
* plugin choosing to display the resource instead of downloading it. This
* is by default set to <code>true</code>.
diff --git a/server/src/main/java/com/vaadin/ui/Upload.java b/server/src/main/java/com/vaadin/ui/Upload.java
index 4cd9ea7b82..6d689c61f4 100644
--- a/server/src/main/java/com/vaadin/ui/Upload.java
+++ b/server/src/main/java/com/vaadin/ui/Upload.java
@@ -193,7 +193,7 @@ public class Upload extends AbstractComponent
target.addAttribute("nextid", nextid);
- // Post file to this strean variable
+ // Post file to this stream variable
target.addVariable(this, "action", getStreamVariable());
}
@@ -1026,10 +1026,11 @@ public class Upload extends AbstractComponent
/**
* In addition to the actual file chooser, upload components have button
- * that starts actual upload progress. This method is used to set a stylename
- * to that button.
+ * that starts actual upload progress. This method is used to set a
+ * stylename to that button.
*
- * @param buttonStyleName styleName for upload components button.
+ * @param buttonStyleName
+ * styleName for upload components button.
* @see #setButtonCaption(String) about when the button is shown / hidden.
* @since 8.2
*/
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java
index 4bdd9fc0f1..e7a480a97f 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java
@@ -39,7 +39,7 @@ public class ValoDefaultCaptionWidthTest extends DefaultCaptionWidthTest {
int width = $(ColorPickerElement.class).first().getSize().getWidth();
// Make sure that implicit width is less than one that will be
// explicitly set by the test
- assertThat("Width of color picker is overriden by "
+ assertThat("Width of color picker is overridden by "
+ "default caption feature", width, is(lessThan(148)));
}
@@ -51,7 +51,7 @@ public class ValoDefaultCaptionWidthTest extends DefaultCaptionWidthTest {
// Width should be 150px but let's just check that it's not which is
// used when default caption is used and at least >= 150-1
assertThat(
- "Width of color picker is overriden by "
+ "Width of color picker is overridden by "
+ "default caption feature",
width, is(greaterThan(149)));
}