2 files changed, 3 insertions, 20 deletions
diff --git a/shared/src/main/java/com/vaadin/shared/ui/datefield/PopupDateFieldState.java b/shared/src/main/java/com/vaadin/shared/ui/datefield/DateFieldState.java
index 3489346564..f71d33fb3a 100644
--- a/shared/src/main/java/com/vaadin/shared/ui/datefield/PopupDateFieldState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/datefield/DateFieldState.java
@@ -17,7 +17,7 @@ package com.vaadin.shared.ui.datefield;
 
 import com.vaadin.shared.annotations.NoLayout;
 
-public class PopupDateFieldState extends TextualDateFieldState {
+public class DateFieldState extends TextualDateFieldState {
     public static final String DESCRIPTION_FOR_ASSISTIVE_DEVICES = "Arrow down key opens calendar element for choosing the date";
 
     {
diff --git a/shared/src/main/java/com/vaadin/shared/ui/datefield/Resolution.java b/shared/src/main/java/com/vaadin/shared/ui/datefield/Resolution.java
index 93dbb7ab83..0fc5da4803 100644
--- a/shared/src/main/java/com/vaadin/shared/ui/datefield/Resolution.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/datefield/Resolution.java
@@ -25,25 +25,7 @@ import java.util.List;
  * @since 7.0
  */
 public enum Resolution {
-    // Values from Calendar.SECOND etc. Set as ints to avoid Calendar dependency
-    // (does not exist on the client side)
-    SECOND(13), MINUTE(12), HOUR(11), DAY(5), MONTH(2), YEAR(1);
-
-    private int calendarField;
-
-    private Resolution(int calendarField) {
-        this.calendarField = calendarField;
-    }
-
-    /**
-     * Returns the field in java.util.Calendar that corresponds to this
-     * resolution.
-     *
-     * @return one of the field numbers used by Calendar
-     */
-    public int getCalendarField() {
-        return calendarField;
-    }
+    DAY, MONTH, YEAR;
 
     /**
      * Returns the resolutions that are higher or equal to the given resolution,
@@ -81,4 +63,5 @@ public enum Resolution {
         }
         return resolutions;
     }
+
 }