2 files changed, 3 insertions, 3 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java
index 63a6776394..fc661ff705 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java
@@ -10,10 +10,10 @@ import com.google.gwt.event.dom.client.DomEvent;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.DateTimeService;
 import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.ui.VCalendarPanel.FocusChangeListener;
 import com.vaadin.terminal.gwt.client.ui.VCalendarPanel.FocusOutListener;
 import com.vaadin.terminal.gwt.client.ui.VCalendarPanel.SubmitListener;
 import com.vaadin.terminal.gwt.client.ui.VCalendarPanel.TimeChangeListener;
-import com.vaadin.terminal.gwt.client.ui.VCalendarPanel.FocusChangeListener;
 
 public class VDateFieldCalendar extends VDateField {
 
@@ -34,7 +34,7 @@ public class VDateFieldCalendar extends VDateField {
             }
         });
         calendarPanel.setFocusOutListener(new FocusOutListener() {
-            public boolean onFocusOut(DomEvent event) {
+            public boolean onFocusOut(DomEvent<?> event) {
                 updateValueFromPanel();
                 return false;
             }
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
index 0f6cb0fe68..ce1c085466 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
@@ -64,7 +64,7 @@ public class VPopupCalendar extends VTextualDate implements Paintable, Field,
 
         calendar = GWT.create(VCalendarPanel.class);
         calendar.setFocusOutListener(new FocusOutListener() {
-            public boolean onFocusOut(DomEvent event) {
+            public boolean onFocusOut(DomEvent<?> event) {
                 event.preventDefault();
                 closeCalendarPanel();
                 return true;