Skip to content

Commit 2cf144a

Browse files
committed
remove direct ref to ConsString
1 parent 9a58883 commit 2cf144a

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Console.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxFunction;
3636

3737
import net.sourceforge.htmlunit.corejs.javascript.BaseFunction;
38-
import net.sourceforge.htmlunit.corejs.javascript.ConsString;
3938
import net.sourceforge.htmlunit.corejs.javascript.Context;
4039
import net.sourceforge.htmlunit.corejs.javascript.Delegator;
4140
import net.sourceforge.htmlunit.corejs.javascript.Function;
@@ -98,8 +97,7 @@ public static void assertMethod(final Context cx, final Scriptable thisObj,
9897

9998
final Object[] data;
10099
final Object first = args[1];
101-
if (first instanceof String
102-
|| first instanceof ConsString
100+
if (first instanceof CharSequence
103101
|| first instanceof ScriptableObject && ("String".equals(((Scriptable) first).getClassName()))) {
104102
data = new Object[args.length - 1];
105103
data[0] = "Assertion failed: " + first.toString();

src/main/java/netscape/javascript/JSObject.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import com.gargoylesoftware.htmlunit.javascript.host.Element;
2727
import com.gargoylesoftware.htmlunit.javascript.host.Window;
2828

29-
import net.sourceforge.htmlunit.corejs.javascript.ConsString;
3029
import net.sourceforge.htmlunit.corejs.javascript.Context;
3130
import net.sourceforge.htmlunit.corejs.javascript.ScriptableObject;
3231

@@ -70,8 +69,8 @@ public Object call(final String methodName, final Object[] args) throws JSExcept
7069
if (jsResult instanceof ScriptableObject) {
7170
return new JSObject((ScriptableObject) jsResult);
7271
}
73-
if (jsResult instanceof ConsString) {
74-
return ((ConsString) jsResult).toString();
72+
if (jsResult instanceof CharSequence) {
73+
return jsResult.toString();
7574
}
7675
return jsResult;
7776
}
@@ -97,8 +96,8 @@ public Object eval(final String expression) throws JSException {
9796
if (jsResult instanceof ScriptableObject) {
9897
return new JSObject((ScriptableObject) jsResult);
9998
}
100-
if (jsResult instanceof ConsString) {
101-
return ((ConsString) jsResult).toString();
99+
if (jsResult instanceof CharSequence) {
100+
return jsResult.toString();
102101
}
103102
return jsResult;
104103
}

0 commit comments

Comments
 (0)