diff options
| author | Pekka Hyvönen <pekka@vaadin.com> | 2012-08-28 10:16:58 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-08-28 11:31:52 +0300 |
| commit | 05964e7adaed15b7bda6ba3c49ce226ec4ff723a (patch) | |
| tree | b76381be637511581aa2b0d9e578c6eb925ccf8e /client | |
| parent | c6d43cc88fb0ef4853e07be54fc76a6aa1dc9e23 (diff) | |
| download | vaadin-framework-05964e7adaed15b7bda6ba3c49ce226ec4ff723a.tar.gz vaadin-framework-05964e7adaed15b7bda6ba3c49ce226ec4ff723a.zip | |
Renamed Component.debugId to id (#3700)
Applied patch from Pekka with minor changes
(@deprecation javadoc, call the real methods from deprecated methods in AbstractComponent)
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/terminal/gwt/client/ComponentLocator.java | 4 | ||||
| -rw-r--r-- | client/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java | 4 |
2 files changed, 4 insertions, 4 deletions
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"); |