Renamed a method based on review #6936

svn changeset:18647/svn branch:6.6

diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
index 6cd9d6bed9e431768a304a9afeaeaac19cc210ce..5f808ea8cdecd0edf8560ab9314e212bc36be95e 100755 (executable)
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
@@ -352,7 +352,7 @@ public class ApplicationConnection {
         int screenHeight = BrowserInfo.get().getScreenHeight();
         int tzOffset = BrowserInfo.get().getTimezoneOffset();
         int rtzOffset = BrowserInfo.get().getRawTimezoneOffset();
-        int dstDiff = BrowserInfo.get().getDSTDifference();
+        int dstDiff = BrowserInfo.get().getDSTSavings();
         boolean dstInEffect = BrowserInfo.get().isDSTInEffect();
         long curDate = BrowserInfo.get().getCurrentDate().getTime();
         String widgetsetVersion = ApplicationConfiguration.VERSION;

diff --git a/src/com/vaadin/terminal/gwt/client/BrowserInfo.java b/src/com/vaadin/terminal/gwt/client/BrowserInfo.java
index 966dd3f8632cd339019df1d1a6f9e901ccc4e3a8..3c908556fad0698988785710b563af2f153e4899 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/BrowserInfo.java
+++ b/src/com/vaadin/terminal/gwt/client/BrowserInfo.java
@@ -350,9 +350,10 @@ public class BrowserInfo {
      * Gets the difference in minutes between the browser's GMT timezone and
      * DST.
      * 
-     * @return the amount of minutes that the timezone shifts when DST is active
+     * @return the amount of minutes that the timezone shifts when DST is in
+     *         effect
      */
-    public native int getDSTDifference()
+    public native int getDSTSavings()
     /*-{
         var d = new Date();
         var tzo1 = d.getTimezoneOffset(); // current offset

diff --git a/src/com/vaadin/terminal/gwt/server/WebBrowser.java b/src/com/vaadin/terminal/gwt/server/WebBrowser.java
index 7c773130193fa39c3a25d80eb370481b22249252..1b0d7fe9867fc5e2f4f8997d89f6f078dc4ff01f 100644 (file)
--- a/src/com/vaadin/terminal/gwt/server/WebBrowser.java
+++ b/src/com/vaadin/terminal/gwt/server/WebBrowser.java
@@ -28,7 +28,7 @@ public class WebBrowser implements Terminal {
     private boolean secureConnection;
     private int timezoneOffset = 0;
     private int rawTimezoneOffset = 0;
-    private int dstDifference;
+    private int dstSavings;
     private boolean dstInEffect;
     private Date currentDate;
 
@@ -91,7 +91,7 @@ public class WebBrowser implements Terminal {
      *            TimeZone offset in minutes from GMT
      * @param rtzo
      *            raw TimeZone offset in minutes from GMT (w/o DST adjustment)
-     * @param dstDiff
+     * @param dstSavings
      *            the difference between the raw TimeZone and DST in minutes
      * @param dstInEffect
      *            is DST currently active in the region or not?
@@ -100,7 +100,7 @@ public class WebBrowser implements Terminal {
      */
     void updateBrowserProperties(Locale locale, String address,
             boolean secureConnection, String agent, String sw, String sh,
-            String tzo, String rtzo, String dstDiff, String dstInEffect,
+            String tzo, String rtzo, String dstSavings, String dstInEffect,
             String curDate) {
         this.locale = locale;
         this.address = address;
@@ -134,12 +134,12 @@ public class WebBrowser implements Terminal {
                 rawTimezoneOffset = 0; // default gmt+0
             }
         }
-        if (dstDiff != null) {
+        if (dstSavings != null) {
             try {
                 // browser->java conversion: min->ms
-                dstDifference = Integer.parseInt(dstDiff) * 60 * 1000;
+                this.dstSavings = Integer.parseInt(dstSavings) * 60 * 1000;
             } catch (final NumberFormatException e) {
-                dstDifference = 0; // default no difference
+                this.dstSavings = 0; // default no savings
             }
         }
         if (dstInEffect != null) {
@@ -347,10 +347,11 @@ public class WebBrowser implements Terminal {
      * Gets the difference in minutes between the browser's GMT TimeZone and
      * DST.
      * 
-     * @return the amount of minutes that the TimeZone shifts when DST is active
+     * @return the amount of minutes that the TimeZone shifts when DST is in
+     *         effect
      */
-    public int getDSTDifference() {
-        return dstDifference;
+    public int getDSTSavings() {
+        return dstSavings;
     }
 
     /**

diff --git a/tests/src/com/vaadin/tests/application/WebBrowserTest.java b/tests/src/com/vaadin/tests/application/WebBrowserTest.java
index 60339efdafffe1d3af79996cb734c1e1979c3e5c..08c9061d455dfccddd3033fc57c1ac4dbc75c348 100644 (file)
--- a/tests/src/com/vaadin/tests/application/WebBrowserTest.java
+++ b/tests/src/com/vaadin/tests/application/WebBrowserTest.java
@@ -63,7 +63,7 @@ public class WebBrowserTest extends TestBase {
                         containsLabel.setValue(contains ? "Yes" : "No");\r
 \r
                         dstDiffLabel.setValue(String.valueOf(getBrowser()\r
-                                .getDSTDifference()));\r
+                                .getDSTSavings()));\r
 \r
                         dstInEffectLabel\r
                                 .setValue(getBrowser().isDSTInEffect() ? "Yes"\r