Derive DateField from new AbstractField (#57).

Change-Id: I5efe17253ecd28dad5a2250076246a9eb30eec62

6 files changed, 134 insertions, 40 deletions

diff --git a/client/src/main/java/com/vaadin/client/legacy/ui/LegacyDateFieldConnector.java b/client/src/main/java/com/vaadin/client/legacy/ui/LegacyDateFieldConnector.java
new file mode 100644
index 0000000000..ac27fac760
--- /dev/null
+++ b/client/src/main/java/com/vaadin/client/legacy/ui/LegacyDateFieldConnector.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.client.legacy.ui;
+
+import com.vaadin.client.ui.datefield.DateFieldConnector;
+import com.vaadin.legacy.ui.LegacyDateField;
+import com.vaadin.shared.ui.Connect;
+
+/**
+ * @author Vaadin Ltd
+ *
+ */
+@Connect(LegacyDateField.class)
+@Deprecated
+public class LegacyDateFieldConnector extends DateFieldConnector {
+
+}
diff --git a/client/src/main/java/com/vaadin/client/legacy/ui/LegacyInlineDateFieldConnector.java b/client/src/main/java/com/vaadin/client/legacy/ui/LegacyInlineDateFieldConnector.java
new file mode 100644
index 0000000000..0674fabbc8
--- /dev/null
+++ b/client/src/main/java/com/vaadin/client/legacy/ui/LegacyInlineDateFieldConnector.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.client.legacy.ui;
+
+import com.vaadin.client.ui.datefield.InlineDateFieldConnector;
+import com.vaadin.legacy.ui.LegacyInlineDateField;
+import com.vaadin.shared.ui.Connect;
+
+/**
+ * @author Vaadin Ltd
+ *
+ */
+@Connect(LegacyInlineDateField.class)
+@Deprecated
+public class LegacyInlineDateFieldConnector extends InlineDateFieldConnector {
+
+}
diff --git a/client/src/main/java/com/vaadin/client/legacy/ui/LegacyPopupDateFieldConnector.java b/client/src/main/java/com/vaadin/client/legacy/ui/LegacyPopupDateFieldConnector.java
new file mode 100644
index 0000000000..9612e5cc7a
--- /dev/null
+++ b/client/src/main/java/com/vaadin/client/legacy/ui/LegacyPopupDateFieldConnector.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.client.legacy.ui;
+
+import com.vaadin.client.ui.datefield.PopupDateFieldConnector;
+import com.vaadin.legacy.ui.LegacyPopupDateField;
+import com.vaadin.shared.ui.Connect;
+
+/**
+ * @author Vaadin Ltd
+ *
+ */
+@Deprecated
+@Connect(LegacyPopupDateField.class)
+public class LegacyPopupDateFieldConnector extends PopupDateFieldConnector {
+
+}
diff --git a/client/src/main/java/com/vaadin/client/ui/datefield/DateFieldConnector.java b/client/src/main/java/com/vaadin/client/ui/datefield/DateFieldConnector.java
index 407d0e387c..22c1995279 100644
--- a/client/src/main/java/com/vaadin/client/ui/datefield/DateFieldConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/datefield/DateFieldConnector.java
@@ -27,13 +27,13 @@ import com.vaadin.client.UIDL;
 import com.vaadin.client.communication.StateChangeEvent;
 import com.vaadin.client.ui.VCalendarPanel.FocusChangeListener;
 import com.vaadin.client.ui.VCalendarPanel.TimeChangeListener;
-import com.vaadin.legacy.ui.LegacyDateField;
 import com.vaadin.client.ui.VPopupCalendar;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.datefield.PopupDateFieldState;
 import com.vaadin.shared.ui.datefield.Resolution;
+import com.vaadin.ui.DateField;
 
-@Connect(LegacyDateField.class)
+@Connect(DateField.class)
 public class DateFieldConnector extends TextualDateConnector {
 
     /*
@@ -81,20 +81,20 @@ public class DateFieldConnector extends TextualDateConnector {
 
         super.updateFromUIDL(uidl, client);
 
-        getWidget().calendar.setDateTimeService(getWidget()
-                .getDateTimeService());
-        getWidget().calendar.setShowISOWeekNumbers(getWidget()
-                .isShowISOWeekNumbers());
+        getWidget().calendar
+                .setDateTimeService(getWidget().getDateTimeService());
+        getWidget().calendar
+                .setShowISOWeekNumbers(getWidget().isShowISOWeekNumbers());
         if (getWidget().calendar.getResolution() != getWidget()
                 .getCurrentResolution()) {
             boolean hasSelectedDate = false;
-            getWidget().calendar.setResolution(getWidget()
-                    .getCurrentResolution());
+            getWidget().calendar
+                    .setResolution(getWidget().getCurrentResolution());
             if (getWidget().calendar.getDate() != null
                     && getWidget().getCurrentDate() != null) {
                 hasSelectedDate = true;
-                getWidget().calendar.setDate((Date) getWidget()
-                        .getCurrentDate().clone());
+                getWidget().calendar
+                        .setDate((Date) getWidget().getCurrentDate().clone());
             }
             // force re-render when changing resolution only
             getWidget().calendar.renderCalendar(hasSelectedDate);
@@ -105,8 +105,8 @@ public class DateFieldConnector extends TextualDateConnector {
             getWidget().calendar.renderCalendar();
         }
 
-        if (getWidget().getCurrentResolution().getCalendarField() <= Resolution.MONTH
-                .getCalendarField()) {
+        if (getWidget().getCurrentResolution()
+                .getCalendarField() <= Resolution.MONTH.getCalendarField()) {
             getWidget().calendar
                     .setFocusChangeListener(new FocusChangeListener() {
                         @Override
@@ -123,12 +123,13 @@ public class DateFieldConnector extends TextualDateConnector {
             getWidget().calendar.setFocusChangeListener(null);
         }
 
-        if (getWidget().getCurrentResolution().getCalendarField() > Resolution.DAY
-                .getCalendarField()) {
+        if (getWidget().getCurrentResolution()
+                .getCalendarField() > Resolution.DAY.getCalendarField()) {
             getWidget().calendar
                     .setTimeChangeListener(new TimeChangeListener() {
                         @Override
-                        public void changed(int hour, int min, int sec, int msec) {
+                        public void changed(int hour, int min, int sec,
+                                int msec) {
                             Date d = getWidget().getDate();
                             if (d == null) {
                                 // date currently null, use the value from
@@ -152,11 +153,11 @@ public class DateFieldConnector extends TextualDateConnector {
         }
 
         if (getWidget().isReadonly()) {
-            getWidget().calendarToggle.addStyleName(VPopupCalendar.CLASSNAME
-                    + "-button-readonly");
+            getWidget().calendarToggle.addStyleName(
+                    VPopupCalendar.CLASSNAME + "-button-readonly");
         } else {
-            getWidget().calendarToggle.removeStyleName(VPopupCalendar.CLASSNAME
-                    + "-button-readonly");
+            getWidget().calendarToggle.removeStyleName(
+                    VPopupCalendar.CLASSNAME + "-button-readonly");
         }
 
         getWidget().setDescriptionForAssistiveDevices(
@@ -200,18 +201,20 @@ public class DateFieldConnector extends TextualDateConnector {
     }
 
     @Override
-    protected void setWidgetStyleNameWithPrefix(String prefix,
-            String styleName, boolean add) {
+    protected void setWidgetStyleNameWithPrefix(String prefix, String styleName,
+            boolean add) {
         super.setWidgetStyleNameWithPrefix(prefix, styleName, add);
 
         // update the style change to popup calendar widget with the correct
         // prefix
         if (!styleName.startsWith("-")) {
-            getWidget().popup.setStyleName(getWidget().getStylePrimaryName()
-                    + "-popup-" + styleName, add);
+            getWidget().popup.setStyleName(
+                    getWidget().getStylePrimaryName() + "-popup-" + styleName,
+                    add);
         } else {
-            getWidget().popup.setStyleName(getWidget().getStylePrimaryName()
-                    + "-popup" + styleName, add);
+            getWidget().popup.setStyleName(
+                    getWidget().getStylePrimaryName() + "-popup" + styleName,
+                    add);
         }
     }
 
diff --git a/client/src/main/java/com/vaadin/client/ui/datefield/InlineDateFieldConnector.java b/client/src/main/java/com/vaadin/client/ui/datefield/InlineDateFieldConnector.java
index 9f5e18c21c..0ed7c1ced3 100644
--- a/client/src/main/java/com/vaadin/client/ui/datefield/InlineDateFieldConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/datefield/InlineDateFieldConnector.java
@@ -23,13 +23,13 @@ import com.vaadin.client.UIDL;
 import com.vaadin.client.communication.StateChangeEvent;
 import com.vaadin.client.ui.VCalendarPanel.FocusChangeListener;
 import com.vaadin.client.ui.VCalendarPanel.TimeChangeListener;
-import com.vaadin.legacy.ui.LegacyInlineDateField;
 import com.vaadin.client.ui.VDateFieldCalendar;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.datefield.InlineDateFieldState;
 import com.vaadin.shared.ui.datefield.Resolution;
+import com.vaadin.ui.InlineDateField;
 
-@Connect(LegacyInlineDateField.class)
+@Connect(InlineDateField.class)
 public class InlineDateFieldConnector extends AbstractDateFieldConnector {
 
     @Override
@@ -40,12 +40,12 @@ public class InlineDateFieldConnector extends AbstractDateFieldConnector {
             return;
         }
 
-        getWidget().calendarPanel.setShowISOWeekNumbers(getWidget()
-                .isShowISOWeekNumbers());
-        getWidget().calendarPanel.setDateTimeService(getWidget()
-                .getDateTimeService());
-        getWidget().calendarPanel.setResolution(getWidget()
-                .getCurrentResolution());
+        getWidget().calendarPanel
+                .setShowISOWeekNumbers(getWidget().isShowISOWeekNumbers());
+        getWidget().calendarPanel
+                .setDateTimeService(getWidget().getDateTimeService());
+        getWidget().calendarPanel
+                .setResolution(getWidget().getCurrentResolution());
         Date currentDate = getWidget().getCurrentDate();
         if (currentDate != null) {
             getWidget().calendarPanel.setDate(new Date(currentDate.getTime()));
@@ -53,12 +53,13 @@ public class InlineDateFieldConnector extends AbstractDateFieldConnector {
             getWidget().calendarPanel.setDate(null);
         }
 
-        if (getWidget().getCurrentResolution().getCalendarField() > Resolution.DAY
-                .getCalendarField()) {
+        if (getWidget().getCurrentResolution()
+                .getCalendarField() > Resolution.DAY.getCalendarField()) {
             getWidget().calendarPanel
                     .setTimeChangeListener(new TimeChangeListener() {
                         @Override
-                        public void changed(int hour, int min, int sec, int msec) {
+                        public void changed(int hour, int min, int sec,
+                                int msec) {
                             Date d = getWidget().getDate();
                             if (d == null) {
                                 // date currently null, use the value from
@@ -79,8 +80,8 @@ public class InlineDateFieldConnector extends AbstractDateFieldConnector {
                     });
         }
 
-        if (getWidget().getCurrentResolution().getCalendarField() <= Resolution.MONTH
-                .getCalendarField()) {
+        if (getWidget().getCurrentResolution()
+                .getCalendarField() <= Resolution.MONTH.getCalendarField()) {
             getWidget().calendarPanel
                     .setFocusChangeListener(new FocusChangeListener() {
                         @Override
diff --git a/client/src/main/java/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java b/client/src/main/java/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java
index 4d212c4451..31232177d3 100644
--- a/client/src/main/java/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java
@@ -16,10 +16,10 @@
 
 package com.vaadin.client.ui.datefield;
 
-import com.vaadin.legacy.ui.LegacyPopupDateField;
 import com.vaadin.shared.ui.Connect;
+import com.vaadin.ui.PopupDateField;
 
-@Connect(LegacyPopupDateField.class)
+@Connect(PopupDateField.class)
 public class PopupDateFieldConnector extends DateFieldConnector {
 
 }