From 96ed9bdfd06c41860ccee7e860f865b44b8afc13 Mon Sep 17 00:00:00 2001 From: Gintas Grigelionis Date: Thu, 12 Apr 2018 08:33:31 +0200 Subject: [PATCH] Inline/whitespace/format --- src/main/org/apache/tools/ant/taskdefs/Checksum.java | 6 +----- .../org/apache/tools/ant/taskdefs/ManifestClassPath.java | 3 +-- src/main/org/apache/tools/ant/taskdefs/SQLExec.java | 3 ++- src/main/org/apache/tools/ant/taskdefs/optional/Javah.java | 6 ++---- .../apache/tools/ant/taskdefs/optional/net/RExecTask.java | 4 ++-- .../types/selectors/modifiedselector/DigestAlgorithm.java | 6 +----- src/main/org/apache/tools/ant/util/FileUtils.java | 5 ++--- src/main/org/apache/tools/ant/util/Native2AsciiUtils.java | 7 +------ src/main/org/apache/tools/tar/TarUtils.java | 3 +-- 9 files changed, 13 insertions(+), 30 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/Checksum.java b/src/main/org/apache/tools/ant/taskdefs/Checksum.java index e753d941e..96327233e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Checksum.java +++ b/src/main/org/apache/tools/ant/taskdefs/Checksum.java @@ -578,11 +578,7 @@ public class Checksum extends MatchingTask implements Condition { private String createDigestString(byte[] fileDigest) { StringBuilder checksumSb = new StringBuilder(); for (byte digestByte : fileDigest) { - String hexStr = Integer.toHexString(BYTE_MASK & digestByte); - if (hexStr.length() < 2) { - checksumSb.append('0'); - } - checksumSb.append(hexStr); + checksumSb.append(String.format("%02x", BYTE_MASK & digestByte)); } return checksumSb.toString(); } diff --git a/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java b/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java index 2872c7f8e..17aa051c9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java +++ b/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java @@ -76,9 +76,8 @@ public class ManifestClassPath extends Task { final FileUtils fileUtils = FileUtils.getFileUtils(); dir = fileUtils.normalize(dir.getAbsolutePath()); - String[] elements = path.list(); StringBuilder buffer = new StringBuilder(); - for (String element : elements) { + for (String element : path.list()) { // Normalize the current file File pathEntry = new File(element); String fullPath = pathEntry.getAbsolutePath(); diff --git a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java index 9d4b5d63d..55f80c69f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java +++ b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java @@ -906,7 +906,8 @@ public class SQLExec extends JDBCTask { } private String maybeQuote(String s) { - if (csvQuoteChar == null || s == null || (!forceCsvQuoteChar && !s.contains(csvColumnSep) && !s.contains(csvQuoteChar))) { + if (csvQuoteChar == null || s == null + || (!forceCsvQuoteChar && !s.contains(csvColumnSep) && !s.contains(csvQuoteChar))) { return s; } StringBuilder sb = new StringBuilder(csvQuoteChar); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java index b5dfddc76..17dd9d76d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java @@ -34,7 +34,6 @@ import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; -import org.apache.tools.ant.util.StringUtils; import org.apache.tools.ant.util.facade.FacadeTaskHelper; import org.apache.tools.ant.util.facade.ImplementationSpecificArgument; @@ -484,11 +483,10 @@ public class Javah extends Task { if (c.length > 1) { message.append("es"); } - message.append(" to be compiled:"); - message.append(StringUtils.LINE_SEP); + message.append(String.format(" to be compiled:%n")); for (String element : c) { cmd.createArgument().setValue(element); - message.append(" ").append(element).append(StringUtils.LINE_SEP); + message.append(String.format(" %s%n", element)); } log(message.toString(), Project.MSG_VERBOSE); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java index 801712343..d41606089 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java @@ -278,7 +278,7 @@ public class RExecTask extends Task { } else { Calendar endTime = Calendar.getInstance(); endTime.add(Calendar.SECOND, timeout); - int read = 0; + int read = 0; while (read != -1) { while (Calendar.getInstance().before(endTime) && is.available() == 0) { Thread.sleep(PAUSE_TIME); @@ -289,7 +289,7 @@ public class RExecTask extends Task { "Response timed-out waiting for EOF", getLocation()); } - read = is.read(); + read = is.read(); if (read != -1) { char c = (char) read; sb.append(c); diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java index 67a3a3946..6b321ea77 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java @@ -166,11 +166,7 @@ public class DigestAlgorithm implements Algorithm { } StringBuilder checksumSb = new StringBuilder(); for (byte digestByte : messageDigest.digest()) { - String hexStr = Integer.toHexString(BYTE_MASK & digestByte); - if (hexStr.length() < 2) { - checksumSb.append('0'); - } - checksumSb.append(hexStr); + checksumSb.append(String.format("%02x", BYTE_MASK & digestByte)); } return checksumSb.toString(); } catch (IOException ignored) { diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java index 541353c72..cc2242c4a 100644 --- a/src/main/org/apache/tools/ant/util/FileUtils.java +++ b/src/main/org/apache/tools/ant/util/FileUtils.java @@ -1073,15 +1073,14 @@ public class FileUtils { } final char[] buffer = new char[bufferSize]; int bufferLength = 0; - StringBuilder textBuffer = null; + StringBuilder textBuffer = new StringBuilder(); while (bufferLength != -1) { bufferLength = rdr.read(buffer); if (bufferLength > 0) { - textBuffer = (textBuffer == null) ? new StringBuilder() : textBuffer; textBuffer.append(buffer, 0, bufferLength); } } - return (textBuffer == null) ? null : textBuffer.toString(); + return (textBuffer.length() == 0) ? null : textBuffer.toString(); } /** diff --git a/src/main/org/apache/tools/ant/util/Native2AsciiUtils.java b/src/main/org/apache/tools/ant/util/Native2AsciiUtils.java index a69d0313d..7a0043933 100644 --- a/src/main/org/apache/tools/ant/util/Native2AsciiUtils.java +++ b/src/main/org/apache/tools/ant/util/Native2AsciiUtils.java @@ -38,12 +38,7 @@ public class Native2AsciiUtils { if (c <= MAX_ASCII) { sb.append(c); } else { - sb.append("\\u"); - String encoded = Integer.toHexString(c); - for (int i = encoded.length(); i < 4; i++) { - sb.append("0"); - } - sb.append(encoded); + sb.append(String.format("\\u%04x", (int) c)); } } return sb.toString(); diff --git a/src/main/org/apache/tools/tar/TarUtils.java b/src/main/org/apache/tools/tar/TarUtils.java index fcd0c4e1f..fcb112725 100644 --- a/src/main/org/apache/tools/tar/TarUtils.java +++ b/src/main/org/apache/tools/tar/TarUtils.java @@ -62,8 +62,7 @@ public class TarUtils { } public String decode(final byte[] buffer) { - final int length = buffer.length; - final StringBuilder result = new StringBuilder(length); + final StringBuilder result = new StringBuilder(buffer.length); for (final byte b : buffer) { if (b == 0) { // Trailing null