[prev in list] [next in list] [prev in thread] [next in thread]
List: htmlunit-develop
Subject: [HtmlUnit] SVN: [11937] trunk/htmlunit/src
From: asashour () users ! sourceforge ! net
Date: 2016-02-29 9:35:26
Message-ID: E1aaKEk-0000mA-OH () sfs-ml-3 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 11937
http://sourceforge.net/p/htmlunit/code/11937
Author: asashour
Date: 2016-02-29 09:35:26 +0000 (Mon, 29 Feb 2016)
Log Message:
-----------
Remove deprecated WebClient.closeAllWindows(), DomNode.getScriptObject(), \
WebWindow.getScriptObject(), HttpWebConnection.shutdown(), \
SgmlPage.createDomDocumentFragment(), XmlPage.getContent(), \
XmlPage.createXmlElement(), XmlPage.createXmlElementNS(), \
XmlPage.getXmlElementDescendants().
Modified Paths:
--------------
trunk/htmlunit/src/changes/changes.xml
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/DialogWindow.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/SgmlPage.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebWindow.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebWindowImpl.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomNode.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/FrameWindow.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/xml/XmlPage.java
Modified: trunk/htmlunit/src/changes/changes.xml
===================================================================
--- trunk/htmlunit/src/changes/changes.xml 2016-02-29 09:28:03 UTC (rev 11936)
+++ trunk/htmlunit/src/changes/changes.xml 2016-02-29 09:35:26 UTC (rev 11937)
@@ -8,6 +8,11 @@
<body>
<release version="2.21" date="???" description="Bugfixes">
+ <action type="remove" dev="asashour">
+ Remove deprecated WebClient.closeAllWindows(), \
DomNode.getScriptObject(), WebWindow.getScriptObject(), + \
HttpWebConnection.shutdown(), SgmlPage.createDomDocumentFragment(), \
XmlPage.getContent(), + XmlPage.createXmlElement(), \
XmlPage.createXmlElementNS() and XmlPage.getXmlElementDescendants(). + \
</action> <action type="update" dev="asashour">
SubmittableElement: rename getSubmitKeyValuePairs() to \
getSubmitNameValuePairs(). </action>
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/DialogWindow.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/DialogWindow.java 2016-02-29 \
09:28:03 UTC (rev 11936)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/DialogWindow.java 2016-02-29 \
09:35:26 UTC (rev 11937) @@ -42,7 +42,7 @@
*/
@Override
protected boolean isJavaScriptInitializationNeeded() {
- return getScriptObject() == null;
+ return getScriptableObject() == null;
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java 2016-02-29 \
09:28:03 UTC (rev 11936)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java 2016-02-29 \
09:35:26 UTC (rev 11937) @@ -921,15 +921,6 @@
}
/**
- * Shutdown the connection.
- * @deprecated as of 2.19, please use {@link #close} instead
- */
- @Deprecated
- public void shutdown() {
- close();
- }
-
- /**
* {@inheritDoc}
*/
@Override
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/SgmlPage.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/SgmlPage.java 2016-02-29 \
09:28:03 UTC (rev 11936)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/SgmlPage.java 2016-02-29 \
09:35:26 UTC (rev 11937) @@ -137,17 +137,7 @@
/**
* Creates an empty {@link DomDocumentFragment} object.
* @return a newly created {@link DomDocumentFragment}
- * @deprecated as of 2.18, please use {@link #createDocumentFragment()} instead
*/
- @Deprecated
- public DomDocumentFragment createDomDocumentFragment() {
- return createDocumentFragment();
- }
-
- /**
- * Creates an empty {@link DomDocumentFragment} object.
- * @return a newly created {@link DomDocumentFragment}
- */
@Override
public DomDocumentFragment createDocumentFragment() {
return new DomDocumentFragment(this);
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java 2016-02-29 \
09:28:03 UTC (rev 11936)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java 2016-02-29 \
09:35:26 UTC (rev 11937) @@ -1749,16 +1749,6 @@
/**
* Closes all opened windows, stopping all background JavaScript processing.
- * @deprecated as of 2.16, please use {@link #close()}, or {@code \
try}-with-resources statement
- */
- @Deprecated
- // Do not remove before March 2016
- public void closeAllWindows() {
- close();
- }
-
- /**
- * Closes all opened windows, stopping all background JavaScript processing.
*
* {@inheritDoc}
*/
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebWindow.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebWindow.java 2016-02-29 \
09:28:03 UTC (rev 11936)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebWindow.java 2016-02-29 \
09:35:26 UTC (rev 11937) @@ -104,18 +104,7 @@
* Returns the JavaScript object that corresponds to this element.
*
* @return the JavaScript object that corresponds to this element
- * @deprecated as of 2.19, please use {@link #getScriptableObject()} instead
*/
- @Deprecated
- Object getScriptObject();
-
- /**
- * <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 element.
- *
- * @return the JavaScript object that corresponds to this element
- */
ScriptableObject getScriptableObject();
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebWindowImpl.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebWindowImpl.java 2016-02-29 \
09:28:03 UTC (rev 11936)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebWindowImpl.java 2016-02-29 \
09:35:26 UTC (rev 11937) @@ -156,14 +156,6 @@
* {@inheritDoc}
*/
@Override
- public Object getScriptObject() {
- return getScriptableObject();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
public ScriptableObject getScriptableObject() {
return scriptObject_;
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomNode.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomNode.java 2016-02-29 \
09:28:03 UTC (rev 11936)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomNode.java 2016-02-29 \
09:35:26 UTC (rev 11937) @@ -905,23 +905,7 @@
* 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();
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/FrameWindow.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/FrameWindow.java 2016-02-29 \
09:28:03 UTC (rev 11936)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/FrameWindow.java 2016-02-29 \
09:35:26 UTC (rev 11937) @@ -81,7 +81,7 @@
*/
@Override
protected boolean isJavaScriptInitializationNeeded() {
- return getScriptObject() == null
+ return getScriptableObject() == null
|| !(getEnclosedPage().getWebResponse() instanceof StringWebResponse);
// TODO: find a better way to distinguish content written by \
document.open(),... }
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 2016-02-29 \
09:28:03 UTC (rev 11936)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java 2016-02-29 \
09:35:26 UTC (rev 11937) @@ -1340,7 +1340,7 @@
private static Object getFrameWindowByName(final HtmlPage page, final String \
name) { try {
- return page.getFrameByName(name).getScriptObject();
+ return page.getFrameByName(name).getScriptableObject();
}
catch (final ElementNotFoundException e) {
return NOT_FOUND;
@@ -1649,7 +1649,7 @@
// But we have to return so that the window can be close()'ed...
// Maybe we can use Rhino's continuation support to save state and \
restart when
// the dialog window is close()'ed? Would only work in interpreted mode, \
though.
- final ScriptableObject jsDialog = (ScriptableObject) \
dialog.getScriptObject(); + final ScriptableObject jsDialog = \
dialog.getScriptableObject(); return jsDialog.get("returnValue", jsDialog);
}
catch (final IOException e) {
@@ -1672,7 +1672,7 @@
try {
final URL completeUrl = ((HtmlPage) \
getDomNodeOrDie()).getFullyQualifiedUrl(url);
final DialogWindow dialog = client.openDialogWindow(completeUrl, \
webWindow, arguments);
- final Window jsDialog = (Window) dialog.getScriptObject();
+ final Window jsDialog = (Window) dialog.getScriptableObject();
return jsDialog;
}
catch (final IOException e) {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/xml/XmlPage.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/xml/XmlPage.java 2016-02-29 \
09:28:03 UTC (rev 11936)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/xml/XmlPage.java 2016-02-29 \
09:35:26 UTC (rev 11937) @@ -152,16 +152,6 @@
}
/**
- * Returns the content of the page.
- * @return the content of the page
- * @deprecated as of 2.18, please use {@link \
#getWebResponse()}.getContentAsString()
- */
- @Deprecated
- public String getContent() {
- return getWebResponse().getContentAsString();
- }
-
- /**
* Returns the DOM representation of the XML content.
* @return {@code null} if the content couldn't be parsed
*/
@@ -173,31 +163,6 @@
}
/**
- * Creates a new XML element with the given tag name.
- *
- * @param tagName the tag name
- * @return the new XML element
- * @deprecated as of 2.18, please use {@link #createElement(String)} instead
- */
- @Deprecated
- public DomElement createXmlElement(final String tagName) {
- return createElement(tagName);
- }
-
- /**
- * Creates a new XML element with the given namespace and qualified name.
- *
- * @param namespaceURI the URI that identifies an XML namespace
- * @param qualifiedName the qualified name of the element type to instantiate
- * @return the new XML element
- * @deprecated as of 2.18, please use {@link #createElementNS(String, String)} \
instead
- */
- @Deprecated
- public DomElement createXmlElementNS(final String namespaceURI, final String \
qualifiedName) {
- return createElementNS(namespaceURI, qualifiedName);
- }
-
- /**
* {@inheritDoc}
* Not yet implemented.
*/
@@ -276,17 +241,6 @@
}
/**
- * Returns an {@link Iterable} that will recursively iterate over all of this \
node's {@link DomElement} descendants.
- *
- * @return an {@link Iterable} that will recursively iterate over all of this \
node's {@link DomElement} descendants
- * @deprecated as of 2.18, please use {@link #getDomElementDescendants()} \
instead
- */
- @Deprecated
- public final Iterable<DomElement> getXmlElementDescendants() {
- return getDomElementDescendants();
- }
-
- /**
* {@inheritDoc}
* Not yet implemented.
*/
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
_______________________________________________
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