[prev in list] [next in list] [prev in thread] [next in thread]
List: htmlunit-develop
Subject: [HtmlUnit] SVN: [11326] trunk/htmlunit/src
From: asashour () users ! sourceforge ! net
Date: 2015-09-29 6:43:40
Message-ID: E1Zgodb-0001eB-Jb () sfs-ml-4 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 11326
http://sourceforge.net/p/htmlunit/code/11326
Author: asashour
Date: 2015-09-29 06:43:39 +0000 (Tue, 29 Sep 2015)
Log Message:
-----------
DomNode: deprecate .getScriptObject()
Modified Paths:
--------------
trunk/htmlunit/src/changes/changes.xml
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/InteractivePage.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMAttribute.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMDocumentType.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMNamedNodeMap.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMNode.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMNodeList.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XSLProcessor.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomNode.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HTMLParser.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlBody.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlFrameSet.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlImage.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlObject.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlPage.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlScript.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/AbstractList.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Attr.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/DocumentFragment.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/MutationObserver.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Range.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/XPathResult.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/Event.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/EventHandler.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/EventTarget.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument.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/HTMLFormElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOptionsCollection.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLDocument.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPage4Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTableRowTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/SelectorSpecificityTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLObjectElementTest.java
Modified: trunk/htmlunit/src/changes/changes.xml
===================================================================
--- trunk/htmlunit/src/changes/changes.xml 2015-09-28 21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/changes/changes.xml 2015-09-29 06:43:39 UTC (rev 11326)
@@ -8,6 +8,9 @@
<body>
<release version="2.19" date="" description="Bugfixes">
+ <action type="update" dev="asashour">
+ DomNode: deprecate .getScriptObject().
+ </action>
<action type="add" dev="asashour">
Introduce AbstractJavaScriptEngine.
</action>
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/InteractivePage.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/InteractivePage.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/InteractivePage.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -164,7 +164,7 @@
public InteractivePage cloneNode(final boolean deep) {
// we need the ScriptObject clone before cloning the kids.
final InteractivePage result = (InteractivePage) super.cloneNode(false);
- final SimpleScriptable jsObjClone = ((SimpleScriptable) \
getScriptObject()).clone(); + final SimpleScriptable jsObjClone = \
((SimpleScriptable) getScriptableObject()).clone(); jsObjClone.setDomNode(result);
// if deep, clone the kids too, and re initialize parts of the clone
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -492,7 +492,7 @@
LOG.debug("Executing onload handler for " + frame);
}
final Event event = new Event(frame, Event.TYPE_LOAD);
- ((Node) frame.getScriptObject()).executeEvent(event);
+ ((Node) \
frame.getScriptableObject()).executeEvent(event); }
}
}
@@ -1748,7 +1748,7 @@
// now looks at the visibility of the frame window
final BaseFrameElement frameElement = fw.getFrameElement();
if (frameElement.isDisplayed()) {
- final HTMLElement htmlElement = (HTMLElement) \
frameElement.getScriptObject(); + final HTMLElement htmlElement = \
(HTMLElement) frameElement.getScriptableObject(); final ComputedCSSStyleDeclaration \
style =
htmlElement.getWindow().getComputedStyle(htmlElement, \
null); use = (style.getCalculatedWidth(false, false) != 0)
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMAttribute.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMAttribute.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMAttribute.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -84,7 +84,7 @@
if (!org.apache.commons.lang3.StringUtils.isEmpty(value)) {
final DomText text = new DomText(getDomNodeOrDie().getPage(), \
value); getDomNodeOrDie().appendChild(text);
- textNode_ = (XMLDOMText) text.getScriptObject();
+ textNode_ = (XMLDOMText) text.getScriptableObject();
}
}
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMDocumentType.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMDocumentType.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMDocumentType.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -124,7 +124,7 @@
@Override
public Object getParentNode() {
final DomDocumentType domDocumentType = getDomNodeOrDie();
- return domDocumentType.getPage().getScriptObject();
+ return domDocumentType.getPage().getScriptableObject();
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMElement.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMElement.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -200,7 +200,7 @@
final Map<String, DomAttr> attributes = \
getDomNodeOrDie().getAttributesMap(); for (final DomAttr attr : attributes.values()) \
{ if (attr.getName().equals(name)) {
- return attr.getScriptObject();
+ return attr.getScriptableObject();
}
}
return null;
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMNamedNodeMap.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMNamedNodeMap.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMNamedNodeMap.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -60,7 +60,7 @@
* @param node the owning node
*/
public XMLDOMNamedNodeMap(final DomNode node) {
- setParentScope(node.getScriptObject());
+ setParentScope(node.getScriptableObject());
setPrototype(getPrototype(getClass()));
attributes_ = node.getAttributes();
@@ -117,7 +117,7 @@
public Object getNamedItemWithoutSyntheticClassAttr(final String name) {
final DomNode attr = (DomNode) attributes_.getNamedItem(name);
if (attr != null) {
- return attr.getScriptObject();
+ return attr.getScriptableObject();
}
return null;
}
@@ -149,7 +149,7 @@
public Object item(final int index) {
final DomNode attr = (DomNode) attributes_.item(index);
if (attr != null) {
- return attr.getScriptObject();
+ return attr.getScriptableObject();
}
return null;
}
@@ -176,7 +176,7 @@
final DomNode attr = (DomNode) attributes_.removeNamedItem(name);
if (attr != null) {
- return attr.getScriptObject();
+ return attr.getScriptableObject();
}
return null;
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMNode.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMNode.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMNode.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -251,7 +251,7 @@
if (document == null) {
return null;
}
- return ((SgmlPage) document).getScriptObject();
+ return ((SgmlPage) document).getScriptableObject();
}
/**
@@ -438,7 +438,7 @@
if (newChildNode instanceof DomDocumentFragment) {
final DomDocumentFragment fragment = (DomDocumentFragment) \
newChildNode; for (final DomNode child : fragment.getChildren()) {
- insertBeforeImpl(new Object[] {child.getScriptObject(), \
refChildObject}); + insertBeforeImpl(new Object[] \
{child.getScriptableObject(), refChildObject}); }
return newChildObject;
}
@@ -514,11 +514,11 @@
final XMLDOMNode refChildObject = ((XMLDOMNode) \
oldChild).getNextSibling();
for (final DomNode node : fragment.getDomNodeOrDie().getChildren()) {
if (firstNode == null) {
- replaceChild(node.getScriptObject(), oldChild);
- firstNode = (XMLDOMNode) node.getScriptObject();
+ replaceChild(node.getScriptableObject(), oldChild);
+ firstNode = (XMLDOMNode) node.getScriptableObject();
}
else {
- insertBeforeImpl(new Object[] {node.getScriptObject(), \
refChildObject}); + insertBeforeImpl(new Object[] \
{node.getScriptableObject(), refChildObject}); }
}
if (firstNode == null) {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMNodeList.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMNodeList.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XMLDOMNodeList.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -103,7 +103,7 @@
* @param description a text useful for debugging
*/
public XMLDOMNodeList(final DomNode parentScope, final boolean \
attributeChangeSensitive, final String description) {
- this(parentScope.getScriptObject());
+ this(parentScope.getScriptableObject());
setDomNode(parentScope, false);
description_ = description;
attributeChangeSensitive_ = attributeChangeSensitive;
@@ -115,7 +115,7 @@
* @param initialElements the initial content for the cache
*/
protected XMLDOMNodeList(final DomNode parentScope, final List<DomNode> \
initialElements) {
- this(parentScope.getScriptObject());
+ this(parentScope.getScriptableObject());
cachedElements_ = new ArrayList<>(initialElements);
}
@@ -147,7 +147,7 @@
Object nextNode;
final List<DomNode> elements = getElements();
if (currentIndex_ >= 0 && currentIndex_ < elements.size()) {
- nextNode = elements.get(currentIndex_).getScriptObject();
+ nextNode = elements.get(currentIndex_).getScriptableObject();
}
else {
nextNode = null;
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XSLProcessor.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XSLProcessor.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/activex/javascript/msxml/XSLProcessor.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -143,7 +143,7 @@
node.setParentScope(getParentScope());
node.setPrototype(getPrototype(node.getClass()));
node.setDomNode(fragment);
- output_ = fragment.getScriptObject();
+ output_ = fragment.getScriptableObject();
}
transform(input_, ((XMLDOMNode) output_).getDomNodeOrDie());
@@ -161,7 +161,7 @@
else {
//remove trailing "\r\n"
final String serializedString =
- serializer.serializeToString((XMLDOMNode) \
child.getScriptObject()); + \
serializer.serializeToString((XMLDOMNode) \
child.getScriptableObject());
output.append(serializedString, 0, serializedString.length() - 2);
}
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomElement.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomElement.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -1153,7 +1153,7 @@
if (LOG.isDebugEnabled()) {
LOG.debug("Firing " + event);
}
- final EventTarget jsElt = (EventTarget) getScriptObject();
+ final EventTarget jsElt = (EventTarget) getScriptableObject();
final ContextAction action = new ContextAction() {
@Override
public Object run(final Context cx) {
@@ -1185,7 +1185,7 @@
public void focus() {
final InteractivePage page = (InteractivePage) getPage();
page.setFocusedElement(this);
- final HTMLElement jsElt = (HTMLElement) getScriptObject();
+ final HTMLElement jsElt = (HTMLElement) getScriptableObject();
jsElt.setActive();
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomNode.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomNode.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomNode.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -278,7 +278,7 @@
*
* @param scriptObject the JavaScript object
*/
- public void setScriptObject(final ScriptableObject scriptObject) {
+ public void setScriptableObject(final ScriptableObject scriptObject) {
scriptObject_ = scriptObject;
}
@@ -741,7 +741,7 @@
// display: iterate top to bottom, because if a parent is display:none,
// there's nothing that a child can do to override it
for (final Node node : getAncestors(true)) {
- final ScriptableObject scriptableObject = ((DomNode) \
node).getScriptObject(); + final ScriptableObject scriptableObject = \
((DomNode) node).getScriptableObject(); if (scriptableObject instanceof HTMLElement) \
{
final HTMLElement elem = (HTMLElement) scriptableObject;
final CSSStyleDeclaration style = \
elem.getWindow().getComputedStyle(elem, null); @@ -899,10 +899,10 @@
if (hasFeature(JS_CLONE_NODE_COPIES_EVENT_LISTENERS)
&& !(this instanceof Document) && !(this instanceof \
DomDocumentFragment)) {
- final Scriptable prototype = newnode.getScriptObject().getPrototype();
+ final Scriptable prototype = \
newnode.getScriptableObject().getPrototype();
final DomNode documentFragment = getPage().createDocumentFragment();
documentFragment.basicAppend(newnode);
- newnode.getScriptObject().setPrototype(prototype);
+ newnode.getScriptableObject().setPrototype(prototype);
}
return newnode;
}
@@ -916,8 +916,24 @@
* a DOM node's JavaScript object should not have to check if they should create \
it first.
*
* @return the JavaScript object that corresponds to this node
+ * @deprecated as of 2.19, please use {@link #getScriptableObject()} instead
*/
+ @Deprecated
public ScriptableObject getScriptObject() {
+ return getScriptableObject();
+ }
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT \
YOUR OWN RISK.</span><br> + *
+ * Returns the JavaScript object that corresponds to this node, lazily \
initializing a new one if necessary. + *
+ * The logic of when and where the JavaScript object is created needs a clean \
up: functions using + * a DOM node's JavaScript object should not have to check \
if they should create it first. + *
+ * @return the JavaScript object that corresponds to this node
+ */
+ public ScriptableObject getScriptableObject() {
if (scriptObject_ == null) {
final SgmlPage page = getPage();
if (this == page) {
@@ -937,7 +953,7 @@
}
throw new IllegalStateException(msg.toString());
}
- scriptObject_ = ((SimpleScriptable) \
page.getScriptObject()).makeScriptableFor(this); + scriptObject_ = \
((SimpleScriptable) page.getScriptableObject()).makeScriptableFor(this); }
return scriptObject_;
}
@@ -1578,7 +1594,7 @@
*/
final Document doc = getOwnerDocument();
if (doc instanceof XmlPage) {
- final ScriptableObject scriptable = ((XmlPage) \
doc).getScriptObject(); + final ScriptableObject scriptable = \
((XmlPage) doc).getScriptableObject();
if (ScriptableObject.hasProperty(scriptable, "getProperty")) {
final Object selectionNS =
ScriptableObject.callMethod(scriptable, "getProperty", \
new Object[]{"SelectionNamespaces"}); @@ -1859,7 +1875,7 @@
final BrowserVersion browserVersion = webClient.getBrowserVersion();
int documentMode = 9;
if (browserVersion.hasFeature(QUERYSELECTORALL_NOT_IN_QUIRKS)) {
- final ScriptableObject sobj = getPage().getScriptObject();
+ final ScriptableObject sobj = getPage().getScriptableObject();
if (sobj instanceof HTMLDocument) {
documentMode = ((HTMLDocument) sobj).getDocumentMode();
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HTMLParser.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HTMLParser.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HTMLParser.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -610,7 +610,7 @@
final int version = (int) \
page_.getWebClient().getBrowserVersion().
\
getBrowserVersionNumeric(); if ("edge".equals(mode)) {
- ((HTMLDocument) \
page_.getScriptObject()).forceDocumentMode(version); + \
((HTMLDocument) page_.getScriptableObject()).forceDocumentMode(version); }
else {
try {
@@ -618,7 +618,7 @@
if (value > version) {
value = version;
}
- ((HTMLDocument) \
page_.getScriptObject()).forceDocumentMode(value); + \
((HTMLDocument) page_.getScriptableObject()).forceDocumentMode(value); }
catch (final Exception e) {
// ignore
@@ -1015,8 +1015,8 @@
final String attrName = \
attrs.getLocalName(i).toLowerCase(Locale.ROOT);
if (body_.getAttributes().getNamedItem(attrName) == null) {
body_.setAttribute(attrName, attrs.getValue(i));
- if (attrName.startsWith("on") && body_.getScriptObject() != \
null) {
- final HTMLBodyElement jsBody = (HTMLBodyElement) \
body_.getScriptObject(); + if (attrName.startsWith("on") && \
body_.getScriptableObject() != null) { + final \
HTMLBodyElement jsBody = (HTMLBodyElement) \
body_.getScriptableObject();
jsBody.createEventHandlerFromAttribute(attrName, \
attrs.getValue(i)); }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlBody.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlBody.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlBody.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -53,7 +53,7 @@
// Force script object creation now to forward onXXX handlers to window.
if (getOwnerDocument() instanceof HtmlPage) {
- getScriptObject();
+ getScriptableObject();
}
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlElement.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlElement.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -878,7 +878,7 @@
*/
private DomNode getDoTypeNode() {
DomNode node = null;
- final HTMLElement scriptElement = (HTMLElement) getScriptObject();
+ final HTMLElement scriptElement = (HTMLElement) getScriptableObject();
if (scriptElement.getIsContentEditable()) {
final DomNodeList<DomNode> children = getChildNodes();
if (!children.isEmpty()) {
@@ -1030,7 +1030,7 @@
* @return true if an event handler has been defined otherwise false
*/
public final boolean hasEventHandlers(final String eventName) {
- final HTMLElement jsObj = (HTMLElement) getScriptObject();
+ final HTMLElement jsObj = (HTMLElement) getScriptableObject();
return jsObj.hasEventHandlers(eventName);
}
@@ -1041,7 +1041,7 @@
* @param eventHandler a Rhino JavaScript function
*/
public final void setEventHandler(final String eventName, final Function \
eventHandler) {
- final HTMLElement jsObj = (HTMLElement) getScriptObject();
+ final HTMLElement jsObj = (HTMLElement) getScriptableObject();
jsObj.setEventHandler(eventName, eventHandler);
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlFrameSet.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlFrameSet.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlFrameSet.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -46,7 +46,7 @@
super(qualifiedName, page, attributes);
// force script object creation now to forward onXXX handlers to window
- getScriptObject();
+ getScriptableObject();
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlImage.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlImage.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlImage.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -185,7 +185,7 @@
// If the download was a success, trigger the onload handler.
if (ok) {
final Event event = new Event(this, Event.TYPE_LOAD);
- final Node scriptObject = (Node) getScriptObject();
+ final Node scriptObject = (Node) getScriptableObject();
final String readyState = htmlPage.getReadyState();
if (READY_STATE_LOADING.equals(readyState)) {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlObject.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlObject.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlObject.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -272,7 +272,7 @@
final String clsId = getClassIdAttribute();
if (ATTRIBUTE_NOT_DEFINED != clsId) {
- ((HTMLObjectElement) getScriptObject()).setClassid(clsId);
+ ((HTMLObjectElement) getScriptableObject()).setClassid(clsId);
}
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlPage.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlPage.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlPage.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -1242,7 +1242,7 @@
else {
event = new Event(frame, eventType);
}
- ((Node) frame.getScriptObject()).executeEvent(event);
+ ((Node) frame.getScriptableObject()).executeEvent(event);
if (!isOnbeforeunloadAccepted((HtmlPage) frame.getPage(), event)) {
return false;
}
@@ -1755,7 +1755,7 @@
if (DomElement.ATTRIBUTE_NOT_DEFINED == value && !(element instanceof \
HtmlApplet)) { // second try are JavaScript attributes
// ...but applets are a bit special so ignore them
- final ScriptableObject scriptObject = element.getScriptObject();
+ final ScriptableObject scriptObject = element.getScriptableObject();
// we have to make sure the scriptObject has a slot for the given \
attribute. // just using get() may use e.g. getWithPreemption().
if (scriptObject.has(attribute, scriptObject)) {
@@ -1813,7 +1813,7 @@
if (DomElement.ATTRIBUTE_NOT_DEFINED == value && !(element instanceof \
HtmlApplet)) { // second try are JavaScript attributes
// ...but applets are a bit special so ignore them
- final ScriptableObject scriptObject = element.getScriptObject();
+ final ScriptableObject scriptObject = element.getScriptableObject();
// we have to make sure the scriptObject has a slot for the given \
attribute. // just using get() may use e.g. getWithPreemption().
if (scriptObject.has(attribute, scriptObject)) {
@@ -2228,7 +2228,7 @@
* @return true for {@code quirks mode}, false for {@code standards mode}
*/
public boolean isQuirksMode() {
- return "BackCompat".equals(((HTMLDocument) \
getScriptObject()).getCompatMode()); + return \
"BackCompat".equals(((HTMLDocument) getScriptableObject()).getCompatMode()); }
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlScript.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlScript.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlScript.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -420,7 +420,7 @@
private void executeEventIfBrowserHasFeature(final String type, final \
BrowserVersionFeatures feature) { if (hasFeature(feature)) {
- final HTMLScriptElement script = (HTMLScriptElement) getScriptObject();
+ final HTMLScriptElement script = (HTMLScriptElement) \
getScriptableObject(); final Event event = new Event(HtmlScript.this, type);
script.executeEvent(event);
}
@@ -530,7 +530,7 @@
protected void setAndExecuteReadyState(final String state) {
if (hasFeature(EVENT_ONREADY_STATE_CHANGE)) {
setReadyState(state);
- final HTMLScriptElement script = (HTMLScriptElement) getScriptObject();
+ final HTMLScriptElement script = (HTMLScriptElement) \
getScriptableObject();
final Event event = new Event(this, Event.TYPE_READY_STATE_CHANGE);
script.executeEvent(event);
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -569,7 +569,7 @@
* @param page the page
*/
public void definePropertiesInStandardsMode(final HtmlPage page) {
- final Window window = ((HTMLDocument) page.getScriptObject()).getWindow();
+ final Window window = ((HTMLDocument) \
page.getScriptableObject()).getWindow(); final BrowserVersion browserVersion = \
window.getBrowserVersion(); for (final ClassConfiguration config : \
jsConfig_.getAll()) { final String jsClassName = config.getClassName();
@@ -924,7 +924,7 @@
private Scriptable getScope(final InteractivePage page, final DomNode node) {
if (node != null) {
- return node.getScriptObject();
+ return node.getScriptableObject();
}
return (Window) page.getEnclosingWindow().getScriptObject();
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/NamedNodeMap.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -77,7 +77,7 @@
* @param element the owning element
*/
public NamedNodeMap(final DomElement element) {
- setParentScope(element.getScriptObject());
+ setParentScope(element.getScriptableObject());
setPrototype(getPrototype(getClass()));
attributes_ = element.getAttributes();
@@ -138,7 +138,7 @@
if (attributes_ != null) {
final DomNode attr = (DomNode) attributes_.getNamedItem(name);
if (attr != null) {
- return attr.getScriptObject();
+ return attr.getScriptableObject();
}
if (!"className".equals(name) && useRecursiveAttributeForIE() && \
isRecursiveAttribute(name)) { return getUnspecifiedAttributeNode(name);
@@ -195,7 +195,7 @@
public Object item(final int index) {
final DomNode attr = (DomNode) attributes_.item(index);
if (attr != null) {
- return attr.getScriptObject();
+ return attr.getScriptableObject();
}
if (useRecursiveAttributeForIE()) {
// we have to search only inside not yet defined items
@@ -226,7 +226,7 @@
final DomAttr attr = domNode.getPage().createAttribute(attrName);
domNode.setAttributeNode(attr);
- return (Attr) attr.getScriptObject();
+ return (Attr) attr.getScriptableObject();
}
/**
@@ -249,7 +249,7 @@
}
private boolean isRecursiveAttribute(final String name) {
- for (Scriptable object = getDomNodeOrDie().getScriptObject(); object != \
null; + for (Scriptable object = getDomNodeOrDie().getScriptableObject(); \
object != null; object = object.getPrototype()) {
for (final Object id : object.getIds()) {
if (name.equals(Context.toString(id))) {
@@ -261,7 +261,7 @@
}
private void collectRecursiveAttributes(final HashSet<String> ids) {
- for (Scriptable object = getDomNodeOrDie().getScriptObject(); object != \
null; + for (Scriptable object = getDomNodeOrDie().getScriptableObject(); \
object != null; object = object.getPrototype()) {
for (final Object id : object.getIds()) {
ids.add(Context.toString(id));
@@ -270,7 +270,7 @@
}
private String getRecusiveAttributeNameAt(final int index, final HashSet<String> \
ids) {
- for (Scriptable object = getDomNodeOrDie().getScriptObject(); object != \
null; + for (Scriptable object = getDomNodeOrDie().getScriptableObject(); \
object != null; object = object.getPrototype()) {
for (final Object id : object.getIds()) {
final String name = Context.toString(id);
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -148,7 +148,7 @@
WebAssert.notNull("domNode", domNode);
domNode_ = domNode;
if (assignScriptObject) {
- domNode_.setScriptObject(this);
+ domNode_.setScriptableObject(this);
}
}
@@ -175,7 +175,7 @@
final DomNode domNode = (DomNode) object;
- final Object scriptObject = domNode.getScriptObject();
+ final Object scriptObject = domNode.getScriptableObject();
if (scriptObject != null) {
return (SimpleScriptable) scriptObject;
}
@@ -243,7 +243,7 @@
scriptable.setParentScope((Scriptable) \
enclosingWindow.getScriptObject()); }
else {
- scriptable.setParentScope(ScriptableObject.getTopLevelScope(domNode.getPage().getScriptObject()));
+ scriptable.setParentScope(ScriptableObject.getTopLevelScope(domNode.getPage().getScriptableObject()));
}
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -304,7 +304,7 @@
final Map<String, DomAttr> attributes = \
getDomNodeOrDie().getAttributesMap(); for (final DomAttr attr : attributes.values()) \
{ if (attr.getName().equals(name)) {
- return attr.getScriptObject();
+ return attr.getScriptableObject();
}
}
return null;
@@ -390,7 +390,7 @@
public Element getFirstElementChild() {
final DomElement child = getDomNodeOrDie().getFirstElementChild();
if (child != null) {
- return (Element) child.getScriptObject();
+ return (Element) child.getScriptableObject();
}
return null;
}
@@ -403,7 +403,7 @@
public Element getLastElementChild() {
final DomElement child = getDomNodeOrDie().getLastElementChild();
if (child != null) {
- return (Element) child.getScriptObject();
+ return (Element) child.getScriptableObject();
}
return null;
}
@@ -416,7 +416,7 @@
public Element getNextElementSibling() {
final DomElement child = getDomNodeOrDie().getNextElementSibling();
if (child != null) {
- return (Element) child.getScriptObject();
+ return (Element) child.getScriptableObject();
}
return null;
}
@@ -429,7 +429,7 @@
public Element getPreviousElementSibling() {
final DomElement child = getDomNodeOrDie().getPreviousElementSibling();
if (child != null) {
- return (Element) child.getScriptObject();
+ return (Element) child.getScriptableObject();
}
return null;
}
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 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -900,7 +900,7 @@
public Object getFrameElement() {
final WebWindow window = getWebWindow();
if (window instanceof FrameWindow) {
- return ((FrameWindow) window).getFrameElement().getScriptObject();
+ return ((FrameWindow) window).getFrameElement().getScriptableObject();
}
return null;
}
@@ -1120,7 +1120,7 @@
final HtmlPage page = (HtmlPage) getWebWindow().getEnclosedPage();
final HtmlElement body = page.getBody();
if (body != null) {
- final HTMLBodyElement b = (HTMLBodyElement) body.getScriptObject();
+ final HTMLBodyElement b = (HTMLBodyElement) \
body.getScriptableObject(); return b.getEventHandler("onload");
}
return null;
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -645,7 +645,7 @@
private static boolean selectsPseudoClass(final BrowserVersion browserVersion,
final AttributeCondition condition, final DomElement element) {
if (browserVersion.hasFeature(QUERYSELECTORALL_NOT_IN_QUIRKS)) {
- final ScriptableObject sobj = element.getPage().getScriptObject();
+ final ScriptableObject sobj = element.getPage().getScriptableObject();
if (sobj instanceof HTMLDocument && ((HTMLDocument) \
sobj).getDocumentMode() < 8) { return false;
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -2039,7 +2039,7 @@
}
else if ("block".equals(display)) {
// Block elements take up 100% of the parent's width.
- final HTMLElement parentJS = (HTMLElement) parent.getScriptObject();
+ final HTMLElement parentJS = (HTMLElement) \
parent.getScriptableObject();
final String parentWidth = getWindow().getComputedStyle(parentJS, \
null).getWidth();
if (getBrowserVersion().hasFeature(CSS_DEFAULT_WIDTH_AUTO)
&& "auto".equals(parentWidth)) {
@@ -2106,13 +2106,13 @@
}
}
for (final DomNode child : childs) {
- if (child.getScriptObject() instanceof HTMLElement) {
- final HTMLElement e = (HTMLElement) child.getScriptObject();
+ if (child.getScriptableObject() instanceof HTMLElement) {
+ final HTMLElement e = (HTMLElement) child.getScriptableObject();
final ComputedCSSStyleDeclaration style = \
e.getWindow().getComputedStyle(e, null); final int w = \
style.getCalculatedWidth(true, true); width += w;
}
- else if (child.getScriptObject() instanceof Text) {
+ else if (child.getScriptableObject() instanceof Text) {
width += child.getTextContent().length() * PIXELS_PER_CHAR;
}
}
@@ -2272,7 +2272,7 @@
final Set<ComputedCSSStyleDeclaration> styles = new HashSet<>();
for (final DomNode child : node.getChildren()) {
if (child.mayBeDisplayed()) {
- final ScriptableObject scriptObj = child.getScriptObject();
+ final ScriptableObject scriptObj = child.getScriptableObject();
if (scriptObj instanceof HTMLElement) {
final HTMLElement e = (HTMLElement) scriptObj;
final ComputedCSSStyleDeclaration style = \
e.getWindow().getComputedStyle(e, null); @@ -2344,7 +2344,7 @@
boolean prevHadComputedTop = false;
while (prev != null && !prevHadComputedTop) {
if (prev instanceof HtmlElement) {
- final HTMLElement e = (HTMLElement) ((HtmlElement) \
prev).getScriptObject(); + final HTMLElement e = (HTMLElement) \
((HtmlElement) prev).getScriptableObject();
final ComputedCSSStyleDeclaration style = \
e.getWindow().getComputedStyle(e, null); int prevTop = 0;
if (style.top_ == null) {
@@ -2467,8 +2467,8 @@
// We need to calculate the horizontal displacement caused by *previous* \
siblings. left = 0;
for (DomNode n = getDomNodeOrDie(); n != null; n = \
n.getPreviousSibling()) {
- if (n.getScriptObject() instanceof HTMLElement) {
- final HTMLElement e = (HTMLElement) n.getScriptObject();
+ if (n.getScriptableObject() instanceof HTMLElement) {
+ final HTMLElement e = (HTMLElement) n.getScriptableObject();
final ComputedCSSStyleDeclaration style = \
e.getWindow().getComputedStyle(e, null); final String d = style.getDisplay();
if ("block".equals(d)) {
@@ -2478,7 +2478,7 @@
left += style.getCalculatedWidth(true, true);
}
}
- else if (n.getScriptObject() instanceof Text) {
+ else if (n.getScriptableObject() instanceof Text) {
left += n.getTextContent().length() * PIXELS_PER_CHAR;
}
if (n instanceof HtmlTableRow) {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/AbstractList.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/AbstractList.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/AbstractList.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -110,7 +110,7 @@
* @param description a text useful for debugging
*/
public AbstractList(final DomNode parentScope, final boolean \
attributeChangeSensitive, final String description) {
- this(parentScope == null ? null : parentScope.getScriptObject());
+ this(parentScope == null ? null : parentScope.getScriptableObject());
if (parentScope != null) {
setDomNode(parentScope, false);
}
@@ -124,7 +124,7 @@
* @param initialElements the initial content for the cache
*/
protected AbstractList(final DomNode parentScope, final List<?> initialElements) \
{
- this(parentScope.getScriptObject());
+ this(parentScope.getScriptableObject());
cachedElements_ = new ArrayList<>(initialElements);
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Attr.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Attr.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Attr.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -123,7 +123,7 @@
public Object getOwnerElement() {
final DomElement parent = getDomNodeOrDie().getOwnerElement();
if (parent != null) {
- return parent.getScriptObject();
+ return parent.getScriptableObject();
}
return null;
}
@@ -182,7 +182,7 @@
}
final DomText text = new DomText(getDomNodeOrDie().getPage(), \
getNodeValue());
- return (Node) text.getScriptObject();
+ return (Node) text.getScriptableObject();
}
/**
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 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -307,7 +307,7 @@
*/
@JsxFunction
public Attr createAttribute(final String attributeName) {
- return (Attr) getPage().createAttribute(attributeName).getScriptObject();
+ return (Attr) \
getPage().createAttribute(attributeName).getScriptableObject(); }
/**
@@ -327,7 +327,7 @@
for (final DomNode childNode : domNode.getDescendants()) {
childNode.processImportNode(this);
}
- return domNode.getScriptObject();
+ return domNode.getScriptableObject();
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentFragment.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentFragment.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentFragment.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -106,7 +106,7 @@
* @return HTML document
*/
protected HTMLDocument getDocument() {
- return (HTMLDocument) getDomNodeOrDie().getPage().getScriptObject();
+ return (HTMLDocument) getDomNodeOrDie().getPage().getScriptableObject();
}
/**
@@ -151,7 +151,7 @@
try {
final List<Node> nodes = new ArrayList<>();
for (final DomNode domNode : \
getDomNodeOrDie().querySelectorAll(selectors)) {
- nodes.add((Node) domNode.getScriptObject());
+ nodes.add((Node) domNode.getScriptableObject());
}
return new StaticNodeList(nodes, this);
}
@@ -171,7 +171,7 @@
try {
final DomNode node = getDomNodeOrDie().querySelector(selectors);
if (node != null) {
- return (Node) node.getScriptObject();
+ return (Node) node.getScriptableObject();
}
return null;
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/MutationObserver.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/MutationObserver.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/MutationObserver.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -114,7 +114,7 @@
*/
@Override
public void characterDataChanged(final CharacterDataChangeEvent event) {
- final ScriptableObject target = event.getCharacterData().getScriptObject();
+ final ScriptableObject target = \
event.getCharacterData().getScriptableObject(); if (subtree_ || target == node_) {
final MutationRecord mutationRecord = new MutationRecord();
final Scriptable scope = getParentScope();
@@ -162,7 +162,7 @@
mutationRecord.setPrototype(getPrototype(mutationRecord.getClass()));
mutationRecord.setType("attributes");
- mutationRecord.setTarget(target.getScriptObject());
+ mutationRecord.setTarget(target.getScriptableObject());
if (attributeOldValue_) {
mutationRecord.setOldValue(event.getValue());
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -347,7 +347,7 @@
if (newChildNode instanceof DomDocumentFragment) {
final DomDocumentFragment fragment = (DomDocumentFragment) \
newChildNode; for (final DomNode child : fragment.getChildren()) {
- if (!isNodeInsertable((Node) child.getScriptObject())) {
+ if (!isNodeInsertable((Node) child.getScriptableObject())) {
if \
(getBrowserVersion().hasFeature(JS_APPEND_CHILD_THROWS_NO_EXCEPTION_FOR_WRONG_NODE)) \
{ return newChild;
}
@@ -454,11 +454,11 @@
final Node refChildObject = ((Node) oldChildObject).getNextSibling();
for (final DomNode node : fragment.getDomNodeOrDie().getChildren()) {
if (firstNode == null) {
- replaceChild(node.getScriptObject(), oldChildObject);
- firstNode = (Node) node.getScriptObject();
+ replaceChild(node.getScriptableObject(), oldChildObject);
+ firstNode = (Node) node.getScriptableObject();
}
else {
- insertBeforeImpl(new Object[] {node.getScriptObject(), \
refChildObject}); + insertBeforeImpl(new Object[] \
{node.getScriptableObject(), refChildObject}); }
}
if (firstNode == null) {
@@ -506,7 +506,7 @@
}
private void copyEventListenersWhenNeeded(final DomNode domNode, final DomNode \
clonedNode) {
- final Node jsNode = (Node) domNode.getScriptObject();
+ final Node jsNode = (Node) domNode.getScriptableObject();
if (jsNode != null) {
final Node jsClonedNode = getJavaScriptNode(clonedNode);
jsClonedNode.getEventListenersContainer().copyFrom(jsNode.getEventListenersContainer());
@@ -705,7 +705,7 @@
if (document == null) {
return null;
}
- return ((SgmlPage) document).getScriptObject();
+ return ((SgmlPage) document).getScriptableObject();
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Range.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Range.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Range.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -109,11 +109,11 @@
Range(final org.w3c.dom.ranges.Range w3cRange) {
final DomNode domNodeStartContainer = (DomNode) \
w3cRange.getStartContainer();
- startContainer_ = (Node) domNodeStartContainer.getScriptObject();
+ startContainer_ = (Node) domNodeStartContainer.getScriptableObject();
startOffset_ = w3cRange.getStartOffset();
final DomNode domNodeEndContainer = (DomNode) w3cRange.getEndContainer();
- endContainer_ = (Node) domNodeEndContainer.getScriptObject();
+ endContainer_ = (Node) domNodeEndContainer.getScriptableObject();
endOffset_ = w3cRange.getEndOffset();
}
@@ -370,7 +370,7 @@
+ e.getMessage());
}
- return fragment.getScriptObject();
+ return fragment.getScriptableObject();
}
/**
@@ -379,7 +379,7 @@
*/
@JsxFunction
public Object extractContents() {
- return toW3C().extractContents().getScriptObject();
+ return toW3C().extractContents().getScriptableObject();
}
/**
@@ -452,7 +452,7 @@
*/
@JsxFunction
public Object cloneContents() {
- return toW3C().cloneContents().getScriptObject();
+ return toW3C().cloneContents().getScriptableObject();
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/XPathResult.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/XPathResult.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/XPathResult.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -188,7 +188,7 @@
throw Context.reportRuntimeError("Cannot get singleNodeValue for type: " \
+ resultType_); }
if (!result_.isEmpty()) {
- return (Node) ((DomNode) result_.get(0)).getScriptObject();
+ return (Node) ((DomNode) result_.get(0)).getScriptableObject();
}
return null;
}
@@ -203,7 +203,7 @@
throw Context.reportRuntimeError("Cannot get iterateNext for type: " + \
resultType_); }
if (iteratorIndex_ < result_.size()) {
- return (Node) ((DomNode) \
result_.get(iteratorIndex_++)).getScriptObject(); + return (Node) \
((DomNode) result_.get(iteratorIndex_++)).getScriptableObject(); }
return null;
}
@@ -220,7 +220,7 @@
throw Context.reportRuntimeError("Cannot get snapshotLength for type: " \
+ resultType_); }
if (index >= 0 && index < result_.size()) {
- return (Node) ((DomNode) result_.get(index)).getScriptObject();
+ return (Node) ((DomNode) result_.get(index)).getScriptableObject();
}
return null;
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/Event.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/Event.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/Event.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -285,7 +285,7 @@
* @param type the event type
*/
public Event(final DomNode domNode, final String type) {
- this((SimpleScriptable) domNode.getScriptObject(), type);
+ this((SimpleScriptable) domNode.getScriptableObject(), type);
setDomNode(domNode, false);
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/EventHandler.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/EventHandler.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/EventHandler.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -71,7 +71,7 @@
throws JavaScriptException {
// the js object to which this event is attached has to be the scope
- final SimpleScriptable jsObj = (SimpleScriptable) node_.getScriptObject();
+ final SimpleScriptable jsObj = (SimpleScriptable) \
node_.getScriptableObject(); // compile "just in time"
if (realFunction_ == null) {
realFunction_ = cx.compileFunction(jsObj, jsSnippet_, eventName_ + " \
event for " + node_
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/EventTarget.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/EventTarget.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/EventTarget.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -154,7 +154,7 @@
final DomNode domNode = eventTarget.getDomNodeOrNull();
eventTarget = null;
if (domNode != null && domNode.getParentNode() != null) {
- eventTarget = (EventTarget) \
domNode.getParentNode().getScriptObject(); + eventTarget = \
(EventTarget) domNode.getParentNode().getScriptableObject(); }
}
@@ -196,7 +196,7 @@
final DomNode domNode = eventTarget.getDomNodeOrNull();
eventTarget = null;
if (domNode != null && domNode.getParentNode() != null) {
- eventTarget = (EventTarget) \
domNode.getParentNode().getScriptObject(); + eventTarget = \
(EventTarget) domNode.getParentNode().getScriptableObject(); }
event.setEventPhase(Event.BUBBLING_PHASE);
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -1459,7 +1459,7 @@
}
final HtmlElement body = page.getBody();
if (body != null) {
- return (HTMLElement) body.getScriptObject();
+ return (HTMLElement) body.getScriptableObject();
}
return null;
}
@@ -1472,7 +1472,7 @@
public HTMLElement getHead() {
final HtmlElement head = getPage().getHead();
if (head != null) {
- return (HTMLElement) head.getScriptObject();
+ return (HTMLElement) head.getScriptableObject();
}
return null;
}
@@ -1519,7 +1519,7 @@
*/
@JsxSetter
public void setBgColor(final String color) {
- final HTMLBodyElement body = (HTMLBodyElement) \
getPage().getBody().getScriptObject(); + final HTMLBodyElement body = \
(HTMLBodyElement) getPage().getBody().getScriptableObject(); body.setBgColor(color);
}
@@ -1545,7 +1545,7 @@
*/
@JsxSetter
public void setAlinkColor(final String color) {
- final HTMLBodyElement body = (HTMLBodyElement) \
getPage().getBody().getScriptObject(); + final HTMLBodyElement body = \
(HTMLBodyElement) getPage().getBody().getScriptableObject(); body.setALink(color);
}
@@ -1571,7 +1571,7 @@
*/
@JsxSetter
public void setLinkColor(final String color) {
- final HTMLBodyElement body = (HTMLBodyElement) \
getPage().getBody().getScriptObject(); + final HTMLBodyElement body = \
(HTMLBodyElement) getPage().getBody().getScriptableObject(); body.setLink(color);
}
@@ -1597,7 +1597,7 @@
*/
@JsxSetter
public void setVlinkColor(final String color) {
- final HTMLBodyElement body = (HTMLBodyElement) \
getPage().getBody().getScriptObject(); + final HTMLBodyElement body = \
(HTMLBodyElement) getPage().getBody().getScriptableObject(); body.setVLink(color);
}
@@ -1623,7 +1623,7 @@
*/
@JsxSetter
public void setFgColor(final String color) {
- final HTMLBodyElement body = (HTMLBodyElement) \
getPage().getBody().getScriptObject(); + final HTMLBodyElement body = \
(HTMLBodyElement) getPage().getBody().getScriptableObject(); body.setText(color);
}
@@ -2082,7 +2082,7 @@
try {
final List<Node> nodes = new ArrayList<>();
for (final DomNode domNode : \
getDomNodeOrDie().querySelectorAll(selectors)) {
- nodes.add((Node) domNode.getScriptObject());
+ nodes.add((Node) domNode.getScriptableObject());
}
return new StaticNodeList(nodes, this);
}
@@ -2102,7 +2102,7 @@
try {
final DomNode node = getDomNodeOrDie().querySelector(selectors);
if (node != null) {
- return (Node) node.getScriptObject();
+ return (Node) node.getScriptableObject();
}
return null;
}
@@ -2132,7 +2132,7 @@
else {
final DomNode page = ((HTMLDocument) start).getDomNodeOrNull();
if (page != null) {
- document = (Document) page.getScriptObject();
+ document = (Document) page.getScriptableObject();
}
}
if (document != null && document instanceof HTMLDocument
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 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -733,7 +733,7 @@
*/
@JsxFunction({ @WebBrowser(FF), @WebBrowser(CHROME), @WebBrowser(value = IE, \
minVersion = 11) })
public Object getAttributeNodeNS(final String namespaceURI, final String \
localName) {
- return getDomNodeOrDie().getAttributeNodeNS(namespaceURI, \
localName).getScriptObject(); + return \
getDomNodeOrDie().getAttributeNodeNS(namespaceURI, localName).getScriptableObject(); \
}
/**
@@ -989,7 +989,7 @@
}
else if (html) {
final DomElement element = (DomElement) node;
- final Element scriptObject = (Element) node.getScriptObject();
+ final Element scriptObject = (Element) node.getScriptableObject();
final boolean isUpperCase = \
getBrowserVersion().hasFeature(HTMLELEMENT_OUTER_HTML_UPPER_CASE); String tag = \
element.getTagName();
@@ -2106,7 +2106,7 @@
try {
final List<Node> nodes = new ArrayList<>();
for (final DomNode domNode : \
getDomNodeOrDie().querySelectorAll(selectors)) {
- nodes.add((Node) domNode.getScriptObject());
+ nodes.add((Node) domNode.getScriptableObject());
}
return new StaticNodeList(nodes, this);
}
@@ -2126,7 +2126,7 @@
try {
final DomNode node = getDomNodeOrDie().querySelector(selectors);
if (node != null) {
- return (Node) node.getScriptObject();
+ return (Node) node.getScriptableObject();
}
return null;
}
@@ -2622,7 +2622,7 @@
// Add the offset for this node.
DomNode node = getDomNodeOrDie();
- HTMLElement element = (HTMLElement) node.getScriptObject();
+ HTMLElement element = (HTMLElement) node.getScriptableObject();
ComputedCSSStyleDeclaration style = \
element.getWindow().getComputedStyle(element, null); left += style.getLeft(true, \
false, false);
@@ -2634,9 +2634,9 @@
// Add the offset for the ancestor nodes.
node = node.getParentNode();
- while (node != null && node.getScriptObject() != offsetParent) {
- if (node.getScriptObject() instanceof HTMLElement) {
- element = (HTMLElement) node.getScriptObject();
+ while (node != null && node.getScriptableObject() != offsetParent) {
+ if (node.getScriptableObject() instanceof HTMLElement) {
+ element = (HTMLElement) node.getScriptableObject();
style = element.getWindow().getComputedStyle(element, null);
left += style.getLeft(true, true, true);
}
@@ -2746,7 +2746,7 @@
// Add the offset for this node.
DomNode node = getDomNodeOrDie();
- HTMLElement element = (HTMLElement) node.getScriptObject();
+ HTMLElement element = (HTMLElement) node.getScriptableObject();
ComputedCSSStyleDeclaration style = \
element.getWindow().getComputedStyle(element, null); top += style.getTop(true, \
false, false);
@@ -2758,9 +2758,9 @@
// Add the offset for the ancestor nodes.
node = node.getParentNode();
- while (node != null && node.getScriptObject() != offsetParent) {
- if (node.getScriptObject() instanceof HTMLElement) {
- element = (HTMLElement) node.getScriptObject();
+ while (node != null && node.getScriptableObject() != offsetParent) {
+ if (node.getScriptableObject() instanceof HTMLElement) {
+ element = (HTMLElement) node.getScriptableObject();
style = element.getWindow().getComputedStyle(element, null);
top += style.getTop(false, true, true);
}
@@ -2768,7 +2768,7 @@
}
if (offsetParent != null) {
- final HTMLElement thiz = (HTMLElement) \
getDomNodeOrDie().getScriptObject(); + final HTMLElement thiz = \
(HTMLElement) getDomNodeOrDie().getScriptableObject(); style = \
thiz.getWindow().getComputedStyle(thiz, null);
final boolean thisElementHasTopMargin = style.getMarginTopValue() != 0;
@@ -2810,7 +2810,7 @@
}
Object offsetParent = null;
- final HTMLElement htmlElement = (HTMLElement) \
currentElement.getScriptObject(); + final HTMLElement htmlElement = \
(HTMLElement) currentElement.getScriptableObject();
if (returnNullIfFixed && \
"fixed".equals(htmlElement.getStyle().getPosition())) { return null;
}
@@ -2829,19 +2829,19 @@
if (parentNode instanceof HtmlBody
|| (useTables && parentNode instanceof HtmlTableDataCell)
|| (useTables && parentNode instanceof HtmlTable)) {
- offsetParent = parentNode.getScriptObject();
+ offsetParent = parentNode.getScriptableObject();
break;
}
- if (parentNode != null && parentNode.getScriptObject() instanceof \
HTMLElement) {
- final HTMLElement parentElement = (HTMLElement) \
parentNode.getScriptObject(); + if (parentNode != null && \
parentNode.getScriptableObject() instanceof HTMLElement) { + final \
HTMLElement parentElement = (HTMLElement) parentNode.getScriptableObject(); final \
ComputedCSSStyleDeclaration parentStyle =
\
parentElement.getWindow().getComputedStyle(parentElement, null);
final String parentPosition = \
parentStyle.getPositionWithInheritance();
final boolean parentIsStatic = "static".equals(parentPosition);
final boolean parentIsFixed = "fixed".equals(parentPosition);
if ((useTablesIfFixed && !parentIsStatic && !parentIsFixed) || \
(!useTablesIfFixed && !parentIsStatic)) {
- offsetParent = parentNode.getScriptObject();
+ offsetParent = parentNode.getScriptableObject();
break;
}
}
@@ -3053,7 +3053,7 @@
else if ("inherit".equals(attribute)) {
final DomNode parent = getDomNodeOrDie().getParentNode();
if (parent != null) {
- final Scriptable parentScriptable = parent.getScriptObject();
+ final Scriptable parentScriptable = parent.getScriptableObject();
if (parentScriptable instanceof HTMLElement) {
return ((HTMLElement) parentScriptable).getIsContentEditable();
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElement.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElement.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -104,7 +104,7 @@
public void setHtmlElement(final HtmlElement htmlElement) {
super.setHtmlElement(htmlElement);
final HtmlForm htmlForm = getHtmlForm();
- htmlForm.setScriptObject(this);
+ htmlForm.setScriptableObject(this);
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElement.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElement.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -120,7 +120,7 @@
input.getParentNode().replaceChild(newInput, input);
}
- input.setScriptObject(null);
+ input.setScriptableObject(null);
setDomNode(newInput, true);
}
else {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOptionsCollection.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOptionsCollection.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOptionsCollection.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -150,7 +150,7 @@
return;
}
- final HTMLSelectElement parent = (HTMLSelectElement) \
htmlSelect_.getScriptObject(); + final HTMLSelectElement parent = \
(HTMLSelectElement) htmlSelect_.getScriptableObject();
if (!has(name, start) && ScriptableObject.hasProperty(parent, name)) {
ScriptableObject.putProperty(parent, name, value);
@@ -179,7 +179,7 @@
}
// If the name was NOT_FOUND on the prototype, then just drop through
// to search on the select element for IE only AND FF.
- final HTMLSelectElement select = (HTMLSelectElement) \
htmlSelect_.getScriptObject(); + final HTMLSelectElement select = \
(HTMLSelectElement) htmlSelect_.getScriptableObject(); return \
ScriptableObject.getProperty(select, name); }
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElement.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElement.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -70,7 +70,7 @@
*/
public void initialize() {
final HtmlSelect htmlSelect = getHtmlSelect();
- htmlSelect.setScriptObject(this);
+ htmlSelect.setScriptableObject(this);
if (optionsArray_ == null) {
optionsArray_ = new HTMLOptionsCollection(this);
optionsArray_.initialize(htmlSelect);
@@ -196,7 +196,7 @@
if (selectedOptions.isEmpty()) {
return "";
}
- return ((HTMLOptionElement) \
selectedOptions.get(0).getScriptObject()).getValue(); + return \
((HTMLOptionElement) selectedOptions.get(0).getScriptableObject()).getValue(); }
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLDocument.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLDocument.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLDocument.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -279,7 +279,7 @@
if (domElement != null) {
if (!(domNode instanceof XmlPage) || domElement instanceof HtmlElement
|| \
getBrowserVersion().hasFeature(JS_XML_GET_ELEMENT_BY_ID__ANY_ELEMENT)) \
{
- return ((DomElement) domElement).getScriptObject();
+ return ((DomElement) domElement).getScriptableObject();
}
if (LOG.isDebugEnabled()) {
LOG.debug("getElementById(" + id + "): no HTML DOM node found with \
this ID");
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -1951,15 +1951,15 @@
client.setWebConnection(conn);
final HtmlPage page1 = client.getPage(URL_FIRST);
- ((HTMLStyleElement) \
page1.getBody().getFirstChild().getScriptObject()).getSheet(); + \
((HTMLStyleElement) page1.getBody().getFirstChild().getScriptableObject()).getSheet();
assertEquals(0, errors.intValue());
final HtmlPage page2 = client.getPage(URL_SECOND);
- ((HTMLStyleElement) \
page2.getBody().getFirstChild().getScriptObject()).getSheet(); + \
((HTMLStyleElement) page2.getBody().getFirstChild().getScriptableObject()).getSheet();
assertEquals(0, errors.intValue());
final HtmlPage page3 = client.getPage(URL_THIRD);
- ((HTMLStyleElement) \
page3.getBody().getFirstChild().getScriptObject()).getSheet(); + \
((HTMLStyleElement) page3.getBody().getFirstChild().getScriptableObject()).getSheet();
assertEquals(2, errors.intValue());
assertEquals("http://127.0.0.1:" + PORT + "/third/http://127.0.0.1:" + PORT \
+ "/third/", errorUri.toString()); }
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPage4Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPage4Test.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPage4Test.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -154,7 +154,7 @@
final CollectingAlertHandler alertHandler = new \
CollectingAlertHandler(); client.setAlertHandler(alertHandler);
final HtmlPage page = client.getPage("http://localhost:" + PORT + \
"/one.html");
- ((HTMLBodyElement) page.getBody().getScriptObject()).getCurrentStyle();
+ ((HTMLBodyElement) \
page.getBody().getScriptableObject()).getCurrentStyle();
assertEquals(getExpectedAlerts(), alertHandler.getCollectedAlerts());
assertEquals(initialTempFiles + 1, getTempFiles());
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTableRowTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTableRowTest.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTableRowTest.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -218,7 +218,7 @@
final String cmd = "document.getElementById('cell')";
final HTMLElement jselement = (HTMLElement) \
page_.executeJavaScript(cmd).getJavaScriptResult();
- assertSame(jselement, cell_.getScriptObject());
+ assertSame(jselement, cell_.getScriptableObject());
}
/**
@@ -233,7 +233,7 @@
final HTMLElement jselement = (HTMLElement) object;
assertEquals("original", ScriptableObject.getProperty(jselement, "a"));
- assertSame(jselement, cell_.getScriptObject());
+ assertSame(jselement, cell_.getScriptableObject());
}
/**
@@ -297,7 +297,7 @@
// scriptable object
page_.executeJavaScript(cmd);
- assertNotSame(cell_.getScriptObject(), cellClone_.getScriptObject());
+ assertNotSame(cell_.getScriptableObject(), \
cellClone_.getScriptableObject()); }
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet2Test.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet2Test.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -67,7 +67,7 @@
final DomElement button2 = page.getElementsByName("b2").get(0);
final HtmlStyle node = (HtmlStyle) \
page.getElementsByTagName("style").item(0);
- final HTMLStyleElement host = (HTMLStyleElement) node.getScriptObject();
+ final HTMLStyleElement host = (HTMLStyleElement) node.getScriptableObject();
final CSSStyleSheet sheet = host.getSheet();
Selector selector = parseSelector(sheet, "*.yui-log input");
@@ -149,7 +149,7 @@
+ "</body></html>";
final HtmlPage page = loadPage(html);
final HtmlStyle node = (HtmlStyle) \
page.getElementsByTagName("style").item(0);
- final HTMLStyleElement host = (HTMLStyleElement) node.getScriptObject();
+ final HTMLStyleElement host = (HTMLStyleElement) node.getScriptableObject();
final CSSStyleSheet sheet = host.getSheet();
Selector selector = sheet.parseSelectors(new InputSource(new \
StringReader("#d\\:e"))).item(0); @@ -215,7 +215,7 @@
+ "</html>";
final HtmlPage page = loadPage(html);
final HtmlStyle node = (HtmlStyle) \
page.getElementsByTagName("style").item(0);
- final HTMLStyleElement host = (HTMLStyleElement) node.getScriptObject();
+ final HTMLStyleElement host = (HTMLStyleElement) node.getScriptableObject();
final CSSStyleSheet sheet = host.getSheet();
final Selector selector = sheet.parseSelectors(new InputSource(new \
StringReader(css))).item(0);
assertEquals(selectBody, sheet.selects(selector, \
page.getHtmlElementById("b"))); @@ -237,7 +237,7 @@
final NodeList list = htmlPage.getElementsByTagName("body");
final HtmlElement element = (HtmlElement) list.item(0);
- final ComputedCSSStyleDeclaration style = ((HTMLElement) \
element.getScriptObject()).getCurrentStyle(); + final \
ComputedCSSStyleDeclaration style = ((HTMLElement) \
element.getScriptableObject()).getCurrentStyle(); assertEquals("CSSStyleDeclaration \
for ''", style.toString()); }
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/SelectorSpecificityTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/SelectorSpecificityTest.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/SelectorSpecificityTest.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -85,7 +85,7 @@
+ "</body></html>";
final HtmlPage page = loadPage(html);
final HtmlStyle node = (HtmlStyle) \
page.getElementsByTagName("style").item(0);
- final HTMLStyleElement host = (HTMLStyleElement) node.getScriptObject();
+ final HTMLStyleElement host = (HTMLStyleElement) node.getScriptableObject();
final CSSStyleSheet sheet = host.getSheet();
final Selector selectorObject = parseSelector(sheet, selector);
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLObjectElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLObjectElementTest.java 2015-09-28 \
21:14:19 UTC (rev 11325)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLObjectElementTest.java 2015-09-29 \
06:43:39 UTC (rev 11326) @@ -113,7 +113,7 @@
page.getHtmlElementById("myButton").click();
final HtmlElement elem = page.getHtmlElementById("id1");
- final HTMLObjectElement jsElem = (HTMLObjectElement) elem.getScriptObject();
+ final HTMLObjectElement jsElem = (HTMLObjectElement) \
elem.getScriptableObject();
final MockActiveXObject activeX = (MockActiveXObject) jsElem.unwrap();
if (null != activeX) {
activeX.setMessage("ActiveX is still alive");
------------------------------------------------------------------------------
_______________________________________________
HtmlUnit-develop mailing list
HtmlUnit-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/htmlunit-develop
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic