Skip to content

Commit 242d4d8

Browse files
rbrirbri
committed
jdk17
1 parent 3509180 commit 242d4d8

22 files changed

+46
-82
lines changed

‎src/main/java/org/htmlunit/ScriptException.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,7 @@ private String createPrintableStackTrace() {
116116
printWriter.println("======= EXCEPTION START ========");
117117

118118
if (getCause() != null) {
119-
if (getCause() instanceof EcmaError) {
120-
final EcmaError ecmaError = (EcmaError) getCause();
119+
if (getCause() instanceof EcmaError ecmaError) {
121120
printWriter.print("EcmaError: ");
122121
printWriter.print("lineNumber=[");
123122
printWriter.print(ecmaError.lineNumber());
@@ -151,8 +150,7 @@ private String createPrintableStackTrace() {
151150
printWriter.println(value);
152151
}
153152
}
154-
else if (getCause() instanceof WrappedException) {
155-
final WrappedException wrappedException = (WrappedException) getCause();
153+
else if (getCause() instanceof WrappedException wrappedException) {
156154
printWriter.print("WrappedException: ");
157155
wrappedException.printStackTrace(printWriter);
158156

@@ -221,8 +219,7 @@ public String getFailingLine() {
221219
* execution of a script.
222220
*/
223221
public int getFailingLineNumber() {
224-
if (getCause() instanceof RhinoException) {
225-
final RhinoException cause = (RhinoException) getCause();
222+
if (getCause() instanceof RhinoException cause) {
226223
return cause.lineNumber();
227224
}
228225

@@ -236,8 +233,7 @@ public int getFailingLineNumber() {
236233
* execution of a script.
237234
*/
238235
public int getFailingColumnNumber() {
239-
if (getCause() instanceof RhinoException) {
240-
final RhinoException cause = (RhinoException) getCause();
236+
if (getCause() instanceof RhinoException cause) {
241237
return cause.columnNumber();
242238
}
243239

‎src/main/java/org/htmlunit/WebClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,7 @@ public void setCurrentWindow(final WebWindow window) {
10041004

10051005
// when marking an iframe window as current we have no need to move the focus
10061006
final boolean isIFrame = currentWindow_ instanceof FrameWindow fw
1007-
&& ((FrameWindow) currentWindow_).getFrameElement() instanceof HtmlInlineFrame;
1007+
&& fw.getFrameElement() instanceof HtmlInlineFrame;
10081008
if (!isIFrame) {
10091009
//1. activeElement becomes focused element for new current window
10101010
//2. onFocus event is triggered for focusedElement of new current window

‎src/main/java/org/htmlunit/WebResponse.java‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -266,22 +266,20 @@ public String getContentAsString(final Charset encoding) {
266266
if (responseData_ != null) {
267267
try (InputStream in = responseData_.getInputStreamWithBomIfApplicable(BOM_HEADERS)) {
268268
if (in instanceof BOMInputStream bomIn) {
269-
try () {
270-
// there seems to be a bug in BOMInputStream
271-
// we have to call this before hasBOM(ByteOrderMark)
272-
if (bomIn.hasBOM()) {
273-
if (bomIn.hasBOM(ByteOrderMark.UTF_8)) {
274-
return IOUtils.toString(bomIn, UTF_8);
275-
}
276-
if (bomIn.hasBOM(ByteOrderMark.UTF_16BE)) {
277-
return IOUtils.toString(bomIn, UTF_16BE);
278-
}
279-
if (bomIn.hasBOM(ByteOrderMark.UTF_16LE)) {
280-
return IOUtils.toString(bomIn, UTF_16LE);
281-
}
269+
// there seems to be a bug in BOMInputStream
270+
// we have to call this before hasBOM(ByteOrderMark)
271+
if (bomIn.hasBOM()) {
272+
if (bomIn.hasBOM(ByteOrderMark.UTF_8)) {
273+
return IOUtils.toString(bomIn, UTF_8);
274+
}
275+
if (bomIn.hasBOM(ByteOrderMark.UTF_16BE)) {
276+
return IOUtils.toString(bomIn, UTF_16BE);
277+
}
278+
if (bomIn.hasBOM(ByteOrderMark.UTF_16LE)) {
279+
return IOUtils.toString(bomIn, UTF_16LE);
282280
}
283-
return IOUtils.toString(bomIn, encoding);
284281
}
282+
return IOUtils.toString(bomIn, encoding);
285283
}
286284

287285
return IOUtils.toString(in, encoding);

‎src/main/java/org/htmlunit/html/impl/SimpleRange.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,10 +452,9 @@ public void surroundContents(final DomNode newParent) {
452452
*/
453453
@Override
454454
public boolean equals(final Object obj) {
455-
if (!(obj instanceof SimpleRange)) {
455+
if (!(obj instanceof SimpleRange other)) {
456456
return false;
457457
}
458-
final SimpleRange other = (SimpleRange) obj;
459458
return new EqualsBuilder()
460459
.append(startContainer_, other.startContainer_)
461460
.append(endContainer_, other.endContainer_)

‎src/main/java/org/htmlunit/html/parser/neko/HtmlUnitNekoDOMBuilder.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -559,8 +559,7 @@ private void handleCharacters() {
559559
if (currentNode_ instanceof HtmlTableRow row) {
560560
final HtmlTable enclosingTable = row.getEnclosingTable();
561561
if (enclosingTable != null) { // may be null when called from Range.createContextualFragment
562-
if (enclosingTable.getPreviousSibling() instanceof DomText) {
563-
final DomText domText = (DomText) enclosingTable.getPreviousSibling();
562+
if (enclosingTable.getPreviousSibling() instanceof DomText domText) {
564563
domText.setTextContent(domText.getWholeText() + textValue);
565564
}
566565
else {
@@ -569,8 +568,7 @@ private void handleCharacters() {
569568
}
570569
}
571570
else if (currentNode_ instanceof HtmlTable enclosingTable) {
572-
if (enclosingTable.getPreviousSibling() instanceof DomText) {
573-
final DomText domText = (DomText) enclosingTable.getPreviousSibling();
571+
if (enclosingTable.getPreviousSibling() instanceof DomText domText) {
574572
domText.setTextContent(domText.getWholeText() + textValue);
575573
}
576574
else {

‎src/main/java/org/htmlunit/html/parser/neko/HtmlUnitNekoHtmlParser.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,9 @@ public void parseFragment(final WebClient webClient, final DomNode parent, final
9090
final String source, final boolean createdByJavascript)
9191
throws SAXException, IOException {
9292
final Page page = parent.getPage();
93-
if (!(page instanceof HtmlPage)) {
93+
if (!(page instanceof HtmlPage htmlPage)) {
9494
return;
9595
}
96-
final HtmlPage htmlPage = (HtmlPage) page;
9796
final URL url = htmlPage.getUrl();
9897

9998
final HtmlUnitNekoDOMBuilder domBuilder =

‎src/main/java/org/htmlunit/javascript/host/URLSearchParams.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,13 +434,11 @@ public boolean has(final String name) {
434434
*/
435435
@JsxFunction
436436
public void forEach(final Object callback) {
437-
if (!(callback instanceof Function)) {
437+
if (!(callback instanceof Function fun)) {
438438
throw JavaScriptEngine.typeError(
439439
"Foreach callback '" + JavaScriptEngine.toString(callback) + "' is not a function");
440440
}
441441

442-
final Function fun = (Function) callback;
443-
444442
String currentSearch = null;
445443
List<NameValuePair> params = null;
446444
// This must be indexes instead of iterator() for correct behavior when of list changes while iterating

‎src/main/java/org/htmlunit/javascript/host/Window.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1413,10 +1413,9 @@ public void triggerOnError(final ScriptException e) {
14131413
msg = "uncaught exception: " + e.getCause().getMessage();
14141414
jsError = ((JavaScriptException) e.getCause()).getValue();
14151415
}
1416-
else if (e.getCause() instanceof EcmaError) {
1416+
else if (e.getCause() instanceof EcmaError ecmaError) {
14171417
msg = "uncaught " + e.getCause().getMessage();
14181418

1419-
final EcmaError ecmaError = (EcmaError) e.getCause();
14201419
final Scriptable err = Context.getCurrentContext().newObject(this, "Error");
14211420
ScriptableObject.putProperty(err, "message", ecmaError.getMessage());
14221421
ScriptableObject.putProperty(err, "fileName", ecmaError.sourceName());
@@ -1670,15 +1669,14 @@ public void print() {
16701669
}
16711670

16721671
final SgmlPage sgmlPage = getDocument().getPage();
1673-
if (!(sgmlPage instanceof HtmlPage)) {
1672+
if (!(sgmlPage instanceof HtmlPage page)) {
16741673
LOG.debug("Page is not an HtmlPage - window.print() ignored");
16751674
return;
16761675
}
16771676

16781677
Event event = new Event(this, Event.TYPE_BEFOREPRINT);
16791678
fireEvent(event);
16801679

1681-
final HtmlPage page = (HtmlPage) sgmlPage;
16821680
page.setPrinting(true);
16831681
try {
16841682
handler.handlePrint(page);
@@ -1722,10 +1720,9 @@ public void releaseEvents(final String type) {
17221720
*/
17231721
@JsxFunction
17241722
public ComputedCSSStyleDeclaration getComputedStyle(final Object element, final String pseudoElement) {
1725-
if (!(element instanceof Element)) {
1723+
if (!(element instanceof Element e)) {
17261724
throw JavaScriptEngine.typeError("parameter 1 is not of type 'Element'");
17271725
}
1728-
final Element e = (Element) element;
17291726

17301727
final ComputedCssStyleDeclaration style = getWebWindow().getComputedStyle(e.getDomNodeOrDie(), pseudoElement);
17311728
return new ComputedCSSStyleDeclaration(e, style);

‎src/main/java/org/htmlunit/javascript/host/canvas/CanvasRenderingContext2D.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,10 @@ public void clearRect(final double x, final double y, final double w, final doub
244244
@JsxFunction
245245
public static void clip(final Context context, final Scriptable scope,
246246
final Scriptable thisObj, final Object[] args, final Function function) {
247-
if (!(thisObj instanceof CanvasRenderingContext2D)) {
247+
if (!(thisObj instanceof CanvasRenderingContext2D canvas)) {
248248
throw JavaScriptEngine.reportRuntimeError(
249249
"CanvasRenderingContext2D.getImageData() failed - this is not a CanvasRenderingContext2D");
250250
}
251-
final CanvasRenderingContext2D canvas = (CanvasRenderingContext2D) thisObj;
252251

253252
RenderingBackend.WindingRule windingRule = WindingRule.NON_ZERO;
254253
if (args.length == 1) {
@@ -298,11 +297,10 @@ public void closePath() {
298297
@JsxFunction
299298
public static ImageData createImageData(final Context context, final Scriptable scope,
300299
final Scriptable thisObj, final Object[] args, final Function function) {
301-
if (!(thisObj instanceof CanvasRenderingContext2D)) {
300+
if (!(thisObj instanceof CanvasRenderingContext2D canvas)) {
302301
throw JavaScriptEngine.reportRuntimeError(
303302
"CanvasRenderingContext2D.getImageData() failed - this is not a CanvasRenderingContext2D");
304303
}
305-
final CanvasRenderingContext2D canvas = (CanvasRenderingContext2D) thisObj;
306304

307305
if (args.length > 0 && args[0] instanceof ImageData imageDataParameter) {
308306
final ImageData imageData = new ImageData(null,

‎src/main/java/org/htmlunit/javascript/host/dom/AbstractRange.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,9 @@ public SimpleRange getSimpleRange() {
206206

207207
@Override
208208
protected Object equivalentValues(final Object value) {
209-
if (!(value instanceof AbstractRange)) {
209+
if (!(value instanceof AbstractRange other)) {
210210
return false;
211211
}
212-
final AbstractRange other = (AbstractRange) value;
213212
return startContainer_ == other.startContainer_
214213
&& endContainer_ == other.endContainer_
215214
&& startOffset_ == other.startOffset_

0 commit comments

Comments
 (0)