From 05964e7adaed15b7bda6ba3c49ce226ec4ff723a Mon Sep 17 00:00:00 2001
From: Pekka Hyvönen <pekka@vaadin.com>
Date: Tue, 28 Aug 2012 10:16:58 +0300
Subject: Renamed Component.debugId to id (#3700)

Applied patch from Pekka with minor changes
(@deprecation javadoc, call the real methods from deprecated methods in AbstractComponent)
---
 shared/src/com/vaadin/shared/ComponentState.java | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'shared')

diff --git a/shared/src/com/vaadin/shared/ComponentState.java b/shared/src/com/vaadin/shared/ComponentState.java
index 92afad0520..ac6f1185bf 100644
--- a/shared/src/com/vaadin/shared/ComponentState.java
+++ b/shared/src/com/vaadin/shared/ComponentState.java
@@ -42,7 +42,7 @@ public class ComponentState extends SharedState {
     private boolean visible = true;
     private URLReference icon = null;
     private List<String> styles = null;
-    private String debugId = null;
+    private String id = null;
     /**
      * A set of event identifiers with registered listeners.
      */
@@ -293,25 +293,25 @@ public class ComponentState extends SharedState {
     }
 
     /**
-     * Gets the debug id for the component. The debugId is added as DOM id for
-     * the component.
+     * Gets the id for the component. The id is added as DOM id for the
+     * component.
      * 
-     * @return The debug id for the component or null if not set
+     * @return The id for the component or null if not set
      */
-    public String getDebugId() {
-        return debugId;
+    public String getId() {
+        return id;
     }
 
     /**
-     * Sets the debug id for the component. The debugId is added as DOM id for
-     * the component.
+     * Sets the id for the component. The id is added as DOM id for the
+     * component.
      * 
-     * @param debugId
-     *            The new debugId for the component or null for no debug id
+     * @param id
+     *            The new id for the component or null for no id
      * 
      */
-    public void setDebugId(String debugId) {
-        this.debugId = debugId;
+    public void setId(String id) {
+        this.id = id;
     }
 
     /**
-- 
cgit v1.2.3


From 3d0a576dcd40ba1fc80bc80814558235d2332c71 Mon Sep 17 00:00:00 2001
From: Leif Åstrand <leif@vaadin.com>
Date: Tue, 28 Aug 2012 13:54:07 +0300
Subject: Identify too old Safari browsers based on webkit version (#9423)

Detection based on "safari" version is not reliable because of the way
various browsers based on webkit report their version numbers in the
user agent string.
---
 shared/src/com/vaadin/shared/VBrowserDetails.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'shared')

diff --git a/shared/src/com/vaadin/shared/VBrowserDetails.java b/shared/src/com/vaadin/shared/VBrowserDetails.java
index 7646d2ba01..2e81fbfe61 100644
--- a/shared/src/com/vaadin/shared/VBrowserDetails.java
+++ b/shared/src/com/vaadin/shared/VBrowserDetails.java
@@ -460,7 +460,8 @@ public class VBrowserDetails implements Serializable {
         if (isIE() && getBrowserMajorVersion() < 8) {
             return true;
         }
-        if (isSafari() && getBrowserMajorVersion() < 5) {
+        // Webkit 533 in Safari 4.1+, Android 2.2+, iOS 4+
+        if (isSafari() && getBrowserEngineVersion() < 533) {
             return true;
         }
         if (isFirefox() && getBrowserMajorVersion() < 4) {
-- 
cgit v1.2.3