Global code reformat

Change-Id: I4b3c74ede518aa2712038d1451974a93cdecabc2

27 files changed, 88 insertions, 14 deletions

diff --git a/server/src/com/vaadin/data/fieldgroup/FieldGroup.java b/server/src/com/vaadin/data/fieldgroup/FieldGroup.java
index 6c515dbdee..981aea387d 100644
--- a/server/src/com/vaadin/data/fieldgroup/FieldGroup.java
+++ b/server/src/com/vaadin/data/fieldgroup/FieldGroup.java
@@ -919,7 +919,8 @@ public class FieldGroup implements Serializable {
             for (Object itemPropertyId : dataSource.getItemPropertyIds()) {
                 if (itemPropertyId instanceof String) {
                     String itemPropertyName = (String) itemPropertyId;
-                    if (minifiedFieldName.equals(minifyFieldName(itemPropertyName))) {
+                    if (minifiedFieldName
+                            .equals(minifyFieldName(itemPropertyName))) {
                         return itemPropertyName;
                     }
                 }
diff --git a/server/src/com/vaadin/server/BrowserWindowOpener.java b/server/src/com/vaadin/server/BrowserWindowOpener.java
index 8e049ca454..a6e420f89c 100644
--- a/server/src/com/vaadin/server/BrowserWindowOpener.java
+++ b/server/src/com/vaadin/server/BrowserWindowOpener.java
@@ -38,7 +38,8 @@ public class BrowserWindowOpener extends AbstractExtension {
         private final String path;
         private final Class<? extends UI> uiClass;
 
-        public BrowserWindowOpenerUIProvider(Class<? extends UI> uiClass, String path) {
+        public BrowserWindowOpenerUIProvider(Class<? extends UI> uiClass,
+                String path) {
             this.path = ensureInitialSlash(path);
             this.uiClass = uiClass;
         }
diff --git a/server/src/com/vaadin/server/communication/AbstractStreamingEvent.java b/server/src/com/vaadin/server/communication/AbstractStreamingEvent.java
index 054bc14f2d..b97a60fd56 100644
--- a/server/src/com/vaadin/server/communication/AbstractStreamingEvent.java
+++ b/server/src/com/vaadin/server/communication/AbstractStreamingEvent.java
@@ -15,7 +15,6 @@
  */
 package com.vaadin.server.communication;
 
-import com.vaadin.server.StreamVariable;
 import com.vaadin.server.StreamVariable.StreamingEvent;
 
 /**
diff --git a/server/src/com/vaadin/server/communication/ConnectorHierarchyWriter.java b/server/src/com/vaadin/server/communication/ConnectorHierarchyWriter.java
index 963886edbb..467bddbdce 100644
--- a/server/src/com/vaadin/server/communication/ConnectorHierarchyWriter.java
+++ b/server/src/com/vaadin/server/communication/ConnectorHierarchyWriter.java
@@ -26,8 +26,8 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import com.vaadin.server.AbstractClientConnector;
-import com.vaadin.server.LegacyCommunicationManager;
 import com.vaadin.server.ClientConnector;
+import com.vaadin.server.LegacyCommunicationManager;
 import com.vaadin.server.PaintException;
 import com.vaadin.ui.UI;
 
diff --git a/server/src/com/vaadin/server/communication/PortletListenerNotifier.java b/server/src/com/vaadin/server/communication/PortletListenerNotifier.java
index c64819ca44..5c03a6f4dc 100644
--- a/server/src/com/vaadin/server/communication/PortletListenerNotifier.java
+++ b/server/src/com/vaadin/server/communication/PortletListenerNotifier.java
@@ -29,8 +29,8 @@ import javax.portlet.RenderResponse;
 import javax.portlet.ResourceRequest;
 import javax.portlet.ResourceResponse;
 
-import com.vaadin.server.SynchronizedRequestHandler;
 import com.vaadin.server.ServletPortletHelper;
+import com.vaadin.server.SynchronizedRequestHandler;
 import com.vaadin.server.VaadinPortletRequest;
 import com.vaadin.server.VaadinPortletResponse;
 import com.vaadin.server.VaadinPortletSession;
diff --git a/server/src/com/vaadin/server/communication/ResourceWriter.java b/server/src/com/vaadin/server/communication/ResourceWriter.java
index 86f8dd3b36..080027943f 100644
--- a/server/src/com/vaadin/server/communication/ResourceWriter.java
+++ b/server/src/com/vaadin/server/communication/ResourceWriter.java
@@ -25,8 +25,8 @@ import java.util.Iterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.vaadin.server.LegacyCommunicationManager;
 import com.vaadin.server.JsonPaintTarget;
+import com.vaadin.server.LegacyCommunicationManager;
 import com.vaadin.ui.CustomLayout;
 import com.vaadin.ui.UI;
 
diff --git a/server/src/com/vaadin/server/communication/StreamingEndEventImpl.java b/server/src/com/vaadin/server/communication/StreamingEndEventImpl.java
index e241bbbfaf..f8cfb160be 100644
--- a/server/src/com/vaadin/server/communication/StreamingEndEventImpl.java
+++ b/server/src/com/vaadin/server/communication/StreamingEndEventImpl.java
@@ -15,7 +15,6 @@
  */
 package com.vaadin.server.communication;
 
-import com.vaadin.server.StreamVariable;
 import com.vaadin.server.StreamVariable.StreamingEndEvent;
 
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/server/communication/StreamingErrorEventImpl.java b/server/src/com/vaadin/server/communication/StreamingErrorEventImpl.java
index 1ee74c68b6..9d9a19e4fe 100644
--- a/server/src/com/vaadin/server/communication/StreamingErrorEventImpl.java
+++ b/server/src/com/vaadin/server/communication/StreamingErrorEventImpl.java
@@ -15,7 +15,6 @@
  */
 package com.vaadin.server.communication;
 
-import com.vaadin.server.StreamVariable;
 import com.vaadin.server.StreamVariable.StreamingErrorEvent;
 
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/server/communication/StreamingProgressEventImpl.java b/server/src/com/vaadin/server/communication/StreamingProgressEventImpl.java
index c07e37e196..69f3bfb29c 100644
--- a/server/src/com/vaadin/server/communication/StreamingProgressEventImpl.java
+++ b/server/src/com/vaadin/server/communication/StreamingProgressEventImpl.java
@@ -15,7 +15,6 @@
  */
 package com.vaadin.server.communication;
 
-import com.vaadin.server.StreamVariable;
 import com.vaadin.server.StreamVariable.StreamingProgressEvent;
 
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/server/communication/StreamingStartEventImpl.java b/server/src/com/vaadin/server/communication/StreamingStartEventImpl.java
index a7f13be499..bd16f08801 100644
--- a/server/src/com/vaadin/server/communication/StreamingStartEventImpl.java
+++ b/server/src/com/vaadin/server/communication/StreamingStartEventImpl.java
@@ -15,7 +15,6 @@
  */
 package com.vaadin.server.communication;
 
-import com.vaadin.server.StreamVariable;
 import com.vaadin.server.StreamVariable.StreamingStartEvent;
 
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/ui/AbstractColorPicker.java b/server/src/com/vaadin/ui/AbstractColorPicker.java
index d7037e366d..c3bdd49155 100644
--- a/server/src/com/vaadin/ui/AbstractColorPicker.java
+++ b/server/src/com/vaadin/ui/AbstractColorPicker.java
@@ -405,6 +405,7 @@ public abstract class AbstractColorPicker extends AbstractComponent implements
                 window.setImmediate(true);
                 window.addCloseListener(this);
                 window.addColorChangeListener(new ColorChangeListener() {
+                    @Override
                     public void colorChanged(ColorChangeEvent event) {
                         AbstractColorPicker.this.colorChanged(event);
                     }
diff --git a/server/src/com/vaadin/ui/AbstractOrderedLayout.java b/server/src/com/vaadin/ui/AbstractOrderedLayout.java
index b06b2e0871..c9eb756daa 100644
--- a/server/src/com/vaadin/ui/AbstractOrderedLayout.java
+++ b/server/src/com/vaadin/ui/AbstractOrderedLayout.java
@@ -439,6 +439,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
      * com.vaadin.ui.Layout.AlignmentHandler#setDefaultComponentAlignment(com
      * .vaadin.ui.Alignment)
      */
+    @Override
     public void setDefaultComponentAlignment(Alignment defaultAlignment) {
         defaultComponentAlignment = defaultAlignment;
     }
diff --git a/server/src/com/vaadin/ui/Calendar.java b/server/src/com/vaadin/ui/Calendar.java
index 4bf2885a8c..38fa355dd8 100644
--- a/server/src/com/vaadin/ui/Calendar.java
+++ b/server/src/com/vaadin/ui/Calendar.java
@@ -1206,14 +1206,16 @@ public class Calendar extends AbstractComponent implements
 
         // remove old listener
         if (getEventProvider() instanceof EventSetChangeNotifier) {
-            ((EventSetChangeNotifier) getEventProvider()).removeEventSetChangeListener(this);
+            ((EventSetChangeNotifier) getEventProvider())
+                    .removeEventSetChangeListener(this);
         }
 
         this.calendarEventProvider = calendarEventProvider;
 
         // add new listener
         if (calendarEventProvider instanceof EventSetChangeNotifier) {
-            ((EventSetChangeNotifier) calendarEventProvider).addEventSetChangeListener(this);
+            ((EventSetChangeNotifier) calendarEventProvider)
+                    .addEventSetChangeListener(this);
         }
     }
 
@@ -1232,6 +1234,7 @@ public class Calendar extends AbstractComponent implements
      * com.vaadin.addon.calendar.ui.CalendarEvents.EventChangeListener#eventChange
      * (com.vaadin.addon.calendar.ui.CalendarEvents.EventChange)
      */
+    @Override
     public void eventSetChange(EventSetChangeEvent changeEvent) {
         // sanity check
         if (calendarEventProvider == changeEvent.getProvider()) {
@@ -1276,6 +1279,7 @@ public class Calendar extends AbstractComponent implements
      * #addListener
      * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.ForwardHandler)
      */
+    @Override
     public void setHandler(ForwardHandler listener) {
         setHandler(ForwardEvent.EVENT_ID, ForwardEvent.class, listener,
                 ForwardHandler.forwardMethod);
@@ -1289,6 +1293,7 @@ public class Calendar extends AbstractComponent implements
      * #addListener
      * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.BackwardHandler)
      */
+    @Override
     public void setHandler(BackwardHandler listener) {
         setHandler(BackwardEvent.EVENT_ID, BackwardEvent.class, listener,
                 BackwardHandler.backwardMethod);
@@ -1302,6 +1307,7 @@ public class Calendar extends AbstractComponent implements
      * #addListener
      * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.DateClickHandler)
      */
+    @Override
     public void setHandler(DateClickHandler listener) {
         setHandler(DateClickEvent.EVENT_ID, DateClickEvent.class, listener,
                 DateClickHandler.dateClickMethod);
@@ -1315,6 +1321,7 @@ public class Calendar extends AbstractComponent implements
      * #addListener
      * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventClickHandler)
      */
+    @Override
     public void setHandler(EventClickHandler listener) {
         setHandler(EventClick.EVENT_ID, EventClick.class, listener,
                 EventClickHandler.eventClickMethod);
@@ -1328,6 +1335,7 @@ public class Calendar extends AbstractComponent implements
      * #addListener
      * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.WeekClickHandler)
      */
+    @Override
     public void setHandler(WeekClickHandler listener) {
         setHandler(WeekClick.EVENT_ID, WeekClick.class, listener,
                 WeekClickHandler.weekClickMethod);
@@ -1342,6 +1350,7 @@ public class Calendar extends AbstractComponent implements
      * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventResizeHandler
      * )
      */
+    @Override
     public void setHandler(EventResizeHandler listener) {
         setHandler(EventResize.EVENT_ID, EventResize.class, listener,
                 EventResizeHandler.eventResizeMethod);
@@ -1356,6 +1365,7 @@ public class Calendar extends AbstractComponent implements
      * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.RangeSelectHandler
      * )
      */
+    @Override
     public void setHandler(RangeSelectHandler listener) {
         setHandler(RangeSelectEvent.EVENT_ID, RangeSelectEvent.class, listener,
                 RangeSelectHandler.rangeSelectMethod);
@@ -1370,6 +1380,7 @@ public class Calendar extends AbstractComponent implements
      * #addListener
      * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventMoveHandler)
      */
+    @Override
     public void setHandler(EventMoveHandler listener) {
         setHandler(MoveEvent.EVENT_ID, MoveEvent.class, listener,
                 EventMoveHandler.eventMoveMethod);
@@ -1382,6 +1393,7 @@ public class Calendar extends AbstractComponent implements
      * com.vaadin.addon.calendar.ui.CalendarComponentEvents.CalendarEventNotifier
      * #getHandler(java.lang.String)
      */
+    @Override
     public EventListener getHandler(String eventId) {
         return handlers.get(eventId);
     }
@@ -1389,6 +1401,7 @@ public class Calendar extends AbstractComponent implements
     /**
      * Get the currently active drop handler
      */
+    @Override
     public DropHandler getDropHandler() {
         return dropHandler;
     }
@@ -1410,6 +1423,7 @@ public class Calendar extends AbstractComponent implements
      * @see
      * com.vaadin.event.dd.DropTarget#translateDropTargetDetails(java.util.Map)
      */
+    @Override
     public TargetDetails translateDropTargetDetails(
             Map<String, Object> clientVariables) {
         Map<String, Object> serverVariables = new HashMap<String, Object>(1);
@@ -1458,12 +1472,14 @@ public class Calendar extends AbstractComponent implements
     public void setContainerDataSource(Container.Indexed container) {
         ContainerEventProvider provider = new ContainerEventProvider(container);
         provider.addEventSetChangeListener(new CalendarEventProvider.EventSetChangeListener() {
+            @Override
             public void eventSetChange(EventSetChangeEvent changeEvent) {
                 // Repaint if events change
                 markAsDirty();
             }
         });
         provider.addEventChangeListener(new EventChangeListener() {
+            @Override
             public void eventChange(EventChangeEvent changeEvent) {
                 // Repaint if event changes
                 markAsDirty();
@@ -1506,12 +1522,14 @@ public class Calendar extends AbstractComponent implements
         provider.setEndDateProperty(endDateProperty);
         provider.setStyleNameProperty(styleNameProperty);
         provider.addEventSetChangeListener(new CalendarEventProvider.EventSetChangeListener() {
+            @Override
             public void eventSetChange(EventSetChangeEvent changeEvent) {
                 // Repaint if events change
                 markAsDirty();
             }
         });
         provider.addEventChangeListener(new EventChangeListener() {
+            @Override
             public void eventChange(EventChangeEvent changeEvent) {
                 // Repaint if event changes
                 markAsDirty();
@@ -1527,6 +1545,7 @@ public class Calendar extends AbstractComponent implements
      * com.vaadin.addon.calendar.event.CalendarEventProvider#getEvents(java.
      * util.Date, java.util.Date)
      */
+    @Override
     public List<CalendarEvent> getEvents(Date startDate, Date endDate) {
         return getEventProvider().getEvents(startDate, endDate);
     }
@@ -1538,6 +1557,7 @@ public class Calendar extends AbstractComponent implements
      * com.vaadin.addon.calendar.event.CalendarEditableEventProvider#addEvent
      * (com.vaadin.addon.calendar.event.CalendarEvent)
      */
+    @Override
     public void addEvent(CalendarEvent event) {
         if (getEventProvider() instanceof CalendarEditableEventProvider) {
             CalendarEditableEventProvider provider = (CalendarEditableEventProvider) getEventProvider();
@@ -1556,6 +1576,7 @@ public class Calendar extends AbstractComponent implements
      * com.vaadin.addon.calendar.event.CalendarEditableEventProvider#removeEvent
      * (com.vaadin.addon.calendar.event.CalendarEvent)
      */
+    @Override
     public void removeEvent(CalendarEvent event) {
         if (getEventProvider() instanceof CalendarEditableEventProvider) {
             CalendarEditableEventProvider provider = (CalendarEditableEventProvider) getEventProvider();
@@ -1599,6 +1620,7 @@ public class Calendar extends AbstractComponent implements
      * </ul>
      * </p>
      */
+    @Override
     public void addActionHandler(Handler actionHandler) {
         if (actionHandler != null) {
             if (actionHandlers == null) {
@@ -1635,6 +1657,7 @@ public class Calendar extends AbstractComponent implements
      * com.vaadin.event.Action.Container#removeActionHandler(com.vaadin.event
      * .Action.Handler)
      */
+    @Override
     public void removeActionHandler(Handler actionHandler) {
         if (actionHandlers != null && actionHandlers.contains(actionHandler)) {
             actionHandlers.remove(actionHandler);
diff --git a/server/src/com/vaadin/ui/GridLayout.java b/server/src/com/vaadin/ui/GridLayout.java
index 60664c8937..53a25c1c83 100644
--- a/server/src/com/vaadin/ui/GridLayout.java
+++ b/server/src/com/vaadin/ui/GridLayout.java
@@ -1245,6 +1245,7 @@ public class GridLayout extends AbstractLayout implements
      * com.vaadin.ui.Layout.AlignmentHandler#setDefaultComponentAlignment(com
      * .vaadin.ui.Alignment)
      */
+    @Override
     public void setDefaultComponentAlignment(Alignment defaultAlignment) {
         defaultComponentAlignment = defaultAlignment;
     }
diff --git a/server/src/com/vaadin/ui/Window.java b/server/src/com/vaadin/ui/Window.java
index 0c1509663a..479992d084 100644
--- a/server/src/com/vaadin/ui/Window.java
+++ b/server/src/com/vaadin/ui/Window.java
@@ -489,7 +489,8 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier,
      * @param listener
      *            the DisplayStateChangeListener to add.
      */
-    public void addDisplayStateChangeListener(DisplayStateChangeListener listener) {
+    public void addDisplayStateChangeListener(
+            DisplayStateChangeListener listener) {
         addListener(DisplayStateChangeEvent.class, listener,
                 DisplayStateChangeListener.displayStateChangeMethod);
     }
@@ -500,7 +501,8 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier,
      * @param listener
      *            the DisplayStateChangeListener to remove.
      */
-    public void removeDisplayStateChangeListener(DisplayStateChangeListener listener) {
+    public void removeDisplayStateChangeListener(
+            DisplayStateChangeListener listener) {
         removeListener(DisplayStateChangeEvent.class, listener,
                 DisplayStateChangeListener.displayStateChangeMethod);
     }
diff --git a/server/src/com/vaadin/ui/components/calendar/ContainerEventProvider.java b/server/src/com/vaadin/ui/components/calendar/ContainerEventProvider.java
index b01140eb88..37ea255d27 100644
--- a/server/src/com/vaadin/ui/components/calendar/ContainerEventProvider.java
+++ b/server/src/com/vaadin/ui/components/calendar/ContainerEventProvider.java
@@ -239,6 +239,7 @@ public class ContainerEventProvider implements CalendarEditableEventProvider,
      * com.vaadin.addon.calendar.event.CalendarEventProvider#getEvents(java.
      * util.Date, java.util.Date)
      */
+    @Override
     public List<CalendarEvent> getEvents(Date startDate, Date endDate) {
         eventCache.clear();
 
@@ -315,6 +316,7 @@ public class ContainerEventProvider implements CalendarEditableEventProvider,
      * #addListener(com.vaadin.addon.calendar.event.CalendarEventProvider.
      * EventSetChangeListener)
      */
+    @Override
     public void addEventSetChangeListener(EventSetChangeListener listener) {
         if (!eventSetChangeListeners.contains(listener)) {
             eventSetChangeListeners.add(listener);
@@ -329,6 +331,7 @@ public class ContainerEventProvider implements CalendarEditableEventProvider,
      * #removeListener(com.vaadin.addon.calendar.event.CalendarEventProvider.
      * EventSetChangeListener)
      */
+    @Override
     public void removeEventSetChangeListener(EventSetChangeListener listener) {
         eventSetChangeListeners.remove(listener);
     }
@@ -340,6 +343,7 @@ public class ContainerEventProvider implements CalendarEditableEventProvider,
      * com.vaadin.addon.calendar.event.CalendarEvent.EventChangeNotifier#addListener
      * (com.vaadin.addon.calendar.event.CalendarEvent.EventChangeListener)
      */
+    @Override
     public void addEventChangeListener(EventChangeListener listener) {
         if (eventChangeListeners.contains(listener)) {
             eventChangeListeners.add(listener);
@@ -353,6 +357,7 @@ public class ContainerEventProvider implements CalendarEditableEventProvider,
      * removeListener
      * (com.vaadin.addon.calendar.event.CalendarEvent.EventChangeListener)
      */
+    @Override
     public void removeEventChangeListener(EventChangeListener listener) {
         eventChangeListeners.remove(listener);
     }
@@ -434,6 +439,7 @@ public class ContainerEventProvider implements CalendarEditableEventProvider,
      * com.vaadin.data.Container.ItemSetChangeListener#containerItemSetChange
      * (com.vaadin.data.Container.ItemSetChangeEvent)
      */
+    @Override
     public void containerItemSetChange(ItemSetChangeEvent event) {
         if (event.getContainer() == container) {
             // Trigger an eventset change event when the itemset changes
@@ -450,6 +456,7 @@ public class ContainerEventProvider implements CalendarEditableEventProvider,
      * com.vaadin.data.Property.ValueChangeListener#valueChange(com.vaadin.data
      * .Property.ValueChangeEvent)
      */
+    @Override
     public void valueChange(ValueChangeEvent event) {
         /*
          * TODO Need to figure out how to get the item which triggered the the
@@ -466,6 +473,7 @@ public class ContainerEventProvider implements CalendarEditableEventProvider,
      * #eventMove
      * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.MoveEvent)
      */
+    @Override
     public void eventMove(MoveEvent event) {
         CalendarEvent ce = event.getCalendarEvent();
         if (eventCache.contains(ce)) {
@@ -496,6 +504,7 @@ public class ContainerEventProvider implements CalendarEditableEventProvider,
      * #eventResize
      * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventResize)
      */
+    @Override
     public void eventResize(EventResize event) {
         CalendarEvent ce = event.getCalendarEvent();
         if (eventCache.contains(ce)) {
@@ -531,6 +540,7 @@ public class ContainerEventProvider implements CalendarEditableEventProvider,
      * com.vaadin.addon.calendar.event.CalendarEditableEventProvider#addEvent
      * (com.vaadin.addon.calendar.event.CalendarEvent)
      */
+    @Override
     public void addEvent(CalendarEvent event) {
         Item item;
         try {
@@ -560,6 +570,7 @@ public class ContainerEventProvider implements CalendarEditableEventProvider,
      * com.vaadin.addon.calendar.event.CalendarEditableEventProvider#removeEvent
      * (com.vaadin.addon.calendar.event.CalendarEvent)
      */
+    @Override
     public void removeEvent(CalendarEvent event) {
         container.removeItem(event);
     }
diff --git a/server/src/com/vaadin/ui/components/calendar/event/BasicEvent.java b/server/src/com/vaadin/ui/components/calendar/event/BasicEvent.java
index ab342dfabf..3f14145f0c 100644
--- a/server/src/com/vaadin/ui/components/calendar/event/BasicEvent.java
+++ b/server/src/com/vaadin/ui/components/calendar/event/BasicEvent.java
@@ -91,6 +91,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
      * 
      * @see com.vaadin.addon.calendar.event.CalendarEvent#getCaption()
      */
+    @Override
     public String getCaption() {
         return caption;
     }
@@ -100,6 +101,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
      * 
      * @see com.vaadin.addon.calendar.event.CalendarEvent#getDescription()
      */
+    @Override
     public String getDescription() {
         return description;
     }
@@ -109,6 +111,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
      * 
      * @see com.vaadin.addon.calendar.event.CalendarEvent#getEnd()
      */
+    @Override
     public Date getEnd() {
         return end;
     }
@@ -118,6 +121,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
      * 
      * @see com.vaadin.addon.calendar.event.CalendarEvent#getStart()
      */
+    @Override
     public Date getStart() {
         return start;
     }
@@ -127,6 +131,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
      * 
      * @see com.vaadin.addon.calendar.event.CalendarEvent#getStyleName()
      */
+    @Override
     public String getStyleName() {
         return styleName;
     }
@@ -136,6 +141,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
      * 
      * @see com.vaadin.addon.calendar.event.CalendarEvent#isAllDay()
      */
+    @Override
     public boolean isAllDay() {
         return isAllDay;
     }
@@ -147,6 +153,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
      * com.vaadin.addon.calendar.event.CalendarEventEditor#setCaption(java.lang
      * .String)
      */
+    @Override
     public void setCaption(String caption) {
         this.caption = caption;
         fireEventChange();
@@ -159,6 +166,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
      * com.vaadin.addon.calendar.event.CalendarEventEditor#setDescription(java
      * .lang.String)
      */
+    @Override
     public void setDescription(String description) {
         this.description = description;
         fireEventChange();
@@ -171,6 +179,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
      * com.vaadin.addon.calendar.event.CalendarEventEditor#setEnd(java.util.
      * Date)
      */
+    @Override
     public void setEnd(Date end) {
         this.end = end;
         fireEventChange();
@@ -183,6 +192,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
      * com.vaadin.addon.calendar.event.CalendarEventEditor#setStart(java.util
      * .Date)
      */
+    @Override
     public void setStart(Date start) {
         this.start = start;
         fireEventChange();
@@ -195,6 +205,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
      * com.vaadin.addon.calendar.event.CalendarEventEditor#setStyleName(java
      * .lang.String)
      */
+    @Override
     public void setStyleName(String styleName) {
         this.styleName = styleName;
         fireEventChange();
@@ -206,6 +217,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
      * @see
      * com.vaadin.addon.calendar.event.CalendarEventEditor#setAllDay(boolean)
      */
+    @Override
     public void setAllDay(boolean isAllDay) {
         this.isAllDay = isAllDay;
         fireEventChange();
@@ -220,6 +232,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
      * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventChangeListener
      * )
      */
+    @Override
     public void addEventChangeListener(EventChangeListener listener) {
         listeners.add(listener);
     }
@@ -233,6 +246,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
      * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventChangeListener
      * )
      */
+    @Override
     public void removeEventChangeListener(EventChangeListener listener) {
         listeners.remove(listener);
     }
diff --git a/server/src/com/vaadin/ui/components/calendar/event/BasicEventProvider.java b/server/src/com/vaadin/ui/components/calendar/event/BasicEventProvider.java
index 0314652245..b2b74a5e52 100644
--- a/server/src/com/vaadin/ui/components/calendar/event/BasicEventProvider.java
+++ b/server/src/com/vaadin/ui/components/calendar/event/BasicEventProvider.java
@@ -56,6 +56,7 @@ public class BasicEventProvider implements CalendarEditableEventProvider,
      * com.vaadin.addon.calendar.event.CalendarEventProvider#getEvents(java.
      * util.Date, java.util.Date)
      */
+    @Override
     public List<CalendarEvent> getEvents(Date startDate, Date endDate) {
         ArrayList<CalendarEvent> activeEvents = new ArrayList<CalendarEvent>();
 
@@ -98,6 +99,7 @@ public class BasicEventProvider implements CalendarEditableEventProvider,
      * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventSetChangeListener
      * )
      */
+    @Override
     public void addEventSetChangeListener(EventSetChangeListener listener) {
         listeners.add(listener);
 
@@ -112,6 +114,7 @@ public class BasicEventProvider implements CalendarEditableEventProvider,
      * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventSetChangeListener
      * )
      */
+    @Override
     public void removeEventSetChangeListener(EventSetChangeListener listener) {
         listeners.remove(listener);
     }
@@ -136,6 +139,7 @@ public class BasicEventProvider implements CalendarEditableEventProvider,
      * #eventChange
      * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventSetChange)
      */
+    @Override
     public void eventChange(EventChangeEvent changeEvent) {
         // naive implementation
         fireEventSetChange();
@@ -148,6 +152,7 @@ public class BasicEventProvider implements CalendarEditableEventProvider,
      * com.vaadin.addon.calendar.event.CalendarEditableEventProvider#addEvent
      * (com.vaadin.addon.calendar.event.CalendarEvent)
      */
+    @Override
     public void addEvent(CalendarEvent event) {
         eventList.add(event);
         if (event instanceof BasicEvent) {
@@ -163,6 +168,7 @@ public class BasicEventProvider implements CalendarEditableEventProvider,
      * com.vaadin.addon.calendar.event.CalendarEditableEventProvider#removeEvent
      * (com.vaadin.addon.calendar.event.CalendarEvent)
      */
+    @Override
     public void removeEvent(CalendarEvent event) {
         eventList.remove(event);
         if (event instanceof BasicEvent) {
diff --git a/server/src/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java b/server/src/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java
index fc2bfd6df4..65e9c94dec 100644
--- a/server/src/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java
+++ b/server/src/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java
@@ -39,6 +39,7 @@ public class BasicBackwardHandler implements BackwardHandler {
      * backward
      * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.BackwardEvent)
      */
+    @Override
     public void backward(BackwardEvent event) {
         Date start = event.getComponent().getStartDate();
         Date end = event.getComponent().getEndDate();
diff --git a/server/src/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java b/server/src/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java
index c91a238b86..ac2470e008 100644
--- a/server/src/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java
+++ b/server/src/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java
@@ -39,6 +39,7 @@ public class BasicDateClickHandler implements DateClickHandler {
      * #dateClick
      * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.DateClickEvent)
      */
+    @Override
     public void dateClick(DateClickEvent event) {
         Date clickedDate = event.getDate();
 
diff --git a/server/src/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java b/server/src/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java
index 139837f339..ae4c5fcc12 100644
--- a/server/src/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java
+++ b/server/src/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java
@@ -39,6 +39,7 @@ public class BasicEventMoveHandler implements EventMoveHandler {
      * #eventMove
      * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.MoveEvent)
      */
+    @Override
     public void eventMove(MoveEvent event) {
         CalendarEvent calendarEvent = event.getCalendarEvent();
 
diff --git a/server/src/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java b/server/src/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java
index c052d0d77b..ee7fc27360 100644
--- a/server/src/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java
+++ b/server/src/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java
@@ -39,6 +39,7 @@ public class BasicEventResizeHandler implements EventResizeHandler {
      * #eventResize
      * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventResize)
      */
+    @Override
     public void eventResize(EventResize event) {
         CalendarEvent calendarEvent = event.getCalendarEvent();
 
diff --git a/server/src/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java b/server/src/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java
index a5307ffd5c..e36c9e5756 100644
--- a/server/src/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java
+++ b/server/src/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java
@@ -38,6 +38,7 @@ public class BasicForwardHandler implements ForwardHandler {
      * com.vaadin.addon.calendar.ui.CalendarComponentEvents.ForwardHandler#forward
      * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.ForwardEvent)
      */
+    @Override
     public void forward(ForwardEvent event) {
         Date start = event.getComponent().getStartDate();
         Date end = event.getComponent().getEndDate();
diff --git a/server/src/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java b/server/src/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java
index 49efe49e48..846fd7dd53 100644
--- a/server/src/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java
+++ b/server/src/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java
@@ -40,6 +40,7 @@ public class BasicWeekClickHandler implements WeekClickHandler {
      * #weekClick
      * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.WeekClick)
      */
+    @Override
     public void weekClick(WeekClick event) {
         int week = event.getWeek();
         int year = event.getYear();
diff --git a/server/src/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java b/server/src/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java
index 9e9855afdd..9123245033 100644
--- a/server/src/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java
+++ b/server/src/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java
@@ -187,6 +187,7 @@ public class ColorPickerGrid extends AbstractComponent implements ColorSelector
      * @param listener
      *            The color change listener
      */
+    @Override
     public void addColorChangeListener(ColorChangeListener listener) {
         addListener(ColorChangeEvent.class, listener, COLOR_CHANGE_METHOD);
     }
@@ -202,6 +203,7 @@ public class ColorPickerGrid extends AbstractComponent implements ColorSelector
      * @param listener
      *            The listener
      */
+    @Override
     public void removeColorChangeListener(ColorChangeListener listener) {
         removeListener(ColorChangeEvent.class, listener);
     }
diff --git a/server/src/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java b/server/src/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java
index e6edbcf40e..2902585f56 100644
--- a/server/src/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java
+++ b/server/src/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java
@@ -194,6 +194,7 @@ public class ColorPickerHistory extends CustomComponent implements
      * @param listener
      *            The listener
      */
+    @Override
     public void addColorChangeListener(ColorChangeListener listener) {
         addListener(ColorChangeEvent.class, listener, COLOR_CHANGE_METHOD);
     }
@@ -204,6 +205,7 @@ public class ColorPickerHistory extends CustomComponent implements
      * @param listener
      *            The listener
      */
+    @Override
     public void removeColorChangeListener(ColorChangeListener listener) {
         removeListener(ColorChangeEvent.class, listener);
     }
diff --git a/server/src/com/vaadin/ui/components/colorpicker/ColorPickerPopup.java b/server/src/com/vaadin/ui/components/colorpicker/ColorPickerPopup.java
index c06ae9f6ff..fee52d1a24 100644
--- a/server/src/com/vaadin/ui/components/colorpicker/ColorPickerPopup.java
+++ b/server/src/com/vaadin/ui/components/colorpicker/ColorPickerPopup.java
@@ -283,6 +283,7 @@ public class ColorPickerPopup extends Window implements ClickListener,
         }
 
         redSlider.addValueChangeListener(new ValueChangeListener() {
+            @Override
             public void valueChange(ValueChangeEvent event) {
                 double red = (Double) event.getProperty().getValue();
                 if (!updatingColors) {
@@ -303,6 +304,7 @@ public class ColorPickerPopup extends Window implements ClickListener,
         }
 
         greenSlider.addValueChangeListener(new ValueChangeListener() {
+            @Override
             public void valueChange(ValueChangeEvent event) {
                 double green = (Double) event.getProperty().getValue();
                 if (!updatingColors) {
@@ -322,6 +324,7 @@ public class ColorPickerPopup extends Window implements ClickListener,
         }
 
         blueSlider.addValueChangeListener(new ValueChangeListener() {
+            @Override
             public void valueChange(ValueChangeEvent event) {
                 double blue = (Double) event.getProperty().getValue();
                 if (!updatingColors) {
@@ -380,6 +383,7 @@ public class ColorPickerPopup extends Window implements ClickListener,
         hueSlider.setWidth("220px");
         hueSlider.setImmediate(true);
         hueSlider.addValueChangeListener(new ValueChangeListener() {
+            @Override
             public void valueChange(ValueChangeEvent event) {
                 if (!updatingColors) {
                     float hue = (Float.parseFloat(event.getProperty()
@@ -417,6 +421,7 @@ public class ColorPickerPopup extends Window implements ClickListener,
         saturationSlider.setWidth("220px");
         saturationSlider.setImmediate(true);
         saturationSlider.addValueChangeListener(new ValueChangeListener() {
+            @Override
             public void valueChange(ValueChangeEvent event) {
                 if (!updatingColors) {
                     float hue = (Float.parseFloat(hueSlider.getValue()
@@ -444,6 +449,7 @@ public class ColorPickerPopup extends Window implements ClickListener,
         valueSlider.setWidth("220px");
         valueSlider.setImmediate(true);
         valueSlider.addValueChangeListener(new ValueChangeListener() {
+            @Override
             public void valueChange(ValueChangeEvent event) {
                 if (!updatingColors) {
                     float hue = (Float.parseFloat(hueSlider.getValue()
@@ -754,6 +760,7 @@ public class ColorPickerPopup extends Window implements ClickListener,
 
     /** HSV color converter */
     Coordinates2Color HSVConverter = new Coordinates2Color() {
+        @Override
         public int[] calculate(Color color) {
 
             float[] hsv = color.getHSV();
@@ -769,6 +776,7 @@ public class ColorPickerPopup extends Window implements ClickListener,
             return new int[] { x, y };
         }
 
+        @Override
         public Color calculate(int x, int y) {
             float saturation = 1f - (y / 220.0f);
             float value = (x / 220.0f);