diff options
Diffstat (limited to 'src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java')
| -rw-r--r-- | src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java | 88 |
1 files changed, 35 insertions, 53 deletions
diff --git a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java index 8762ddc47..e5fa4dd5f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java @@ -55,10 +55,10 @@ public abstract class AbstractCvsTask extends Task { private Commandline cmd = new Commandline(); - private ArrayList<Module> modules = new ArrayList<Module>(); + private List<Module> modules = new ArrayList<>(); /** list of Commandline children */ - private Vector<Commandline> vecCommandlines = new Vector<Commandline>(); + private List<Commandline> commandlines = new Vector<>(); /** * the CVSROOT variable. @@ -149,11 +149,6 @@ public abstract class AbstractCvsTask extends Task { private OutputStream outputStream; private OutputStream errorStream; - /** empty no-arg constructor*/ - public AbstractCvsTask() { - super(); - } - /** * sets the handler * @param handler a handler able of processing the output and error streams from the cvs exe @@ -385,11 +380,12 @@ public abstract class AbstractCvsTask extends Task { * @throws BuildException if failonerror is set to true and the * cvs command fails. */ + @Override public void execute() throws BuildException { String savedCommand = getCommand(); - if (this.getCommand() == null && vecCommandlines.size() == 0) { + if (this.getCommand() == null && commandlines.isEmpty()) { // re-implement legacy behaviour: this.setCommand(AbstractCvsTask.DEFAULT_COMMAND); } @@ -397,16 +393,13 @@ public abstract class AbstractCvsTask extends Task { String c = this.getCommand(); Commandline cloned = null; if (c != null) { - cloned = (Commandline) cmd.clone(); + cloned = cmd.clone(); cloned.createArgument(true).setLine(c); this.addConfiguredCommandline(cloned, true); } try { - final int size = vecCommandlines.size(); - for (int i = 0; i < size; i++) { - this.runCommand((Commandline) vecCommandlines.elementAt(i)); - } + commandlines.forEach(this::runCommand); } finally { if (cloned != null) { removeCommandline(cloned); @@ -421,24 +414,24 @@ public abstract class AbstractCvsTask extends Task { String cmdLine = Commandline.describeCommand(execute .getCommandline()); - StringBuffer stringBuffer = removeCvsPassword(cmdLine); + StringBuilder buf = removeCvsPassword(cmdLine); String newLine = StringUtils.LINE_SEP; String[] variableArray = execute.getEnvironment(); if (variableArray != null) { - stringBuffer.append(newLine); - stringBuffer.append(newLine); - stringBuffer.append("environment:"); - stringBuffer.append(newLine); + buf.append(newLine); + buf.append(newLine); + buf.append("environment:"); + buf.append(newLine); for (int z = 0; z < variableArray.length; z++) { - stringBuffer.append(newLine); - stringBuffer.append("\t"); - stringBuffer.append(variableArray[z]); + buf.append(newLine); + buf.append("\t"); + buf.append(variableArray[z]); } } - return stringBuffer.toString(); + return buf.toString(); } /** @@ -449,24 +442,24 @@ public abstract class AbstractCvsTask extends Task { * @param cmdLine the CVS command line * @return a StringBuffer where the password has been removed (if available) */ - private StringBuffer removeCvsPassword(String cmdLine) { - StringBuffer stringBuffer = new StringBuffer(cmdLine); + private StringBuilder removeCvsPassword(String cmdLine) { + StringBuilder buf = new StringBuilder(cmdLine); int start = cmdLine.indexOf("-d:"); if (start >= 0) { - int stop = cmdLine.indexOf("@", start); - int startproto = cmdLine.indexOf(":", start); - int startuser = cmdLine.indexOf(":", startproto + 1); - int startpass = cmdLine.indexOf(":", startuser + 1); - stop = cmdLine.indexOf("@", start); + int stop = cmdLine.indexOf('@', start); + int startproto = cmdLine.indexOf(':', start); + int startuser = cmdLine.indexOf(':', startproto + 1); + int startpass = cmdLine.indexOf(':', startuser + 1); + stop = cmdLine.indexOf('@', start); if (stop >= 0 && startpass > startproto && startpass < stop) { for (int i = startpass + 1; i < stop; i++) { - stringBuffer.replace(i, i + 1, "*"); + buf.replace(i, i + 1, "*"); } } } - return stringBuffer; + return buf; } /** @@ -478,10 +471,8 @@ public abstract class AbstractCvsTask extends Task { public void setCvsRoot(String root) { // Check if not real cvsroot => set it to null - if (root != null) { - if (root.trim().equals("")) { - root = null; - } + if (root != null && root.trim().isEmpty()) { + root = null; } this.cvsRoot = root; @@ -502,11 +493,8 @@ public abstract class AbstractCvsTask extends Task { * @param rsh the CVS_RSH variable */ public void setCvsRsh(String rsh) { - // Check if not real cvsrsh => set it to null - if (rsh != null) { - if (rsh.trim().equals("")) { - rsh = null; - } + if (rsh != null && rsh.trim().isEmpty()) { + rsh = null; } this.cvsRsh = rsh; @@ -535,7 +523,6 @@ public abstract class AbstractCvsTask extends Task { * @return the port of CVS */ public int getPort() { - return this.port; } @@ -553,7 +540,6 @@ public abstract class AbstractCvsTask extends Task { * @return password file */ public File getPassFile() { - return this.passFile; } @@ -576,7 +562,6 @@ public abstract class AbstractCvsTask extends Task { * @return directory where the checked out files should be placed */ public File getDest() { - return this.dest; } @@ -595,7 +580,6 @@ public abstract class AbstractCvsTask extends Task { * @return package/module */ public String getPackage() { - return this.cvsPackage; } /** @@ -613,7 +597,7 @@ public abstract class AbstractCvsTask extends Task { */ public void setTag(String p) { // Check if not real tag => set it to null - if (p != null && p.trim().length() > 0) { + if (!(p == null || p.trim().isEmpty())) { tag = p; addCommandArgument("-r" + p); } @@ -649,7 +633,7 @@ public abstract class AbstractCvsTask extends Task { * can understand see man cvs */ public void setDate(String p) { - if (p != null && p.trim().length() > 0) { + if (!(p == null || p.trim().isEmpty())) { addCommandArgument("-D"); addCommandArgument(p); } @@ -695,7 +679,6 @@ public abstract class AbstractCvsTask extends Task { reallyquiet = q; } - /** * If true, report only and don't change any files. * @@ -794,7 +777,7 @@ public abstract class AbstractCvsTask extends Task { * @param c command line which should be removed */ protected void removeCommandline(Commandline c) { - vecCommandlines.removeElement(c); + commandlines.remove(c); } /** @@ -818,9 +801,9 @@ public abstract class AbstractCvsTask extends Task { } this.configureCommandline(c); if (insertAtStart) { - vecCommandlines.insertElementAt(c, 0); + commandlines.add(0, c); } else { - vecCommandlines.addElement(c); + commandlines.add(c); } } @@ -854,13 +837,12 @@ public abstract class AbstractCvsTask extends Task { } protected List<Module> getModules() { - @SuppressWarnings("unchecked") - final List<Module> clone = (List<Module>) modules.clone(); - return clone; + return new ArrayList<>(modules); } public static final class Module { private String name; + public void setName(String s) { name = s; } |