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)
---
 client/src/com/vaadin/terminal/gwt/client/ComponentLocator.java       | 4 ++--
 .../com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'client')

diff --git a/client/src/com/vaadin/terminal/gwt/client/ComponentLocator.java b/client/src/com/vaadin/terminal/gwt/client/ComponentLocator.java
index f1a2b9b925..22a28d14bf 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ComponentLocator.java
+++ b/client/src/com/vaadin/terminal/gwt/client/ComponentLocator.java
@@ -458,7 +458,7 @@ public class ComponentLocator {
                 ServerConnector connector = ConnectorMap.get(client)
                         .getConnector(id);
                 if (connector == null) {
-                    // Lookup by debugId
+                    // Lookup by component id
                     // TODO Optimize this
                     connector = findConnectorById(client.getRootConnector(),
                             id.substring(5));
@@ -606,7 +606,7 @@ public class ComponentLocator {
     private ServerConnector findConnectorById(ServerConnector root, String id) {
         SharedState state = root.getState();
         if (state instanceof ComponentState
-                && id.equals(((ComponentState) state).getDebugId())) {
+                && id.equals(((ComponentState) state).getId())) {
             return root;
         }
         for (ServerConnector child : root.getChildren()) {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java
index f36107e947..5741111716 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java
+++ b/client/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java
@@ -123,8 +123,8 @@ public abstract class AbstractComponentConnector extends AbstractConnector
     public void onStateChanged(StateChangeEvent stateChangeEvent) {
         ConnectorMap paintableMap = ConnectorMap.get(getConnection());
 
-        if (getState().getDebugId() != null) {
-            getWidget().getElement().setId(getState().getDebugId());
+        if (getState().getId() != null) {
+            getWidget().getElement().setId(getState().getId());
         } else {
             getWidget().getElement().removeAttribute("id");
 
-- 
cgit v1.2.3