From 7d25670284b11c7c62ba25183f265227cb3dba83 Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Wed, 5 Sep 2012 19:50:56 +0300 Subject: Reformat project --- server/src/com/vaadin/Application.java | 6 +- .../src/com/vaadin/data/util/AbstractProperty.java | 4 + .../data/util/ContainerHierarchicalWrapper.java | 4 + .../vaadin/data/util/ContainerOrderedWrapper.java | 4 + .../src/com/vaadin/data/util/IndexedContainer.java | 4 + .../src/com/vaadin/data/util/PropertysetItem.java | 2 + .../data/util/sqlcontainer/SQLContainer.java | 2 + .../data/util/sqlcontainer/query/TableQuery.java | 2 + .../com/vaadin/external/json/JSONException.java | 2 +- .../src/com/vaadin/external/json/JSONStringer.java | 2 +- .../src/com/vaadin/server/AbstractUIProvider.java | 4 +- server/src/com/vaadin/server/AddonContext.java | 6 +- .../vaadin/server/ApplicationConfiguration.java | 1 + .../com/vaadin/server/ApplicationStartedEvent.java | 4 +- .../vaadin/server/ApplicationStartedListener.java | 7 +- .../com/vaadin/server/CommunicationManager.java | 3 +- .../vaadin/server/CustomizedSystemMessages.java | 126 ++++++++++----------- server/src/com/vaadin/server/GAEVaadinServlet.java | 3 +- .../src/com/vaadin/server/LegacyVaadinPortlet.java | 7 +- .../src/com/vaadin/server/LegacyVaadinServlet.java | 7 +- .../vaadin/server/PortletCommunicationManager.java | 3 +- server/src/com/vaadin/server/RequestHandler.java | 1 - server/src/com/vaadin/server/RequestTimer.java | 1 - server/src/com/vaadin/server/ServerRpcManager.java | 1 - server/src/com/vaadin/server/SystemMessages.java | 49 ++++---- server/src/com/vaadin/server/UIProvider.java | 4 +- .../vaadin/server/UnsupportedBrowserHandler.java | 1 - server/src/com/vaadin/server/VaadinPortlet.java | 7 +- server/src/com/vaadin/server/VaadinServlet.java | 9 +- .../vaadin/server/WrappedHttpServletRequest.java | 1 - .../src/com/vaadin/ui/AbstractOrderedLayout.java | 6 +- server/src/com/vaadin/ui/AbstractSelect.java | 4 + server/src/com/vaadin/ui/ComboBox.java | 5 + server/src/com/vaadin/ui/CustomField.java | 4 + server/src/com/vaadin/ui/DateField.java | 6 +- server/src/com/vaadin/ui/DragAndDropWrapper.java | 2 +- server/src/com/vaadin/ui/Embedded.java | 2 +- server/src/com/vaadin/ui/Flash.java | 6 +- server/src/com/vaadin/ui/Label.java | 2 + server/src/com/vaadin/ui/MenuBar.java | 2 +- server/src/com/vaadin/ui/OptionGroup.java | 4 + server/src/com/vaadin/ui/ProgressIndicator.java | 2 +- server/src/com/vaadin/ui/RichTextArea.java | 2 +- server/src/com/vaadin/ui/TabSheet.java | 4 + server/src/com/vaadin/ui/Table.java | 2 + server/src/com/vaadin/ui/Tree.java | 2 + server/src/com/vaadin/ui/UI.java | 4 +- server/src/com/vaadin/ui/Upload.java | 2 +- 48 files changed, 182 insertions(+), 156 deletions(-) (limited to 'server/src/com/vaadin') diff --git a/server/src/com/vaadin/Application.java b/server/src/com/vaadin/Application.java index 13ce23d1e4..ff9e84dc67 100644 --- a/server/src/com/vaadin/Application.java +++ b/server/src/com/vaadin/Application.java @@ -26,9 +26,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import com.vaadin.server.AbstractUIProvider; -import com.vaadin.server.VaadinSession; import com.vaadin.server.Terminal.ErrorEvent; import com.vaadin.server.Terminal.ErrorListener; +import com.vaadin.server.VaadinSession; import com.vaadin.server.WrappedRequest; import com.vaadin.ui.UI; @@ -100,8 +100,8 @@ public abstract class Application extends AbstractUIProvider implements } @Override - public UI createInstance(VaadinSession application, Class type, - WrappedRequest request) { + public UI createInstance(VaadinSession application, + Class type, WrappedRequest request) { return getUIInstance(request); } diff --git a/server/src/com/vaadin/data/util/AbstractProperty.java b/server/src/com/vaadin/data/util/AbstractProperty.java index 6636996cd5..76d47039d0 100644 --- a/server/src/com/vaadin/data/util/AbstractProperty.java +++ b/server/src/com/vaadin/data/util/AbstractProperty.java @@ -133,6 +133,7 @@ public abstract class AbstractProperty implements Property, * @deprecated Since 7.0, replaced by * {@link #addReadOnlyStatusChangeListener(com.vaadin.data.Property.ReadOnlyStatusChangeListener)} **/ + @Override @Deprecated public void addListener(Property.ReadOnlyStatusChangeListener listener) { addReadOnlyStatusChangeListener(listener); @@ -156,6 +157,7 @@ public abstract class AbstractProperty implements Property, * @deprecated Since 7.0, replaced by * {@link #removeReadOnlyStatusChangeListener(com.vaadin.data.Property.ReadOnlyStatusChangeListener)} **/ + @Override @Deprecated public void removeListener(Property.ReadOnlyStatusChangeListener listener) { removeReadOnlyStatusChangeListener(listener); @@ -218,6 +220,7 @@ public abstract class AbstractProperty implements Property, * @deprecated Since 7.0, replaced by * {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} **/ + @Override @Deprecated public void addListener(ValueChangeListener listener) { addValueChangeListener(listener); @@ -235,6 +238,7 @@ public abstract class AbstractProperty implements Property, * @deprecated Since 7.0, replaced by * {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} **/ + @Override @Deprecated public void removeListener(ValueChangeListener listener) { removeValueChangeListener(listener); diff --git a/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java b/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java index 24d0a8d3a0..fdfb296186 100644 --- a/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java +++ b/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java @@ -722,6 +722,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * @deprecated Since 7.0, replaced by * {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} **/ + @Override @Deprecated public void addListener(Container.ItemSetChangeListener listener) { addItemSetChangeListener(listener); @@ -745,6 +746,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * @deprecated Since 7.0, replaced by * {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} **/ + @Override @Deprecated public void removeListener(Container.ItemSetChangeListener listener) { removeItemSetChangeListener(listener); @@ -769,6 +771,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * @deprecated Since 7.0, replaced by * {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} **/ + @Override @Deprecated public void addListener(Container.PropertySetChangeListener listener) { addPropertySetChangeListener(listener); @@ -793,6 +796,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * @deprecated Since 7.0, replaced by * {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} **/ + @Override @Deprecated public void removeListener(Container.PropertySetChangeListener listener) { removePropertySetChangeListener(listener); diff --git a/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java b/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java index bb904f4cda..ad1eda9a8d 100644 --- a/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java +++ b/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java @@ -522,6 +522,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * @deprecated Since 7.0, replaced by * {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} **/ + @Override @Deprecated public void addListener(Container.ItemSetChangeListener listener) { addItemSetChangeListener(listener); @@ -545,6 +546,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * @deprecated Since 7.0, replaced by * {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} **/ + @Override @Deprecated public void removeListener(Container.ItemSetChangeListener listener) { removeItemSetChangeListener(listener); @@ -569,6 +571,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * @deprecated Since 7.0, replaced by * {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} **/ + @Override @Deprecated public void addListener(Container.PropertySetChangeListener listener) { addPropertySetChangeListener(listener); @@ -593,6 +596,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * @deprecated Since 7.0, replaced by * {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} **/ + @Override @Deprecated public void removeListener(Container.PropertySetChangeListener listener) { removePropertySetChangeListener(listener); diff --git a/server/src/com/vaadin/data/util/IndexedContainer.java b/server/src/com/vaadin/data/util/IndexedContainer.java index e0a8fe1dc1..e957d958a9 100644 --- a/server/src/com/vaadin/data/util/IndexedContainer.java +++ b/server/src/com/vaadin/data/util/IndexedContainer.java @@ -532,6 +532,7 @@ public class IndexedContainer extends * @deprecated Since 7.0, replaced by * {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} **/ + @Override @Deprecated public void addListener(Property.ValueChangeListener listener) { addValueChangeListener(listener); @@ -554,6 +555,7 @@ public class IndexedContainer extends * @deprecated Since 7.0, replaced by * {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} **/ + @Override @Deprecated public void removeListener(Property.ValueChangeListener listener) { removeValueChangeListener(listener); @@ -1013,6 +1015,7 @@ public class IndexedContainer extends * @deprecated Since 7.0, replaced by * {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} **/ + @Override @Deprecated public void addListener(Property.ValueChangeListener listener) { addValueChangeListener(listener); @@ -1034,6 +1037,7 @@ public class IndexedContainer extends * @deprecated Since 7.0, replaced by * {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} **/ + @Override @Deprecated public void removeListener(Property.ValueChangeListener listener) { removeValueChangeListener(listener); diff --git a/server/src/com/vaadin/data/util/PropertysetItem.java b/server/src/com/vaadin/data/util/PropertysetItem.java index 6fba011d75..b423c72f43 100644 --- a/server/src/com/vaadin/data/util/PropertysetItem.java +++ b/server/src/com/vaadin/data/util/PropertysetItem.java @@ -212,6 +212,7 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier, * @deprecated Since 7.0, replaced by * {@link #addPropertySetChangeListener(com.vaadin.data.Item.PropertySetChangeListener)} **/ + @Override @Deprecated public void addListener(Item.PropertySetChangeListener listener) { addPropertySetChangeListener(listener); @@ -235,6 +236,7 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier, * @deprecated Since 7.0, replaced by * {@link #removePropertySetChangeListener(com.vaadin.data.Item.PropertySetChangeListener)} **/ + @Override @Deprecated public void removeListener(Item.PropertySetChangeListener listener) { removePropertySetChangeListener(listener); diff --git a/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java b/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java index 1b479a21d8..64014cd254 100644 --- a/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java @@ -1523,6 +1523,7 @@ public class SQLContainer implements Container, Container.Filterable, * @deprecated Since 7.0, replaced by * {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} **/ + @Override @Deprecated public void addListener(Container.ItemSetChangeListener listener) { addItemSetChangeListener(listener); @@ -1548,6 +1549,7 @@ public class SQLContainer implements Container, Container.Filterable, * @deprecated Since 7.0, replaced by * {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} **/ + @Override @Deprecated public void removeListener(Container.ItemSetChangeListener listener) { removeItemSetChangeListener(listener); diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java b/server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java index 8a3dabbf0e..89dc5e41a7 100644 --- a/server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java @@ -715,6 +715,7 @@ public class TableQuery implements QueryDelegate, * @deprecated Since 7.0, replaced by * {@link #addRowIdChangeListener(com.vaadin.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener)} **/ + @Override @Deprecated public void addListener(RowIdChangeListener listener) { addRowIdChangeListener(listener); @@ -734,6 +735,7 @@ public class TableQuery implements QueryDelegate, * @deprecated Since 7.0, replaced by * {@link #removeRowIdChangeListener(com.vaadin.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener)} **/ + @Override @Deprecated public void removeListener(RowIdChangeListener listener) { removeRowIdChangeListener(listener); diff --git a/server/src/com/vaadin/external/json/JSONException.java b/server/src/com/vaadin/external/json/JSONException.java index 895ffcb457..21663c1e37 100644 --- a/server/src/com/vaadin/external/json/JSONException.java +++ b/server/src/com/vaadin/external/json/JSONException.java @@ -27,6 +27,6 @@ public class JSONException extends Exception { @Override public Throwable getCause() { - return this.cause; + return cause; } } diff --git a/server/src/com/vaadin/external/json/JSONStringer.java b/server/src/com/vaadin/external/json/JSONStringer.java index ae905cb15f..b5917222b1 100644 --- a/server/src/com/vaadin/external/json/JSONStringer.java +++ b/server/src/com/vaadin/external/json/JSONStringer.java @@ -79,6 +79,6 @@ public class JSONStringer extends JSONWriter { */ @Override public String toString() { - return this.mode == 'd' ? this.writer.toString() : null; + return mode == 'd' ? writer.toString() : null; } } diff --git a/server/src/com/vaadin/server/AbstractUIProvider.java b/server/src/com/vaadin/server/AbstractUIProvider.java index ee8ebd2745..e93e1a6ae1 100644 --- a/server/src/com/vaadin/server/AbstractUIProvider.java +++ b/server/src/com/vaadin/server/AbstractUIProvider.java @@ -27,8 +27,8 @@ import com.vaadin.ui.UI; public abstract class AbstractUIProvider implements UIProvider { @Override - public UI createInstance(VaadinSession application, Class type, - WrappedRequest request) { + public UI createInstance(VaadinSession application, + Class type, WrappedRequest request) { try { return type.newInstance(); } catch (InstantiationException e) { diff --git a/server/src/com/vaadin/server/AddonContext.java b/server/src/com/vaadin/server/AddonContext.java index ca8c837a2e..2b1cedc162 100644 --- a/server/src/com/vaadin/server/AddonContext.java +++ b/server/src/com/vaadin/server/AddonContext.java @@ -143,9 +143,9 @@ public class AddonContext { } /** - * Adds a listener that will be notified any time a new {@link VaadinSession} - * instance is started or more precisely directly after - * {@link VaadinSession#init()} has been invoked. + * Adds a listener that will be notified any time a new + * {@link VaadinSession} instance is started or more precisely directly + * after {@link VaadinSession#init()} has been invoked. * * @param applicationStartListener * the application start listener that should be added diff --git a/server/src/com/vaadin/server/ApplicationConfiguration.java b/server/src/com/vaadin/server/ApplicationConfiguration.java index edb33e6c39..1b56906f78 100644 --- a/server/src/com/vaadin/server/ApplicationConfiguration.java +++ b/server/src/com/vaadin/server/ApplicationConfiguration.java @@ -18,6 +18,7 @@ package com.vaadin.server; import java.util.Properties; +import org.apache.catalina.core.ApplicationContext; /** * A collection of properties configured for all applications as well as a way diff --git a/server/src/com/vaadin/server/ApplicationStartedEvent.java b/server/src/com/vaadin/server/ApplicationStartedEvent.java index 9ecab4d477..f1c79cc81c 100644 --- a/server/src/com/vaadin/server/ApplicationStartedEvent.java +++ b/server/src/com/vaadin/server/ApplicationStartedEvent.java @@ -18,7 +18,6 @@ package com.vaadin.server; import java.util.EventObject; - /** * Event used by * {@link ApplicationStartedListener#applicationStarted(ApplicationStartedEvent)} @@ -38,7 +37,8 @@ public class ApplicationStartedEvent extends EventObject { * @param application * the application that has been started */ - public ApplicationStartedEvent(AddonContext context, VaadinSession application) { + public ApplicationStartedEvent(AddonContext context, + VaadinSession application) { super(context); this.application = application; } diff --git a/server/src/com/vaadin/server/ApplicationStartedListener.java b/server/src/com/vaadin/server/ApplicationStartedListener.java index b7858447df..c59035b3db 100644 --- a/server/src/com/vaadin/server/ApplicationStartedListener.java +++ b/server/src/com/vaadin/server/ApplicationStartedListener.java @@ -18,11 +18,10 @@ package com.vaadin.server; import java.util.EventListener; - /** - * Listener that gets notified when a new {@link VaadinSession} has been started. - * Add-ons can use this listener to automatically integrate with API tied to the - * Application API. + * Listener that gets notified when a new {@link VaadinSession} has been + * started. Add-ons can use this listener to automatically integrate with API + * tied to the Application API. * * @see AddonContext#addApplicationStartedListener(ApplicationStartedListener) * diff --git a/server/src/com/vaadin/server/CommunicationManager.java b/server/src/com/vaadin/server/CommunicationManager.java index 32c4d2c217..3a4b481571 100644 --- a/server/src/com/vaadin/server/CommunicationManager.java +++ b/server/src/com/vaadin/server/CommunicationManager.java @@ -111,8 +111,7 @@ public class CommunicationManager extends AbstractCommunicationManager { @Override protected InputStream getThemeResourceAsStream(UI uI, String themeName, String resource) { - VaadinServletSession context = (VaadinServletSession) uI - .getSession(); + VaadinServletSession context = (VaadinServletSession) uI.getSession(); ServletContext servletContext = context.getHttpSession() .getServletContext(); return servletContext.getResourceAsStream("/" diff --git a/server/src/com/vaadin/server/CustomizedSystemMessages.java b/server/src/com/vaadin/server/CustomizedSystemMessages.java index 8e3d7bf8e0..7aee7c883d 100644 --- a/server/src/com/vaadin/server/CustomizedSystemMessages.java +++ b/server/src/com/vaadin/server/CustomizedSystemMessages.java @@ -19,45 +19,44 @@ package com.vaadin.server; import java.io.Serializable; /** - * Contains the system messages used to notify the user about various - * critical situations that can occur. + * Contains the system messages used to notify the user about various critical + * situations that can occur. *

* Vaadin gets the SystemMessages from your application by calling a static - * getSystemMessages() method. By default the - * Application.getSystemMessages() is used. You can customize this by - * defining a static MyApplication.getSystemMessages() and returning - * CustomizedSystemMessages. Note that getSystemMessages() is static - - * changing the system messages will by default change the message for all - * users of the application. + * getSystemMessages() method. By default the Application.getSystemMessages() is + * used. You can customize this by defining a static + * MyApplication.getSystemMessages() and returning CustomizedSystemMessages. + * Note that getSystemMessages() is static - changing the system messages will + * by default change the message for all users of the application. *

*

- * The default behavior is to show a notification, and restart the - * application the the user clicks the message.
- * Instead of restarting the application, you can set a specific URL that - * the user is taken to.
- * Setting both caption and message to null will restart the application (or - * go to the specified URL) without displaying a notification. + * The default behavior is to show a notification, and restart the application + * the the user clicks the message.
+ * Instead of restarting the application, you can set a specific URL that the + * user is taken to.
+ * Setting both caption and message to null will restart the application (or go + * to the specified URL) without displaying a notification. * set*NotificationEnabled(false) will achieve the same thing. *

*

* The situations are: - *

  • Session expired: the user session has expired, usually due to - * inactivity.
    • + *
  • Session expired: the user session has expired, usually due to inactivity. + *
    • *
  • Communication error: the client failed to contact the server, or the * server returned and invalid response.
    • *
  • Internal error: unhandled critical server error (e.g out of memory, * database crash) *
  • Out of sync: the client is not in sync with the server. E.g the user - * opens two windows showing the same application, but the application does - * not support this and uses the same Window instance. When the user makes - * changes in one of the windows - the other window is no longer in sync, - * and (for instance) pressing a button that is no longer present in the UI - * will cause a out-of-sync -situation. + * opens two windows showing the same application, but the application does not + * support this and uses the same Window instance. When the user makes changes + * in one of the windows - the other window is no longer in sync, and (for + * instance) pressing a button that is no longer present in the UI will cause a + * out-of-sync -situation. *

    */ -public class CustomizedSystemMessages extends SystemMessages - implements Serializable { +public class CustomizedSystemMessages extends SystemMessages implements + Serializable { /** * Sets the URL to go to when the session has expired. @@ -83,10 +82,10 @@ public class CustomizedSystemMessages extends SystemMessages } /** - * Sets the caption of the notification. Set to null for no caption. If - * both caption and message are null, client automatically forwards to - * sessionExpiredUrl after timeout timer expires. Timer uses value read - * from HTTPSession.getMaxInactiveInterval() + * Sets the caption of the notification. Set to null for no caption. If both + * caption and message are null, client automatically forwards to + * sessionExpiredUrl after timeout timer expires. Timer uses value read from + * HTTPSession.getMaxInactiveInterval() * * @param sessionExpiredCaption * the caption @@ -96,10 +95,10 @@ public class CustomizedSystemMessages extends SystemMessages } /** - * Sets the message of the notification. Set to null for no message. If - * both caption and message are null, client automatically forwards to - * sessionExpiredUrl after timeout timer expires. Timer uses value read - * from HTTPSession.getMaxInactiveInterval() + * Sets the message of the notification. Set to null for no message. If both + * caption and message are null, client automatically forwards to + * sessionExpiredUrl after timeout timer expires. Timer uses value read from + * HTTPSession.getMaxInactiveInterval() * * @param sessionExpiredMessage * the message @@ -131,26 +130,24 @@ public class CustomizedSystemMessages extends SystemMessages } /** - * Sets the caption of the notification. Set to null for no caption. If - * both caption and message is null, the notification is disabled; + * Sets the caption of the notification. Set to null for no caption. If both + * caption and message is null, the notification is disabled; * * @param authenticationErrorCaption * the caption */ - public void setAuthenticationErrorCaption( - String authenticationErrorCaption) { + public void setAuthenticationErrorCaption(String authenticationErrorCaption) { this.authenticationErrorCaption = authenticationErrorCaption; } /** - * Sets the message of the notification. Set to null for no message. If - * both caption and message is null, the notification is disabled; + * Sets the message of the notification. Set to null for no message. If both + * caption and message is null, the notification is disabled; * * @param authenticationErrorMessage * the message */ - public void setAuthenticationErrorMessage( - String authenticationErrorMessage) { + public void setAuthenticationErrorMessage(String authenticationErrorMessage) { this.authenticationErrorMessage = authenticationErrorMessage; } @@ -177,26 +174,24 @@ public class CustomizedSystemMessages extends SystemMessages } /** - * Sets the caption of the notification. Set to null for no caption. If - * both caption and message is null, the notification is disabled; + * Sets the caption of the notification. Set to null for no caption. If both + * caption and message is null, the notification is disabled; * * @param communicationErrorCaption * the caption */ - public void setCommunicationErrorCaption( - String communicationErrorCaption) { + public void setCommunicationErrorCaption(String communicationErrorCaption) { this.communicationErrorCaption = communicationErrorCaption; } /** - * Sets the message of the notification. Set to null for no message. If - * both caption and message is null, the notification is disabled; + * Sets the message of the notification. Set to null for no message. If both + * caption and message is null, the notification is disabled; * * @param communicationErrorMessage * the message */ - public void setCommunicationErrorMessage( - String communicationErrorMessage) { + public void setCommunicationErrorMessage(String communicationErrorMessage) { this.communicationErrorMessage = communicationErrorMessage; } @@ -223,8 +218,8 @@ public class CustomizedSystemMessages extends SystemMessages } /** - * Sets the caption of the notification. Set to null for no caption. If - * both caption and message is null, the notification is disabled; + * Sets the caption of the notification. Set to null for no caption. If both + * caption and message is null, the notification is disabled; * * @param internalErrorCaption * the caption @@ -234,8 +229,8 @@ public class CustomizedSystemMessages extends SystemMessages } /** - * Sets the message of the notification. Set to null for no message. If - * both caption and message is null, the notification is disabled; + * Sets the message of the notification. Set to null for no message. If both + * caption and message is null, the notification is disabled; * * @param internalErrorMessage * the message @@ -267,8 +262,8 @@ public class CustomizedSystemMessages extends SystemMessages } /** - * Sets the caption of the notification. Set to null for no caption. If - * both caption and message is null, the notification is disabled; + * Sets the caption of the notification. Set to null for no caption. If both + * caption and message is null, the notification is disabled; * * @param outOfSyncCaption * the caption @@ -278,8 +273,8 @@ public class CustomizedSystemMessages extends SystemMessages } /** - * Sets the message of the notification. Set to null for no message. If - * both caption and message is null, the notification is disabled; + * Sets the message of the notification. Set to null for no message. If both + * caption and message is null, the notification is disabled; * * @param outOfSyncMessage * the message @@ -299,13 +294,12 @@ public class CustomizedSystemMessages extends SystemMessages } /** - * Enables or disables the notification for "cookies disabled" messages. - * If disabled, the URL returned by {@link #getCookiesDisabledURL()} is - * loaded directly. + * Enables or disables the notification for "cookies disabled" messages. If + * disabled, the URL returned by {@link #getCookiesDisabledURL()} is loaded + * directly. * * @param cookiesDisabledNotificationEnabled - * true to enable "cookies disabled" messages, false - * otherwise + * true to enable "cookies disabled" messages, false otherwise */ public void setCookiesDisabledNotificationEnabled( boolean cookiesDisabledNotificationEnabled) { @@ -313,9 +307,9 @@ public class CustomizedSystemMessages extends SystemMessages } /** - * Sets the caption of the "cookies disabled" notification. Set to null - * for no caption. If both caption and message is null, the notification - * is disabled. + * Sets the caption of the "cookies disabled" notification. Set to null for + * no caption. If both caption and message is null, the notification is + * disabled. * * @param cookiesDisabledCaption * the caption for the "cookies disabled" notification @@ -325,9 +319,9 @@ public class CustomizedSystemMessages extends SystemMessages } /** - * Sets the message of the "cookies disabled" notification. Set to null - * for no message. If both caption and message is null, the notification - * is disabled. + * Sets the message of the "cookies disabled" notification. Set to null for + * no message. If both caption and message is null, the notification is + * disabled. * * @param cookiesDisabledMessage * the message for the "cookies disabled" notification diff --git a/server/src/com/vaadin/server/GAEVaadinServlet.java b/server/src/com/vaadin/server/GAEVaadinServlet.java index 4ea1dff7f4..957c0a9fe1 100644 --- a/server/src/com/vaadin/server/GAEVaadinServlet.java +++ b/server/src/com/vaadin/server/GAEVaadinServlet.java @@ -320,7 +320,8 @@ public class GAEVaadinServlet extends VaadinServlet { ObjectInputStream ois; try { ois = new ObjectInputStream(bais); - VaadinSession applicationContext = (VaadinSession) ois.readObject(); + VaadinSession applicationContext = (VaadinSession) ois + .readObject(); applicationContext.storeInSession(new WrappedHttpSession( session)); } catch (IOException e) { diff --git a/server/src/com/vaadin/server/LegacyVaadinPortlet.java b/server/src/com/vaadin/server/LegacyVaadinPortlet.java index f436cbb624..e62bf5f4d4 100644 --- a/server/src/com/vaadin/server/LegacyVaadinPortlet.java +++ b/server/src/com/vaadin/server/LegacyVaadinPortlet.java @@ -45,10 +45,9 @@ public class LegacyVaadinPortlet extends VaadinPortlet { } @Override - protected VaadinPortletSession createApplication( - PortletRequest request) throws PortletException { - VaadinPortletSession application = super - .createApplication(request); + protected VaadinPortletSession createApplication(PortletRequest request) + throws PortletException { + VaadinPortletSession application = super.createApplication(request); // Must set current before running init() VaadinSession.setCurrent(application); diff --git a/server/src/com/vaadin/server/LegacyVaadinServlet.java b/server/src/com/vaadin/server/LegacyVaadinServlet.java index 93a9410509..183d4389d6 100644 --- a/server/src/com/vaadin/server/LegacyVaadinServlet.java +++ b/server/src/com/vaadin/server/LegacyVaadinServlet.java @@ -45,10 +45,9 @@ public class LegacyVaadinServlet extends VaadinServlet { } @Override - protected VaadinServletSession createApplication( - HttpServletRequest request) throws ServletException { - VaadinServletSession application = super - .createApplication(request); + protected VaadinServletSession createApplication(HttpServletRequest request) + throws ServletException { + VaadinServletSession application = super.createApplication(request); // Must set current before running init() VaadinSession.setCurrent(application); diff --git a/server/src/com/vaadin/server/PortletCommunicationManager.java b/server/src/com/vaadin/server/PortletCommunicationManager.java index 1a2b892a32..fcb0ae228e 100644 --- a/server/src/com/vaadin/server/PortletCommunicationManager.java +++ b/server/src/com/vaadin/server/PortletCommunicationManager.java @@ -156,8 +156,7 @@ public class PortletCommunicationManager extends AbstractCommunicationManager { @Override protected InputStream getThemeResourceAsStream(UI uI, String themeName, String resource) { - VaadinPortletSession context = (VaadinPortletSession) uI - .getSession(); + VaadinPortletSession context = (VaadinPortletSession) uI.getSession(); PortletContext portletContext = context.getPortletSession() .getPortletContext(); return portletContext.getResourceAsStream("/" diff --git a/server/src/com/vaadin/server/RequestHandler.java b/server/src/com/vaadin/server/RequestHandler.java index 0557c06378..66e20dafbe 100644 --- a/server/src/com/vaadin/server/RequestHandler.java +++ b/server/src/com/vaadin/server/RequestHandler.java @@ -19,7 +19,6 @@ package com.vaadin.server; import java.io.IOException; import java.io.Serializable; - /** * Handler for producing a response to non-UIDL requests. Handlers can be added * to applications using {@link VaadinSession#addRequestHandler(RequestHandler)} diff --git a/server/src/com/vaadin/server/RequestTimer.java b/server/src/com/vaadin/server/RequestTimer.java index 149a1499e7..26a5689665 100644 --- a/server/src/com/vaadin/server/RequestTimer.java +++ b/server/src/com/vaadin/server/RequestTimer.java @@ -18,7 +18,6 @@ package com.vaadin.server; import java.io.Serializable; - /** * Times the handling of requests and stores the information as an attribute in * the request. The timing info is later passed on to the client in the UIDL and diff --git a/server/src/com/vaadin/server/ServerRpcManager.java b/server/src/com/vaadin/server/ServerRpcManager.java index 92e4d24240..8ef165e084 100644 --- a/server/src/com/vaadin/server/ServerRpcManager.java +++ b/server/src/com/vaadin/server/ServerRpcManager.java @@ -17,7 +17,6 @@ package com.vaadin.server; import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; diff --git a/server/src/com/vaadin/server/SystemMessages.java b/server/src/com/vaadin/server/SystemMessages.java index 3f6a0f9a68..647266d8e3 100644 --- a/server/src/com/vaadin/server/SystemMessages.java +++ b/server/src/com/vaadin/server/SystemMessages.java @@ -18,15 +18,12 @@ package com.vaadin.server; import java.io.Serializable; - - /** - * Contains the system messages used to notify the user about various - * critical situations that can occur. + * Contains the system messages used to notify the user about various critical + * situations that can occur. *

    - * Customize by overriding the static - * {@link VaadinSession#getSystemMessages()} and returning - * {@link CustomizedSystemMessages}. + * Customize by overriding the static {@link VaadinSession#getSystemMessages()} + * and returning {@link CustomizedSystemMessages}. *

    *

    * The defaults defined in this class are: @@ -49,16 +46,15 @@ import java.io.Serializable; *

  • outOfSyncURL = null
    • *
  • outOfSyncNotificationEnabled = true
    • *
  • outOfSyncCaption = "Out of sync"
    • - *
  • outOfSyncMessage = "Something has caused us to be out of sync - * with the server.
    + *
  • outOfSyncMessage = "Something has caused us to be out of sync with + * the server.
    * Take note of any unsaved data, and click here to re-sync."
    • *
  • cookiesDisabledURL = null
    • *
  • cookiesDisabledNotificationEnabled = true
    • *
  • cookiesDisabledCaption = "Cookies disabled"
    • *
  • cookiesDisabledMessage = "This application requires cookies to * function.
    - * Please enable cookies in your browser and click here to try again. - *
    • + * Please enable cookies in your browser and click here to try again. * *

    * @@ -134,8 +130,7 @@ public class SystemMessages implements Serializable { } /** - * @return null to reload the application after communication error - * message. + * @return null to reload the application after communication error message. */ public String getCommunicationErrorURL() { return communicationErrorURL; @@ -198,8 +193,8 @@ public class SystemMessages implements Serializable { } /** - * @return null to reload the current URL after internal error message - * has been shown. + * @return null to reload the current URL after internal error message has + * been shown. */ public String getInternalErrorURL() { return internalErrorURL; @@ -216,8 +211,7 @@ public class SystemMessages implements Serializable { * @return "Internal error" */ public String getInternalErrorCaption() { - return (internalErrorNotificationEnabled ? internalErrorCaption - : null); + return (internalErrorNotificationEnabled ? internalErrorCaption : null); } /** @@ -226,8 +220,7 @@ public class SystemMessages implements Serializable { * continue." */ public String getInternalErrorMessage() { - return (internalErrorNotificationEnabled ? internalErrorMessage - : null); + return (internalErrorNotificationEnabled ? internalErrorMessage : null); } /** @@ -253,8 +246,7 @@ public class SystemMessages implements Serializable { /** * @return "Something has caused us to be out of sync with the server.
    - * Take note of any unsaved data, and click here to - * re-sync." + * Take note of any unsaved data, and click here to re-sync." */ public String getOutOfSyncMessage() { return (outOfSyncNotificationEnabled ? outOfSyncMessage : null); @@ -272,13 +264,12 @@ public class SystemMessages implements Serializable { } /** - * Determines if "cookies disabled" messages should be shown to the end - * user or not. If the notification is disabled the user will be - * immediately redirected to the URL returned by - * {@link #getCookiesDisabledURL()}. + * Determines if "cookies disabled" messages should be shown to the end user + * or not. If the notification is disabled the user will be immediately + * redirected to the URL returned by {@link #getCookiesDisabledURL()}. * - * @return true to show "cookies disabled" messages to the end user, - * false to redirect to the given URL directly + * @return true to show "cookies disabled" messages to the end user, false + * to redirect to the given URL directly */ public boolean isCookiesDisabledNotificationEnabled() { return cookiesDisabledNotificationEnabled; @@ -296,8 +287,8 @@ public class SystemMessages implements Serializable { } /** - * Returns the message shown to the user when cookies are disabled in - * the browser. + * Returns the message shown to the user when cookies are disabled in the + * browser. * * @return The "cookies disabled" message */ diff --git a/server/src/com/vaadin/server/UIProvider.java b/server/src/com/vaadin/server/UIProvider.java index b2908a04d6..de68b121f0 100644 --- a/server/src/com/vaadin/server/UIProvider.java +++ b/server/src/com/vaadin/server/UIProvider.java @@ -23,8 +23,8 @@ public interface UIProvider { public Class getUIClass(VaadinSession application, WrappedRequest request); - public UI createInstance(VaadinSession application, Class type, - WrappedRequest request); + public UI createInstance(VaadinSession application, + Class type, WrappedRequest request); public String getPageTitleForUI(WrappedRequest request, Class uiClass); diff --git a/server/src/com/vaadin/server/UnsupportedBrowserHandler.java b/server/src/com/vaadin/server/UnsupportedBrowserHandler.java index dccbf7ba7b..f84c2ec5dc 100644 --- a/server/src/com/vaadin/server/UnsupportedBrowserHandler.java +++ b/server/src/com/vaadin/server/UnsupportedBrowserHandler.java @@ -18,7 +18,6 @@ package com.vaadin.server; import java.io.IOException; import java.io.Writer; - /** * A {@link RequestHandler} that presents an informative page if the browser in * use is unsupported. Recognizes Chrome Frame and allow it to be used. diff --git a/server/src/com/vaadin/server/VaadinPortlet.java b/server/src/com/vaadin/server/VaadinPortlet.java index 941d96ea25..236b38b27c 100644 --- a/server/src/com/vaadin/server/VaadinPortlet.java +++ b/server/src/com/vaadin/server/VaadinPortlet.java @@ -651,8 +651,7 @@ public class VaadinPortlet extends GenericPortlet implements Constants { */ private void handleOtherRequest(WrappedPortletRequest request, WrappedResponse response, RequestType requestType, - VaadinSession application, - VaadinPortletSession applicationContext, + VaadinSession application, VaadinPortletSession applicationContext, PortletCommunicationManager applicationManager) throws PortletException, IOException, MalformedURLException { if (requestType == RequestType.APPLICATION_RESOURCE @@ -844,8 +843,8 @@ public class VaadinPortlet extends GenericPortlet implements Constants { return newApplication; } - protected VaadinPortletSession createApplication( - PortletRequest request) throws PortletException { + protected VaadinPortletSession createApplication(PortletRequest request) + throws PortletException { VaadinPortletSession application = new VaadinPortletSession(); try { diff --git a/server/src/com/vaadin/server/VaadinServlet.java b/server/src/com/vaadin/server/VaadinServlet.java index d2e04da2e9..3a60cf5009 100644 --- a/server/src/com/vaadin/server/VaadinServlet.java +++ b/server/src/com/vaadin/server/VaadinServlet.java @@ -625,8 +625,9 @@ public class VaadinServlet extends HttpServlet implements Constants { } - private VaadinSession createAndRegisterApplication(HttpServletRequest request) - throws ServletException, MalformedURLException { + private VaadinSession createAndRegisterApplication( + HttpServletRequest request) throws ServletException, + MalformedURLException { VaadinSession newApplication = createApplication(request); try { @@ -721,8 +722,8 @@ public class VaadinServlet extends HttpServlet implements Constants { * @throws ServletException * @throws MalformedURLException */ - protected VaadinServletSession createApplication( - HttpServletRequest request) throws ServletException { + protected VaadinServletSession createApplication(HttpServletRequest request) + throws ServletException { VaadinServletSession newApplication = new VaadinServletSession(); try { diff --git a/server/src/com/vaadin/server/WrappedHttpServletRequest.java b/server/src/com/vaadin/server/WrappedHttpServletRequest.java index 4221551601..e86166545a 100644 --- a/server/src/com/vaadin/server/WrappedHttpServletRequest.java +++ b/server/src/com/vaadin/server/WrappedHttpServletRequest.java @@ -19,7 +19,6 @@ package com.vaadin.server; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; - /** * Wrapper for {@link HttpServletRequest}. * diff --git a/server/src/com/vaadin/ui/AbstractOrderedLayout.java b/server/src/com/vaadin/ui/AbstractOrderedLayout.java index 4e27dbb158..fb345d30ec 100644 --- a/server/src/com/vaadin/ui/AbstractOrderedLayout.java +++ b/server/src/com/vaadin/ui/AbstractOrderedLayout.java @@ -232,8 +232,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements @Override public void setComponentAlignment(Component childComponent, Alignment alignment) { - ChildComponentData childData = getState().childData.get( - childComponent); + ChildComponentData childData = getState().childData.get(childComponent); if (childData != null) { // Alignments are bit masks childData.alignmentBitmask = alignment.getBitMask(); @@ -252,8 +251,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements */ @Override public Alignment getComponentAlignment(Component childComponent) { - ChildComponentData childData = getState().childData.get( - childComponent); + ChildComponentData childData = getState().childData.get(childComponent); if (childData == null) { throw new IllegalArgumentException( "The given component is not a child of this layout"); diff --git a/server/src/com/vaadin/ui/AbstractSelect.java b/server/src/com/vaadin/ui/AbstractSelect.java index 2f420b9286..1e9db0a264 100644 --- a/server/src/com/vaadin/ui/AbstractSelect.java +++ b/server/src/com/vaadin/ui/AbstractSelect.java @@ -1493,6 +1493,7 @@ public abstract class AbstractSelect extends AbstractField implements * @deprecated Since 7.0, replaced by * {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} **/ + @Override @Deprecated public void addListener(Container.PropertySetChangeListener listener) { addPropertySetChangeListener(listener); @@ -1518,6 +1519,7 @@ public abstract class AbstractSelect extends AbstractField implements * @deprecated Since 7.0, replaced by * {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} **/ + @Override @Deprecated public void removeListener(Container.PropertySetChangeListener listener) { removePropertySetChangeListener(listener); @@ -1541,6 +1543,7 @@ public abstract class AbstractSelect extends AbstractField implements * @deprecated Since 7.0, replaced by * {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} **/ + @Override @Deprecated public void addListener(Container.ItemSetChangeListener listener) { addItemSetChangeListener(listener); @@ -1566,6 +1569,7 @@ public abstract class AbstractSelect extends AbstractField implements * @deprecated Since 7.0, replaced by * {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} **/ + @Override @Deprecated public void removeListener(Container.ItemSetChangeListener listener) { removeItemSetChangeListener(listener); diff --git a/server/src/com/vaadin/ui/ComboBox.java b/server/src/com/vaadin/ui/ComboBox.java index 2555aac339..b16d0ee3d0 100644 --- a/server/src/com/vaadin/ui/ComboBox.java +++ b/server/src/com/vaadin/ui/ComboBox.java @@ -701,6 +701,7 @@ public class ComboBox extends AbstractSelect implements return filteringMode; } + @Override public void addBlurListener(BlurListener listener) { addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener, BlurListener.blurMethod); @@ -709,6 +710,7 @@ public class ComboBox extends AbstractSelect implements /** * @deprecated Since 7.0, replaced by {@link #addBlurListener(BlurListener)} **/ + @Override @Deprecated public void addListener(BlurListener listener) { addBlurListener(listener); @@ -723,6 +725,7 @@ public class ComboBox extends AbstractSelect implements * @deprecated Since 7.0, replaced by * {@link #removeBlurListener(BlurListener)} **/ + @Override @Deprecated public void removeListener(BlurListener listener) { removeBlurListener(listener); @@ -738,6 +741,7 @@ public class ComboBox extends AbstractSelect implements * @deprecated Since 7.0, replaced by * {@link #addFocusListener(FocusListener)} **/ + @Override @Deprecated public void addListener(FocusListener listener) { addFocusListener(listener); @@ -752,6 +756,7 @@ public class ComboBox extends AbstractSelect implements * @deprecated Since 7.0, replaced by * {@link #removeFocusListener(FocusListener)} **/ + @Override @Deprecated public void removeListener(FocusListener listener) { removeFocusListener(listener); diff --git a/server/src/com/vaadin/ui/CustomField.java b/server/src/com/vaadin/ui/CustomField.java index 7bb6e66cf9..75182f37bd 100644 --- a/server/src/com/vaadin/ui/CustomField.java +++ b/server/src/com/vaadin/ui/CustomField.java @@ -230,6 +230,7 @@ public abstract class CustomField extends AbstractField implements * @deprecated Since 7.0, replaced by * {@link #addComponentAttachListener(com.vaadin.ui.ComponentContainer.ComponentAttachListener)} **/ + @Override @Deprecated public void addListener(ComponentAttachListener listener) { addComponentAttachListener(listener); @@ -245,6 +246,7 @@ public abstract class CustomField extends AbstractField implements * @deprecated Since 7.0, replaced by * {@link #removeComponentAttachListener(com.vaadin.ui.ComponentContainer.ComponentAttachListener)} **/ + @Override @Deprecated public void removeListener(ComponentAttachListener listener) { removeComponentAttachListener(listener); @@ -259,6 +261,7 @@ public abstract class CustomField extends AbstractField implements * @deprecated Since 7.0, replaced by * {@link #addComponentDetachListener(com.vaadin.ui.ComponentContainer.ComponentDetachListener)} **/ + @Override @Deprecated public void addListener(ComponentDetachListener listener) { addComponentDetachListener(listener); @@ -274,6 +277,7 @@ public abstract class CustomField extends AbstractField implements * @deprecated Since 7.0, replaced by * {@link #removeComponentDetachListener(com.vaadin.ui.ComponentContainer.ComponentDetachListener)} **/ + @Override @Deprecated public void removeListener(ComponentDetachListener listener) { removeComponentDetachListener(listener); diff --git a/server/src/com/vaadin/ui/DateField.java b/server/src/com/vaadin/ui/DateField.java index 712034a562..f54959fb0a 100644 --- a/server/src/com/vaadin/ui/DateField.java +++ b/server/src/com/vaadin/ui/DateField.java @@ -36,9 +36,9 @@ import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.BlurListener; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; +import com.vaadin.server.LegacyComponent; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; -import com.vaadin.server.LegacyComponent; import com.vaadin.shared.ui.datefield.DateFieldConstants; /** @@ -750,6 +750,7 @@ public class DateField extends AbstractField implements * @deprecated Since 7.0, replaced by * {@link #addFocusListener(FocusListener)} **/ + @Override @Deprecated public void addListener(FocusListener listener) { addFocusListener(listener); @@ -764,6 +765,7 @@ public class DateField extends AbstractField implements * @deprecated Since 7.0, replaced by * {@link #removeFocusListener(FocusListener)} **/ + @Override @Deprecated public void removeListener(FocusListener listener) { removeFocusListener(listener); @@ -778,6 +780,7 @@ public class DateField extends AbstractField implements /** * @deprecated Since 7.0, replaced by {@link #addBlurListener(BlurListener)} **/ + @Override @Deprecated public void addListener(BlurListener listener) { addBlurListener(listener); @@ -792,6 +795,7 @@ public class DateField extends AbstractField implements * @deprecated Since 7.0, replaced by * {@link #removeBlurListener(BlurListener)} **/ + @Override @Deprecated public void removeListener(BlurListener listener) { removeBlurListener(listener); diff --git a/server/src/com/vaadin/ui/DragAndDropWrapper.java b/server/src/com/vaadin/ui/DragAndDropWrapper.java index d3f3e23448..ca4807ff5d 100644 --- a/server/src/com/vaadin/ui/DragAndDropWrapper.java +++ b/server/src/com/vaadin/ui/DragAndDropWrapper.java @@ -29,10 +29,10 @@ import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.DropTarget; import com.vaadin.event.dd.TargetDetails; import com.vaadin.event.dd.TargetDetailsImpl; +import com.vaadin.server.LegacyComponent; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.StreamVariable; -import com.vaadin.server.LegacyComponent; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.dd.HorizontalDropLocation; import com.vaadin.shared.ui.dd.VerticalDropLocation; diff --git a/server/src/com/vaadin/ui/Embedded.java b/server/src/com/vaadin/ui/Embedded.java index b3afb52249..3bcd7a26a0 100644 --- a/server/src/com/vaadin/ui/Embedded.java +++ b/server/src/com/vaadin/ui/Embedded.java @@ -22,10 +22,10 @@ import java.util.Map; import com.vaadin.event.MouseEvents.ClickEvent; import com.vaadin.event.MouseEvents.ClickListener; +import com.vaadin.server.LegacyComponent; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.Resource; -import com.vaadin.server.LegacyComponent; import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.embedded.EmbeddedConstants; diff --git a/server/src/com/vaadin/ui/Flash.java b/server/src/com/vaadin/ui/Flash.java index d39f34634e..430018289a 100644 --- a/server/src/com/vaadin/ui/Flash.java +++ b/server/src/com/vaadin/ui/Flash.java @@ -34,8 +34,7 @@ public class Flash extends AbstractEmbedded { */ public void setCodebase(String codebase) { if (codebase != getState().codebase - || (codebase != null && !codebase.equals(getState() -.codebase))) { + || (codebase != null && !codebase.equals(getState().codebase))) { getState().codebase = codebase; requestRepaint(); } @@ -53,8 +52,7 @@ public class Flash extends AbstractEmbedded { */ public void setCodetype(String codetype) { if (codetype != getState().codetype - || (codetype != null && !codetype.equals(getState() -.codetype))) { + || (codetype != null && !codetype.equals(getState().codetype))) { getState().codetype = codetype; requestRepaint(); } diff --git a/server/src/com/vaadin/ui/Label.java b/server/src/com/vaadin/ui/Label.java index 53b618a87f..86cbdb3253 100644 --- a/server/src/com/vaadin/ui/Label.java +++ b/server/src/com/vaadin/ui/Label.java @@ -357,6 +357,7 @@ public class Label extends AbstractComponent implements Property, * @deprecated Since 7.0, replaced by * {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} **/ + @Override @Deprecated public void addListener(Property.ValueChangeListener listener) { addValueChangeListener(listener); @@ -379,6 +380,7 @@ public class Label extends AbstractComponent implements Property, * @deprecated Since 7.0, replaced by * {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} **/ + @Override @Deprecated public void removeListener(Property.ValueChangeListener listener) { removeValueChangeListener(listener); diff --git a/server/src/com/vaadin/ui/MenuBar.java b/server/src/com/vaadin/ui/MenuBar.java index d948ef813a..a254f62fc8 100644 --- a/server/src/com/vaadin/ui/MenuBar.java +++ b/server/src/com/vaadin/ui/MenuBar.java @@ -22,10 +22,10 @@ import java.util.List; import java.util.Map; import java.util.Stack; +import com.vaadin.server.LegacyComponent; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.Resource; -import com.vaadin.server.LegacyComponent; import com.vaadin.shared.ui.menubar.MenuBarConstants; /** diff --git a/server/src/com/vaadin/ui/OptionGroup.java b/server/src/com/vaadin/ui/OptionGroup.java index 983a01381d..8a9e7f101d 100644 --- a/server/src/com/vaadin/ui/OptionGroup.java +++ b/server/src/com/vaadin/ui/OptionGroup.java @@ -97,6 +97,7 @@ public class OptionGroup extends AbstractSelect implements /** * @deprecated Since 7.0, replaced by {@link #addBlurListener(BlurListener)} **/ + @Override @Deprecated public void addListener(BlurListener listener) { addBlurListener(listener); @@ -111,6 +112,7 @@ public class OptionGroup extends AbstractSelect implements * @deprecated Since 7.0, replaced by * {@link #removeBlurListener(BlurListener)} **/ + @Override @Deprecated public void removeListener(BlurListener listener) { removeBlurListener(listener); @@ -126,6 +128,7 @@ public class OptionGroup extends AbstractSelect implements * @deprecated Since 7.0, replaced by * {@link #addFocusListener(FocusListener)} **/ + @Override @Deprecated public void addListener(FocusListener listener) { addFocusListener(listener); @@ -141,6 +144,7 @@ public class OptionGroup extends AbstractSelect implements * @deprecated Since 7.0, replaced by * {@link #removeFocusListener(FocusListener)} **/ + @Override @Deprecated public void removeListener(FocusListener listener) { removeFocusListener(listener); diff --git a/server/src/com/vaadin/ui/ProgressIndicator.java b/server/src/com/vaadin/ui/ProgressIndicator.java index 7558ff0e43..fa51197a8b 100644 --- a/server/src/com/vaadin/ui/ProgressIndicator.java +++ b/server/src/com/vaadin/ui/ProgressIndicator.java @@ -20,9 +20,9 @@ import java.util.Map; import com.vaadin.data.Property; import com.vaadin.data.util.ObjectProperty; +import com.vaadin.server.LegacyComponent; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; -import com.vaadin.server.LegacyComponent; /** * ProgressIndicator is component that shows user state of a diff --git a/server/src/com/vaadin/ui/RichTextArea.java b/server/src/com/vaadin/ui/RichTextArea.java index 261701b835..e687c68815 100644 --- a/server/src/com/vaadin/ui/RichTextArea.java +++ b/server/src/com/vaadin/ui/RichTextArea.java @@ -19,9 +19,9 @@ package com.vaadin.ui; import java.util.Map; import com.vaadin.data.Property; +import com.vaadin.server.LegacyComponent; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; -import com.vaadin.server.LegacyComponent; /** * A simple RichTextArea to edit HTML format text. diff --git a/server/src/com/vaadin/ui/TabSheet.java b/server/src/com/vaadin/ui/TabSheet.java index 291aea3bd6..1293966e58 100644 --- a/server/src/com/vaadin/ui/TabSheet.java +++ b/server/src/com/vaadin/ui/TabSheet.java @@ -1238,6 +1238,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, /** * @deprecated Since 7.0, replaced by {@link #addBlurListener(BlurListener)} **/ + @Override @Deprecated public void addListener(BlurListener listener) { addBlurListener(listener); @@ -1252,6 +1253,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, * @deprecated Since 7.0, replaced by * {@link #removeBlurListener(BlurListener)} **/ + @Override @Deprecated public void removeListener(BlurListener listener) { removeBlurListener(listener); @@ -1267,6 +1269,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, * @deprecated Since 7.0, replaced by * {@link #addFocusListener(FocusListener)} **/ + @Override @Deprecated public void addListener(FocusListener listener) { addFocusListener(listener); @@ -1281,6 +1284,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, * @deprecated Since 7.0, replaced by * {@link #removeFocusListener(FocusListener)} **/ + @Override @Deprecated public void removeListener(FocusListener listener) { removeFocusListener(listener); diff --git a/server/src/com/vaadin/ui/Table.java b/server/src/com/vaadin/ui/Table.java index e0469f6522..989e6adba8 100644 --- a/server/src/com/vaadin/ui/Table.java +++ b/server/src/com/vaadin/ui/Table.java @@ -4626,6 +4626,7 @@ public class Table extends AbstractSelect implements Action.Container, * @deprecated Since 7.0, replaced by * {@link #addItemClickListener(ItemClickListener)} **/ + @Override @Deprecated public void addListener(ItemClickListener listener) { addItemClickListener(listener); @@ -4641,6 +4642,7 @@ public class Table extends AbstractSelect implements Action.Container, * @deprecated Since 7.0, replaced by * {@link #removeItemClickListener(ItemClickListener)} **/ + @Override @Deprecated public void removeListener(ItemClickListener listener) { removeItemClickListener(listener); diff --git a/server/src/com/vaadin/ui/Tree.java b/server/src/com/vaadin/ui/Tree.java index 306d1f18ba..44a1208cf8 100644 --- a/server/src/com/vaadin/ui/Tree.java +++ b/server/src/com/vaadin/ui/Tree.java @@ -1205,6 +1205,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * @deprecated Since 7.0, replaced by * {@link #addItemClickListener(ItemClickListener)} **/ + @Override @Deprecated public void addListener(ItemClickListener listener) { addItemClickListener(listener); @@ -1220,6 +1221,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * @deprecated Since 7.0, replaced by * {@link #removeItemClickListener(ItemClickListener)} **/ + @Override @Deprecated public void removeListener(ItemClickListener listener) { removeItemClickListener(listener); diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java index 1c1fcf5492..e0f984de0d 100644 --- a/server/src/com/vaadin/ui/UI.java +++ b/server/src/com/vaadin/ui/UI.java @@ -956,8 +956,8 @@ public abstract class UI extends AbstractComponentContainer implements throw new IllegalStateException("UI id has already been defined"); } this.uiId = uiId; - theme = getSession().getUiProvider(request, getClass()) - .getThemeForUI(request, getClass()); + theme = getSession().getUiProvider(request, getClass()).getThemeForUI( + request, getClass()); getPage().init(request); diff --git a/server/src/com/vaadin/ui/Upload.java b/server/src/com/vaadin/ui/Upload.java index 2323b22e17..624f6a3f91 100644 --- a/server/src/com/vaadin/ui/Upload.java +++ b/server/src/com/vaadin/ui/Upload.java @@ -24,11 +24,11 @@ import java.util.Iterator; import java.util.LinkedHashSet; import java.util.Map; +import com.vaadin.server.LegacyComponent; import com.vaadin.server.NoInputStreamException; import com.vaadin.server.NoOutputStreamException; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; -import com.vaadin.server.LegacyComponent; import com.vaadin.server.StreamVariable.StreamingProgressEvent; /** -- cgit v1.2.3