[richfaces-svn-commits] JBoss Rich Faces SVN: r21176 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/javascript.
Author: lfryc(a)redhat.com
Date: 2011-01-24 10:55:36 -0500 (Mon, 24 Jan 2011)
New Revision: 21176
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/javascript/JQueryScript.java
Log:
JQueryScript takes ExtendedLocator<JQueryLocator> instead of JQueryLocator directly
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/javascript/JQueryScript.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/javascript/JQueryScript.java 2011-01-24
15:25:54 UTC (rev 21175)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/javascript/JQueryScript.java 2011-01-24
15:55:36 UTC (rev 21176)
@@ -25,6 +25,7 @@
import org.apache.commons.lang.StringEscapeUtils;
import org.jboss.test.selenium.encapsulated.JavaScript;
+import org.jboss.test.selenium.locator.ExtendedLocator;
import org.jboss.test.selenium.locator.JQueryLocator;
/**
@@ -43,12 +44,12 @@
StringEscapeUtils.escapeJavaScript(selector), jqueryScript));
}
- public JQueryScript(JQueryLocator jQueryLocator) {
+ public JQueryScript(ExtendedLocator<JQueryLocator> jQueryLocator) {
super(format("jQuery('{0}',
selenium.browserbot.getCurrentWindow().document)",
StringEscapeUtils.escapeJavaScript(jQueryLocator.getRawLocator())));
}
- public JQueryScript(JQueryLocator jQueryLocator, String jqueryScript) {
+ public JQueryScript(ExtendedLocator<JQueryLocator> jQueryLocator, String
jqueryScript) {
super(format("jQuery('{0}',
selenium.browserbot.getCurrentWindow().document).{1}",
StringEscapeUtils.escapeJavaScript(jQueryLocator.getRawLocator()),
jqueryScript));
}
@@ -65,7 +66,7 @@
return new JQueryScript(selector, jqueryScript);
}
- public static JQueryScript jqScript(JQueryLocator jQueryLocator, String jqueryScript)
{
+ public static JQueryScript jqScript(ExtendedLocator<JQueryLocator>
jQueryLocator, String jqueryScript) {
return new JQueryScript(jQueryLocator, jqueryScript);
}
}