diff options
14 files changed, 30 insertions, 42 deletions
diff --git a/client/src/com/vaadin/client/communication/AtmospherePushConnection.java b/client/src/com/vaadin/client/communication/AtmospherePushConnection.java index d3321a41a7..ef5fc56347 100644 --- a/client/src/com/vaadin/client/communication/AtmospherePushConnection.java +++ b/client/src/com/vaadin/client/communication/AtmospherePushConnection.java @@ -246,8 +246,7 @@ public class AtmospherePushConnection implements PushConnection { * */ protected void onError() { - VConsole.error("Push connection using " - + getConfig().getTransport() + VConsole.error("Push connection using " + getConfig().getTransport() + " failed!"); } diff --git a/client/src/com/vaadin/client/ui/AbstractClickEventHandler.java b/client/src/com/vaadin/client/ui/AbstractClickEventHandler.java index 2f97d30ece..e91abe9663 100644 --- a/client/src/com/vaadin/client/ui/AbstractClickEventHandler.java +++ b/client/src/com/vaadin/client/ui/AbstractClickEventHandler.java @@ -78,9 +78,8 @@ public abstract class AbstractClickEventHandler implements MouseDownHandler, && elementUnderMouse == lastMouseDownTarget) { mouseUpPreviewMatched = true; } else { - VConsole.log("Ignoring mouseup from " - + elementUnderMouse + " when mousedown was on " - + lastMouseDownTarget); + VConsole.log("Ignoring mouseup from " + elementUnderMouse + + " when mousedown was on " + lastMouseDownTarget); } } } diff --git a/client/src/com/vaadin/client/ui/VNativeButton.java b/client/src/com/vaadin/client/ui/VNativeButton.java index 6e1c5bae77..71413a76e6 100644 --- a/client/src/com/vaadin/client/ui/VNativeButton.java +++ b/client/src/com/vaadin/client/ui/VNativeButton.java @@ -16,14 +16,9 @@ package com.vaadin.client.ui; -import com.google.gwt.core.client.Scheduler; -import com.google.gwt.core.client.Scheduler.ScheduledCommand; -import com.google.gwt.dom.client.Document; import com.google.gwt.dom.client.Element; -import com.google.gwt.dom.client.NativeEvent; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.event.dom.client.MouseEvent; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Event; import com.google.gwt.user.client.ui.Button; @@ -31,7 +26,6 @@ import com.vaadin.client.ApplicationConnection; import com.vaadin.client.BrowserInfo; import com.vaadin.client.MouseEventDetailsBuilder; import com.vaadin.client.Util; -import com.vaadin.client.VConsole; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.button.ButtonServerRpc; diff --git a/client/src/com/vaadin/client/ui/VWindow.java b/client/src/com/vaadin/client/ui/VWindow.java index 084ce522c1..0ed5bd57bd 100644 --- a/client/src/com/vaadin/client/ui/VWindow.java +++ b/client/src/com/vaadin/client/ui/VWindow.java @@ -571,7 +571,8 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, } } - public void updateMaximizeRestoreClassName(boolean visible, WindowMode windowMode) { + public void updateMaximizeRestoreClassName(boolean visible, + WindowMode windowMode) { String className; if (windowMode == WindowMode.MAXIMIZED) { className = CLASSNAME + "-restorebox"; diff --git a/server/src/com/vaadin/ui/DateField.java b/server/src/com/vaadin/ui/DateField.java index 08815f4592..5017fac993 100644 --- a/server/src/com/vaadin/ui/DateField.java +++ b/server/src/com/vaadin/ui/DateField.java @@ -19,10 +19,8 @@ package com.vaadin.ui; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Collection; -import java.util.Collections; import java.util.Date; import java.util.HashMap; -import java.util.List; import java.util.Locale; import java.util.Map; import java.util.TimeZone; diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java index 5cbd425ac6..0ad2787cb6 100644 --- a/server/src/com/vaadin/ui/UI.java +++ b/server/src/com/vaadin/ui/UI.java @@ -118,7 +118,8 @@ public abstract class UI extends AbstractSingleComponentContainer implements private Page page = new Page(this); - private LoadingIndicatorConfiguration loadingIndicatorConfiguration = new LoadingIndicatorConfigurationImpl(this); + private LoadingIndicatorConfiguration loadingIndicatorConfiguration = new LoadingIndicatorConfigurationImpl( + this); /** * Scroll Y position. @@ -167,7 +168,8 @@ public abstract class UI extends AbstractSingleComponentContainer implements private boolean closing = false; - private TooltipConfiguration tooltipConfiguration = new TooltipConfigurationImpl(this); + private TooltipConfiguration tooltipConfiguration = new TooltipConfigurationImpl( + this); /** * Creates a new empty UI without a caption. The content of the UI must be diff --git a/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java b/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java index d15d8de100..d56e0d27b3 100644 --- a/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java +++ b/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java @@ -15,7 +15,6 @@ */ package com.vaadin.shared.ui.datefield; - public class InlineDateFieldState extends TextualDateFieldState { { primaryStyleName = "v-inline-datefield"; diff --git a/theme-compiler/src/com/vaadin/sass/internal/resolver/VaadinResolver.java b/theme-compiler/src/com/vaadin/sass/internal/resolver/VaadinResolver.java index 25c7e04f99..2460c2ad2e 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/resolver/VaadinResolver.java +++ b/theme-compiler/src/com/vaadin/sass/internal/resolver/VaadinResolver.java @@ -36,7 +36,7 @@ public class VaadinResolver implements ScssStylesheetResolver { } InputSource source = null; - + // Can we find the scss from the file system? ScssStylesheetResolver resolver = new FilesystemResolver(); source = resolver.resolve(identifier); diff --git a/uitest/src/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java b/uitest/src/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java index 0d962309e4..3c857a8753 100644 --- a/uitest/src/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java +++ b/uitest/src/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java @@ -47,27 +47,24 @@ public class LoadingIndicatorConfigurationTest extends AbstractTestUIWithLog { }); secondDelay = createIntegerTextField("Second delay (ms)", getState().loadingIndicatorConfiguration.secondDelay); - secondDelay - .addValueChangeListener(new Property.ValueChangeListener() { - @Override - public void valueChange(ValueChangeEvent event) { - getLoadingIndicatorConfiguration().setSecondDelay( - (Integer) secondDelay.getConvertedValue()); - } - }); + secondDelay.addValueChangeListener(new Property.ValueChangeListener() { + @Override + public void valueChange(ValueChangeEvent event) { + getLoadingIndicatorConfiguration().setSecondDelay( + (Integer) secondDelay.getConvertedValue()); + } + }); thirdDelay = createIntegerTextField("Third delay (ms)", getState().loadingIndicatorConfiguration.thirdDelay); - thirdDelay - .addValueChangeListener(new Property.ValueChangeListener() { - @Override - public void valueChange(ValueChangeEvent event) { - getLoadingIndicatorConfiguration().setThirdDelay( - (Integer) thirdDelay.getConvertedValue()); - } - }); + thirdDelay.addValueChangeListener(new Property.ValueChangeListener() { + @Override + public void valueChange(ValueChangeEvent event) { + getLoadingIndicatorConfiguration().setThirdDelay( + (Integer) thirdDelay.getConvertedValue()); + } + }); - getLayout() - .addComponents(firstDelay, secondDelay, thirdDelay); + getLayout().addComponents(firstDelay, secondDelay, thirdDelay); HorizontalLayout hl = new HorizontalLayout(); hl.setMargin(true); diff --git a/uitest/src/com/vaadin/tests/components/ui/TooltipConfiguration.java b/uitest/src/com/vaadin/tests/components/ui/TooltipConfiguration.java index 2227e89256..4d201d2a1a 100644 --- a/uitest/src/com/vaadin/tests/components/ui/TooltipConfiguration.java +++ b/uitest/src/com/vaadin/tests/components/ui/TooltipConfiguration.java @@ -41,8 +41,8 @@ public class TooltipConfiguration extends AbstractTestUIWithLog { maxWidth.addValueChangeListener(new Property.ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { - getTooltipConfiguration() - .setMaxWidth((Integer) maxWidth.getConvertedValue()); + getTooltipConfiguration().setMaxWidth( + (Integer) maxWidth.getConvertedValue()); } }); openDelay = createIntegerTextField("Open delay", diff --git a/uitest/src/com/vaadin/tests/layouts/VerticalLayoutSlotExpansionAndAlignment.java b/uitest/src/com/vaadin/tests/layouts/VerticalLayoutSlotExpansionAndAlignment.java index bba8ccf120..fe2dd6cea8 100644 --- a/uitest/src/com/vaadin/tests/layouts/VerticalLayoutSlotExpansionAndAlignment.java +++ b/uitest/src/com/vaadin/tests/layouts/VerticalLayoutSlotExpansionAndAlignment.java @@ -1,6 +1,5 @@ package com.vaadin.tests.layouts; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Alignment; import com.vaadin.ui.HorizontalLayout; diff --git a/uitest/src/com/vaadin/tests/minitutorials/broadcastingmessages/Broadcaster.java b/uitest/src/com/vaadin/tests/minitutorials/broadcastingmessages/Broadcaster.java index e355cd1dbd..57ad0d97ba 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/broadcastingmessages/Broadcaster.java +++ b/uitest/src/com/vaadin/tests/minitutorials/broadcastingmessages/Broadcaster.java @@ -1,4 +1,3 @@ -package com.vaadin.tests.minitutorials.broadcastingmessages; /* * Copyright 2000-2013 Vaadin Ltd. * @@ -15,6 +14,7 @@ package com.vaadin.tests.minitutorials.broadcastingmessages; * the License. */ +package com.vaadin.tests.minitutorials.broadcastingmessages; import java.util.ArrayList; import java.util.List; diff --git a/uitest/src/com/vaadin/tests/minitutorials/broadcastingmessages/BroadcasterUI.java b/uitest/src/com/vaadin/tests/minitutorials/broadcastingmessages/BroadcasterUI.java index 80c847250d..88ab4af967 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/broadcastingmessages/BroadcasterUI.java +++ b/uitest/src/com/vaadin/tests/minitutorials/broadcastingmessages/BroadcasterUI.java @@ -1,6 +1,5 @@ package com.vaadin.tests.minitutorials.broadcastingmessages; - import com.vaadin.server.VaadinRequest; import com.vaadin.tests.minitutorials.broadcastingmessages.Broadcaster.BroadcastListener; import com.vaadin.ui.Button; diff --git a/uitest/src/com/vaadin/tests/widgetset/server/RoundTripTester.java b/uitest/src/com/vaadin/tests/widgetset/server/RoundTripTester.java index d16a7a7811..c8e561e665 100644 --- a/uitest/src/com/vaadin/tests/widgetset/server/RoundTripTester.java +++ b/uitest/src/com/vaadin/tests/widgetset/server/RoundTripTester.java @@ -43,7 +43,8 @@ public class RoundTripTester extends AbstractComponent { public void start(long testDuration, int payloadSize) { testStart = System.currentTimeMillis(); testEnd = testStart + testDuration; - getRpcProxy(RoundTripTesterRpc.class).ping(1, generatePayload(payloadSize)); + getRpcProxy(RoundTripTesterRpc.class).ping(1, + generatePayload(payloadSize)); } private String generatePayload(int payloadSize) { |