[HtmlUnit] SVN: [7814] trunk/htmlunit/src

[<asa...@us...>]

Revision: 7814
          http://sourceforge.net/p/htmlunit/code/7814
Author:   asashour
Date:     2012-12-01 08:32:29 +0000 (Sat, 01 Dec 2012)
Log Message:
-----------
trivial: remove deprecation usage

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlScriptTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java	2012-12-01 07:50:50 UTC (rev 7813)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java	2012-12-01 08:32:29 UTC (rev 7814)
@@ -529,7 +529,7 @@
      * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span>
      *
      * <p>Throws a {@link FailingHttpStatusCodeException} if the request's status code indicates a request
-     * failure and {@link #isThrowExceptionOnFailingStatusCode()} returns <tt>true</tt>.
+     * failure and {@link WebClientOptions#isThrowExceptionOnFailingStatusCode()} returns <tt>true</tt>.
      *
      * @param webResponse the response which may trigger a {@link FailingHttpStatusCodeException}
      */
@@ -1496,7 +1496,7 @@
         else if (status >= HttpStatus.SC_MOVED_PERMANENTLY
             && status <= HttpStatus.SC_TEMPORARY_REDIRECT
             && status != HttpStatus.SC_NOT_MODIFIED
-            && isRedirectEnabled()) {
+            && getOptions().isRedirectEnabled()) {
 
             final URL newUrl;
             String locationString = null;

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlScriptTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlScriptTest.java	2012-12-01 07:50:50 UTC (rev 7813)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlScriptTest.java	2012-12-01 08:32:29 UTC (rev 7814)
@@ -50,7 +50,7 @@
      * results in a {@link FailingHttpStatusCodeException}, depending on how the client has been
      * configured.
      *
-     * @see WebClient#isThrowExceptionOnFailingStatusCode()
+     * @see com.gargoylesoftware.htmlunit.WebClientOptions#isThrowExceptionOnFailingStatusCode()
      * @throws Exception if an error occurs
      */
     @Test