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 33381474657864b1420b1df1d6909168b7d3f32f..e69c55d445e0c1e736eac2394565d069714ce0cb 100644 (file)
--- 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)