removed dead code + some cleanup

svn changeset:14964/svn branch:6.4

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
index f3adb6f51419f6f950e4b10a8cec2c67818664f4..40c9887c8337d1dd6aba28899b6429f6fe346c39 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
@@ -5,7 +5,6 @@
 package com.vaadin.terminal.gwt.client.ui;\r
 \r
 import java.util.Date;\r
-import java.util.List;\r
 \r
 import com.google.gwt.dom.client.Node;\r
 import com.google.gwt.event.dom.client.BlurEvent;\r
@@ -67,7 +66,7 @@ public class VCalendarPanel extends FocusableFlexTable implements
         /**\r
          * @return true if the calendar panel is not used after focus moves out\r
          */\r
-        boolean onFocusOut(DomEvent event);\r
+        boolean onFocusOut(DomEvent<?> event);\r
     }\r
 \r
     /**\r
@@ -140,7 +139,6 @@ public class VCalendarPanel extends FocusableFlexTable implements
     private int resolution = VDateField.RESOLUTION_YEAR;\r
 \r
     private int focusedRow;\r
-    private int focusedColumn;\r
 \r
     private Timer mouseTimer;\r
 \r
@@ -215,7 +213,6 @@ public class VCalendarPanel extends FocusableFlexTable implements
                             if (curday.getDay() == day) {\r
                                 curday.addStyleDependentName(CN_FOCUSED);\r
                                 focusedDay = curday;\r
-                                focusedColumn = j;\r
                                 focusedRow = i;\r
                                 return;\r
                             }\r
@@ -258,7 +255,6 @@ public class VCalendarPanel extends FocusableFlexTable implements
      */\r
     private void selectFocused() {\r
         if (focusedDate != null) {\r
-            int changedFields = 0;\r
             /*\r
              * #5594 set Date (day) to 1 in order to prevent any kind of\r
              * wrapping of months when later setting the month. (e.g. 31 ->\r
@@ -268,14 +264,11 @@ public class VCalendarPanel extends FocusableFlexTable implements
             value.setDate(1);\r
             if (value.getYear() != focusedDate.getYear()) {\r
                 value.setYear(focusedDate.getYear());\r
-                changedFields += VDateField.RESOLUTION_YEAR;\r
             }\r
             if (value.getMonth() != focusedDate.getMonth()) {\r
                 value.setMonth(focusedDate.getMonth());\r
-                changedFields += VDateField.RESOLUTION_MONTH;\r
             }\r
             if (value.getDate() != focusedDate.getDate()) {\r
-                changedFields += VDateField.RESOLUTION_DAY;\r
             }\r
             // We always need to set the date, even if it hasn't changed, since\r
             // it was forced to 1 above.\r
@@ -292,7 +285,7 @@ public class VCalendarPanel extends FocusableFlexTable implements
         return false;\r
     }\r
 \r
-    private int getResolution() {\r
+    public int getResolution() {\r
         return resolution;\r
     }\r
 \r
@@ -534,7 +527,6 @@ public class VCalendarPanel extends FocusableFlexTable implements
                     if (dayOfMonth == focusedDate.getDate()) {\r
                         focusedDay = day;\r
                         focusedRow = weekOfMonth;\r
-                        focusedColumn = firstWeekdayColumn + dayOfWeek;\r
                         if (hasFocus) {\r
                             day.addStyleDependentName(CN_FOCUSED);\r
                         }\r
@@ -700,10 +692,6 @@ public class VCalendarPanel extends FocusableFlexTable implements
         }\r
     }\r
 \r
-    public interface CalendarEntrySource {\r
-        public List getEntries(Date date, int resolution);\r
-    }\r
-\r
     /*\r
      * (non-Javadoc)\r
      * \r
@@ -733,7 +721,7 @@ public class VCalendarPanel extends FocusableFlexTable implements
      * @param event\r
      *            The keydown/keypress event\r
      */\r
-    private void handleKeyPress(DomEvent event) {\r
+    private void handleKeyPress(DomEvent<?> event) {\r
         if (time != null\r
                 && time.getElement().isOrHasChild(\r
                         (Node) event.getNativeEvent().getEventTarget().cast())) {\r
@@ -1274,8 +1262,6 @@ public class VCalendarPanel extends FocusableFlexTable implements
 \r
         private ListBox ampm;\r
 \r
-        private ListBox lastField;\r
-\r
         /**\r
          * Constructor\r
          */\r
@@ -1364,7 +1350,6 @@ public class VCalendarPanel extends FocusableFlexTable implements
                 add(new VLabel(h < 10 ? "0" + h : "" + h));\r
             } else {\r
                 add(hours);\r
-                lastField = hours;\r
             }\r
 \r
             if (getResolution() >= VDateField.RESOLUTION_MIN) {\r
@@ -1374,7 +1359,6 @@ public class VCalendarPanel extends FocusableFlexTable implements
                     add(new VLabel(m < 10 ? "0" + m : "" + m));\r
                 } else {\r
                     add(mins);\r
-                    lastField = mins;\r
                 }\r
             }\r
             if (getResolution() >= VDateField.RESOLUTION_SEC) {\r
@@ -1384,7 +1368,6 @@ public class VCalendarPanel extends FocusableFlexTable implements
                     add(new VLabel(s < 10 ? "0" + s : "" + s));\r
                 } else {\r
                     add(sec);\r
-                    lastField = sec;\r
                 }\r
             }\r
             if (getResolution() == VDateField.RESOLUTION_MSEC) {\r
@@ -1395,7 +1378,6 @@ public class VCalendarPanel extends FocusableFlexTable implements
                     add(new VLabel(m < 10 ? "0" + ms : ms));\r
                 } else {\r
                     add(msec);\r
-                    lastField = msec;\r
                 }\r
             }\r
             if (getResolution() == VDateField.RESOLUTION_HOUR) {\r
@@ -1411,7 +1393,6 @@ public class VCalendarPanel extends FocusableFlexTable implements
                     add(new VLabel(ampm.getItemText(i)));\r
                 } else {\r
                     add(ampm);\r
-                    lastField = ampm;\r
                 }\r
             }\r
 \r
@@ -1598,7 +1579,7 @@ public class VCalendarPanel extends FocusableFlexTable implements
      * @param event\r
      * @return\r
      */\r
-    protected boolean onTabOut(DomEvent event) {\r
+    protected boolean onTabOut(DomEvent<?> event) {\r
         if (focusOutListener != null) {\r
             return focusOutListener.onFocusOut(event);\r
         }\r