summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSun Zhe <31067185+ZheSun88@users.noreply.github.com>2018-10-09 15:50:45 +0300
committerGitHub <noreply@github.com>2018-10-09 15:50:45 +0300
commit2c59809dd2ab8a607b032a5278ca63330988ef0d (patch)
treecb1a6970f37e9a91e558889fae82b3fdefabd3f7
parent68fef02ce461427b9796bd16f7205eaf91fa4537 (diff)
downloadvaadin-framework-2c59809dd2ab8a607b032a5278ca63330988ef0d.tar.gz
vaadin-framework-2c59809dd2ab8a607b032a5278ca63330988ef0d.zip
Run formatter to the code (#11227)
-rw-r--r--client/src/main/java/com/vaadin/client/ui/VComboBox.java4
-rw-r--r--server/src/main/java/com/vaadin/server/ErrorHandlingRunnable.java2
-rw-r--r--server/src/main/java/com/vaadin/ui/Grid.java4
-rw-r--r--server/src/main/java/com/vaadin/ui/UI.java14
-rw-r--r--shared/src/main/java/com/vaadin/osgi/resources/impl/VaadinResourceTrackerComponent.java13
5 files changed, 20 insertions, 17 deletions
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 2575f056b9..a8ab05770e 100644
--- a/client/src/main/java/com/vaadin/client/ui/VComboBox.java
+++ b/client/src/main/java/com/vaadin/client/ui/VComboBox.java
@@ -257,12 +257,12 @@ public class VComboBox extends Composite implements Field, KeyDownHandler,
return $entry(function(e) {
var deltaX = e.deltaX ? e.deltaX : -0.5*e.wheelDeltaX;
var deltaY = e.deltaY ? e.deltaY : -0.5*e.wheelDeltaY;
-
+
// IE8 has only delta y
if (isNaN(deltaY)) {
deltaY = -0.5*e.wheelDelta;
}
-
+
@com.vaadin.client.ui.VComboBox.JsniUtil::moveScrollFromEvent(*)(widget, deltaX, deltaY, e, e.deltaMode);
});
}-*/;
diff --git a/server/src/main/java/com/vaadin/server/ErrorHandlingRunnable.java b/server/src/main/java/com/vaadin/server/ErrorHandlingRunnable.java
index a74c31c389..f35e5eca5b 100644
--- a/server/src/main/java/com/vaadin/server/ErrorHandlingRunnable.java
+++ b/server/src/main/java/com/vaadin/server/ErrorHandlingRunnable.java
@@ -46,7 +46,7 @@ public interface ErrorHandlingRunnable extends Runnable, Serializable {
* returned. If the runnable does not extend {@link ErrorHandlingRunnable},
* then the original exception is returned.
*
- * @since
+ * @since
* @param runnable
* the runnable for which the exception should be processed, not
* <code>null</code>
diff --git a/server/src/main/java/com/vaadin/ui/Grid.java b/server/src/main/java/com/vaadin/ui/Grid.java
index 1b824cf53f..579256d091 100644
--- a/server/src/main/java/com/vaadin/ui/Grid.java
+++ b/server/src/main/java/com/vaadin/ui/Grid.java
@@ -3010,8 +3010,8 @@ public class Grid<T> extends AbstractListing<T> implements HasComponents,
/**
* Gets a {@link Column} of this grid by its identifying string.
*
- * When you use the Grid constructor with bean class, the columns are
- * initialised with columnId being the property name.
+ * When you use the Grid constructor with bean class, the columns are
+ * initialised with columnId being the property name.
*
* @see Column#setId(String)
*
diff --git a/server/src/main/java/com/vaadin/ui/UI.java b/server/src/main/java/com/vaadin/ui/UI.java
index 181382603d..cf9aee4e1a 100644
--- a/server/src/main/java/com/vaadin/ui/UI.java
+++ b/server/src/main/java/com/vaadin/ui/UI.java
@@ -230,8 +230,8 @@ public abstract class UI extends AbstractSingleComponentContainer
}
json.append("]}");
getRpcProxy(DebugWindowClientRpc.class)
- .reportLayoutProblems(json.toString());
-}
+ .reportLayoutProblems(json.toString());
+ }
@Override
public void showServerDesign(Connector connector) {
@@ -1581,10 +1581,10 @@ public abstract class UI extends AbstractSingleComponentContainer
"access() task ignored because UI got detached after the task was enqueued."
+ " To suppress this message, change the task to implement {} and make it handle {}."
+ " Affected task: {}",
- new Object[] {
- ErrorHandlingRunnable.class.getName(),
- UIDetachedException.class.getName(),
- runnable });
+ new Object[] {
+ ErrorHandlingRunnable.class.getName(),
+ UIDetachedException.class.getName(),
+ runnable });
} else if (exception != null) {
/*
* If no ErrorHandlingRunnable, or if it threw an
@@ -1727,7 +1727,7 @@ public abstract class UI extends AbstractSingleComponentContainer
// If pushMode is disabled then there should never be a pushConnection;
// if enabled there should always be
assert (pushConnection == null)
- ^ getPushConfiguration().getPushMode().isEnabled();
+ ^ getPushConfiguration().getPushMode().isEnabled();
if (pushConnection == this.pushConnection) {
return;
diff --git a/shared/src/main/java/com/vaadin/osgi/resources/impl/VaadinResourceTrackerComponent.java b/shared/src/main/java/com/vaadin/osgi/resources/impl/VaadinResourceTrackerComponent.java
index b05223052e..932de4e787 100644
--- a/shared/src/main/java/com/vaadin/osgi/resources/impl/VaadinResourceTrackerComponent.java
+++ b/shared/src/main/java/com/vaadin/osgi/resources/impl/VaadinResourceTrackerComponent.java
@@ -204,9 +204,10 @@ public class VaadinResourceTrackerComponent {
*/
@Activate
protected void activate() throws NamespaceException {
- for(Delegate registration : resourceToRegistration.values()) {
+ for (Delegate registration : resourceToRegistration.values()) {
registration.init(httpService);
- httpService.registerResources(registration.alias, registration.path, registration);
+ httpService.registerResources(registration.alias, registration.path,
+ registration);
}
}
@@ -215,10 +216,11 @@ public class VaadinResourceTrackerComponent {
*/
@Deactivate
protected void deactivate() {
- for(final Delegate registration : resourceToRegistration.values()) {
+ for (final Delegate registration : resourceToRegistration.values()) {
unregisterResource(registration);
}
- for(List<ServiceRegistration<? extends OsgiVaadinResource>> registrations : contributorToRegistrations.values()) {
+ for (List<ServiceRegistration<? extends OsgiVaadinResource>> registrations : contributorToRegistrations
+ .values()) {
for (ServiceRegistration<? extends OsgiVaadinResource> reg : registrations) {
reg.unregister();
}
@@ -263,7 +265,8 @@ public class VaadinResourceTrackerComponent {
private void registerResource(String alias, String path, Bundle bundle,
Long serviceId) {
- resourceToRegistration.put(serviceId, new Delegate(alias, path, bundle));
+ resourceToRegistration.put(serviceId,
+ new Delegate(alias, path, bundle));
}
private void unregisterResource(Long serviceId) {