[HtmlUnit] SVN: [15289] trunk/htmlunit
rbri--- via HtmlUnit-develop <[email protected]>
| Newsgroups | gmane.comp.java.htmlunit.devel |
|---|---|
| Message-ID | <[email protected]> |
Revision: 15289
http://sourceforge.net/p/htmlunit/code/15289
Author: rbri
Date: 2018-05-23 18:15:25 +0000 (Wed, 23 May 2018)
Log Message:
-----------
adapt to next core-js build
Modified Paths:
--------------
trunk/htmlunit/pom.xml
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequest.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/BackgroundJavaScriptFactory.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/DownloadBehaviorJob.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/JavascriptXMLHttpRequestJob.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MessagePort.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/WebSocket.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/worker/DedicatedWorkerGlobalScope.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/util/DebuggingWebConnection.java
Modified: trunk/htmlunit/pom.xml
===================================================================
--- trunk/htmlunit/pom.xml 2018-05-22 18:47:26 UTC (rev 15288)
+++ trunk/htmlunit/pom.xml 2018-05-23 18:15:25 UTC (rev 15289)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>2.31</version>
+ <version>2.32-SNAPSHOT</version>
<name>HtmlUnit</name>
<organization>
<name>Gargoyle Software Inc.</name>
@@ -869,7 +869,7 @@
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit-core-js</artifactId>
- <version>2.31</version>
+ <version>2.32-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequest.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequest.java 2018-05-22 18:47:26 UTC (rev 15288)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLHTTPRequest.java 2018-05-23 18:15:25 UTC (rev 15289)
@@ -465,7 +465,7 @@
// Create and start a thread in which to execute the request.
final Scriptable startingScope = w;
final ContextFactory cf = ((JavaScriptEngine) client.getJavaScriptEngine()).getContextFactory();
- final ContextAction action = new ContextAction() {
+ final ContextAction<Object> action = new ContextAction<Object>() {
@Override
public Object run(final Context cx) {
// KEY_STARTING_SCOPE maintains a stack of scopes
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomElement.java 2018-05-22 18:47:26 UTC (rev 15288)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomElement.java 2018-05-23 18:15:25 UTC (rev 15289)
@@ -64,8 +64,6 @@
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLElement;
import com.gargoylesoftware.htmlunit.util.StringUtils;
-import net.sourceforge.htmlunit.corejs.javascript.Context;
-import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
import net.sourceforge.htmlunit.corejs.javascript.ContextFactory;
/**
@@ -1406,16 +1404,10 @@
if (LOG.isDebugEnabled()) {
LOG.debug("Firing " + event);
}
+
final EventTarget jsElt = getScriptableObject();
- final ContextAction action = new ContextAction() {
- @Override
- public Object run(final Context cx) {
- return jsElt.fireEvent(event);
- }
- };
-
final ContextFactory cf = ((JavaScriptEngine) client.getJavaScriptEngine()).getContextFactory();
- final ScriptResult result = (ScriptResult) cf.call(action);
+ final ScriptResult result = (ScriptResult) cf.call(cx -> jsElt.fireEvent(event));
if (event.isAborted(result)) {
preventDefault();
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2018-05-22 18:47:26 UTC (rev 15288)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2018-05-23 18:15:25 UTC (rev 15289)
@@ -170,22 +170,16 @@
public void initialize(final WebWindow webWindow) {
WebAssert.notNull("webWindow", webWindow);
- final ContextAction action = new ContextAction() {
- @Override
- public Object run(final Context cx) {
- try {
- init(webWindow, cx);
- }
- catch (final Exception e) {
- LOG.error("Exception while initializing JavaScript for the page", e);
- throw new ScriptException(null, e); // BUG: null is not useful.
- }
-
- return null;
+ getContextFactory().call(cx -> {
+ try {
+ init(webWindow, cx);
}
- };
-
- getContextFactory().call(action);
+ catch (final Exception e) {
+ LOG.error("Exception while initializing JavaScript for the page", e);
+ throw new ScriptException(null, e); // BUG: null is not useful.
+ }
+ return null;
+ });
}
/**
@@ -734,7 +728,7 @@
LOG.trace("Javascript compile " + sourceName + newline + sourceCode + newline);
}
- final ContextAction action = new HtmlUnitContextAction(scope, owningPage) {
+ final ContextAction<Object> action = new HtmlUnitContextAction(scope, owningPage) {
@Override
public Object doRun(final Context cx) {
return cx.compileString(sourceCode, sourceName, startLine, null);
@@ -783,7 +777,7 @@
* @return the result of executing the specified code
*/
public Object execute(final HtmlPage page, final Scriptable scope, final Script script) {
- final ContextAction action = new HtmlUnitContextAction(scope, page) {
+ final ContextAction<Object> action = new HtmlUnitContextAction(scope, page) {
@Override
public Object doRun(final Context cx) {
return script.exec(cx, scope);
@@ -831,7 +825,7 @@
public Object callFunction(final HtmlPage page, final Function function,
final Scriptable scope, final Scriptable thisObject, final Object[] args) {
- final ContextAction action = new HtmlUnitContextAction(scope, page) {
+ final ContextAction<Object> action = new HtmlUnitContextAction(scope, page) {
@Override
public Object doRun(final Context cx) {
if (ScriptRuntime.hasTopCall(cx)) {
@@ -869,7 +863,7 @@
* ContextAction should be preferred because according to Rhino doc it
* "guarantees proper association of Context instances with the current thread and is faster".
*/
- private abstract class HtmlUnitContextAction implements ContextAction {
+ private abstract class HtmlUnitContextAction implements ContextAction<Object> {
private final Scriptable scope_;
private final HtmlPage page_;
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/BackgroundJavaScriptFactory.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/BackgroundJavaScriptFactory.java 2018-05-22 18:47:26 UTC (rev 15288)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/BackgroundJavaScriptFactory.java 2018-05-23 18:15:25 UTC (rev 15289)
@@ -90,7 +90,7 @@
* @return JavaScriptJob the created job
*/
public JavaScriptJob createJavascriptXMLHttpRequestJob(final ContextFactory contextFactory,
- final ContextAction action) {
+ final ContextAction<Object> action) {
return new JavascriptXMLHttpRequestJob(contextFactory, action);
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/DownloadBehaviorJob.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/DownloadBehaviorJob.java 2018-05-22 18:47:26 UTC (rev 15288)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/DownloadBehaviorJob.java 2018-05-23 18:15:25 UTC (rev 15289)
@@ -26,8 +26,6 @@
import com.gargoylesoftware.htmlunit.WebResponse;
import com.gargoylesoftware.htmlunit.javascript.JavaScriptEngine;
-import net.sourceforge.htmlunit.corejs.javascript.Context;
-import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
import net.sourceforge.htmlunit.corejs.javascript.ContextFactory;
import net.sourceforge.htmlunit.corejs.javascript.Function;
import net.sourceforge.htmlunit.corejs.javascript.Scriptable;
@@ -73,15 +71,11 @@
LOG.debug("Downloaded content: " + StringUtils.abbreviate(content, 512));
}
final Object[] args = new Object[] {content};
- final ContextAction action = new ContextAction() {
- @Override
- public Object run(final Context cx) {
- callback_.call(cx, scope, scope, args);
- return null;
- }
- };
final ContextFactory cf = ((JavaScriptEngine) client_.getJavaScriptEngine()).getContextFactory();
- cf.call(action);
+ cf.call(cx -> {
+ callback_.call(cx, scope, scope, args);
+ return null;
+ });
}
catch (final IOException e) {
LOG.error("Behavior #default#download: Cannot download " + url_, e);
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/JavascriptXMLHttpRequestJob.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/JavascriptXMLHttpRequestJob.java 2018-05-22 18:47:26 UTC (rev 15288)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/JavascriptXMLHttpRequestJob.java 2018-05-23 18:15:25 UTC (rev 15289)
@@ -23,9 +23,9 @@
*/
final class JavascriptXMLHttpRequestJob extends BasicJavaScriptJob {
private final ContextFactory contextFactory_;
- private final ContextAction action_;
+ private final ContextAction<Object> action_;
- JavascriptXMLHttpRequestJob(final ContextFactory contextFactory, final ContextAction action) {
+ JavascriptXMLHttpRequestJob(final ContextFactory contextFactory, final ContextAction<Object> action) {
super();
contextFactory_ = contextFactory;
action_ = action;
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MessagePort.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MessagePort.java 2018-05-22 18:47:26 UTC (rev 15288)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/MessagePort.java 2018-05-23 18:15:25 UTC (rev 15289)
@@ -31,8 +31,6 @@
import com.gargoylesoftware.htmlunit.javascript.host.event.EventTarget;
import com.gargoylesoftware.htmlunit.javascript.host.event.MessageEvent;
-import net.sourceforge.htmlunit.corejs.javascript.Context;
-import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
import net.sourceforge.htmlunit.corejs.javascript.ContextFactory;
import net.sourceforge.htmlunit.corejs.javascript.Function;
@@ -112,15 +110,8 @@
final PostponedAction action = new PostponedAction(w.getWebWindow().getEnclosedPage()) {
@Override
public void execute() throws Exception {
- final ContextAction contextAction = new ContextAction() {
- @Override
- public Object run(final Context cx) {
- return port1_.dispatchEvent(event);
- }
- };
-
final ContextFactory cf = jsEngine.getContextFactory();
- cf.call(contextAction);
+ cf.call(cx -> port1_.dispatchEvent(event));
}
};
jsEngine.addPostponedAction(action);
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/WebSocket.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/WebSocket.java 2018-05-22 18:47:26 UTC (rev 15288)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/WebSocket.java 2018-05-23 18:15:25 UTC (rev 15289)
@@ -32,7 +32,6 @@
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.client.WebSocketClient;
-import com.gargoylesoftware.htmlunit.ScriptResult;
import com.gargoylesoftware.htmlunit.WebClient;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.javascript.JavaScriptEngine;
@@ -49,7 +48,6 @@
import com.gargoylesoftware.htmlunit.javascript.host.event.MessageEvent;
import net.sourceforge.htmlunit.corejs.javascript.Context;
-import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
import net.sourceforge.htmlunit.corejs.javascript.Function;
import net.sourceforge.htmlunit.corejs.javascript.ScriptRuntime;
import net.sourceforge.htmlunit.corejs.javascript.Scriptable;
@@ -499,14 +497,8 @@
evt.setParentScope(getParentScope());
evt.setPrototype(getPrototype(evt.getClass()));
- final JavaScriptEngine engine
- = (JavaScriptEngine) containingPage_.getWebClient().getJavaScriptEngine();
- engine.getContextFactory().call(new ContextAction() {
- @Override
- public ScriptResult run(final Context cx) {
- return executeEventLocally(evt);
- }
- });
+ final JavaScriptEngine engine = (JavaScriptEngine) containingPage_.getWebClient().getJavaScriptEngine();
+ engine.getContextFactory().call(cx -> executeEventLocally(evt));
}
private void callFunction(final Function function, final Object[] args) {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java 2018-05-22 18:47:26 UTC (rev 15288)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java 2018-05-23 18:15:25 UTC (rev 15289)
@@ -2209,7 +2209,7 @@
final PostponedAction action = new PostponedAction(page) {
@Override
public void execute() throws Exception {
- final ContextAction contextAction = new ContextAction() {
+ final ContextAction<Object> contextAction = new ContextAction<Object>() {
@Override
public Object run(final Context cx) {
return dispatchEvent(event);
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/worker/DedicatedWorkerGlobalScope.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/worker/DedicatedWorkerGlobalScope.java 2018-05-22 18:47:26 UTC (rev 15288)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/worker/DedicatedWorkerGlobalScope.java 2018-05-23 18:15:25 UTC (rev 15289)
@@ -120,7 +120,7 @@
}
final JavaScriptEngine jsEngine =
(JavaScriptEngine) owningWindow_.getWebWindow().getWebClient().getJavaScriptEngine();
- final ContextAction action = new ContextAction() {
+ final ContextAction<Object> action = new ContextAction<Object>() {
@Override
public Object run(final Context cx) {
worker_.getEventListenersContainer().executeCapturingListeners(event, null);
@@ -145,7 +145,7 @@
final JavaScriptEngine jsEngine =
(JavaScriptEngine) owningWindow_.getWebWindow().getWebClient().getJavaScriptEngine();
- final ContextAction action = new ContextAction() {
+ final ContextAction<Object> action = new ContextAction<Object>() {
@Override
public Object run(final Context cx) {
return executeEvent(cx, event);
@@ -202,7 +202,7 @@
final JavaScriptEngine javaScriptEngine = (JavaScriptEngine) webClient.getJavaScriptEngine();
final DedicatedWorkerGlobalScope thisScope = this;
- final ContextAction action = new ContextAction() {
+ final ContextAction<Object> action = new ContextAction<Object>() {
@Override
public Object run(final Context cx) {
final Script script = javaScriptEngine.compile(page, thisScope, scriptCode,
@@ -226,10 +226,10 @@
class WorkerJob extends BasicJavaScriptJob {
private final ContextFactory contextFactory_;
- private final ContextAction action_;
+ private final ContextAction<Object> action_;
private final String description_;
- WorkerJob(final ContextFactory contextFactory, final ContextAction action, final String description) {
+ WorkerJob(final ContextFactory contextFactory, final ContextAction<Object> action, final String description) {
contextFactory_ = contextFactory;
action_ = action;
description_ = description;
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java 2018-05-22 18:47:26 UTC (rev 15288)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java 2018-05-23 18:15:25 UTC (rev 15289)
@@ -637,7 +637,7 @@
// Create and start a thread in which to execute the request.
final Scriptable startingScope = w;
final ContextFactory cf = ((JavaScriptEngine) client.getJavaScriptEngine()).getContextFactory();
- final ContextAction action = new ContextAction() {
+ final ContextAction<Object> action = new ContextAction<Object>() {
@Override
public Object run(final Context cx) {
// KEY_STARTING_SCOPE maintains a stack of scopes
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/util/DebuggingWebConnection.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/util/DebuggingWebConnection.java 2018-05-22 18:47:26 UTC (rev 15288)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/util/DebuggingWebConnection.java 2018-05-23 18:15:25 UTC (rev 15289)
@@ -129,7 +129,7 @@
// skip if it is already formatted? => TODO
final ContextFactory factory = new ContextFactory();
- final ContextAction action = new ContextAction() {
+ final ContextAction<Object> action = new ContextAction<Object>() {
@Override
public Object run(final Context cx) {
cx.setOptimizationLevel(-1);
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot