Menu
▾
▴
[HtmlUnit] SVN: [14785] trunk/htmlunit/src
|
From: <asa...@us...> - 2017-08-11 08:48:18
|
Revision: 14785
http://sourceforge.net/p/htmlunit/code/14785
Author: asashour
Date: 2017-08-11 08:48:15 +0000 (Fri, 11 Aug 2017)
Log Message:
-----------
use Event constants
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlFileInput.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window2.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/EventNode2.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/FileReader.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument2.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameSetElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElement2.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGElement.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlFileInput.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlFileInput.java 2017-08-11 08:07:49 UTC (rev 14784)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlFileInput.java 2017-08-11 08:48:15 UTC (rev 14785)
@@ -25,6 +25,7 @@
import org.apache.commons.lang3.StringUtils;
import com.gargoylesoftware.htmlunit.SgmlPage;
+import com.gargoylesoftware.htmlunit.javascript.host.event.Event;
import com.gargoylesoftware.htmlunit.util.KeyDataPair;
import com.gargoylesoftware.htmlunit.util.NameValuePair;
@@ -162,7 +163,7 @@
files[i] = normalizeFile(files[i]);
}
files_ = files;
- fireEvent("change");
+ fireEvent(Event.TYPE_CHANGE);
}
/**
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 2017-08-11 08:07:49 UTC (rev 14784)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java 2017-08-11 08:48:15 UTC (rev 14785)
@@ -1102,7 +1102,7 @@
*/
@JsxGetter
public Object getOnload() {
- final Object onload = getEventHandler("load");
+ final Object onload = getEventHandler(Event.TYPE_LOAD);
if (onload == null) {
final HtmlPage page = (HtmlPage) getWebWindow().getEnclosedPage();
final HtmlElement body = page.getBody();
@@ -2311,7 +2311,7 @@
*/
@JsxGetter(IE)
public Function getOnfocusin() {
- return getEventHandler("focusin");
+ return getEventHandler(Event.TYPE_FOCUS_IN);
}
/**
@@ -2320,7 +2320,7 @@
*/
@JsxSetter(IE)
public void setOnfocusin(final Object onfocusin) {
- setHandlerForJavaScript("focusin", onfocusin);
+ setHandlerForJavaScript(Event.TYPE_FOCUS_IN, onfocusin);
}
/**
@@ -2329,7 +2329,7 @@
*/
@JsxGetter
public Function getOnfocus() {
- return getEventHandler("focus");
+ return getEventHandler(Event.TYPE_FOCUS);
}
/**
@@ -2338,7 +2338,7 @@
*/
@JsxSetter
public void setOnfocus(final Object onfocus) {
- setHandlerForJavaScript("focus", onfocus);
+ setHandlerForJavaScript(Event.TYPE_FOCUS, onfocus);
}
/**
@@ -2563,7 +2563,7 @@
*/
@JsxGetter
public Function getOnkeydown() {
- return getEventHandler("keydown");
+ return getEventHandler(Event.TYPE_KEY_DOWN);
}
/**
@@ -2572,7 +2572,7 @@
*/
@JsxSetter
public void setOnkeydown(final Object onkeydown) {
- setHandlerForJavaScript("keydown", onkeydown);
+ setHandlerForJavaScript(Event.TYPE_KEY_DOWN, onkeydown);
}
/**
@@ -2635,7 +2635,7 @@
*/
@JsxGetter
public Function getOnkeyup() {
- return getEventHandler("keyup");
+ return getEventHandler(Event.TYPE_KEY_UP);
}
/**
@@ -2644,7 +2644,7 @@
*/
@JsxSetter
public void setOnkeyup(final Object onkeyup) {
- setHandlerForJavaScript("keyup", onkeyup);
+ setHandlerForJavaScript(Event.TYPE_KEY_UP, onkeyup);
}
/**
@@ -2689,7 +2689,7 @@
*/
@JsxGetter
public Function getOnreset() {
- return getEventHandler("reset");
+ return getEventHandler(Event.TYPE_RESET);
}
/**
@@ -2698,7 +2698,7 @@
*/
@JsxSetter
public void setOnreset(final Object onreset) {
- setHandlerForJavaScript("reset", onreset);
+ setHandlerForJavaScript(Event.TYPE_RESET, onreset);
}
/**
@@ -2707,7 +2707,7 @@
*/
@JsxGetter
public Function getOnkeypress() {
- return getEventHandler("keypress");
+ return getEventHandler(Event.TYPE_KEY_PRESS);
}
/**
@@ -2716,7 +2716,7 @@
*/
@JsxSetter
public void setOnkeypress(final Object onkeypress) {
- setHandlerForJavaScript("keypress", onkeypress);
+ setHandlerForJavaScript(Event.TYPE_KEY_PRESS, onkeypress);
}
/**
@@ -2743,7 +2743,7 @@
*/
@JsxGetter(IE)
public Function getOnfocusout() {
- return getEventHandler("focusout");
+ return getEventHandler(Event.TYPE_FOCUS_OUT);
}
/**
@@ -2752,7 +2752,7 @@
*/
@JsxSetter(IE)
public void setOnfocusout(final Object onfocusout) {
- setHandlerForJavaScript("focusout", onfocusout);
+ setHandlerForJavaScript(Event.TYPE_FOCUS_OUT, onfocusout);
}
/**
@@ -2851,7 +2851,7 @@
*/
@JsxGetter
public Function getOncontextmenu() {
- return getEventHandler("contextmenu");
+ return getEventHandler(MouseEvent.TYPE_CONTEXT_MENU);
}
/**
@@ -2860,7 +2860,7 @@
*/
@JsxSetter
public void setOncontextmenu(final Object oncontextmenu) {
- setHandlerForJavaScript("contextmenu", oncontextmenu);
+ setHandlerForJavaScript(MouseEvent.TYPE_CONTEXT_MENU, oncontextmenu);
}
/**
@@ -2869,7 +2869,7 @@
*/
@JsxGetter
public Function getOnmousemove() {
- return getEventHandler("mousemove");
+ return getEventHandler(MouseEvent.TYPE_MOUSE_MOVE);
}
/**
@@ -2878,7 +2878,7 @@
*/
@JsxSetter
public void setOnmousemove(final Object onmousemove) {
- setHandlerForJavaScript("mousemove", onmousemove);
+ setHandlerForJavaScript(MouseEvent.TYPE_MOUSE_MOVE, onmousemove);
}
/**
@@ -2887,7 +2887,7 @@
*/
@JsxGetter(IE)
public Function getOnreadystatechange() {
- return getEventHandler("readystatechange");
+ return getEventHandler(Event.TYPE_READY_STATE_CHANGE);
}
/**
@@ -2896,7 +2896,7 @@
*/
@JsxSetter(IE)
public void setOnreadystatechange(final Object onreadystatechange) {
- setHandlerForJavaScript("readystatechange", onreadystatechange);
+ setHandlerForJavaScript(Event.TYPE_READY_STATE_CHANGE, onreadystatechange);
}
/**
@@ -2959,7 +2959,7 @@
*/
@JsxGetter
public Function getOnmouseover() {
- return getEventHandler("mouseover");
+ return getEventHandler(MouseEvent.TYPE_MOUSE_OVER);
}
/**
@@ -2968,7 +2968,7 @@
*/
@JsxSetter
public void setOnmouseover(final Object onmouseover) {
- setHandlerForJavaScript("mouseover", onmouseover);
+ setHandlerForJavaScript(MouseEvent.TYPE_MOUSE_OVER, onmouseover);
}
/**
@@ -3031,7 +3031,7 @@
*/
@JsxGetter(CHROME)
public Function getOnclose() {
- return getEventHandler("close");
+ return getEventHandler(Event.TYPE_CLOSE);
}
/**
@@ -3040,7 +3040,7 @@
*/
@JsxSetter(CHROME)
public void setOnclose(final Object onclose) {
- setHandlerForJavaScript("close", onclose);
+ setHandlerForJavaScript(Event.TYPE_CLOSE, onclose);
}
/**
@@ -3337,7 +3337,7 @@
*/
@JsxGetter
public Function getOnmouseout() {
- return getEventHandler("mouseout");
+ return getEventHandler(MouseEvent.TYPE_MOUSE_OUT);
}
/**
@@ -3346,7 +3346,7 @@
*/
@JsxSetter
public void setOnmouseout(final Object onmouseout) {
- setHandlerForJavaScript("mouseout", onmouseout);
+ setHandlerForJavaScript(MouseEvent.TYPE_MOUSE_OUT, onmouseout);
}
/**
@@ -3409,7 +3409,7 @@
*/
@JsxGetter
public Function getOnmousedown() {
- return getEventHandler("mousedown");
+ return getEventHandler(MouseEvent.TYPE_MOUSE_DOWN);
}
/**
@@ -3418,7 +3418,7 @@
*/
@JsxSetter
public void setOnmousedown(final Object onmousedown) {
- setHandlerForJavaScript("mousedown", onmousedown);
+ setHandlerForJavaScript(MouseEvent.TYPE_MOUSE_DOWN, onmousedown);
}
/**
@@ -3877,7 +3877,7 @@
*/
@JsxGetter
public Function getOnmouseup() {
- return getEventHandler("mouseup");
+ return getEventHandler(MouseEvent.TYPE_MOUSE_UP);
}
/**
@@ -3886,7 +3886,7 @@
*/
@JsxSetter
public void setOnmouseup(final Object onmouseup) {
- setHandlerForJavaScript("mouseup", onmouseup);
+ setHandlerForJavaScript(MouseEvent.TYPE_MOUSE_UP, onmouseup);
}
/**
@@ -3985,7 +3985,7 @@
*/
@JsxGetter
public Function getOninput() {
- return getEventHandler("input");
+ return getEventHandler(Event.TYPE_INPUT);
}
/**
@@ -3994,7 +3994,7 @@
*/
@JsxSetter
public void setOninput(final Object oninput) {
- setHandlerForJavaScript("input", oninput);
+ setHandlerForJavaScript(Event.TYPE_INPUT, oninput);
}
/**
@@ -4165,7 +4165,7 @@
*/
@JsxGetter
public Function getOnunload() {
- return getEventHandler("unload");
+ return getEventHandler(Event.TYPE_UNLOAD);
}
/**
@@ -4174,7 +4174,7 @@
*/
@JsxSetter
public void setOnunload(final Object onunload) {
- setHandlerForJavaScript("unload", onunload);
+ setHandlerForJavaScript(Event.TYPE_UNLOAD, onunload);
}
/**
@@ -4345,7 +4345,7 @@
*/
@JsxGetter
public Function getOnpopstate() {
- return getEventHandler("popstate");
+ return getEventHandler(Event.TYPE_POPSTATE);
}
/**
@@ -4354,7 +4354,7 @@
*/
@JsxSetter
public void setOnpopstate(final Object onpopstate) {
- setHandlerForJavaScript("popstate", onpopstate);
+ setHandlerForJavaScript(Event.TYPE_POPSTATE, onpopstate);
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window2.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window2.java 2017-08-11 08:07:49 UTC (rev 14784)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window2.java 2017-08-11 08:48:15 UTC (rev 14785)
@@ -353,7 +353,7 @@
@Getter
public static Object getOnload(final Object self) {
final Window2 window = getWindow(self);
- final Object onload = window.getHandlerForJavaScript("load");
+ final Object onload = window.getHandlerForJavaScript(Event2.TYPE_LOAD);
if (onload == null) {
final HtmlPage page = (HtmlPage) window.getWebWindow().getEnclosedPage();
final HtmlElement body = page.getBody();
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java 2017-08-11 08:07:49 UTC (rev 14784)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java 2017-08-11 08:48:15 UTC (rev 14785)
@@ -1425,7 +1425,7 @@
*/
@JsxSetter
public void setOnclick(final Object handler) {
- setEventHandler("click", handler);
+ setEventHandler(MouseEvent.TYPE_CLICK, handler);
}
/**
@@ -1434,7 +1434,7 @@
*/
@JsxGetter
public Object getOnclick() {
- return getEventHandler("click");
+ return getEventHandler(MouseEvent.TYPE_CLICK);
}
/**
@@ -1443,7 +1443,7 @@
*/
@JsxSetter
public void setOndblclick(final Object handler) {
- setEventHandler("dblclick", handler);
+ setEventHandler(MouseEvent.TYPE_DBL_CLICK, handler);
}
/**
@@ -1452,7 +1452,7 @@
*/
@JsxGetter
public Object getOndblclick() {
- return getEventHandler("dblclick");
+ return getEventHandler(MouseEvent.TYPE_DBL_CLICK);
}
/**
@@ -1461,7 +1461,7 @@
*/
@JsxSetter
public void setOnblur(final Object handler) {
- setEventHandler("blur", handler);
+ setEventHandler(Event.TYPE_BLUR, handler);
}
/**
@@ -1470,7 +1470,7 @@
*/
@JsxGetter
public Object getOnblur() {
- return getEventHandler("blur");
+ return getEventHandler(Event.TYPE_BLUR);
}
/**
@@ -1479,7 +1479,7 @@
*/
@JsxSetter
public void setOnfocus(final Object handler) {
- setEventHandler("focus", handler);
+ setEventHandler(Event.TYPE_FOCUS, handler);
}
/**
@@ -1488,7 +1488,7 @@
*/
@JsxGetter
public Object getOnfocus() {
- return getEventHandler("focus");
+ return getEventHandler(Event.TYPE_FOCUS);
}
/**
@@ -1497,7 +1497,7 @@
*/
@JsxSetter(IE)
public void setOnfocusin(final Object handler) {
- setEventHandler("focusin", handler);
+ setEventHandler(Event.TYPE_FOCUS_IN, handler);
}
/**
@@ -1506,7 +1506,7 @@
*/
@JsxGetter(IE)
public Object getOnfocusin() {
- return getEventHandler("focusin");
+ return getEventHandler(Event.TYPE_FOCUS_IN);
}
/**
@@ -1515,7 +1515,7 @@
*/
@JsxSetter(IE)
public void setOnfocusout(final Object handler) {
- setEventHandler("focusout", handler);
+ setEventHandler(Event.TYPE_FOCUS_OUT, handler);
}
/**
@@ -1524,7 +1524,7 @@
*/
@JsxGetter(IE)
public Object getOnfocusout() {
- return getEventHandler("focusout");
+ return getEventHandler(Event.TYPE_FOCUS_OUT);
}
/**
@@ -1533,7 +1533,7 @@
*/
@JsxSetter
public void setOnkeydown(final Object handler) {
- setEventHandler("keydown", handler);
+ setEventHandler(Event.TYPE_KEY_DOWN, handler);
}
/**
@@ -1542,7 +1542,7 @@
*/
@JsxGetter
public Object getOnkeydown() {
- return getEventHandler("keydown");
+ return getEventHandler(Event.TYPE_KEY_DOWN);
}
/**
@@ -1551,7 +1551,7 @@
*/
@JsxSetter
public void setOnkeypress(final Object handler) {
- setEventHandler("keypress", handler);
+ setEventHandler(Event.TYPE_KEY_PRESS, handler);
}
/**
@@ -1560,7 +1560,7 @@
*/
@JsxGetter
public Object getOnkeypress() {
- return getEventHandler("keypress");
+ return getEventHandler(Event.TYPE_KEY_PRESS);
}
/**
@@ -1569,7 +1569,7 @@
*/
@JsxSetter
public void setOnkeyup(final Object handler) {
- setEventHandler("keyup", handler);
+ setEventHandler(Event.TYPE_KEY_UP, handler);
}
/**
@@ -1578,7 +1578,7 @@
*/
@JsxGetter
public Object getOnkeyup() {
- return getEventHandler("keyup");
+ return getEventHandler(Event.TYPE_KEY_UP);
}
/**
@@ -1587,7 +1587,7 @@
*/
@JsxSetter
public void setOnmousedown(final Object handler) {
- setEventHandler("mousedown", handler);
+ setEventHandler(MouseEvent.TYPE_MOUSE_DOWN, handler);
}
/**
@@ -1596,7 +1596,7 @@
*/
@JsxGetter
public Object getOnmousedown() {
- return getEventHandler("mousedown");
+ return getEventHandler(MouseEvent.TYPE_MOUSE_DOWN);
}
/**
@@ -1605,7 +1605,7 @@
*/
@JsxSetter
public void setOnmousemove(final Object handler) {
- setEventHandler("mousemove", handler);
+ setEventHandler(MouseEvent.TYPE_MOUSE_MOVE, handler);
}
/**
@@ -1614,7 +1614,7 @@
*/
@JsxGetter
public Object getOnmousemove() {
- return getEventHandler("mousemove");
+ return getEventHandler(MouseEvent.TYPE_MOUSE_MOVE);
}
/**
@@ -1623,7 +1623,7 @@
*/
@JsxSetter
public void setOnmouseout(final Object handler) {
- setEventHandler("mouseout", handler);
+ setEventHandler(MouseEvent.TYPE_MOUSE_OUT, handler);
}
/**
@@ -1632,7 +1632,7 @@
*/
@JsxGetter
public Object getOnmouseout() {
- return getEventHandler("mouseout");
+ return getEventHandler(MouseEvent.TYPE_MOUSE_OUT);
}
/**
@@ -1641,7 +1641,7 @@
*/
@JsxSetter
public void setOnmouseover(final Object handler) {
- setEventHandler("mouseover", handler);
+ setEventHandler(MouseEvent.TYPE_MOUSE_OVER, handler);
}
/**
@@ -1650,7 +1650,7 @@
*/
@JsxGetter
public Object getOnmouseover() {
- return getEventHandler("mouseover");
+ return getEventHandler(MouseEvent.TYPE_MOUSE_OVER);
}
/**
@@ -1659,7 +1659,7 @@
*/
@JsxSetter
public void setOnmouseup(final Object handler) {
- setEventHandler("mouseup", handler);
+ setEventHandler(MouseEvent.TYPE_MOUSE_UP, handler);
}
/**
@@ -1668,7 +1668,7 @@
*/
@JsxGetter
public Object getOnmouseup() {
- return getEventHandler("mouseup");
+ return getEventHandler(MouseEvent.TYPE_MOUSE_UP);
}
/**
@@ -1677,7 +1677,7 @@
*/
@JsxSetter
public void setOncontextmenu(final Object handler) {
- setEventHandler("contextmenu", handler);
+ setEventHandler(MouseEvent.TYPE_CONTEXT_MENU, handler);
}
/**
@@ -1686,7 +1686,7 @@
*/
@JsxGetter
public Object getOncontextmenu() {
- return getEventHandler("contextmenu");
+ return getEventHandler(MouseEvent.TYPE_CONTEXT_MENU);
}
/**
@@ -1713,7 +1713,7 @@
*/
@JsxSetter
public void setOnerror(final Object handler) {
- setEventHandler("error", handler);
+ setEventHandler(Event.TYPE_ERROR, handler);
}
/**
@@ -1722,7 +1722,7 @@
*/
@JsxGetter
public Object getOnerror() {
- return getEventHandler("error");
+ return getEventHandler(Event.TYPE_ERROR);
}
/**
@@ -1731,7 +1731,7 @@
*/
@JsxGetter
public Function getOninput() {
- return getEventHandler("input");
+ return getEventHandler(Event.TYPE_INPUT);
}
/**
@@ -1740,7 +1740,7 @@
*/
@JsxSetter
public void setOninput(final Object oninput) {
- setEventHandler("input", oninput);
+ setEventHandler(Event.TYPE_INPUT, oninput);
}
/**
@@ -2399,7 +2399,7 @@
*/
@JsxGetter
public Function getOnchange() {
- return getEventHandler("change");
+ return getEventHandler(Event.TYPE_CHANGE);
}
/**
@@ -2408,7 +2408,7 @@
*/
@JsxSetter
public void setOnchange(final Object onchange) {
- setEventHandler("change", onchange);
+ setEventHandler(Event.TYPE_CHANGE, onchange);
}
/**
@@ -2417,7 +2417,7 @@
*/
@JsxGetter(CHROME)
public Function getOnclose() {
- return getEventHandler("close");
+ return getEventHandler(Event.TYPE_CLOSE);
}
/**
@@ -2426,7 +2426,7 @@
*/
@JsxSetter(CHROME)
public void setOnclose(final Object onclose) {
- setEventHandler("close", onclose);
+ setEventHandler(Event.TYPE_CLOSE, onclose);
}
/**
@@ -2705,7 +2705,7 @@
*/
@JsxGetter
public Function getOnload() {
- return getEventHandler("load");
+ return getEventHandler(Event.TYPE_LOAD);
}
/**
@@ -2714,7 +2714,7 @@
*/
@JsxSetter
public void setOnload(final Object onload) {
- setEventHandler("load", onload);
+ setEventHandler(Event.TYPE_LOAD, onload);
}
/**
@@ -3137,7 +3137,7 @@
*/
@JsxGetter
public Function getOnreadystatechange() {
- return getEventHandler("readystatechange");
+ return getEventHandler(Event.TYPE_READY_STATE_CHANGE);
}
/**
@@ -3146,7 +3146,7 @@
*/
@JsxSetter
public void setOnreadystatechange(final Object onreadystatechange) {
- setEventHandler("readystatechange", onreadystatechange);
+ setEventHandler(Event.TYPE_READY_STATE_CHANGE, onreadystatechange);
}
/**
@@ -3155,7 +3155,7 @@
*/
@JsxGetter
public Function getOnreset() {
- return getEventHandler("reset");
+ return getEventHandler(Event.TYPE_RESET);
}
/**
@@ -3164,7 +3164,7 @@
*/
@JsxSetter
public void setOnreset(final Object onreset) {
- setEventHandler("reset", onreset);
+ setEventHandler(Event.TYPE_RESET, onreset);
}
/**
@@ -3335,7 +3335,7 @@
*/
@JsxGetter
public Function getOnsubmit() {
- return getEventHandler("submit");
+ return getEventHandler(Event.TYPE_SUBMIT);
}
/**
@@ -3344,7 +3344,7 @@
*/
@JsxSetter
public void setOnsubmit(final Object onsubmit) {
- setEventHandler("submit", onsubmit);
+ setEventHandler(Event.TYPE_SUBMIT, onsubmit);
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/EventNode2.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/EventNode2.java 2017-08-11 08:07:49 UTC (rev 14784)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/EventNode2.java 2017-08-11 08:48:15 UTC (rev 14785)
@@ -16,6 +16,8 @@
import static com.gargoylesoftware.js.nashorn.internal.objects.annotations.SupportedBrowser.IE;
+import com.gargoylesoftware.htmlunit.javascript.host.event.Event2;
+import com.gargoylesoftware.htmlunit.javascript.host.event.MouseEvent2;
import com.gargoylesoftware.js.nashorn.internal.objects.annotations.Getter;
import com.gargoylesoftware.js.nashorn.internal.objects.annotations.Setter;
@@ -36,7 +38,7 @@
*/
@Setter
public void setOnclick(final Object handler) {
- setEventHandler("click", handler);
+ setEventHandler(MouseEvent2.TYPE_CLICK, handler);
}
/**
@@ -54,7 +56,7 @@
*/
@Setter
public void setOndblclick(final Object handler) {
- setEventHandler("dblclick", handler);
+ setEventHandler(MouseEvent2.TYPE_DBL_CLICK, handler);
}
/**
@@ -72,7 +74,7 @@
*/
@Setter
public void setOnblur(final Object handler) {
- setEventHandler("blur", handler);
+ setEventHandler(Event2.TYPE_BLUR, handler);
}
/**
@@ -90,7 +92,7 @@
*/
@Setter
public void setOnfocus(final Object handler) {
- setEventHandler("focus", handler);
+ setEventHandler(Event2.TYPE_FOCUS, handler);
}
/**
@@ -108,7 +110,7 @@
*/
@Setter(IE)
public void setOnfocusin(final Object handler) {
- setEventHandler("focusin", handler);
+ setEventHandler(Event2.TYPE_FOCUS_IN, handler);
}
/**
@@ -126,7 +128,7 @@
*/
@Setter(IE)
public void setOnfocusout(final Object handler) {
- setEventHandler("focusout", handler);
+ setEventHandler(Event2.TYPE_FOCUS_OUT, handler);
}
/**
@@ -144,7 +146,7 @@
*/
@Setter
public void setOnkeydown(final Object handler) {
- setEventHandler("keydown", handler);
+ setEventHandler(Event2.TYPE_KEY_DOWN, handler);
}
/**
@@ -162,7 +164,7 @@
*/
@Setter
public void setOnkeypress(final Object handler) {
- setEventHandler("keypress", handler);
+ setEventHandler(Event2.TYPE_KEY_PRESS, handler);
}
/**
@@ -180,7 +182,7 @@
*/
@Setter
public void setOnkeyup(final Object handler) {
- setEventHandler("keyup", handler);
+ setEventHandler(Event2.TYPE_KEY_UP, handler);
}
/**
@@ -198,7 +200,7 @@
*/
@Setter
public void setOnmousedown(final Object handler) {
- setEventHandler("mousedown", handler);
+ setEventHandler(MouseEvent2.TYPE_MOUSE_DOWN, handler);
}
/**
@@ -216,7 +218,7 @@
*/
@Setter
public void setOnmousemove(final Object handler) {
- setEventHandler("mousemove", handler);
+ setEventHandler(MouseEvent2.TYPE_MOUSE_MOVE, handler);
}
/**
@@ -234,7 +236,7 @@
*/
@Setter
public void setOnmouseout(final Object handler) {
- setEventHandler("mouseout", handler);
+ setEventHandler(MouseEvent2.TYPE_MOUSE_OUT, handler);
}
/**
@@ -252,7 +254,7 @@
*/
@Setter
public void setOnmouseover(final Object handler) {
- setEventHandler("mouseover", handler);
+ setEventHandler(MouseEvent2.TYPE_MOUSE_OVER, handler);
}
/**
@@ -270,7 +272,7 @@
*/
@Setter
public void setOnmouseup(final Object handler) {
- setEventHandler("mouseup", handler);
+ setEventHandler(MouseEvent2.TYPE_MOUSE_UP, handler);
}
/**
@@ -288,7 +290,7 @@
*/
@Setter
public void setOncontextmenu(final Object handler) {
- setEventHandler("contextmenu", handler);
+ setEventHandler(MouseEvent2.TYPE_CONTEXT_MENU, handler);
}
/**
@@ -319,30 +321,12 @@
}
/**
- * Sets the {@code onpropertychange} event handler for this element.
- * @param handler the {@code onpropertychange} event handler for this element
- */
- @Setter(IE)
- public void setOnpropertychange(final Object handler) {
- setEventHandler("propertychange", handler);
- }
-
- /**
- * Returns the {@code onpropertychange} event handler for this element.
- * @return the {@code onpropertychange} event handler for this element
- */
- @Getter(IE)
- public Object getOnpropertychange() {
- return getEventHandlerProp("onpropertychange");
- }
-
- /**
* Sets the {@code onerror} event handler for this element.
* @param handler the {@code onerror} event handler for this element
*/
@Setter
public void setOnerror(final Object handler) {
- setEventHandler("error", handler);
+ setEventHandler(Event2.TYPE_ERROR, handler);
}
/**
@@ -360,7 +344,7 @@
*/
@Setter
public void setOninput(final Object onchange) {
- setEventHandler("input", onchange);
+ setEventHandler(Event2.TYPE_INPUT, onchange);
}
/**
@@ -369,6 +353,6 @@
*/
@Getter
public Object getOninput() {
- return getEventHandler("input");
+ return getEventHandler(Event2.TYPE_INPUT);
}
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/FileReader.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/FileReader.java 2017-08-11 08:07:49 UTC (rev 14784)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/FileReader.java 2017-08-11 08:48:15 UTC (rev 14785)
@@ -89,6 +89,7 @@
/**
* Reads the contents of the specified {@link Blob} or {@link File}.
* @param object the {@link Blob} or {@link File} from which to read
+ * @throws IOException if an error occurs
*/
@JsxFunction
public void readAsDataURL(final Object object) throws IOException {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElement.java 2017-08-11 08:07:49 UTC (rev 14784)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElement.java 2017-08-11 08:48:15 UTC (rev 14785)
@@ -31,6 +31,7 @@
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxSetter;
import com.gargoylesoftware.htmlunit.javascript.host.css.ComputedCSSStyleDeclaration;
import com.gargoylesoftware.htmlunit.javascript.host.dom.TextRange;
+import com.gargoylesoftware.htmlunit.javascript.host.event.Event;
import net.sourceforge.htmlunit.corejs.javascript.Function;
@@ -242,7 +243,7 @@
*/
@JsxGetter
public Function getOnbeforeunload() {
- return getEventHandler("beforeunload");
+ return getEventHandler(Event.TYPE_BEFORE_UNLOAD);
}
/**
@@ -251,7 +252,7 @@
*/
@JsxSetter
public void setOnbeforeunload(final Object onbeforeunload) {
- setEventHandler("beforeunload", onbeforeunload);
+ setEventHandler(Event.TYPE_BEFORE_UNLOAD, onbeforeunload);
}
/**
@@ -260,7 +261,7 @@
*/
@JsxGetter
public Function getOnhashchange() {
- return getEventHandler("hashchange");
+ return getEventHandler(Event.TYPE_HASH_CHANGE);
}
/**
@@ -269,7 +270,7 @@
*/
@JsxSetter
public void setOnhashchange(final Object onhashchange) {
- setEventHandler("hashchange", onhashchange);
+ setEventHandler(Event.TYPE_HASH_CHANGE, onhashchange);
}
/**
@@ -296,7 +297,7 @@
*/
@JsxGetter
public Function getOnmessage() {
- return getEventHandler("message");
+ return getEventHandler(Event.TYPE_MESSAGE);
}
/**
@@ -305,7 +306,7 @@
*/
@JsxSetter
public void setOnmessage(final Object onmessage) {
- setEventHandler("message", onmessage);
+ setEventHandler(Event.TYPE_MESSAGE, onmessage);
}
/**
@@ -386,7 +387,7 @@
*/
@JsxGetter
public Function getOnpopstate() {
- return getEventHandler("popstate");
+ return getEventHandler(Event.TYPE_POPSTATE);
}
/**
@@ -395,7 +396,7 @@
*/
@JsxSetter
public void setOnpopstate(final Object onpopstate) {
- setEventHandler("popstate", onpopstate);
+ setEventHandler(Event.TYPE_POPSTATE, onpopstate);
}
/**
@@ -458,7 +459,7 @@
*/
@JsxGetter
public Function getOnunload() {
- return getEventHandler("unload");
+ return getEventHandler(Event.TYPE_UNLOAD);
}
/**
@@ -467,7 +468,7 @@
*/
@JsxSetter
public void setOnunload(final Object onunload) {
- setEventHandler("unload", onunload);
+ setEventHandler(Event.TYPE_UNLOAD, onunload);
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument2.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument2.java 2017-08-11 08:07:49 UTC (rev 14784)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument2.java 2017-08-11 08:48:15 UTC (rev 14785)
@@ -377,7 +377,7 @@
}
/**
- * JavaScript function "close".
+ * JavaScript function {@code close}.
*
* See http://www.whatwg.org/specs/web-apps/current-work/multipage/section-dynamic.html for
* a good description of the semantics of open(), write(), writeln() and close().
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java 2017-08-11 08:07:49 UTC (rev 14784)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java 2017-08-11 08:48:15 UTC (rev 14785)
@@ -127,6 +127,7 @@
import com.gargoylesoftware.htmlunit.javascript.host.dom.DOMTokenList;
import com.gargoylesoftware.htmlunit.javascript.host.dom.Node;
import com.gargoylesoftware.htmlunit.javascript.host.dom.NodeList;
+import com.gargoylesoftware.htmlunit.javascript.host.event.Event;
import com.gargoylesoftware.htmlunit.javascript.host.event.EventHandler;
import com.gargoylesoftware.htmlunit.javascript.host.event.MouseEvent;
@@ -2032,7 +2033,7 @@
*/
@JsxSetter
public void setOnchange(final Object onchange) {
- setEventHandler("change", onchange);
+ setEventHandler(Event.TYPE_CHANGE, onchange);
}
/**
@@ -2041,7 +2042,7 @@
*/
@JsxGetter
public Function getOnchange() {
- return getEventHandler("change");
+ return getEventHandler(Event.TYPE_CHANGE);
}
/**
@@ -2050,7 +2051,7 @@
*/
@JsxGetter
public Object getOnsubmit() {
- return getEventHandler("submit");
+ return getEventHandler(Event.TYPE_SUBMIT);
}
/**
@@ -2059,7 +2060,7 @@
*/
@JsxSetter
public void setOnsubmit(final Object onsubmit) {
- setEventHandler("submit", onsubmit);
+ setEventHandler(Event.TYPE_SUBMIT, onsubmit);
}
/**
@@ -2173,7 +2174,7 @@
*/
@JsxSetter
public void setOnclick(final Object handler) {
- setEventHandler("click", handler);
+ setEventHandler(MouseEvent.TYPE_CLICK, handler);
}
/**
@@ -2182,7 +2183,7 @@
*/
@JsxGetter
public Object getOnclick() {
- return getEventHandler("click");
+ return getEventHandler(MouseEvent.TYPE_CLICK);
}
/**
@@ -2191,7 +2192,7 @@
*/
@JsxSetter
public void setOndblclick(final Object handler) {
- setEventHandler("dblclick", handler);
+ setEventHandler(MouseEvent.TYPE_DBL_CLICK, handler);
}
/**
@@ -2200,7 +2201,7 @@
*/
@JsxGetter
public Object getOndblclick() {
- return getEventHandler("dblclick");
+ return getEventHandler(MouseEvent.TYPE_DBL_CLICK);
}
/**
@@ -2209,7 +2210,7 @@
*/
@JsxSetter
public void setOnblur(final Object handler) {
- setEventHandler("blur", handler);
+ setEventHandler(Event.TYPE_BLUR, handler);
}
/**
@@ -2218,7 +2219,7 @@
*/
@JsxGetter
public Object getOnblur() {
- return getEventHandler("blur");
+ return getEventHandler(Event.TYPE_BLUR);
}
/**
@@ -2227,7 +2228,7 @@
*/
@JsxSetter
public void setOnfocus(final Object handler) {
- setEventHandler("focus", handler);
+ setEventHandler(Event.TYPE_FOCUS, handler);
}
/**
@@ -2236,7 +2237,7 @@
*/
@JsxGetter
public Object getOnfocus() {
- return getEventHandler("focus");
+ return getEventHandler(Event.TYPE_FOCUS);
}
/**
@@ -2245,7 +2246,7 @@
*/
@JsxSetter(IE)
public void setOnfocusin(final Object handler) {
- setEventHandler("focusin", handler);
+ setEventHandler(Event.TYPE_FOCUS_IN, handler);
}
/**
@@ -2254,7 +2255,7 @@
*/
@JsxGetter(IE)
public Object getOnfocusin() {
- return getEventHandler("focusin");
+ return getEventHandler(Event.TYPE_FOCUS_IN);
}
/**
@@ -2263,7 +2264,7 @@
*/
@JsxSetter(IE)
public void setOnfocusout(final Object handler) {
- setEventHandler("focusout", handler);
+ setEventHandler(Event.TYPE_FOCUS_OUT, handler);
}
/**
@@ -2272,7 +2273,7 @@
*/
@JsxGetter(IE)
public Object getOnfocusout() {
- return getEventHandler("focusout");
+ return getEventHandler(Event.TYPE_FOCUS_OUT);
}
/**
@@ -2281,7 +2282,7 @@
*/
@JsxSetter
public void setOnkeydown(final Object handler) {
- setEventHandler("keydown", handler);
+ setEventHandler(Event.TYPE_KEY_DOWN, handler);
}
/**
@@ -2290,7 +2291,7 @@
*/
@JsxGetter
public Object getOnkeydown() {
- return getEventHandler("keydown");
+ return getEventHandler(Event.TYPE_KEY_DOWN);
}
/**
@@ -2299,7 +2300,7 @@
*/
@JsxSetter
public void setOnkeypress(final Object handler) {
- setEventHandler("keypress", handler);
+ setEventHandler(Event.TYPE_KEY_PRESS, handler);
}
/**
@@ -2308,7 +2309,7 @@
*/
@JsxGetter
public Object getOnkeypress() {
- return getEventHandler("keypress");
+ return getEventHandler(Event.TYPE_KEY_PRESS);
}
/**
@@ -2317,7 +2318,7 @@
*/
@JsxSetter
public void setOnkeyup(final Object handler) {
- setEventHandler("keyup", handler);
+ setEventHandler(Event.TYPE_KEY_UP, handler);
}
/**
@@ -2326,7 +2327,7 @@
*/
@JsxGetter
public Object getOnkeyup() {
- return getEventHandler("keyup");
+ return getEventHandler(Event.TYPE_KEY_UP);
}
/**
@@ -2335,7 +2336,7 @@
*/
@JsxSetter
public void setOnmousedown(final Object handler) {
- setEventHandler("mousedown", handler);
+ setEventHandler(MouseEvent.TYPE_MOUSE_DOWN, handler);
}
/**
@@ -2344,7 +2345,7 @@
*/
@JsxGetter
public Object getOnmousedown() {
- return getEventHandler("mousedown");
+ return getEventHandler(MouseEvent.TYPE_MOUSE_DOWN);
}
/**
@@ -2353,7 +2354,7 @@
*/
@JsxSetter
public void setOnmousemove(final Object handler) {
- setEventHandler("mousemove", handler);
+ setEventHandler(MouseEvent.TYPE_MOUSE_MOVE, handler);
}
/**
@@ -2362,7 +2363,7 @@
*/
@JsxGetter
public Object getOnmousemove() {
- return getEventHandler("mousemove");
+ return getEventHandler(MouseEvent.TYPE_MOUSE_MOVE);
}
/**
@@ -2371,7 +2372,7 @@
*/
@JsxSetter
public void setOnmouseout(final Object handler) {
- setEventHandler("mouseout", handler);
+ setEventHandler(MouseEvent.TYPE_MOUSE_OUT, handler);
}
/**
@@ -2380,7 +2381,7 @@
*/
@JsxGetter
public Object getOnmouseout() {
- return getEventHandler("mouseout");
+ return getEventHandler(MouseEvent.TYPE_MOUSE_OUT);
}
/**
@@ -2389,7 +2390,7 @@
*/
@JsxSetter
public void setOnmouseover(final Object handler) {
- setEventHandler("mouseover", handler);
+ setEventHandler(MouseEvent.TYPE_MOUSE_OVER, handler);
}
/**
@@ -2398,7 +2399,7 @@
*/
@JsxGetter
public Object getOnmouseover() {
- return getEventHandler("mouseover");
+ return getEventHandler(MouseEvent.TYPE_MOUSE_OVER);
}
/**
@@ -2407,7 +2408,7 @@
*/
@JsxSetter
public void setOnmouseup(final Object handler) {
- setEventHandler("mouseup", handler);
+ setEventHandler(MouseEvent.TYPE_MOUSE_UP, handler);
}
/**
@@ -2416,7 +2417,7 @@
*/
@JsxGetter
public Object getOnmouseup() {
- return getEventHandler("mouseup");
+ return getEventHandler(MouseEvent.TYPE_MOUSE_UP);
}
/**
@@ -2425,7 +2426,7 @@
*/
@JsxSetter
public void setOncontextmenu(final Object handler) {
- setEventHandler("contextmenu", handler);
+ setEventHandler(MouseEvent.TYPE_CONTEXT_MENU, handler);
}
/**
@@ -2434,7 +2435,7 @@
*/
@JsxGetter
public Object getOncontextmenu() {
- return getEventHandler("contextmenu");
+ return getEventHandler(MouseEvent.TYPE_CONTEXT_MENU);
}
/**
@@ -2461,7 +2462,7 @@
*/
@JsxSetter
public void setOnerror(final Object handler) {
- setEventHandler("error", handler);
+ setEventHandler(Event.TYPE_ERROR, handler);
}
/**
@@ -2470,7 +2471,7 @@
*/
@JsxGetter
public Object getOnerror() {
- return getEventHandler("error");
+ return getEventHandler(Event.TYPE_ERROR);
}
/**
@@ -2479,7 +2480,7 @@
*/
@JsxGetter
public Function getOninput() {
- return getEventHandler("input");
+ return getEventHandler(Event.TYPE_INPUT);
}
/**
@@ -2488,7 +2489,7 @@
*/
@JsxSetter
public void setOninput(final Object oninput) {
- setEventHandler("input", oninput);
+ setEventHandler(Event.TYPE_INPUT, oninput);
}
/**
@@ -2637,7 +2638,7 @@
*/
@JsxGetter(CHROME)
public Function getOnclose() {
- return getEventHandler("close");
+ return getEventHandler(Event.TYPE_CLOSE);
}
/**
@@ -2646,7 +2647,7 @@
*/
@JsxSetter(CHROME)
public void setOnclose(final Object onclose) {
- setEventHandler("close", onclose);
+ setEventHandler(Event.TYPE_CLOSE, onclose);
}
/**
@@ -2891,7 +2892,7 @@
*/
@JsxGetter
public Function getOnload() {
- return getEventHandler("load");
+ return getEventHandler(Event.TYPE_LOAD);
}
/**
@@ -2900,7 +2901,7 @@
*/
@JsxSetter
public void setOnload(final Object onload) {
- setEventHandler("load", onload);
+ setEventHandler(Event.TYPE_LOAD, onload);
}
/**
@@ -3287,7 +3288,7 @@
*/
@JsxGetter
public Function getOnreset() {
- return getEventHandler("reset");
+ return getEventHandler(Event.TYPE_RESET);
}
/**
@@ -3296,7 +3297,7 @@
*/
@JsxSetter
public void setOnreset(final Object onreset) {
- setEventHandler("reset", onreset);
+ setEventHandler(Event.TYPE_RESET, onreset);
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameSetElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameSetElement.java 2017-08-11 08:07:49 UTC (rev 14784)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameSetElement.java 2017-08-11 08:48:15 UTC (rev 14785)
@@ -24,6 +24,7 @@
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxGetter;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxSetter;
+import com.gargoylesoftware.htmlunit.javascript.host.event.Event;
import net.sourceforge.htmlunit.corejs.javascript.Context;
import net.sourceforge.htmlunit.corejs.javascript.Function;
@@ -137,7 +138,7 @@
*/
@JsxGetter
public Function getOnbeforeunload() {
- return getEventHandler("beforeunload");
+ return getEventHandler(Event.TYPE_BEFORE_UNLOAD);
}
/**
@@ -146,7 +147,7 @@
*/
@JsxSetter
public void setOnbeforeunload(final Object beforeunload) {
- setEventHandler("beforeunload", beforeunload);
+ setEventHandler(Event.TYPE_BEFORE_UNLOAD, beforeunload);
}
/**
@@ -155,7 +156,7 @@
*/
@JsxGetter
public Function getOnhashchange() {
- return getEventHandler("hashchange");
+ return getEventHandler(Event.TYPE_HASH_CHANGE);
}
/**
@@ -164,7 +165,7 @@
*/
@JsxSetter
public void setOnhashchange(final Object hashchange) {
- setEventHandler("hashchange", hashchange);
+ setEventHandler(Event.TYPE_HASH_CHANGE, hashchange);
}
/**
@@ -191,7 +192,7 @@
*/
@JsxGetter
public Function getOnmessage() {
- return getEventHandler("message");
+ return getEventHandler(Event.TYPE_MESSAGE);
}
/**
@@ -200,7 +201,7 @@
*/
@JsxSetter
public void setOnmessage(final Object message) {
- setEventHandler("message", message);
+ setEventHandler(Event.TYPE_MESSAGE, message);
}
/**
@@ -299,7 +300,7 @@
*/
@JsxGetter({CHROME, FF})
public Function getOnpopstate() {
- return getEventHandler("popstate");
+ return getEventHandler(Event.TYPE_POPSTATE);
}
/**
@@ -308,7 +309,7 @@
*/
@JsxSetter({CHROME, FF})
public void setOnpopstate(final Object popstate) {
- setEventHandler("popstate", popstate);
+ setEventHandler(Event.TYPE_POPSTATE, popstate);
}
/**
@@ -371,7 +372,7 @@
*/
@JsxGetter
public Function getOnunload() {
- return getEventHandler("unload");
+ return getEventHandler(Event.TYPE_UNLOAD);
}
/**
@@ -380,7 +381,7 @@
*/
@JsxSetter
public void setOnunload(final Object unload) {
- setEventHandler("unload", unload);
+ setEventHandler(Event.TYPE_UNLOAD, unload);
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElement.java 2017-08-11 08:07:49 UTC (rev 14784)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElement.java 2017-08-11 08:48:15 UTC (rev 14785)
@@ -32,6 +32,7 @@
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxGetter;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxSetter;
+import com.gargoylesoftware.htmlunit.javascript.host.event.Event;
import net.sourceforge.htmlunit.corejs.javascript.Undefined;
@@ -139,7 +140,7 @@
*/
@JsxGetter(IE)
public Object getOnreadystatechange() {
- return getEventHandler("readystatechange");
+ return getEventHandler(Event.TYPE_READY_STATE_CHANGE);
}
/**
@@ -148,7 +149,7 @@
*/
@JsxSetter(IE)
public void setOnreadystatechange(final Object handler) {
- setEventHandler("readystatechange", handler);
+ setEventHandler(Event.TYPE_READY_STATE_CHANGE, handler);
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElement2.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElement2.java 2017-08-11 08:07:49 UTC (rev 14784)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElement2.java 2017-08-11 08:48:15 UTC (rev 14785)
@@ -28,6 +28,8 @@
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlScript;
+import com.gargoylesoftware.htmlunit.javascript.host.event.Event;
+import com.gargoylesoftware.htmlunit.javascript.host.event.Event2;
import com.gargoylesoftware.js.nashorn.ScriptUtils;
import com.gargoylesoftware.js.nashorn.internal.objects.Global;
import com.gargoylesoftware.js.nashorn.internal.objects.annotations.Getter;
@@ -157,7 +159,7 @@
*/
@Setter(IE)
public void setOnreadystatechange(final Object handler) {
- setEventHandler("readystatechange", handler);
+ setEventHandler(Event.TYPE_READY_STATE_CHANGE, handler);
}
/**
@@ -175,7 +177,7 @@
*/
@Setter
public void setOnload(final Object handler) {
- setEventHandler("load", handler);
+ setEventHandler(Event2.TYPE_LOAD, handler);
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGElement.java 2017-08-11 08:07:49 UTC (rev 14784)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGElement.java 2017-08-11 08:48:15 UTC (rev 14785)
@@ -27,6 +27,8 @@
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxSetter;
import com.gargoylesoftware.htmlunit.javascript.host.Element;
import com.gargoylesoftware.htmlunit.javascript.host.css.CSSStyleDeclaration;
+import com.gargoylesoftware.htmlunit.javascript.host.event.Event;
+import com.gargoylesoftware.htmlunit.javascript.host.event.MouseEvent;
import com.gargoylesoftware.htmlunit.svg.SvgElement;
import net.sourceforge.htmlunit.corejs.javascript.Function;
@@ -99,7 +101,7 @@
*/
@JsxGetter({CHROME, FF})
public Function getOnfocus() {
- return getEventHandler("focus");
+ return getEventHandler(Event.TYPE_FOCUS);
}
/**
@@ -108,7 +110,7 @@
*/
@JsxSetter({CHROME, FF})
public void setOnfocus(final Object focus) {
- setEventHandler("focus", focus);
+ setEventHandler(Event.TYPE_FOCUS, focus);
}
/**
@@ -405,7 +407,7 @@
*/
@JsxGetter({CHROME, FF})
public Function getOnkeydown() {
- return getEventHandler("keydown");
+ return getEventHandler(Event.TYPE_KEY_DOWN);
}
/**
@@ -414,7 +416,7 @@
*/
@JsxSetter({CHROME, FF})
public void setOnkeydown(final Object keydown) {
- setEventHandler("keydown", keydown);
+ setEventHandler(Event.TYPE_KEY_DOWN, keydown);
}
/**
@@ -459,7 +461,7 @@
*/
@JsxGetter({CHROME, FF})
public Function getOnclick() {
- return getEventHandler("click");
+ return getEventHandler(MouseEvent.TYPE_CLICK);
}
/**
@@ -468,7 +470,7 @@
*/
@JsxSetter({CHROME, FF})
public void setOnclick(final Object click) {
- setEventHandler("click", click);
+ setEventHandler(MouseEvent.TYPE_CLICK, click);
}
/**
@@ -477,7 +479,7 @@
*/
@JsxGetter({CHROME, FF})
public Function getOnkeyup() {
- return getEventHandler("keyup");
+ return getEventHandler(Event.TYPE_KEY_UP);
}
/**
@@ -486,7 +488,7 @@
*/
@JsxSetter({CHROME, FF})
public void setOnkeyup(final Object keyup) {
- setEventHandler("keyup", keyup);
+ setEventHandler(Event.TYPE_KEY_UP, keyup);
}
/**
@@ -495,7 +497,7 @@
*/
@JsxGetter({CHROME, FF})
public Function getOnchange() {
- return getEventHandler("change");
+ return getEventHandler(Event.TYPE_CHANGE);
}
/**
@@ -504,7 +506,7 @@
*/
@JsxSetter({CHROME, FF})
public void setOnchange(final Object change) {
- setEventHandler("change", change);
+ setEventHandler(Event.TYPE_CHANGE, change);
}
/**
@@ -513,7 +515,7 @@
*/
@JsxGetter({CHROME, FF})
public Function getOnreset() {
- return getEventHandler("reset");
+ return getEventHandler(Event.TYPE_RESET);
}
/**
@@ -522,7 +524,7 @@
*/
@JsxSetter({CHROME, FF})
public void setOnreset(final Object reset) {
- setEventHandler("reset", reset);
+ setEventHandler(Event.TYPE_RESET, reset);
}
/**
@@ -531,7 +533,7 @@
*/
@JsxGetter({CHROME, FF})
public Function getOnkeypress() {
- return getEventHandler("keypress");
+ return getEventHandler(Event.TYPE_KEY_PRESS);
}
/**
@@ -540,7 +542,7 @@
*/
@JsxSetter({CHROME, FF})
public void setOnkeypress(final Object keypress) {
- setEventHandler("keypress", keypress);
+ setEventHandler(Event.TYPE_KEY_PRESS, keypress);
}
/**
@@ -567,7 +569,7 @@
*/
@JsxGetter({CHROME, FF})
public Function getOndblclick() {
- return getEventHandler("dblclick");
+ return getEventHandler(MouseEvent.TYPE_DBL_CLICK);
}
/**
@@ -576,7 +578,7 @@
*/
@JsxSetter({CHROME, FF})
public void setOndblclick(final Object dblclick) {
- setEventHandler("dblclick", dblclick);
+ setEventHandler(MouseEvent.TYPE_DBL_CLICK, dblclick);
}
/**
@@ -693,7 +695,7 @@
*/
@JsxGetter({CHROME, FF})
public Function getOncontextmenu() {
- return getEventHandler("contextmenu");
+ return getEventHandler(MouseEvent.TYPE_CONTEXT_MENU);
}
/**
@@ -702,7 +704,7 @@
*/
@JsxSetter({CHROME, FF})
public void setOncontextmenu(final Object contextmenu) {
- setEventHandler("contextmenu", contextmenu);
+ setEventHandler(MouseEvent.TYPE_CONTEXT_MENU, contextmenu);
}
/**
@@ -711,7 +713,7 @@
*/
@JsxGetter({CHROME, FF})
public Function getOnmousemove() {
- return getEventHandler("mousemove");
+ return getEventHandler(MouseEvent.TYPE_MOUSE_MOVE);
}
/**
@@ -720,7 +722,7 @@
*/
@JsxSetter({CHROME, FF})
public void setOnmousemove(final Object mousemove) {
- setEventHandler("mousemove", mousemove);
+ setEventHandler(MouseEvent.TYPE_MOUSE_MOVE, mousemove);
}
/**
@@ -729,7 +731,7 @@
*/
@JsxGetter({CHROME, FF})
public Function getOnerror() {
- return getEventHandler("error");
+ return getEventHandler(Event.TYPE_ERROR);
}
/**
@@ -738,7 +740,7 @@
*/
@JsxSetter({CHROME, FF})
public void setOnerror(final Object error) {
- setEventHandler("error", error);
+ setEventHandler(Event.TYPE_ERROR, error);
}
/**
@@ -747,7 +749,7 @@
*/
@JsxGetter({CHROME, FF})
public Function getOnmouseup() {
- return getEventHandler("mouseup");
+ return getEventHandler(MouseEvent.TYPE_MOUSE_UP);
}
/**
@@ -756,7 +758,7 @@
*/
@JsxSetter({CHROME, FF})
public void setOnmouseup(final Object mouseup) {
- setEventHandler("mouseup", mouseup);
+ setEventHandler(MouseEvent.TYPE_MOUSE_UP, mouseup);
}
/**
@@ -819,7 +821,7 @@
*/
@JsxGetter({CHROME, FF})
public Function getOnmouseover() {
- return getEventHandler("mouseover");
+ return getEventHandler(MouseEvent.TYPE_MOUSE_OVER);
}
/**
@@ -828,7 +830,7 @@
*/
@JsxSetter({CHROME, FF})
public void setOnmouseover(final Object mouseover) {
- setEventHandler("mouseover", mouseover);
+ setEventHandler(MouseEvent.TYPE_MOUSE_OVER, mouseover);
}
/**
@@ -837,7 +839,7 @@
*/
@JsxGetter({CHROME, FF})
public Function getOninput() {
- return getEventHandler("input");
+ return getEventHandler(Event.TYPE_INPUT);
}
/**
@@ -846,7 +848,7 @@
*/
@JsxSetter({CHROME, FF})
public void setOninput(final Object input) {
- setEventHandler("input", input);
+ setEventHandler(Event.TYPE_INPUT, input);
}
/**
@@ -927,7 +929,7 @@
*/
@JsxGetter(CHROME)
public Function getOnclose() {
- return getEventHandler("close");
+ return getEventHandler(Event.TYPE_CLOSE);
}
/**
@@ -936,7 +938,7 @@
*/
@JsxSetter(CHROME)
public void setOnclose(final Object close) {
- setEventHandler("close", close);
+ setEventHandler(Event.TYPE_CLOSE, close);
}
/**
@@ -981,7 +983,7 @@
*/
@JsxGetter({CHROME, FF})
public Function getOnsubmit() {
- return getEventHandler("submit");
+ return getEventHandler(Event.TYPE_SUBMIT);
}
/**
@@ -990,7 +992,7 @@
*/
@JsxSetter({CHROME, FF})
public void setOnsubmit(final Object submit) {
- setEventHandler("submit", submit);
+ setEventHandler(Event.TYPE_SUBMIT, submit);
}
/**
@@ -1107,7 +1109,7 @@
*/
@JsxGetter({CHROME, FF})
public Function getOnblur() {
- return getEventHandler("blur");
+ return getEventHandler(Event.TYPE_BLUR);
}
/**
@@ -1116,7 +1118,7 @@
*/
@JsxSetter({CHROME, FF})
public void setOnblur(final Object blur) {
- setEventHandler("blur", blur);
+ setEventHandler(Event.TYPE_BLUR, blur);
}
/**
@@ -1233,7 +1235,7 @@
*/
@JsxGetter({CHROME, FF})
public Function getOnload() {
- return getEventHandler("load");
+ return getEventHandler(Event.TYPE_LOAD);
}
/**
@@ -1242,7 +1244,7 @@
*/
@JsxSetter({CHROME, FF})
public void setOnload(final Object load) {
- setEventHandler("load", load);
+ setEventHandler(Event.TYPE_LOAD, load);
}
/**
@@ -1341,7 +1343,7 @@
*/
@JsxGetter({CHROME, FF})
public Function getOnmouseout() {
- return getEventHandler("mouseout");
+ return getEventHandler(MouseEvent.TYPE_MOUSE_OUT);
}
/**
@@ -1350,7 +1352,7 @@
*/
@JsxSetter({CHROME, FF})
public void setOnmouseout(final Object mouseout) {
- setEventHandler("mouseout", mouseout);
+ setEventHandler(MouseEvent.TYPE_MOUSE_OUT, mouseout);
}
/**
@@ -1431,7 +1433,7 @@
*/
@JsxGetter({CHROME, FF})
public Function getOnmousedown() {
- return getEventHandler("mousedown");
+ return getEventHandler(MouseEvent.TYPE_MOUSE_DOWN);
}
/**
@@ -1440,7 +1442,7 @@
*/
@JsxSetter({CHROME, FF})
public void setOnmousedown(final Object mousedown) {
- setEventHandler("mousedown", mousedown);
+ setEventHandler(MouseEvent.TYPE_MOUSE_DOWN, mousedown);
}
/**
|
