From: Artur Signell <artur@vaadin.com>
Date: Tue, 16 Sep 2014 07:09:39 +0000 (+0300)
Subject: Remove Calendar dependency (#14668)
X-Git-Tag: 7.3.2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3abed394ed9d95cebb9523be94cc91d8cc47f7bc;p=vaadin-framework.git

Remove Calendar dependency (#14668)

This can cause GWT compilation problems as java.util.Calendar is not
available in GWT

Change-Id: Ia13d8f433ac43fcfd670c8e05b1295d3c64327cf
---

diff --git a/shared/src/com/vaadin/shared/ui/datefield/Resolution.java b/shared/src/com/vaadin/shared/ui/datefield/Resolution.java
index 6d467e233c..689db11188 100644
--- a/shared/src/com/vaadin/shared/ui/datefield/Resolution.java
+++ b/shared/src/com/vaadin/shared/ui/datefield/Resolution.java
@@ -16,7 +16,6 @@
 package com.vaadin.shared.ui.datefield;
 
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.List;
 
 /**
@@ -26,8 +25,9 @@ import java.util.List;
  * @since 7.0
  */
 public enum Resolution {
-    SECOND(Calendar.SECOND), MINUTE(Calendar.MINUTE), HOUR(Calendar.HOUR_OF_DAY), DAY(
-            Calendar.DAY_OF_MONTH), MONTH(Calendar.MONTH), YEAR(Calendar.YEAR);
+    // 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;
 
@@ -36,7 +36,7 @@ public enum Resolution {
     }
 
     /**
-     * Returns the field in {@link Calendar} that corresponds to this
+     * Returns the field in java.util.Calendar that corresponds to this
      * resolution.
      * 
      * @return one of the field numbers used by Calendar