[HtmlUnit] SVN: [14423] trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/ javascript/host

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[HtmlUnit] SVN: [14423] trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/ javascript/host

rbri
Revision: 14423
          http://sourceforge.net/p/htmlunit/code/14423
Author:   rbri
Date:     2017-05-10 06:48:52 +0000 (Wed, 10 May 2017)
Log Message:
-----------
fix build

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Animation.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/CharacterData.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/ProcessingInstruction.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Animation.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Animation.java 2017-05-10 06:14:19 UTC (rev 14422)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Animation.java 2017-05-10 06:48:52 UTC (rev 14423)
@@ -25,7 +25,7 @@
  *
  * @author Ronald Brill
  */
-@JsxClass(FF52)
+@JsxClass(isJSObject = false, value = FF52)
 public class Animation extends SimpleScriptable {
 
     /**

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/CharacterData.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/CharacterData.java 2017-05-10 06:14:19 UTC (rev 14422)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/CharacterData.java 2017-05-10 06:48:52 UTC (rev 14423)
@@ -53,7 +53,7 @@
      */
     @JsxGetter
     public Object getData() {
-        return getDomNodeOrDie().getData();
+        return getDomCharacterDataOrDie().getData();
     }
 
     /**
@@ -62,7 +62,7 @@
      */
     @JsxSetter
     public void setData(final String newValue) {
-        getDomNodeOrDie().setData(newValue);
+        getDomCharacterDataOrDie().setData(newValue);
     }
 
     /**
@@ -71,7 +71,7 @@
      */
     @JsxGetter
     public int getLength() {
-        return getDomNodeOrDie().getLength();
+        return getDomCharacterDataOrDie().getLength();
     }
 
     /**
@@ -80,7 +80,7 @@
      */
     @JsxFunction
     public void appendData(final String arg) {
-        getDomNodeOrDie().appendData(arg);
+        getDomCharacterDataOrDie().appendData(arg);
     }
 
     /**
@@ -103,7 +103,7 @@
             }
         }
 
-        final DomCharacterData domCharacterData = getDomNodeOrDie();
+        final DomCharacterData domCharacterData = getDomCharacterDataOrDie();
         if (offset > domCharacterData.getLength()) {
             throw Context.reportRuntimeError("Provided offset: " + offset + " is greater than length.");
         }
@@ -119,7 +119,7 @@
      */
     @JsxFunction
     public void insertData(final int offset, final String arg) {
-        getDomNodeOrDie().insertData(offset, arg);
+        getDomCharacterDataOrDie().insertData(offset, arg);
     }
 
     /**
@@ -132,7 +132,7 @@
      */
     @JsxFunction
     public void replaceData(final int offset, final int count, final String arg) {
-        getDomNodeOrDie().replaceData(offset, count, arg);
+        getDomCharacterDataOrDie().replaceData(offset, count, arg);
     }
 
     /**
@@ -144,14 +144,10 @@
      */
     @JsxFunction
     public String substringData(final int offset, final int count) {
-        return getDomNodeOrDie().substringData(offset, count);
+        return getDomCharacterDataOrDie().substringData(offset, count);
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public DomCharacterData getDomNodeOrDie() {
+    private DomCharacterData getDomCharacterDataOrDie() {
         return (DomCharacterData) super.getDomNodeOrDie();
     }
 

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/ProcessingInstruction.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/ProcessingInstruction.java 2017-05-10 06:14:19 UTC (rev 14422)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/ProcessingInstruction.java 2017-05-10 06:48:52 UTC (rev 14423)
@@ -30,7 +30,7 @@
  * @author Ahmed Ashour
  */
 @JsxClass(domClass = DomProcessingInstruction.class)
-public class ProcessingInstruction extends Node {
+public class ProcessingInstruction extends CharacterData {
 
     /**
      * Creates an instance.
@@ -65,5 +65,4 @@
     public void setData(final String data) {
         ((DomProcessingInstruction) getDomNodeOrDie()).setData(data);
     }
-
 }


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
HtmlUnit-develop mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/htmlunit-develop