From b9b9c2dcd65181e7a0a8bbcad80b51cdce0937d2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Leif=20=C3=85strand?= Date: Thu, 28 Jun 2012 19:45:35 +0300 Subject: [PATCH] Rename getWidgetElement() -> getElement() (#8888) --- WebContent/statictestfiles/jsconnector.js | 2 +- src/com/vaadin/terminal/AbstractJavaScriptExtension.java | 6 +++--- .../terminal/gwt/client/JavaScriptConnectorHelper.java | 2 +- src/com/vaadin/ui/AbstractJavaScriptComponent.java | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/WebContent/statictestfiles/jsconnector.js b/WebContent/statictestfiles/jsconnector.js index d7f697dbf5..a87df92bc8 100644 --- a/WebContent/statictestfiles/jsconnector.js +++ b/WebContent/statictestfiles/jsconnector.js @@ -1,7 +1,7 @@ window.com_vaadin_tests_components_javascriptcomponent_BasicJavaScriptComponent_ExampleWidget = function() { var connector = this; - var rootElement = connector.getWidgetElement(); + var rootElement = connector.getElement(); rootElement.innerHTML = 'Hello world!'; rootElement.onclick = function() { connector.getRpcProxy().onClick("message"); diff --git a/src/com/vaadin/terminal/AbstractJavaScriptExtension.java b/src/com/vaadin/terminal/AbstractJavaScriptExtension.java index bdcd948c74..77540c355a 100644 --- a/src/com/vaadin/terminal/AbstractJavaScriptExtension.java +++ b/src/com/vaadin/terminal/AbstractJavaScriptExtension.java @@ -34,9 +34,9 @@ import com.vaadin.ui.JavaScriptCallback; * the connector's parent. If connectorId is provided, the id of * the parent of the corresponding connector with the passed id is returned * instead. - *
  • getWidgetElement([connectorId]) - returns the DOM Element - * that is the root of a connector's widget. null is returned if - * the connector can not be found or if the connector doesn't have a widget. If + *
  • getElement([connectorId]) - returns the DOM Element that is + * the root of a connector's widget. null is returned if the + * connector can not be found or if the connector doesn't have a widget. If * connectorId is not provided, the connector id of the current * connector will be used.
    • *
  • getState() - returns an object corresponding to the shared diff --git a/src/com/vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java b/src/com/vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java index f3a3aa3e83..86c11fd26d 100644 --- a/src/com/vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java +++ b/src/com/vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java @@ -185,7 +185,7 @@ public class JavaScriptConnectorHelper { } return rpcObjects.@java.util.Map::get(Ljava/lang/Object;)(iface); }), - 'getWidgetElement': $entry(function(connectorId) { + 'getElement': $entry(function(connectorId) { return h.@com.vaadin.terminal.gwt.client.JavaScriptConnectorHelper::getWidgetElement(Ljava/lang/String;)(connectorId); }), 'registerRpc': function(iface, rpcHandler) { diff --git a/src/com/vaadin/ui/AbstractJavaScriptComponent.java b/src/com/vaadin/ui/AbstractJavaScriptComponent.java index 0d7f60186a..969c5b7fcd 100644 --- a/src/com/vaadin/ui/AbstractJavaScriptComponent.java +++ b/src/com/vaadin/ui/AbstractJavaScriptComponent.java @@ -37,9 +37,9 @@ import com.vaadin.terminal.gwt.client.ui.JavaScriptWidget; * the connector's parent. If connectorId is provided, the id of * the parent of the corresponding connector with the passed id is returned * instead.
    • - *
  • getWidgetElement([connectorId]) - returns the DOM Element - * that is the root of a connector's widget. null is returned if - * the connector can not be found or if the connector doesn't have a widget. If + *
  • getElement([connectorId]) - returns the DOM Element that is + * the root of a connector's widget. null is returned if the + * connector can not be found or if the connector doesn't have a widget. If * connectorId is not provided, the connector id of the current * connector will be used.
    • *
  • getState() - returns an object corresponding to the shared -- 2.39.5