Repository: ant Updated Branches: refs/heads/master 46328b6bb -> 547d7a8b8
Yet more isEmpty() Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/547d7a8b Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/547d7a8b Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/547d7a8b Branch: refs/heads/master Commit: 547d7a8b886d1f1a7fc5eae8d42b6981bfd38cc4 Parents: 46328b6 Author: Gintas Grigelionis <[email protected]> Authored: Sun Apr 15 09:21:31 2018 +0200 Committer: Gintas Grigelionis <[email protected]> Committed: Sun Apr 15 09:22:13 2018 +0200 ---------------------------------------------------------------------- .../org/apache/tools/ant/DefaultLogger.java | 26 +++++++------------- .../tools/ant/taskdefs/JikesOutputParser.java | 2 +- src/main/org/apache/tools/ant/taskdefs/Zip.java | 4 +-- .../ant/taskdefs/optional/net/FTPTask.java | 2 +- .../tools/ant/taskdefs/optional/vss/MSVSS.java | 2 +- .../ant/taskdefs/optional/vss/MSVSSLABEL.java | 2 +- 6 files changed, 15 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/547d7a8b/src/main/org/apache/tools/ant/DefaultLogger.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/DefaultLogger.java b/src/main/org/apache/tools/ant/DefaultLogger.java index cebd26f..3469379 100644 --- a/src/main/org/apache/tools/ant/DefaultLogger.java +++ b/src/main/org/apache/tools/ant/DefaultLogger.java @@ -150,7 +150,7 @@ public class DefaultLogger implements BuildLogger { if (verbose || !(error instanceof BuildException)) { m.append(StringUtils.getStackTrace(error)); } else { - m.append(error).append(StringUtils.LINE_SEP); + m.append(String.format("%s%n", error)); } } @@ -166,17 +166,13 @@ public class DefaultLogger implements BuildLogger { Throwable error = event.getException(); StringBuffer message = new StringBuffer(); if (error == null) { - message.append(StringUtils.LINE_SEP); - message.append(getBuildSuccessfulMessage()); + message.append(String.format("%n%s", getBuildSuccessfulMessage())); } else { - message.append(StringUtils.LINE_SEP); - message.append(getBuildFailedMessage()); - message.append(StringUtils.LINE_SEP); + message.append(String.format("%n%s%n", getBuildFailedMessage())); throwableMessage(message, error, Project.MSG_VERBOSE <= msgOutputLevel); } - message.append(StringUtils.LINE_SEP); - message.append("Total time: "); - message.append(formatTime(System.currentTimeMillis() - startTime)); + message.append(String.format("%nTotal time: %s", + formatTime(System.currentTimeMillis() - startTime))); String msg = message.toString(); if (error == null) { @@ -214,9 +210,8 @@ public class DefaultLogger implements BuildLogger { */ public void targetStarted(BuildEvent event) { if (Project.MSG_INFO <= msgOutputLevel - && !event.getTarget().getName().equals("")) { - String msg = StringUtils.LINE_SEP - + event.getTarget().getName() + ":"; + && !event.getTarget().getName().isEmpty()) { + String msg = String.format("%n%s:", event.getTarget().getName()); printMessage(msg, out, event.getPriority()); log(msg); } @@ -261,7 +256,7 @@ public class DefaultLogger implements BuildLogger { StringBuilder message = new StringBuilder(); if (event.getTask() == null || emacsMode) { - //emacs mode or there is no task + // emacs mode or there is no task message.append(event.getMessage()); } else { // Print out the name of the task if we're in one @@ -275,10 +270,7 @@ public class DefaultLogger implements BuildLogger { new BufferedReader(new StringReader(event.getMessage()))) { message.append(r.lines().map(line -> prefix + line) - .collect(Collectors.joining(StringUtils.LINE_SEP))); - if (message.length() == 0) { - message.append(prefix); - } + .collect(Collectors.joining(System.lineSeparator(), prefix, ""))); } catch (IOException e) { // shouldn't be possible message.append(label).append(event.getMessage()); http://git-wip-us.apache.org/repos/asf/ant/blob/547d7a8b/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java b/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java index 5ffb954..569968c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java +++ b/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java @@ -133,7 +133,7 @@ public class JikesOutputParser implements ExecuteStreamHandler { while ((line = reader.readLine()) != null) { lower = line.toLowerCase(); - if (line.trim().equals("")) { + if (line.trim().isEmpty()) { continue; } if (lower.contains("error")) { http://git-wip-us.apache.org/repos/asf/ant/blob/547d7a8b/src/main/org/apache/tools/ant/taskdefs/Zip.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java index a8a4d6a..bf61812 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Zip.java +++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java @@ -1418,7 +1418,7 @@ public class Zip extends MatchingTask { if (filesets[i] instanceof ZipFileSet) { final ZipFileSet zfs = (ZipFileSet) filesets[i]; if (zfs.getFullpath(getProject()) != null - && !zfs.getFullpath(getProject()).equals("")) { + && !zfs.getFullpath(getProject()).isEmpty()) { // in this case all files from origin map to // the fullPath attribute of the zipfileset at // destination @@ -1427,7 +1427,7 @@ public class Zip extends MatchingTask { myMapper = fm; } else if (zfs.getPrefix(getProject()) != null - && !zfs.getPrefix(getProject()).equals("")) { + && !zfs.getPrefix(getProject()).isEmpty()) { final GlobPatternMapper gm = new GlobPatternMapper(); gm.setFrom("*"); String prefix = zfs.getPrefix(getProject()); http://git-wip-us.apache.org/repos/asf/ant/blob/547d7a8b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java index d1ccdb4..44eb02e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java @@ -543,7 +543,7 @@ public class FTPTask extends Task implements FTPTaskConfig { * @see org.apache.commons.net.ftp.FTPClientConfig */ public void setServerLanguageCodeConfig(String serverLanguageCode) { - if (serverLanguageCode != null && !serverLanguageCode.equals("")) { + if (serverLanguageCode != null && !serverLanguageCode.isEmpty()) { this.serverLanguageCodeConfig = serverLanguageCode; configurationHasBeenSet(); } http://git-wip-us.apache.org/repos/asf/ant/blob/547d7a8b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java index 9e0705d..9086393 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java @@ -463,7 +463,7 @@ public abstract class MSVSS extends Task implements MSVSSConstants { // Use getShortLabel() so labels longer then 30 char are truncated // and the user is warned String shortLabel = getShortLabel(); - if (shortLabel != null && !shortLabel.equals("")) { + if (shortLabel != null && !shortLabel.isEmpty()) { versionDateLabel = FLAG_VERSION_LABEL + shortLabel; } } http://git-wip-us.apache.org/repos/asf/ant/blob/547d7a8b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java index 6290f2e..c31a800 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java @@ -41,7 +41,7 @@ public class MSVSSLABEL extends MSVSS { } String label = getLabel(); - if (label.equals("")) { + if (label.isEmpty()) { String msg = "label attribute must be set!"; throw new BuildException(msg, getLocation()); }
