Skip to content

Commit e56810c

Browse files
rbrirbri
committed
code cleanup
1 parent 8960bfa commit e56810c

10 files changed

Lines changed: 69 additions & 113 deletions

File tree

‎src/main/java/org/htmlunit/attachment/DownloadingAttachmentHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class DownloadingAttachmentHandler implements AttachmentHandler {
4444

4545
private static final Log LOG = LogFactory.getLog(DownloadingAttachmentHandler.class);
4646

47-
private Path downloadFolder_;
47+
private final Path downloadFolder_;
4848

4949
/**
5050
* Creates a new DownloadingAttachmentHandler that stores all downloaded files in the

‎src/main/java/org/htmlunit/css/ComputedCssStyleDeclaration.java‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -464,30 +464,28 @@ public AbstractCSSRuleImpl getParentRule() {
464464
public StyleElement getStyleElement(final String name) {
465465
final StyleElement existent = elementStyleDeclaration_.getStyleElement(name);
466466

467-
if (localModifications_ != null) {
468-
final StyleElement localStyleMod = localModifications_.get(name);
469-
if (localStyleMod == null) {
470-
return existent;
471-
}
467+
final StyleElement localStyleMod = localModifications_.get(name);
468+
if (localStyleMod == null) {
469+
return existent;
470+
}
472471

473-
if (existent == null) {
474-
// Local modifications represent either default style elements or style elements
475-
// defined in stylesheets; either way, they shouldn't overwrite any style
476-
// elements derived directly from the HTML element's "style" attribute.
477-
return localStyleMod;
478-
}
472+
if (existent == null) {
473+
// Local modifications represent either default style elements or style elements
474+
// defined in stylesheets; either way, they shouldn't overwrite any style
475+
// elements derived directly from the HTML element's "style" attribute.
476+
return localStyleMod;
477+
}
479478

480-
// replace if !IMPORTANT
481-
if (StyleElement.PRIORITY_IMPORTANT.equals(localStyleMod.getPriority())) {
482-
if (existent.isImportant()) {
483-
if (existent.getSpecificity().compareTo(localStyleMod.getSpecificity()) < 0) {
484-
return localStyleMod;
485-
}
486-
}
487-
else {
479+
// replace if !IMPORTANT
480+
if (StyleElement.PRIORITY_IMPORTANT.equals(localStyleMod.getPriority())) {
481+
if (existent.isImportant()) {
482+
if (existent.getSpecificity().compareTo(localStyleMod.getSpecificity()) < 0) {
488483
return localStyleMod;
489484
}
490485
}
486+
else {
487+
return localStyleMod;
488+
}
491489
}
492490
return existent;
493491
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -814,9 +814,7 @@ public DomElement getLastElementChild() {
814814
public int getChildElementCount() {
815815
int counter = 0;
816816

817-
final Iterator<DomElement> iterator = getChildElements().iterator();
818-
while (iterator.hasNext()) {
819-
iterator.next();
817+
for (DomElement domElement : getChildElements()) {
820818
counter++;
821819
}
822820
return counter;

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

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1408,7 +1408,7 @@ protected final class DescendantDomNodesIterator implements Iterator<DomNode> {
14081408
* Creates a new instance which iterates over the specified node type.
14091409
*/
14101410
public DescendantDomNodesIterator() {
1411-
nextNode_ = getFirstChildElement(DomNode.this);
1411+
nextNode_ = DomNode.this.getFirstChild();
14121412
}
14131413

14141414
/** {@inheritDoc} */
@@ -1439,13 +1439,12 @@ public void remove() {
14391439
/**
14401440
* @return the next node, if there is one
14411441
*/
1442-
@SuppressWarnings("unchecked")
14431442
public DomNode nextNode() {
14441443
currentNode_ = nextNode_;
14451444

1446-
DomNode next = getFirstChildElement(nextNode_);
1445+
DomNode next = nextNode_.getFirstChild();
14471446
if (next == null) {
1448-
next = getNextDomSibling(nextNode_);
1447+
next = nextNode_.getNextSibling();
14491448
}
14501449
if (next == null) {
14511450
next = getNextElementUpwards(nextNode_);
@@ -1463,41 +1462,13 @@ private DomNode getNextElementUpwards(final DomNode startingNode) {
14631462
DomNode parent = startingNode.getParentNode();
14641463
while (parent != null && parent != DomNode.this) {
14651464
DomNode next = parent.getNextSibling();
1466-
while (next != null && !isAccepted(next)) {
1467-
next = next.getNextSibling();
1468-
}
14691465
if (next != null) {
14701466
return next;
14711467
}
14721468
parent = parent.getParentNode();
14731469
}
14741470
return null;
14751471
}
1476-
1477-
private DomNode getFirstChildElement(final DomNode parent) {
1478-
DomNode node = parent.getFirstChild();
1479-
while (node != null && !isAccepted(node)) {
1480-
node = node.getNextSibling();
1481-
}
1482-
return node;
1483-
}
1484-
1485-
/**
1486-
* Indicates if the node is accepted. If not it won't be explored at all.
1487-
* @param node the node to test
1488-
* @return {@code true} if accepted
1489-
*/
1490-
private boolean isAccepted(final DomNode node) {
1491-
return DomNode.class.isAssignableFrom(node.getClass());
1492-
}
1493-
1494-
private DomNode getNextDomSibling(final DomNode element) {
1495-
DomNode node = element.getNextSibling();
1496-
while (node != null && !isAccepted(node)) {
1497-
node = node.getNextSibling();
1498-
}
1499-
return node;
1500-
}
15011472
}
15021473

15031474
/**
@@ -1542,7 +1513,6 @@ public void remove() {
15421513
/**
15431514
* @return the next node, if there is one
15441515
*/
1545-
@SuppressWarnings("unchecked")
15461516
public DomElement nextNode() {
15471517
currentNode_ = nextNode_;
15481518

@@ -1645,7 +1615,6 @@ public void remove() {
16451615
/**
16461616
* @return the next node, if there is one
16471617
*/
1648-
@SuppressWarnings("unchecked")
16491618
public HtmlElement nextNode() {
16501619
currentNode_ = nextNode_;
16511620

‎src/main/java/org/htmlunit/javascript/host/css/CSSStyleDeclaration.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -834,12 +834,7 @@ private void updateFont(final String font, final boolean force) {
834834

835835
if (!lineHeight.equals(defaultLineHeight)) {
836836
newFont.append('/');
837-
if (lineHeight.equals(defaultLineHeight)) {
838-
newFont.append(Definition.LINE_HEIGHT.getDefaultComputedValue(browserVersion));
839-
}
840-
else {
841-
newFont.append(lineHeight);
842-
}
837+
newFont.append(lineHeight);
843838
}
844839

845840
newFont.append(' ').append(getFontFamily());

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

Lines changed: 42 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -114,51 +114,49 @@ protected void init(final Object[] args, final Function ctorObj) {
114114
return;
115115
}
116116

117-
if (args.length > 0) {
118-
if (args[0] instanceof NativeArray) {
119-
final NativeArray arrayArgs = (NativeArray) args[0];
120-
if (arrayArgs.getLength() == 6) {
121-
m11_ = JavaScriptEngine.toNumber(arrayArgs.get(0));
122-
m12_ = JavaScriptEngine.toNumber(arrayArgs.get(1));
123-
124-
m21_ = JavaScriptEngine.toNumber(arrayArgs.get(2));
125-
m22_ = JavaScriptEngine.toNumber(arrayArgs.get(3));
126-
127-
m41_ = JavaScriptEngine.toNumber(arrayArgs.get(4));
128-
m42_ = JavaScriptEngine.toNumber(arrayArgs.get(5));
129-
130-
is2D_ = true;
131-
return;
132-
}
133-
134-
if (arrayArgs.getLength() == 16) {
135-
m11_ = JavaScriptEngine.toNumber(arrayArgs.get(0));
136-
m12_ = JavaScriptEngine.toNumber(arrayArgs.get(1));
137-
m13_ = JavaScriptEngine.toNumber(arrayArgs.get(2));
138-
m14_ = JavaScriptEngine.toNumber(arrayArgs.get(3));
139-
140-
m21_ = JavaScriptEngine.toNumber(arrayArgs.get(4));
141-
m22_ = JavaScriptEngine.toNumber(arrayArgs.get(5));
142-
m23_ = JavaScriptEngine.toNumber(arrayArgs.get(6));
143-
m24_ = JavaScriptEngine.toNumber(arrayArgs.get(7));
144-
145-
m31_ = JavaScriptEngine.toNumber(arrayArgs.get(8));
146-
m32_ = JavaScriptEngine.toNumber(arrayArgs.get(9));
147-
m33_ = JavaScriptEngine.toNumber(arrayArgs.get(10));
148-
m34_ = JavaScriptEngine.toNumber(arrayArgs.get(11));
149-
150-
m41_ = JavaScriptEngine.toNumber(arrayArgs.get(12));
151-
m42_ = JavaScriptEngine.toNumber(arrayArgs.get(13));
152-
m43_ = JavaScriptEngine.toNumber(arrayArgs.get(14));
153-
m44_ = JavaScriptEngine.toNumber(arrayArgs.get(15));
154-
155-
is2D_ = false;
156-
return;
157-
}
158-
159-
throw JavaScriptEngine.typeError("DOMMatrixReadOnly constructor: Matrix init sequence must have "
160-
+ "a length of 6 or 16 (actual value: " + arrayArgs.getLength() + ")");
117+
if (args[0] instanceof NativeArray) {
118+
final NativeArray arrayArgs = (NativeArray) args[0];
119+
if (arrayArgs.getLength() == 6) {
120+
m11_ = JavaScriptEngine.toNumber(arrayArgs.get(0));
121+
m12_ = JavaScriptEngine.toNumber(arrayArgs.get(1));
122+
123+
m21_ = JavaScriptEngine.toNumber(arrayArgs.get(2));
124+
m22_ = JavaScriptEngine.toNumber(arrayArgs.get(3));
125+
126+
m41_ = JavaScriptEngine.toNumber(arrayArgs.get(4));
127+
m42_ = JavaScriptEngine.toNumber(arrayArgs.get(5));
128+
129+
is2D_ = true;
130+
return;
161131
}
132+
133+
if (arrayArgs.getLength() == 16) {
134+
m11_ = JavaScriptEngine.toNumber(arrayArgs.get(0));
135+
m12_ = JavaScriptEngine.toNumber(arrayArgs.get(1));
136+
m13_ = JavaScriptEngine.toNumber(arrayArgs.get(2));
137+
m14_ = JavaScriptEngine.toNumber(arrayArgs.get(3));
138+
139+
m21_ = JavaScriptEngine.toNumber(arrayArgs.get(4));
140+
m22_ = JavaScriptEngine.toNumber(arrayArgs.get(5));
141+
m23_ = JavaScriptEngine.toNumber(arrayArgs.get(6));
142+
m24_ = JavaScriptEngine.toNumber(arrayArgs.get(7));
143+
144+
m31_ = JavaScriptEngine.toNumber(arrayArgs.get(8));
145+
m32_ = JavaScriptEngine.toNumber(arrayArgs.get(9));
146+
m33_ = JavaScriptEngine.toNumber(arrayArgs.get(10));
147+
m34_ = JavaScriptEngine.toNumber(arrayArgs.get(11));
148+
149+
m41_ = JavaScriptEngine.toNumber(arrayArgs.get(12));
150+
m42_ = JavaScriptEngine.toNumber(arrayArgs.get(13));
151+
m43_ = JavaScriptEngine.toNumber(arrayArgs.get(14));
152+
m44_ = JavaScriptEngine.toNumber(arrayArgs.get(15));
153+
154+
is2D_ = false;
155+
return;
156+
}
157+
158+
throw JavaScriptEngine.typeError("DOMMatrixReadOnly constructor: Matrix init sequence must have "
159+
+ "a length of 6 or 16 (actual value: " + arrayArgs.getLength() + ")");
162160
}
163161

164162
throw JavaScriptEngine.asJavaScriptException(

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,10 +1267,8 @@ public TreeWalker createTreeWalker(final Node root, final double whatToShow, fin
12671267
// this strange conversation preserves NodeFilter.SHOW_ALL
12681268
final int whatToShowI = (int) Double.valueOf(whatToShow).longValue();
12691269

1270-
expandEntityReferences = false;
1271-
12721270
final org.w3c.dom.traversal.NodeFilter filterWrapper = createFilterWrapper(filter, false);
1273-
final TreeWalker t = new TreeWalker(root, whatToShowI, filterWrapper, expandEntityReferences);
1271+
final TreeWalker t = new TreeWalker(root, whatToShowI, filterWrapper, false);
12741272
t.setParentScope(getWindow(this));
12751273
t.setPrototype(staticGetPrototype(getWindow(this), TreeWalker.class));
12761274
return t;

‎src/main/java/org/htmlunit/javascript/host/draganddrop/DataTransferItem.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class DataTransferItem extends HtmlUnitScriptable {
4141

4242
private final String kind_;
4343
private final String type_;
44-
private Object data_;
44+
private final Object data_;
4545

4646
/**
4747
* Ctor.

‎src/main/java/org/htmlunit/javascript/host/intl/DateTimeFormat.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ public Scriptable resolvedOptions() {
318318
static final class DateTimeFormatHelper {
319319

320320
private final DateTimeFormatter formatter_;
321-
private Chronology chronology_;
321+
private final Chronology chronology_;
322322
private final String locale_;
323323

324324
DateTimeFormatHelper(final String locale, final Chronology chronology, final String pattern) {

‎src/main/java/org/htmlunit/websocket/JettyWebSocketAdapter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public WebSocketAdapter buildWebSocketAdapter(final WebClient webClient,
5151

5252
private final Object clientLock_ = new Object();
5353
private WebSocketClient client_;
54-
private WebSocketListener listener_;
54+
private final WebSocketListener listener_;
5555

5656
private volatile Session incomingSession_;
5757
private Session outgoingSession_;

0 commit comments

Comments
 (0)