From: Jonatan Kronqvist <jonatan@vaadin.com>
Date: Tue, 2 Oct 2012 10:54:48 +0000 (+0300)
Subject: Fixes #9828 - ComponentLocator now makes use of debug IDs if present
X-Git-Tag: 7.0.0.beta6~108
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=facd94111590d9fe7b8b5ceffe3f7d0db0024948;p=vaadin-framework.git

Fixes #9828 - ComponentLocator now makes use of debug IDs if present

Change-Id: I58aeee42ef386dd3eef8fdf25f8dd430eb22774c
---

diff --git a/client/src/com/vaadin/client/ComponentLocator.java b/client/src/com/vaadin/client/ComponentLocator.java
index 3338147465..e69c55d445 100644
--- a/client/src/com/vaadin/client/ComponentLocator.java
+++ b/client/src/com/vaadin/client/ComponentLocator.java
@@ -436,8 +436,10 @@ public class ComponentLocator {
         if (w == null) {
             return null;
         }
-
-        if (w instanceof VUI) {
+        String elementId = w.getElement().getId();
+        if (elementId != null && !elementId.isEmpty()) {
+            return "PID_S" + elementId;
+        } else if (w instanceof VUI) {
             return "";
         } else if (w instanceof VWindow) {
             Connector windowConnector = ConnectorMap.get(client)