Skip to content

Commit a889fa4

Browse files
committed
looks like HtmlUnitRegExpProxy is no longer required
1 parent 83e296c commit a889fa4

File tree

8 files changed

+11
-1751
lines changed

8 files changed

+11
-1751
lines changed

src/main/java/org/htmlunit/html/HtmlInput.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.util.HashSet;
2626
import java.util.Locale;
2727
import java.util.Map;
28-
import java.util.regex.Pattern;
2928

3029
import org.apache.commons.lang3.StringUtils;
3130
import org.apache.commons.logging.Log;
@@ -36,11 +35,13 @@
3635
import org.htmlunit.ScriptResult;
3736
import org.htmlunit.SgmlPage;
3837
import org.htmlunit.WebClient;
38+
import org.htmlunit.corejs.javascript.Context;
39+
import org.htmlunit.corejs.javascript.regexp.RegExpEngineAccess;
3940
import org.htmlunit.javascript.AbstractJavaScriptEngine;
41+
import org.htmlunit.javascript.HtmlUnitContextFactory;
4042
import org.htmlunit.javascript.host.event.Event;
4143
import org.htmlunit.javascript.host.event.MouseEvent;
4244
import org.htmlunit.javascript.host.html.HTMLInputElement;
43-
import org.htmlunit.javascript.regexp.RegExpJsToJavaConverter;
4445
import org.htmlunit.util.NameValuePair;
4546
import org.xml.sax.helpers.AttributesImpl;
4647

@@ -1011,10 +1012,12 @@ private boolean isPatternValid() {
10111012
return true;
10121013
}
10131014

1014-
final RegExpJsToJavaConverter converter = new RegExpJsToJavaConverter();
1015-
final String javaPattern = converter.convert(pattern);
1016-
try {
1017-
return Pattern.matches(javaPattern, value);
1015+
try (Context cx = HtmlUnitContextFactory.getGlobal().enterContext()) {
1016+
RegExpEngineAccess.compile(cx, pattern, "");
1017+
final RegExpEngineAccess.CompiledRegExp compiled
1018+
= RegExpEngineAccess.compile(cx, "^(?:" + pattern + ")$", "");
1019+
1020+
return RegExpEngineAccess.matches(cx, value, compiled);
10181021
}
10191022
catch (final Exception ignored) {
10201023
// ignore if regex invalid

0 commit comments

Comments
 (0)