Skip to content

Commit cb9208b

Browse files
rbrirbri
committed
checkstyle
1 parent eeae78a commit cb9208b

File tree

6 files changed

+186
-135
lines changed

6 files changed

+186
-135
lines changed

‎src/main/java/org/htmlunit/html/DefaultElementFactory.java‎

Lines changed: 52 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
import static org.htmlunit.BrowserVersionFeatures.HTML_LAYER_TAG;
1818

1919
import java.util.ArrayList;
20-
import java.util.Arrays;
21-
import java.util.Collections;
2220
import java.util.List;
2321
import java.util.Locale;
2422
import java.util.Map;
@@ -58,7 +56,58 @@ public class DefaultElementFactory implements ElementFactory {
5856
* You can generate your own test cases by looking into
5957
* org.htmlunit.source.ElementTestSource#generateTestForHtmlElements(String, String).
6058
*/
61-
public static final List<String> SUPPORTED_TAGS_ = List.of(HtmlAbbreviated.TAG_NAME, HtmlAcronym.TAG_NAME, HtmlAnchor.TAG_NAME, HtmlAddress.TAG_NAME, HtmlArea.TAG_NAME, HtmlArticle.TAG_NAME, HtmlAside.TAG_NAME, HtmlAudio.TAG_NAME, HtmlBase.TAG_NAME, HtmlBaseFont.TAG_NAME, HtmlBidirectionalIsolation.TAG_NAME, HtmlBidirectionalOverride.TAG_NAME, HtmlBig.TAG_NAME, HtmlBlockQuote.TAG_NAME, HtmlBody.TAG_NAME, HtmlBold.TAG_NAME, HtmlBreak.TAG_NAME, HtmlButton.TAG_NAME, HtmlCanvas.TAG_NAME, HtmlCaption.TAG_NAME, HtmlCenter.TAG_NAME, HtmlCitation.TAG_NAME, HtmlCode.TAG_NAME, HtmlData.TAG_NAME, HtmlDataList.TAG_NAME, HtmlDefinition.TAG_NAME, HtmlDefinitionDescription.TAG_NAME, HtmlDeletedText.TAG_NAME, HtmlDetails.TAG_NAME, HtmlDialog.TAG_NAME, HtmlDirectory.TAG_NAME, HtmlDivision.TAG_NAME, HtmlDefinitionList.TAG_NAME, HtmlDefinitionTerm.TAG_NAME, HtmlEmbed.TAG_NAME, HtmlEmphasis.TAG_NAME, HtmlFieldSet.TAG_NAME, HtmlFigureCaption.TAG_NAME, HtmlFigure.TAG_NAME, HtmlFont.TAG_NAME, HtmlForm.TAG_NAME, HtmlFooter.TAG_NAME, HtmlFrame.TAG_NAME, HtmlFrameSet.TAG_NAME, HtmlHead.TAG_NAME, HtmlHeader.TAG_NAME, HtmlHeading1.TAG_NAME, HtmlHeading2.TAG_NAME, HtmlHeading3.TAG_NAME, HtmlHeading4.TAG_NAME, HtmlHeading5.TAG_NAME, HtmlHeading6.TAG_NAME, HtmlHorizontalRule.TAG_NAME, HtmlHtml.TAG_NAME, HtmlInlineFrame.TAG_NAME, HtmlInlineQuotation.TAG_NAME, HtmlImage.TAG_NAME, HtmlImage.TAG_NAME2, HtmlInput.TAG_NAME, HtmlInsertedText.TAG_NAME, HtmlItalic.TAG_NAME, HtmlKeyboard.TAG_NAME, HtmlLabel.TAG_NAME, HtmlLayer.TAG_NAME, HtmlLegend.TAG_NAME, HtmlListing.TAG_NAME, HtmlListItem.TAG_NAME, HtmlLink.TAG_NAME, HtmlMain.TAG_NAME, HtmlMap.TAG_NAME, HtmlMark.TAG_NAME, HtmlMarquee.TAG_NAME, HtmlMenu.TAG_NAME, HtmlMeta.TAG_NAME, HtmlMeter.TAG_NAME, HtmlNav.TAG_NAME, HtmlNoBreak.TAG_NAME, HtmlNoEmbed.TAG_NAME, HtmlNoFrames.TAG_NAME, HtmlNoLayer.TAG_NAME, HtmlNoScript.TAG_NAME, HtmlObject.TAG_NAME, HtmlOrderedList.TAG_NAME, HtmlOptionGroup.TAG_NAME, HtmlOption.TAG_NAME, HtmlOutput.TAG_NAME, HtmlParagraph.TAG_NAME, HtmlParameter.TAG_NAME, HtmlPicture.TAG_NAME, HtmlPlainText.TAG_NAME, HtmlPreformattedText.TAG_NAME, HtmlProgress.TAG_NAME, HtmlRb.TAG_NAME, HtmlRp.TAG_NAME, HtmlRt.TAG_NAME, HtmlRtc.TAG_NAME, HtmlRuby.TAG_NAME, HtmlS.TAG_NAME, HtmlSample.TAG_NAME, HtmlScript.TAG_NAME, HtmlSection.TAG_NAME, HtmlSelect.TAG_NAME, HtmlSlot.TAG_NAME, HtmlSmall.TAG_NAME, HtmlSource.TAG_NAME, HtmlSpan.TAG_NAME, HtmlStrike.TAG_NAME, HtmlStrong.TAG_NAME, HtmlStyle.TAG_NAME, HtmlSubscript.TAG_NAME, HtmlSummary.TAG_NAME, HtmlSuperscript.TAG_NAME, HtmlSvg.TAG_NAME, HtmlTable.TAG_NAME, HtmlTableColumn.TAG_NAME, HtmlTableColumnGroup.TAG_NAME, HtmlTableBody.TAG_NAME, HtmlTableDataCell.TAG_NAME, HtmlTableHeaderCell.TAG_NAME, HtmlTableRow.TAG_NAME, HtmlTextArea.TAG_NAME, HtmlTableFooter.TAG_NAME, HtmlTableHeader.TAG_NAME, HtmlTeletype.TAG_NAME, HtmlTemplate.TAG_NAME, HtmlTime.TAG_NAME, HtmlTitle.TAG_NAME, HtmlTrack.TAG_NAME, HtmlUnderlined.TAG_NAME, HtmlUnorderedList.TAG_NAME, HtmlVariable.TAG_NAME, HtmlVideo.TAG_NAME, HtmlWordBreak.TAG_NAME, HtmlExample.TAG_NAME);
59+
public static final List<String> SUPPORTED_TAGS_ = List.of(
60+
HtmlAbbreviated.TAG_NAME, HtmlAcronym.TAG_NAME,
61+
HtmlAnchor.TAG_NAME, HtmlAddress.TAG_NAME, HtmlArea.TAG_NAME,
62+
HtmlArticle.TAG_NAME, HtmlAside.TAG_NAME, HtmlAudio.TAG_NAME,
63+
HtmlBase.TAG_NAME, HtmlBaseFont.TAG_NAME,
64+
HtmlBidirectionalIsolation.TAG_NAME, HtmlBidirectionalOverride.TAG_NAME, HtmlBig.TAG_NAME,
65+
HtmlBlockQuote.TAG_NAME, HtmlBody.TAG_NAME, HtmlBold.TAG_NAME,
66+
HtmlBreak.TAG_NAME, HtmlButton.TAG_NAME, HtmlCanvas.TAG_NAME, HtmlCaption.TAG_NAME,
67+
HtmlCenter.TAG_NAME, HtmlCitation.TAG_NAME, HtmlCode.TAG_NAME,
68+
HtmlData.TAG_NAME, HtmlDataList.TAG_NAME,
69+
HtmlDefinition.TAG_NAME, HtmlDefinitionDescription.TAG_NAME,
70+
HtmlDeletedText.TAG_NAME, HtmlDetails.TAG_NAME, HtmlDialog.TAG_NAME, HtmlDirectory.TAG_NAME,
71+
HtmlDivision.TAG_NAME, HtmlDefinitionList.TAG_NAME,
72+
HtmlDefinitionTerm.TAG_NAME, HtmlEmbed.TAG_NAME,
73+
HtmlEmphasis.TAG_NAME,
74+
HtmlFieldSet.TAG_NAME, HtmlFigureCaption.TAG_NAME, HtmlFigure.TAG_NAME,
75+
HtmlFont.TAG_NAME, HtmlForm.TAG_NAME, HtmlFooter.TAG_NAME,
76+
HtmlFrame.TAG_NAME, HtmlFrameSet.TAG_NAME,
77+
HtmlHead.TAG_NAME, HtmlHeader.TAG_NAME,
78+
HtmlHeading1.TAG_NAME, HtmlHeading2.TAG_NAME, HtmlHeading3.TAG_NAME,
79+
HtmlHeading4.TAG_NAME, HtmlHeading5.TAG_NAME, HtmlHeading6.TAG_NAME,
80+
HtmlHorizontalRule.TAG_NAME, HtmlHtml.TAG_NAME, HtmlInlineFrame.TAG_NAME,
81+
HtmlInlineQuotation.TAG_NAME,
82+
HtmlImage.TAG_NAME, HtmlImage.TAG_NAME2,
83+
HtmlInput.TAG_NAME,
84+
HtmlInsertedText.TAG_NAME,
85+
HtmlItalic.TAG_NAME,
86+
HtmlKeyboard.TAG_NAME, HtmlLabel.TAG_NAME, HtmlLayer.TAG_NAME,
87+
HtmlLegend.TAG_NAME, HtmlListing.TAG_NAME, HtmlListItem.TAG_NAME,
88+
HtmlLink.TAG_NAME, HtmlMain.TAG_NAME, HtmlMap.TAG_NAME, HtmlMark.TAG_NAME, HtmlMarquee.TAG_NAME,
89+
HtmlMenu.TAG_NAME, HtmlMeta.TAG_NAME, HtmlMeter.TAG_NAME,
90+
HtmlNav.TAG_NAME,
91+
HtmlNoBreak.TAG_NAME, HtmlNoEmbed.TAG_NAME, HtmlNoFrames.TAG_NAME,
92+
HtmlNoLayer.TAG_NAME,
93+
HtmlNoScript.TAG_NAME, HtmlObject.TAG_NAME, HtmlOrderedList.TAG_NAME,
94+
HtmlOptionGroup.TAG_NAME, HtmlOption.TAG_NAME, HtmlOutput.TAG_NAME,
95+
HtmlParagraph.TAG_NAME,
96+
HtmlParameter.TAG_NAME, HtmlPicture.TAG_NAME, HtmlPlainText.TAG_NAME, HtmlPreformattedText.TAG_NAME,
97+
HtmlProgress.TAG_NAME,
98+
HtmlRb.TAG_NAME, HtmlRp.TAG_NAME, HtmlRt.TAG_NAME, HtmlRtc.TAG_NAME, HtmlRuby.TAG_NAME,
99+
HtmlS.TAG_NAME, HtmlSample.TAG_NAME,
100+
HtmlScript.TAG_NAME, HtmlSection.TAG_NAME, HtmlSelect.TAG_NAME, HtmlSlot.TAG_NAME, HtmlSmall.TAG_NAME,
101+
HtmlSource.TAG_NAME, HtmlSpan.TAG_NAME,
102+
HtmlStrike.TAG_NAME, HtmlStrong.TAG_NAME, HtmlStyle.TAG_NAME,
103+
HtmlSubscript.TAG_NAME, HtmlSummary.TAG_NAME, HtmlSuperscript.TAG_NAME,
104+
HtmlSvg.TAG_NAME,
105+
HtmlTable.TAG_NAME, HtmlTableColumn.TAG_NAME, HtmlTableColumnGroup.TAG_NAME,
106+
HtmlTableBody.TAG_NAME, HtmlTableDataCell.TAG_NAME, HtmlTableHeaderCell.TAG_NAME,
107+
HtmlTableRow.TAG_NAME, HtmlTextArea.TAG_NAME, HtmlTableFooter.TAG_NAME,
108+
HtmlTableHeader.TAG_NAME, HtmlTeletype.TAG_NAME, HtmlTemplate.TAG_NAME, HtmlTime.TAG_NAME,
109+
HtmlTitle.TAG_NAME, HtmlTrack.TAG_NAME, HtmlUnderlined.TAG_NAME, HtmlUnorderedList.TAG_NAME,
110+
HtmlVariable.TAG_NAME, HtmlVideo.TAG_NAME, HtmlWordBreak.TAG_NAME, HtmlExample.TAG_NAME);
62111

63112
// for performance optimization
64113
static final class OrderedFastHashMapWithLowercaseKeys<K, V> extends OrderedFastHashMap<K, V> {

‎src/main/java/org/htmlunit/html/HtmlTable.java‎

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
import java.util.List;
2222
import java.util.Map;
2323
import java.util.NoSuchElementException;
24-
import java.util.Objects;
2524

2625
import org.htmlunit.ElementNotFoundException;
2726
import org.htmlunit.SgmlPage;
27+
import org.htmlunit.util.geometry.Point2D;
2828

2929
/**
3030
* Wrapper for the HTML element "table".
@@ -76,13 +76,13 @@ public class HtmlTable extends HtmlElement {
7676
*/
7777
public final HtmlTableCell getCellAt(final int rowIndex, final int columnIndex) {
7878
final RowIterator rowIterator = getRowIterator();
79-
final HashSet<Position> occupied = new HashSet<>();
79+
final HashSet<Point2D> occupied = new HashSet<>();
8080
int row = 0;
8181
for (final HtmlTableRow htmlTableRow : rowIterator) {
8282
final HtmlTableRow.CellIterator cellIterator = htmlTableRow.getCellIterator();
8383
int col = 0;
8484
for (final HtmlTableCell cell : cellIterator) {
85-
while (occupied.contains(new Position(row, col))) {
85+
while (occupied.contains(new Point2D(row, col))) {
8686
col++;
8787
}
8888
final int nextRow = row + cell.getRowSpan();
@@ -97,7 +97,7 @@ public final HtmlTableCell getCellAt(final int rowIndex, final int columnIndex)
9797
if (rowSpan > 1 || columnSpan > 1) {
9898
for (int i = 0; i < rowSpan; i++) {
9999
for (int j = 0; j < columnSpan; j++) {
100-
occupied.add(new Position(row + i, col + j));
100+
occupied.add(new Point2D(row + i, col + j));
101101
}
102102
}
103103
}
@@ -444,30 +444,4 @@ protected boolean isEmptyXmlTagExpanded() {
444444
public DisplayStyle getDefaultStyleDisplay() {
445445
return DisplayStyle.TABLE;
446446
}
447-
448-
private record Position(int posX_, int posY_) {
449-
450-
@Override
451-
public boolean equals(final Object obj) {
452-
if (this == obj) {
453-
return true;
454-
}
455-
if (obj == null) {
456-
return false;
457-
}
458-
if (getClass() != obj.getClass()) {
459-
return false;
460-
}
461-
462-
final Position other = (Position) obj;
463-
if (posX_ != other.posX_) {
464-
return false;
465-
}
466-
if (posY_ != other.posY_) {
467-
return false;
468-
}
469-
470-
return true;
471-
}
472-
}
473447
}

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

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import java.net.URL;
3333
import java.time.ZoneId;
3434
import java.time.format.DateTimeFormatter;
35-
import java.util.Collections;
3635
import java.util.Date;
3736
import java.util.HashMap;
3837
import java.util.HashSet;
@@ -186,11 +185,36 @@ public class Document extends Node {
186185
have a no-arg constructor.
187186
*/
188187
static {
189-
SUPPORTED_DOM2_EVENT_TYPE_MAP = Map.of("HTMLEvents", Event.class, "MouseEvents", MouseEvent.class, "MutationEvents", MutationEvent.class, "UIEvents", UIEvent.class);
190-
191-
SUPPORTED_DOM3_EVENT_TYPE_MAP = Map.ofEntries(Map.entry("Event", Event.class), Map.entry("KeyboardEvent", KeyboardEvent.class), Map.entry("MouseEvent", MouseEvent.class), Map.entry("MessageEvent", MessageEvent.class), Map.entry("MutationEvent", MutationEvent.class), Map.entry("UIEvent", UIEvent.class), Map.entry("CustomEvent", CustomEvent.class), Map.entry("CloseEvent", CloseEvent.class), Map.entry("CompositionEvent", CompositionEvent.class), Map.entry("DragEvent", DragEvent.class), Map.entry("TextEvent", TextEvent.class));
192-
193-
SUPPORTED_VENDOR_EVENT_TYPE_MAP = Map.of("BeforeUnloadEvent", BeforeUnloadEvent.class, "Events", Event.class, "HashChangeEvent", HashChangeEvent.class, "KeyEvents", KeyboardEvent.class, "PointerEvent", PointerEvent.class, "PopStateEvent", PopStateEvent.class, "ProgressEvent", ProgressEvent.class, "FocusEvent", FocusEvent.class, "WheelEvent", WheelEvent.class, "AnimationEvent", AnimationEvent.class);
188+
SUPPORTED_DOM2_EVENT_TYPE_MAP = Map.of(
189+
"HTMLEvents", Event.class,
190+
"MouseEvents", MouseEvent.class,
191+
"MutationEvents", MutationEvent.class,
192+
"UIEvents", UIEvent.class);
193+
194+
SUPPORTED_DOM3_EVENT_TYPE_MAP = Map.ofEntries(
195+
Map.entry("Event", Event.class),
196+
Map.entry("KeyboardEvent", KeyboardEvent.class),
197+
Map.entry("MouseEvent", MouseEvent.class),
198+
Map.entry("MessageEvent", MessageEvent.class),
199+
Map.entry("MutationEvent", MutationEvent.class),
200+
Map.entry("UIEvent", UIEvent.class),
201+
Map.entry("CustomEvent", CustomEvent.class),
202+
Map.entry("CloseEvent", CloseEvent.class),
203+
Map.entry("CompositionEvent", CompositionEvent.class),
204+
Map.entry("DragEvent", DragEvent.class),
205+
Map.entry("TextEvent", TextEvent.class));
206+
207+
SUPPORTED_VENDOR_EVENT_TYPE_MAP = Map.of(
208+
"BeforeUnloadEvent", BeforeUnloadEvent.class,
209+
"Events", Event.class,
210+
"HashChangeEvent", HashChangeEvent.class,
211+
"KeyEvents", KeyboardEvent.class,
212+
"PointerEvent", PointerEvent.class,
213+
"PopStateEvent", PopStateEvent.class,
214+
"ProgressEvent", ProgressEvent.class,
215+
"FocusEvent", FocusEvent.class,
216+
"WheelEvent", WheelEvent.class,
217+
"AnimationEvent", AnimationEvent.class);
194218
}
195219

196220
private Window window_;

0 commit comments

Comments
 (0)