Skip to content

Commit 8c0972c

Browse files
committed
fix some pmd warnings
1 parent 45abac0 commit 8c0972c

7 files changed

Lines changed: 28 additions & 27 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ protected void doClickStateUpdate(final boolean shiftKey, final boolean ctrlKey,
195195
target = page.getResolvedTarget(getTargetAttribute());
196196
}
197197
page.getWebClient().download(page.getEnclosingWindow(), target, webRequest,
198-
true, (ATTRIBUTE_NOT_DEFINED != downloadAttribute) ? downloadAttribute : null, "Link click");
198+
true, (ATTRIBUTE_NOT_DEFINED == downloadAttribute) ? null : downloadAttribute, "Link click");
199199
}
200200

201201
private boolean relContainsNoreferrer() {

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,7 @@ protected void printXml(final DomElement node) throws IOException {
125125
builder_.append(indent_).append('<');
126126
printOpeningTag(node);
127127

128-
if (!hasChildren && !node.isEmptyXmlTagExpanded()) {
129-
builder_.append("/>\n");
130-
}
131-
else {
128+
if (hasChildren || node.isEmptyXmlTagExpanded()) {
132129
builder_.append(">\n");
133130
for (DomNode child = node.getFirstChild(); child != null; child = child.getNextSibling()) {
134131
indent_.append(" ");
@@ -142,6 +139,9 @@ protected void printXml(final DomElement node) throws IOException {
142139
}
143140
builder_.append(indent_).append("</").append(node.getTagName()).append(">\n");
144141
}
142+
else {
143+
builder_.append("/>\n");
144+
}
145145
}
146146
}
147147

@@ -397,12 +397,12 @@ private File createFile(final String url, final String extension) throws IOExcep
397397
int counter = 0;
398398
while (true) {
399399
final String fileName;
400-
if (counter != 0) {
401-
fileName = StringUtils.substringBeforeLast(name, ".")
402-
+ "_" + counter + "." + StringUtils.substringAfterLast(name, ".");
400+
if (counter == 0) {
401+
fileName = name;
403402
}
404403
else {
405-
fileName = name;
404+
fileName = StringUtils.substringBeforeLast(name, ".")
405+
+ "_" + counter + "." + StringUtils.substringAfterLast(name, ".");
406406
}
407407
FileUtils.forceMkdir(outputDir_);
408408
final File f = new File(outputDir_, fileName);

src/main/java/org/htmlunit/html/serializer/HtmlSerializerNormalizedText.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,11 +341,11 @@ protected void appendTitle(final HtmlSerializerTextBuilder builder, final HtmlTi
341341
protected void appendTableRow(final HtmlSerializerTextBuilder builder, final HtmlTableRow htmlTableRow) {
342342
boolean first = true;
343343
for (final HtmlTableCell cell : htmlTableRow.getCells()) {
344-
if (!first) {
345-
builder.appendTab();
344+
if (first) {
345+
first = false;
346346
}
347347
else {
348-
first = false;
348+
builder.appendTab();
349349
}
350350
appendChildren(builder, cell); // trim?
351351
}

src/main/java/org/htmlunit/html/serializer/HtmlSerializerVisibleText.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -378,11 +378,11 @@ protected void appendTableRow(final HtmlSerializerTextBuilder builder,
378378
final HtmlTableRow htmlTableRow, final Mode mode) {
379379
boolean first = true;
380380
for (final HtmlTableCell cell : htmlTableRow.getCells()) {
381-
if (!first) {
382-
builder.appendBlank();
381+
if (first) {
382+
first = false;
383383
}
384384
else {
385-
first = false;
385+
builder.appendBlank();
386386
}
387387
appendChildren(builder, cell, mode); // trim?
388388
}

src/main/java/org/htmlunit/javascript/host/intl/Collator.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ public class Collator extends HtmlUnitScriptable {
4646
public static Scriptable jsConstructor(final Context cx, final Scriptable scope,
4747
final Object[] args, final Function ctorObj, final boolean inNewExpr) {
4848
final String[] locales;
49-
if (args.length != 0) {
49+
if (args.length == 0) {
50+
locales = new String[] {""};
51+
}
52+
else {
5053
if (args[0] instanceof NativeArray) {
5154
final NativeArray array = (NativeArray) args[0];
5255
locales = new String[(int) array.getLength()];
@@ -58,9 +61,6 @@ public static Scriptable jsConstructor(final Context cx, final Scriptable scope,
5861
locales = new String[] {JavaScriptEngine.toString(args[0])};
5962
}
6063
}
61-
else {
62-
locales = new String[] {""};
63-
}
6464
final Window window = getWindow(ctorObj);
6565
final Collator format = new Collator(/*locales, window.getBrowserVersion()*/);
6666
format.setParentScope(window);

src/main/java/org/htmlunit/javascript/host/intl/NumberFormat.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,10 @@ private static String getPattern(final Map<String, String> formats, final String
171171
public static Scriptable jsConstructor(final Context cx, final Scriptable scope,
172172
final Object[] args, final Function ctorObj, final boolean inNewExpr) {
173173
final String[] locales;
174-
if (args.length != 0) {
174+
if (args.length == 0) {
175+
locales = new String[] {""};
176+
}
177+
else {
175178
if (args[0] instanceof NativeArray) {
176179
final NativeArray array = (NativeArray) args[0];
177180
locales = new String[(int) array.getLength()];
@@ -183,9 +186,6 @@ public static Scriptable jsConstructor(final Context cx, final Scriptable scope,
183186
locales = new String[] {JavaScriptEngine.toString(args[0])};
184187
}
185188
}
186-
else {
187-
locales = new String[] {""};
188-
}
189189
final Window window = getWindow(ctorObj);
190190
final NumberFormat format = new NumberFormat(locales, window.getBrowserVersion());
191191
format.setParentScope(window);

src/main/java/org/htmlunit/javascript/host/xml/XMLSerializer.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,11 @@ else if (foredNamespace != null) {
201201
break;
202202
}
203203
}
204-
if (!startTagClosed) {
204+
205+
if (startTagClosed) {
206+
builder.append("</").append(nodeName).append('>');
207+
}
208+
else {
205209
final String tagName = StringUtils.toRootLowerCase(nodeName);
206210
if (NON_EMPTY_TAGS.contains(tagName)) {
207211
builder.append("></").append(nodeName).append('>');
@@ -210,9 +214,6 @@ else if (foredNamespace != null) {
210214
builder.append(optionalPrefix).append("/>");
211215
}
212216
}
213-
else {
214-
builder.append("</").append(nodeName).append('>');
215-
}
216217
}
217218

218219
}

0 commit comments

Comments
 (0)