aboutsummaryrefslogtreecommitdiffstats
path: root/server/src/main/java
diff options
context:
space:
mode:
authorAhmed Ashour <asashour@yahoo.com>2017-10-04 10:29:34 +0200
committerHenri Sara <henri.sara@gmail.com>2017-10-04 11:29:34 +0300
commit83f5e593f66d36d99b22298e8023afd3c31a6122 (patch)
treef17f2a455cd928e3867f58274df68b4014da781d /server/src/main/java
parentf265739578783ca08b7829ba030a38574b3ed4a7 (diff)
downloadvaadin-framework-83f5e593f66d36d99b22298e8023afd3c31a6122.tar.gz
vaadin-framework-83f5e593f66d36d99b22298e8023afd3c31a6122.zip
Fix typos (#10124)
Diffstat (limited to 'server/src/main/java')
-rw-r--r--server/src/main/java/com/vaadin/data/Binder.java11
-rw-r--r--server/src/main/java/com/vaadin/event/MouseEvents.java8
-rw-r--r--server/src/main/java/com/vaadin/server/SessionExpiredHandler.java6
-rw-r--r--server/src/main/java/com/vaadin/server/VaadinService.java4
-rw-r--r--server/src/main/java/com/vaadin/ui/Button.java8
-rw-r--r--server/src/main/java/com/vaadin/ui/Upload.java4
-rw-r--r--server/src/main/java/com/vaadin/util/TimeZoneUtil.java4
7 files changed, 24 insertions, 21 deletions
diff --git a/server/src/main/java/com/vaadin/data/Binder.java b/server/src/main/java/com/vaadin/data/Binder.java
index 2d1f685181..7a2ed319c9 100644
--- a/server/src/main/java/com/vaadin/data/Binder.java
+++ b/server/src/main/java/com/vaadin/data/Binder.java
@@ -423,9 +423,11 @@ public class Binder<BEAN> implements Serializable {
TARGET nullRepresentation) {
return withConverter(
fieldValue -> Objects.equals(fieldValue, nullRepresentation)
- ? null : fieldValue,
+ ? null
+ : fieldValue,
modelValue -> Objects.isNull(modelValue)
- ? nullRepresentation : modelValue);
+ ? nullRepresentation
+ : modelValue);
}
/**
@@ -1516,7 +1518,7 @@ public class Binder<BEAN> implements Serializable {
restoreBeanState(bean, oldValues);
} else if (getBean() == null || bean.equals(getBean())) {
/*
- * Changes have been succesfully saved. The set is only cleared
+ * Changes have been successfully saved. The set is only cleared
* if using readBean/writeBean or when the changes are stored in
* the currently set bean.
*
@@ -2158,7 +2160,8 @@ public class Binder<BEAN> implements Serializable {
Converter<FIELDVALUE, FIELDVALUE> nullRepresentationConverter = Converter
.from(fieldValue -> fieldValue,
modelValue -> Objects.isNull(modelValue)
- ? field.getEmptyValue() : modelValue,
+ ? field.getEmptyValue()
+ : modelValue,
exception -> exception.getMessage());
ConverterDelegate<FIELDVALUE> converter = new ConverterDelegate<>(
nullRepresentationConverter);
diff --git a/server/src/main/java/com/vaadin/event/MouseEvents.java b/server/src/main/java/com/vaadin/event/MouseEvents.java
index 34456f2498..b4b25b9683 100644
--- a/server/src/main/java/com/vaadin/event/MouseEvents.java
+++ b/server/src/main/java/com/vaadin/event/MouseEvents.java
@@ -134,7 +134,7 @@ public interface MouseEvents {
/**
* Checks if the Alt key was down when the mouse event took place.
*
- * @return true if Alt was down when the event occured, false otherwise
+ * @return true if Alt was down when the event occurred, false otherwise
*/
public boolean isAltKey() {
return details.isAltKey();
@@ -143,7 +143,7 @@ public interface MouseEvents {
/**
* Checks if the Ctrl key was down when the mouse event took place.
*
- * @return true if Ctrl was pressed when the event occured, false
+ * @return true if Ctrl was pressed when the event occurred, false
* otherwise
*/
public boolean isCtrlKey() {
@@ -153,7 +153,7 @@ public interface MouseEvents {
/**
* Checks if the Meta key was down when the mouse event took place.
*
- * @return true if Meta was pressed when the event occured, false
+ * @return true if Meta was pressed when the event occurred, false
* otherwise
*/
public boolean isMetaKey() {
@@ -163,7 +163,7 @@ public interface MouseEvents {
/**
* Checks if the Shift key was down when the mouse event took place.
*
- * @return true if Shift was pressed when the event occured, false
+ * @return true if Shift was pressed when the event occurred, false
* otherwise
*/
public boolean isShiftKey() {
diff --git a/server/src/main/java/com/vaadin/server/SessionExpiredHandler.java b/server/src/main/java/com/vaadin/server/SessionExpiredHandler.java
index 5d8c2e13b8..cb0b4cdbc3 100644
--- a/server/src/main/java/com/vaadin/server/SessionExpiredHandler.java
+++ b/server/src/main/java/com/vaadin/server/SessionExpiredHandler.java
@@ -27,9 +27,9 @@ import java.io.IOException;
public interface SessionExpiredHandler extends RequestHandler {
/**
- * Called when the a session expiration has occured and a notification needs
- * to be sent to the user. If a response is written, this method should
- * return <code>true</code> to indicate that no more
+ * Called when the a session expiration has occurred and a notification
+ * needs to be sent to the user. If a response is written, this method
+ * should return <code>true</code> to indicate that no more
* {@link SessionExpiredHandler} handlers should be invoked for the request.
*
* @param request
diff --git a/server/src/main/java/com/vaadin/server/VaadinService.java b/server/src/main/java/com/vaadin/server/VaadinService.java
index b65ae5ad9d..d086b68a12 100644
--- a/server/src/main/java/com/vaadin/server/VaadinService.java
+++ b/server/src/main/java/com/vaadin/server/VaadinService.java
@@ -1629,7 +1629,7 @@ public abstract class VaadinService implements Serializable {
ci.getInternalErrorMessage(), null,
ci.getInternalErrorURL()));
} catch (IOException e) {
- // An exception occured while writing the response. Log
+ // An exception occurred while writing the response. Log
// it and continue handling only the original error.
getLogger().log(Level.WARNING,
"Failed to write critical notification response to the client",
@@ -1657,7 +1657,7 @@ public abstract class VaadinService implements Serializable {
* @param reponseString
* The actual response
* @throws IOException
- * If an error occured while writing the response
+ * If an error occurred while writing the response
*/
public void writeStringResponse(VaadinResponse response, String contentType,
String reponseString) throws IOException {
diff --git a/server/src/main/java/com/vaadin/ui/Button.java b/server/src/main/java/com/vaadin/ui/Button.java
index e235097251..c759a3a440 100644
--- a/server/src/main/java/com/vaadin/ui/Button.java
+++ b/server/src/main/java/com/vaadin/ui/Button.java
@@ -241,7 +241,7 @@ public class Button extends AbstractFocusable
/**
* Checks if the Alt key was down when the mouse event took place.
*
- * @return true if Alt was down when the event occured, false otherwise
+ * @return true if Alt was down when the event occurred, false otherwise
* or if unknown
*/
public boolean isAltKey() {
@@ -255,7 +255,7 @@ public class Button extends AbstractFocusable
/**
* Checks if the Ctrl key was down when the mouse event took place.
*
- * @return true if Ctrl was pressed when the event occured, false
+ * @return true if Ctrl was pressed when the event occurred, false
* otherwise or if unknown
*/
public boolean isCtrlKey() {
@@ -269,7 +269,7 @@ public class Button extends AbstractFocusable
/**
* Checks if the Meta key was down when the mouse event took place.
*
- * @return true if Meta was pressed when the event occured, false
+ * @return true if Meta was pressed when the event occurred, false
* otherwise or if unknown
*/
public boolean isMetaKey() {
@@ -283,7 +283,7 @@ public class Button extends AbstractFocusable
/**
* Checks if the Shift key was down when the mouse event took place.
*
- * @return true if Shift was pressed when the event occured, false
+ * @return true if Shift was pressed when the event occurred, false
* otherwise or if unknown
*/
public boolean isShiftKey() {
diff --git a/server/src/main/java/com/vaadin/ui/Upload.java b/server/src/main/java/com/vaadin/ui/Upload.java
index a23e273e09..9096d8bc40 100644
--- a/server/src/main/java/com/vaadin/ui/Upload.java
+++ b/server/src/main/java/com/vaadin/ui/Upload.java
@@ -605,10 +605,10 @@ public class Upload extends AbstractComponent
public interface SucceededListener extends Serializable {
/**
- * Upload successfull..
+ * Upload successful.
*
* @param event
- * the Upload successfull event.
+ * the Upload successful event.
*/
public void uploadSucceeded(SucceededEvent event);
}
diff --git a/server/src/main/java/com/vaadin/util/TimeZoneUtil.java b/server/src/main/java/com/vaadin/util/TimeZoneUtil.java
index ec3d28e730..c3c25b21e4 100644
--- a/server/src/main/java/com/vaadin/util/TimeZoneUtil.java
+++ b/server/src/main/java/com/vaadin/util/TimeZoneUtil.java
@@ -93,11 +93,11 @@ public final class TimeZoneUtil implements Serializable {
if (i.toLocalDate().getYear() != year) {
break;
}
- long epocHours = Duration
+ long epochHours = Duration
.ofSeconds(t.getInstant().getEpochSecond())
.toHours();
long duration = Math.max(t.getDuration().toMinutes(), 0);
- transitionsList.add(epocHours);
+ transitionsList.add(epochHours);
transitionsList.add(duration);
}
}