You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by jl...@apache.org on 2014/11/25 00:44:54 UTC
[1/6] ant-easyant-core git commit: simplify some loops
Repository: ant-easyant-core
Updated Branches:
refs/heads/master c61c43ee3 -> 0b161f88f
simplify some loops
Project: http://git-wip-us.apache.org/repos/asf/ant-easyant-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-easyant-core/commit/34eeaeac
Tree: http://git-wip-us.apache.org/repos/asf/ant-easyant-core/tree/34eeaeac
Diff: http://git-wip-us.apache.org/repos/asf/ant-easyant-core/diff/34eeaeac
Branch: refs/heads/master
Commit: 34eeaeac4dacb647195408f40ffdb914d350520e
Parents: c61c43e
Author: Jean-Louis Boudart <je...@gmail.com>
Authored: Mon Nov 24 20:45:31 2014 +0100
Committer: Jean-Louis Boudart <je...@gmail.com>
Committed: Mon Nov 24 20:45:31 2014 +0100
----------------------------------------------------------------------
.../core/report/XMLEasyAntReportWriter.java | 29 ++++++--------------
.../tasks/ConfigureEasyAntIvyInstance.java | 5 ++--
.../org/apache/easyant/tasks/EasyAntRunner.java | 19 ++++++-------
.../apache/easyant/tasks/ImportAntscripts.java | 29 ++++++++------------
.../apache/easyant/tasks/RegisterArtifact.java | 6 ++--
5 files changed, 33 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/34eeaeac/src/main/java/org/apache/easyant/core/report/XMLEasyAntReportWriter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/core/report/XMLEasyAntReportWriter.java b/src/main/java/org/apache/easyant/core/report/XMLEasyAntReportWriter.java
index f7c06dc..8482240 100644
--- a/src/main/java/org/apache/easyant/core/report/XMLEasyAntReportWriter.java
+++ b/src/main/java/org/apache/easyant/core/report/XMLEasyAntReportWriter.java
@@ -17,21 +17,6 @@
*/
package org.apache.easyant.core.report;
-import java.io.BufferedWriter;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
import org.apache.easyant.core.descriptor.PropertyDescriptor;
import org.apache.ivy.core.cache.ArtifactOrigin;
import org.apache.ivy.core.module.descriptor.Configuration;
@@ -49,6 +34,10 @@ import org.apache.ivy.util.DateUtil;
import org.apache.ivy.util.Message;
import org.apache.ivy.util.XMLHelper;
+import java.io.*;
+import java.util.*;
+import java.util.Map.Entry;
+
/**
* XmlReportWriter allows to write ResolveReport in an xml format.
*/
@@ -179,7 +168,7 @@ public class XMLEasyAntReportWriter {
+ XMLHelper.escape(dep.getResolvedId().getRevision())
+ "\""
+ (dep.getResolvedId().getBranch() == null ? "" : " branch=\""
- + XMLHelper.escape(dep.getResolvedId().getBranch()) + "\"") + details + " downloaded=\""
+ + XMLHelper.escape(dep.getResolvedId().getBranch()) + "\"") + details + " downloaded=\""
+ dep.isDownloaded() + "\"" + " searched=\"" + dep.isSearched() + "\"" + defaultValue + " conf=\""
+ toString(dep.getConfigurations(report.getConfiguration())) + "\"" + " position=\"" + position + "\">");
if (md != null) {
@@ -246,10 +235,9 @@ public class XMLEasyAntReportWriter {
private void outputCallers(ConfigurationResolveReport report, PrintWriter out, IvyNode dep) {
Caller[] callers = dep.getCallers(report.getConfiguration());
for (Caller caller : callers) {
- StringBuffer callerDetails = new StringBuffer();
+ StringBuilder callerDetails = new StringBuilder();
Map<?, ?> callerExtraAttributes = caller.getDependencyDescriptor().getExtraAttributes();
- for (Iterator<?> iterator = callerExtraAttributes.entrySet().iterator(); iterator.hasNext(); ) {
- Entry<String, Object> entry = (Entry<String, Object>) iterator.next();
+ for (Entry<?, ?> entry : callerExtraAttributes.entrySet()) {
callerDetails.append(" extra-").append(entry.getKey()).append("=\"")
.append(XMLHelper.escape(entry.getValue().toString())).append("\"");
}
@@ -284,8 +272,7 @@ public class XMLEasyAntReportWriter {
out.print("\t\t\t\t\t<artifact name=\"" + XMLHelper.escape(anAdr.getName()) + "\" type=\""
+ XMLHelper.escape(anAdr.getType()) + "\" ext=\"" + XMLHelper.escape(anAdr.getExt()) + "\"");
extraAttributes = anAdr.getArtifact().getExtraAttributes();
- for (Iterator<?> iterator = extraAttributes.entrySet().iterator(); iterator.hasNext(); ) {
- Entry<String, Object> entry = (Entry<String, Object>) iterator.next();
+ for (Entry<?, ?> entry : extraAttributes.entrySet()) {
out.print(" extra-" + entry.getKey() + "=\"" + XMLHelper.escape(entry.getValue().toString()) + "\"");
}
out.print(" status=\"" + XMLHelper.escape(anAdr.getDownloadStatus().toString()) + "\"");
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/34eeaeac/src/main/java/org/apache/easyant/tasks/ConfigureEasyAntIvyInstance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/tasks/ConfigureEasyAntIvyInstance.java b/src/main/java/org/apache/easyant/tasks/ConfigureEasyAntIvyInstance.java
index 2f50e9d..52f0801 100644
--- a/src/main/java/org/apache/easyant/tasks/ConfigureEasyAntIvyInstance.java
+++ b/src/main/java/org/apache/easyant/tasks/ConfigureEasyAntIvyInstance.java
@@ -19,6 +19,7 @@ package org.apache.easyant.tasks;
import java.io.File;
import java.net.URL;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -66,9 +67,7 @@ public class ConfigureEasyAntIvyInstance extends Task {
public void setBuildConfiguration(String buildConfiguration) {
String[] buildConfs = buildConfiguration.split(",");
Set<String> buildConfigurations = new HashSet<String>();
- for (String conf : buildConfs) {
- buildConfigurations.add(conf);
- }
+ Collections.addAll(buildConfigurations, buildConfs);
getEasyantConfiguration().setActiveBuildConfigurations(buildConfigurations);
}
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/34eeaeac/src/main/java/org/apache/easyant/tasks/EasyAntRunner.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/tasks/EasyAntRunner.java b/src/main/java/org/apache/easyant/tasks/EasyAntRunner.java
index 47c9acf..c83b7df 100755
--- a/src/main/java/org/apache/easyant/tasks/EasyAntRunner.java
+++ b/src/main/java/org/apache/easyant/tasks/EasyAntRunner.java
@@ -17,18 +17,19 @@
*/
package org.apache.easyant.tasks;
-import java.io.File;
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.Vector;
-
import org.apache.easyant.core.EasyAntEngine;
import org.apache.easyant.core.configuration.EasyAntConfiguration;
import org.apache.easyant.core.configuration.EasyantConfigurationFactory;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
+import java.io.File;
+import java.net.URL;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.Vector;
+
public class EasyAntRunner extends Task {
private boolean fork = true;
@@ -42,7 +43,7 @@ public class EasyAntRunner extends Task {
eaEngine.doBuild();
} else {
eaEngine.configureEasyAnt(getProject());
- eaEngine.loadProject(getProject());;
+ eaEngine.loadProject(getProject());
getProject().executeTargets(new Vector(getEasyantConfiguration().getTargets()));
}
}
@@ -85,9 +86,7 @@ public class EasyAntRunner extends Task {
public void setBuildConfiguration(String buildConfiguration) {
String[] buildConfs = buildConfiguration.split(",");
Set<String> buildConfigurations = new HashSet<String>();
- for (String conf : buildConfs) {
- buildConfigurations.add(conf);
- }
+ Collections.addAll(buildConfigurations, buildConfs);
getEasyantConfiguration().setActiveBuildConfigurations(buildConfigurations);
}
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/34eeaeac/src/main/java/org/apache/easyant/tasks/ImportAntscripts.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/tasks/ImportAntscripts.java b/src/main/java/org/apache/easyant/tasks/ImportAntscripts.java
index 4637104..18fc375 100644
--- a/src/main/java/org/apache/easyant/tasks/ImportAntscripts.java
+++ b/src/main/java/org/apache/easyant/tasks/ImportAntscripts.java
@@ -17,19 +17,6 @@
*/
package org.apache.easyant.tasks;
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
import org.apache.ivy.Ivy;
import org.apache.ivy.ant.AntMessageLogger;
import org.apache.ivy.core.cache.DefaultRepositoryCacheManager;
@@ -62,9 +49,16 @@ import org.apache.tools.ant.taskdefs.ImportTask;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.Path.PathElement;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.text.ParseException;
+import java.util.*;
+
/**
* EXPERIMENTAL, IT IS NOT INTENDED FOR PUBLIC USE
- * <p>
+ * <p/>
* An Ant task which resolve some build scripts and import them
*/
public class ImportAntscripts extends Task {
@@ -236,7 +230,7 @@ public class ImportAntscripts extends Task {
}
private List<ArtifactDownloadReport> sortArtifacts(Ivy ivy, ArtifactDownloadReport[] artifacts,
- List<ModuleDescriptor> dependencies) {
+ List<ModuleDescriptor> dependencies) {
// first lets map the artifacts to their id
Map<ModuleRevisionId, List<ArtifactDownloadReport>> artifactsById = new HashMap<ModuleRevisionId, List<ArtifactDownloadReport>>();
for (ArtifactDownloadReport artifact : artifacts) {
@@ -271,7 +265,6 @@ public class ImportAntscripts extends Task {
}
/**
- *
* @return the ivy instance corresponding to the ivysettings.xml provided by the end user
*/
private Ivy getExternalIvy() {
@@ -346,7 +339,7 @@ public class ImportAntscripts extends Task {
*/
private ResolveReport resolve(Ivy ivy, ModuleDescriptor md, String conf) {
ResolveOptions options = new ResolveOptions();
- options.setConfs(new String[] { conf });
+ options.setConfs(new String[]{conf});
ResolveReport report;
try {
report = ivy.resolve(md, options);
@@ -467,7 +460,7 @@ public class ImportAntscripts extends Task {
RetrieveOptions options = new RetrieveOptions();
options.setSync(false);
options.setResolveId(resolve.getResolveId());
- options.setConfs(new String[] { conf });
+ options.setConfs(new String[]{conf});
options.setDestIvyPattern("${easyant.localrepo.basedir}/[organization]/[module]/[revision]/ivy.xml");
try {
ivy.retrieve(md.getModuleRevisionId(),
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/34eeaeac/src/main/java/org/apache/easyant/tasks/RegisterArtifact.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/tasks/RegisterArtifact.java b/src/main/java/org/apache/easyant/tasks/RegisterArtifact.java
index e5621c0..6b7d630 100644
--- a/src/main/java/org/apache/easyant/tasks/RegisterArtifact.java
+++ b/src/main/java/org/apache/easyant/tasks/RegisterArtifact.java
@@ -60,9 +60,9 @@ public class RegisterArtifact extends IvyPostResolveTask {
for (String configuration : configurations) {
if ("*".equals(configuration)) {
String[] declaredConfs = md.getConfigurationsNames();
- for (int j = 0; j < declaredConfs.length; j++) {
- artifact.addConfiguration(declaredConfs[j]);
- md.addArtifact(declaredConfs[j], artifact);
+ for (String declaredConf : declaredConfs) {
+ artifact.addConfiguration(declaredConf);
+ md.addArtifact(declaredConf, artifact);
}
} else {
// create configuration if it doesn't exist
[3/6] ant-easyant-core git commit: use stringbuilder instead of
stringbuffer use string concatenation when no string builder is necessary
(compiler will do it for us, and it makes our code easier to read)
Posted by jl...@apache.org.
use stringbuilder instead of stringbuffer
use string concatenation when no string builder is necessary (compiler will do it for us, and it makes our code easier to read)
Project: http://git-wip-us.apache.org/repos/asf/ant-easyant-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-easyant-core/commit/dee60069
Tree: http://git-wip-us.apache.org/repos/asf/ant-easyant-core/tree/dee60069
Diff: http://git-wip-us.apache.org/repos/asf/ant-easyant-core/diff/dee60069
Branch: refs/heads/master
Commit: dee60069781a95747f6b63af929ee908a5d00828
Parents: e031538
Author: Jean-Louis Boudart <je...@gmail.com>
Authored: Mon Nov 24 23:52:56 2014 +0100
Committer: Jean-Louis Boudart <je...@gmail.com>
Committed: Mon Nov 24 23:52:56 2014 +0100
----------------------------------------------------------------------
.../org/apache/easyant/core/EasyAntMain.java | 7 +--
.../apache/easyant/core/ant/ProjectUtils.java | 48 +++++++-------------
.../ant/listerners/DefaultEasyAntLogger.java | 4 +-
.../core/ant/listerners/MultiModuleLogger.java | 4 +-
.../core/report/XMLEasyAntReportWriter.java | 16 +------
.../org/apache/easyant/tasks/BindTarget.java | 15 ++----
.../tasks/IvyDependencyUpdateChecker.java | 12 +----
.../easyant/tasks/PluginUpdateChecker.java | 11 +----
.../org/apache/easyant/tasks/SubModule.java | 14 +-----
.../AbstractFindClassPathStrategy.java | 7 +--
.../apache/easyant/core/EasyAntBaseTest.java | 26 +++++------
.../apache/easyant/tasks/AntTestListener.java | 2 +-
12 files changed, 47 insertions(+), 119 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/dee60069/src/main/java/org/apache/easyant/core/EasyAntMain.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/core/EasyAntMain.java b/src/main/java/org/apache/easyant/core/EasyAntMain.java
index 7c91c6f..cd818b8 100755
--- a/src/main/java/org/apache/easyant/core/EasyAntMain.java
+++ b/src/main/java/org/apache/easyant/core/EasyAntMain.java
@@ -734,12 +734,7 @@ public class EasyAntMain implements AntMain {
}
props.load(in);
- StringBuilder msg = new StringBuilder();
- msg.append("Apache Ant version ");
- msg.append(props.getProperty("VERSION"));
- msg.append(" compiled on ");
- msg.append(props.getProperty("DATE"));
- antVersion = msg.toString();
+ antVersion = "Apache Ant version " + props.getProperty("VERSION") + " compiled on " + props.getProperty("DATE");
} catch (IOException ioe) {
throw new BuildException("Could not load the version information", ioe);
} finally {
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/dee60069/src/main/java/org/apache/easyant/core/ant/ProjectUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/core/ant/ProjectUtils.java b/src/main/java/org/apache/easyant/core/ant/ProjectUtils.java
index d801337..fce22f5 100644
--- a/src/main/java/org/apache/easyant/core/ant/ProjectUtils.java
+++ b/src/main/java/org/apache/easyant/core/ant/ProjectUtils.java
@@ -17,27 +17,19 @@
*/
package org.apache.easyant.core.ant;
+import org.apache.easyant.core.EasyAntMagicNames;
+import org.apache.easyant.core.ant.listerners.MultiModuleLogger;
+import org.apache.tools.ant.*;
+import org.apache.tools.ant.util.ClasspathUtils;
+
import java.io.File;
import java.io.PrintStream;
import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.Map;
-import org.apache.easyant.core.EasyAntMagicNames;
-import org.apache.easyant.core.ant.listerners.MultiModuleLogger;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.BuildListener;
-import org.apache.tools.ant.BuildLogger;
-import org.apache.tools.ant.DefaultLogger;
-import org.apache.tools.ant.Location;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.ProjectHelper;
-import org.apache.tools.ant.Target;
-import org.apache.tools.ant.util.ClasspathUtils;
-
/**
* Utilitary class to manipulate ant's project (such as creating toplevel target)
- *
*/
public class ProjectUtils {
@@ -48,7 +40,7 @@ public class ProjectUtils {
/**
* emulates a top level target
- *
+ *
* @return a top level target
*/
public static Target createTopLevelTarget() {
@@ -60,7 +52,7 @@ public class ProjectUtils {
/**
* Emulate an empty project import task check that projectHelper is at toplevel by checking the size of
* projectHelper.getImportTask()
- *
+ *
* @return a temporary file acting as a mainscript
*/
public static File emulateMainScript(Project project) {
@@ -69,11 +61,9 @@ public class ProjectUtils {
/**
* Replace main logger implementation
- *
- * @param project
- * a given project
- * @param logger
- * {@link BuildLogger} implementation to use
+ *
+ * @param project a given project
+ * @param logger {@link BuildLogger} implementation to use
*/
public static void replaceMainLogger(Project project, BuildLogger logger) {
// Change the default output logger
@@ -118,9 +108,8 @@ public class ProjectUtils {
/**
* Install multi module logger Multi module logger specified through {@link EasyAntMagicNames}.MULTIMODULE_LOGGER
* property. If this property is not set use default implementation
- *
- * @param project
- * a given project where multi module logger should be installed
+ *
+ * @param project a given project where multi module logger should be installed
*/
public static void installMultiModuleLogger(Project project) {
String multiModuleLoggerClassName = project.getProperty(EasyAntMagicNames.MULTIMODULE_LOGGER);
@@ -134,9 +123,8 @@ public class ProjectUtils {
/**
* Print memory details
- *
- * @param project
- * a given project
+ *
+ * @param project a given project
*/
public static void printMemoryDetails(Project project) {
project.log("---- Memory Details ----");
@@ -150,15 +138,13 @@ public class ProjectUtils {
/**
* Targets in imported files with a project name and not overloaded by the main build file will be in the target map
* twice. This method removes the duplicate target.
- *
- * @param targets
- * the targets to filter.
+ *
+ * @param targets the targets to filter.
* @return the filtered targets.
*/
public static Map<String, Target> removeDuplicateTargets(Map<?, ?> targets) {
Map<Location, Target> locationMap = new HashMap<Location, Target>();
- for (Map.Entry<?, ?> entry1 : targets.entrySet()) {
- Map.Entry<?, ?> entry = (Map.Entry<?, ?>) entry1;
+ for (Map.Entry<?, ?> entry : targets.entrySet()) {
String name = (String) entry.getKey();
Target target = (Target) entry.getValue();
Target otherTarget = locationMap.get(target.getLocation());
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/dee60069/src/main/java/org/apache/easyant/core/ant/listerners/DefaultEasyAntLogger.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/core/ant/listerners/DefaultEasyAntLogger.java b/src/main/java/org/apache/easyant/core/ant/listerners/DefaultEasyAntLogger.java
index fd88da8..77c011a 100644
--- a/src/main/java/org/apache/easyant/core/ant/listerners/DefaultEasyAntLogger.java
+++ b/src/main/java/org/apache/easyant/core/ant/listerners/DefaultEasyAntLogger.java
@@ -34,7 +34,7 @@ public class DefaultEasyAntLogger extends NoBannerLogger {
private long startTime = System.currentTimeMillis();
- protected static void throwableMessage(StringBuffer m, Throwable error, boolean verbose) {
+ protected static void throwableMessage(StringBuilder m, Throwable error, boolean verbose) {
while (error != null) {
Throwable cause = error.getCause();
@@ -73,7 +73,7 @@ public class DefaultEasyAntLogger extends NoBannerLogger {
@Override
public void buildFinished(BuildEvent event) {
Throwable error = event.getException();
- StringBuffer message = new StringBuffer();
+ StringBuilder message = new StringBuilder();
if (error == null) {
message.append(StringUtils.LINE_SEP);
message.append(getBuildSuccessfulMessage());
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/dee60069/src/main/java/org/apache/easyant/core/ant/listerners/MultiModuleLogger.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/core/ant/listerners/MultiModuleLogger.java b/src/main/java/org/apache/easyant/core/ant/listerners/MultiModuleLogger.java
index 1ee4619..6df22a6 100644
--- a/src/main/java/org/apache/easyant/core/ant/listerners/MultiModuleLogger.java
+++ b/src/main/java/org/apache/easyant/core/ant/listerners/MultiModuleLogger.java
@@ -184,9 +184,7 @@ public class MultiModuleLogger extends DefaultEasyAntLogger implements SubBuildL
private void printExecutionSubBuildsExecutionTimes(Project project) {
List<ExecutionResult> allSubBuildResults = project.getReference(EXECUTION_TIMER_BUILD_RESULTS);
if (allSubBuildResults != null && !allSubBuildResults.isEmpty()) {
- StringBuilder sb = new StringBuilder();
- sb.append(LINE_SEP).append("Project Sub-modules Summary: ").append(LINE_SEP).append(formatExecutionResults(allSubBuildResults));
- project.log(sb.toString());
+ project.log(LINE_SEP + "Project Sub-modules Summary: " + LINE_SEP + formatExecutionResults(allSubBuildResults));
}
}
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/dee60069/src/main/java/org/apache/easyant/core/report/XMLEasyAntReportWriter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/core/report/XMLEasyAntReportWriter.java b/src/main/java/org/apache/easyant/core/report/XMLEasyAntReportWriter.java
index 8482240..9f2c910 100644
--- a/src/main/java/org/apache/easyant/core/report/XMLEasyAntReportWriter.java
+++ b/src/main/java/org/apache/easyant/core/report/XMLEasyAntReportWriter.java
@@ -84,19 +84,7 @@ public class XMLEasyAntReportWriter {
out.println("\t<configurations>");
for (Configuration configuration : easyAntReport.getModuleDescriptor().getConfigurations()) {
- StringBuilder sb = new StringBuilder();
- sb.append("\t\t<configuration name=\"");
- sb.append(XMLHelper.escape(configuration.getName()));
- sb.append("\" description=\"");
- sb.append(XMLHelper.escape(configuration.getDescription()));
- sb.append("\" extends=\"");
- sb.append(XMLHelper.escape(Arrays.toString(configuration.getExtends())));
- sb.append("\" deprecated=\"");
- sb.append(XMLHelper.escape(configuration.getDeprecated()));
- sb.append("\" visibility=\"");
- sb.append(XMLHelper.escape(configuration.getVisibility().toString()));
- sb.append("\"/>");
- out.println(sb.toString());
+ out.println("\t\t<configuration name=\"" + XMLHelper.escape(configuration.getName()) + "\" description=\"" + XMLHelper.escape(configuration.getDescription()) + "\" extends=\"" + XMLHelper.escape(Arrays.toString(configuration.getExtends())) + "\" deprecated=\"" + XMLHelper.escape(configuration.getDeprecated()) + "\" visibility=\"" + XMLHelper.escape(configuration.getVisibility().toString()) + "\"/>");
}
out.println("\t</configurations>");
@@ -374,7 +362,7 @@ public class XMLEasyAntReportWriter {
parameterReports = easyAntReport.getParameterReportsFromCurrentModule();
}
for (ParameterReport paramReport : parameterReports) {
- StringBuffer param = new StringBuffer();
+ StringBuilder param = new StringBuilder();
if (!ParameterType.PROPERTY.equals(paramReport.getType())) {
if (ParameterType.PATH.equals(paramReport.getType())) {
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/dee60069/src/main/java/org/apache/easyant/tasks/BindTarget.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/tasks/BindTarget.java b/src/main/java/org/apache/easyant/tasks/BindTarget.java
index d49c806..6653be2 100644
--- a/src/main/java/org/apache/easyant/tasks/BindTarget.java
+++ b/src/main/java/org/apache/easyant/tasks/BindTarget.java
@@ -17,14 +17,10 @@
*/
package org.apache.easyant.tasks;
-import java.util.Enumeration;
-
import org.apache.easyant.core.BuildConfigurationHelper;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.ExtensionPoint;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.apache.tools.ant.Task;
+import org.apache.tools.ant.*;
+
+import java.util.Enumeration;
public class BindTarget extends Task {
@@ -34,10 +30,9 @@ public class BindTarget extends Task {
private String buildConfigurations;
public void execute() throws BuildException {
- StringBuilder message = new StringBuilder();
- message.append("extension-point mapping for target ").append(getTarget()).append(" ");
+ String message = "extension-point mapping for target " + getTarget();
if (!BuildConfigurationHelper.isBuildConfigurationActive(getBuildConfigurations(), getProject(),
- message.toString())) {
+ message)) {
log("no matching build configuration for this extension-point mapping, this mapping will be ignored",
Project.MSG_DEBUG);
return;
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/dee60069/src/main/java/org/apache/easyant/tasks/IvyDependencyUpdateChecker.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/tasks/IvyDependencyUpdateChecker.java b/src/main/java/org/apache/easyant/tasks/IvyDependencyUpdateChecker.java
index 8caeb1c..f3d21ad 100644
--- a/src/main/java/org/apache/easyant/tasks/IvyDependencyUpdateChecker.java
+++ b/src/main/java/org/apache/easyant/tasks/IvyDependencyUpdateChecker.java
@@ -107,17 +107,7 @@ public class IvyDependencyUpdateChecker extends IvyPostResolveTask {
// .isTranstive() methods doesn't have the same meaning)
boolean isTransitiveDependency = latest.getDependencyDescriptor(latest.getRoot()) == null;
if ((!isTransitiveDependency) || (isTransitiveDependency && showTransitive)) {
- StringBuilder sb = new StringBuilder();
- sb.append("\t")//
- .append(originalDependency.getResolvedId().getOrganisation()) //
- .append('#')//
- .append(originalDependency.getResolvedId().getName())//
- .append(isTransitiveDependency ? " (transitive)" : "") //
- .append("\t")//
- .append(originalDependency.getResolvedId().getRevision())//
- .append(" -> ")//
- .append(latest.getResolvedId().getRevision());
- log(sb.toString());
+ log("\t" + originalDependency.getResolvedId().getOrganisation() + '#' + originalDependency.getResolvedId().getName() + (isTransitiveDependency ? " (transitive)" : "") + "\t" + originalDependency.getResolvedId().getRevision() + " -> " + latest.getResolvedId().getRevision());
dependencyUpdateDetected = true;
}
}
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/dee60069/src/main/java/org/apache/easyant/tasks/PluginUpdateChecker.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/tasks/PluginUpdateChecker.java b/src/main/java/org/apache/easyant/tasks/PluginUpdateChecker.java
index 6e50048..c9cb898 100644
--- a/src/main/java/org/apache/easyant/tasks/PluginUpdateChecker.java
+++ b/src/main/java/org/apache/easyant/tasks/PluginUpdateChecker.java
@@ -86,16 +86,7 @@ public class PluginUpdateChecker extends AbstractEasyAntTask {
String resolvedRevision = report.getModuleDescriptor().getDependencies()[0].getDependencyRevisionId()
.getRevision();
if (!resolvedRevision.equals(moduleRevisionId.getRevision())) {
- StringBuilder sb = new StringBuilder();
- sb.append("\t")//
- .append(moduleRevisionId.getOrganisation()) //
- .append('#')//
- .append(moduleRevisionId.getName())//
- .append("\t")//
- .append(moduleRevisionId.getRevision())//
- .append(" -> ")//
- .append(resolvedRevision);
- log(sb.toString());
+ log("\t" + moduleRevisionId.getOrganisation() + '#' + moduleRevisionId.getName() + "\t" + moduleRevisionId.getRevision() + " -> " + resolvedRevision);
pluginUpdateDetected=true;
}
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/dee60069/src/main/java/org/apache/easyant/tasks/SubModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/tasks/SubModule.java b/src/main/java/org/apache/easyant/tasks/SubModule.java
index 3144ef6..987dcfd 100644
--- a/src/main/java/org/apache/easyant/tasks/SubModule.java
+++ b/src/main/java/org/apache/easyant/tasks/SubModule.java
@@ -315,13 +315,7 @@ public class SubModule extends AbstractEasyAntTask {
if (keys.contains(target)) {
filteredTargets.add(target);
} else {
- StringBuilder sb = new StringBuilder();
- sb.append("Skipping undefined target '")//
- .append(target)//
- .append("'")//
- .append(" on ")//
- .append(subProject.getName());
- subProject.log(sb.toString(), Project.MSG_VERBOSE);
+ subProject.log("Skipping undefined target '" + target + "'" + " on " + subProject.getName(), Project.MSG_VERBOSE);
}
}
return CollectionUtils.flattenToString(filteredTargets);
@@ -334,11 +328,7 @@ public class SubModule extends AbstractEasyAntTask {
*/
private void printExecutingTargetMsg(Project subProject) {
final String HEADER = "======================================================================";
- StringBuilder sb = new StringBuilder();
- sb.append(HEADER).append(StringUtils.LINE_SEP);
- sb.append("Executing ").append(targets).append(" on ").append(subProject.getName());
- sb.append(StringUtils.LINE_SEP).append(HEADER);
- subProject.log(sb.toString());
+ subProject.log(HEADER + StringUtils.LINE_SEP + "Executing " + targets + " on " + subProject.getName() + StringUtils.LINE_SEP + HEADER);
}
/**
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/dee60069/src/main/java/org/apache/easyant/tasks/findclasspath/AbstractFindClassPathStrategy.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/tasks/findclasspath/AbstractFindClassPathStrategy.java b/src/main/java/org/apache/easyant/tasks/findclasspath/AbstractFindClassPathStrategy.java
index 93a2a24..6dc3346 100644
--- a/src/main/java/org/apache/easyant/tasks/findclasspath/AbstractFindClassPathStrategy.java
+++ b/src/main/java/org/apache/easyant/tasks/findclasspath/AbstractFindClassPathStrategy.java
@@ -63,12 +63,7 @@ public abstract class AbstractFindClassPathStrategy extends DataType {
* ivy instance reference
*/
protected void loadCachePath(String organisation, String module, String revision, String conf, Reference ivyRef) {
- StringBuilder sb = new StringBuilder();
- sb.append("Building classpath (").append(getPathid()).append(")");
- sb.append(" with ");
- sb.append(organisation).append("#").append(module).append(";").append(revision);
- sb.append(" conf=").append(conf);
- log(sb.toString(), Project.MSG_DEBUG);
+ log("Building classpath (" + getPathid() + ")" + " with " + organisation + "#" + module + ";" + revision + " conf=" + conf, Project.MSG_DEBUG);
IvyCachePath pluginCachePath = new IvyCachePath();
pluginCachePath.setOrganisation(organisation);
pluginCachePath.setModule(module);
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/dee60069/src/test/java/org/apache/easyant/core/EasyAntBaseTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/easyant/core/EasyAntBaseTest.java b/src/test/java/org/apache/easyant/core/EasyAntBaseTest.java
index 2545077..b4b1a44 100755
--- a/src/test/java/org/apache/easyant/core/EasyAntBaseTest.java
+++ b/src/test/java/org/apache/easyant/core/EasyAntBaseTest.java
@@ -52,10 +52,10 @@ public abstract class EasyAntBaseTest {
protected Project project;
protected EasyAntConfiguration conf;
- private StringBuffer logBuffer;
- private StringBuffer fullLogBuffer;
- private StringBuffer outBuffer;
- private StringBuffer errBuffer;
+ private StringBuilder logBuffer;
+ private StringBuilder fullLogBuffer;
+ private StringBuilder outBuffer;
+ private StringBuilder errBuffer;
private BuildException buildException;
@Rule
@@ -276,7 +276,7 @@ public abstract class EasyAntBaseTest {
return buildException;
}
- private String cleanBuffer(StringBuffer buffer) {
+ private String cleanBuffer(StringBuilder buffer) {
StringBuilder cleanedBuffer = new StringBuilder();
for (int i = 0; i < buffer.length(); i++) {
char ch = buffer.charAt(i);
@@ -403,8 +403,8 @@ public abstract class EasyAntBaseTest {
throw new RuntimeException("You must call the configureProject method before initProject()");
}
// Flush the buffer
- logBuffer = new StringBuffer();
- fullLogBuffer = new StringBuffer();
+ logBuffer = new StringBuilder();
+ fullLogBuffer = new StringBuilder();
// init the new project instance
project = new Project();
project.addBuildListener(new AntTestListener(conf.getMsgOutputLevel()));
@@ -426,14 +426,14 @@ public abstract class EasyAntBaseTest {
try {
sysOut.flush();
sysErr.flush();
- outBuffer = new StringBuffer();
+ outBuffer = new StringBuilder();
PrintStream out = new PrintStream(new AntOutputStream(outBuffer));
System.setOut(out);
- errBuffer = new StringBuffer();
+ errBuffer = new StringBuilder();
PrintStream err = new PrintStream(new AntOutputStream(errBuffer));
System.setErr(err);
- logBuffer = new StringBuffer();
- fullLogBuffer = new StringBuffer();
+ logBuffer = new StringBuilder();
+ fullLogBuffer = new StringBuilder();
buildException = null;
project.executeTarget(targetName);
} finally {
@@ -601,9 +601,9 @@ public abstract class EasyAntBaseTest {
* an output stream which saves stuff to our buffer.
*/
private static class AntOutputStream extends java.io.OutputStream {
- private StringBuffer buffer;
+ private StringBuilder buffer;
- public AntOutputStream(StringBuffer buffer) {
+ public AntOutputStream(StringBuilder buffer) {
this.buffer = buffer;
}
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/dee60069/src/test/java/org/apache/easyant/tasks/AntTestListener.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/easyant/tasks/AntTestListener.java b/src/test/java/org/apache/easyant/tasks/AntTestListener.java
index 939b1ee..29b42eb 100644
--- a/src/test/java/org/apache/easyant/tasks/AntTestListener.java
+++ b/src/test/java/org/apache/easyant/tasks/AntTestListener.java
@@ -29,7 +29,7 @@ public class AntTestListener implements BuildListener {
private int logLevel;
- private StringBuffer buildLog = new StringBuffer();
+ private StringBuilder buildLog = new StringBuilder();
/**
* Constructs a test listener which will ignore log events above the given level.
[4/6] ant-easyant-core git commit: use isEmpty
Posted by jl...@apache.org.
use isEmpty
Project: http://git-wip-us.apache.org/repos/asf/ant-easyant-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-easyant-core/commit/370e5b4b
Tree: http://git-wip-us.apache.org/repos/asf/ant-easyant-core/tree/370e5b4b
Diff: http://git-wip-us.apache.org/repos/asf/ant-easyant-core/diff/370e5b4b
Branch: refs/heads/master
Commit: 370e5b4bdf779bb0116183f044ebcd14803a82e2
Parents: dee6006
Author: Jean-Louis Boudart <je...@gmail.com>
Authored: Mon Nov 24 23:54:51 2014 +0100
Committer: Jean-Louis Boudart <je...@gmail.com>
Committed: Tue Nov 25 00:13:25 2014 +0100
----------------------------------------------------------------------
.../org/apache/easyant/core/EasyAntEngine.java | 6 +-
.../org/apache/easyant/core/EasyAntMain.java | 160 +++++++------------
.../easyant/core/ant/MetaBuildExecutor.java | 10 +-
.../core/ant/helper/EasyAntProjectHelper.java | 60 +++----
.../org/apache/easyant/man/ListParameters.java | 8 +-
.../java/org/apache/easyant/man/ListProps.java | 10 +-
.../org/apache/easyant/tasks/CheckResolver.java | 19 +--
.../easyant/tasks/CoreRevisionCheckerTask.java | 19 ++-
.../tasks/IvyDependencyUpdateChecker.java | 15 +-
.../org/apache/easyant/tasks/LoadModule.java | 43 ++---
.../org/apache/easyant/tasks/ParameterTask.java | 51 +++---
11 files changed, 155 insertions(+), 246 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/370e5b4b/src/main/java/org/apache/easyant/core/EasyAntEngine.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/core/EasyAntEngine.java b/src/main/java/org/apache/easyant/core/EasyAntEngine.java
index 537fad7..1ea1199 100755
--- a/src/main/java/org/apache/easyant/core/EasyAntEngine.java
+++ b/src/main/java/org/apache/easyant/core/EasyAntEngine.java
@@ -24,8 +24,8 @@ import org.apache.easyant.core.configuration.EasyantConfigurationFactory;
import org.apache.easyant.core.descriptor.PluginDescriptor;
import org.apache.easyant.core.ivy.InheritableScope;
import org.apache.easyant.core.ivy.IvyInstanceHelper;
-import org.apache.easyant.core.services.PluginService;
import org.apache.easyant.core.services.DefaultPluginService;
+import org.apache.easyant.core.services.PluginService;
import org.apache.easyant.tasks.ConfigureBuildScopedRepository;
import org.apache.easyant.tasks.Import;
import org.apache.easyant.tasks.LoadModule;
@@ -396,7 +396,7 @@ public class EasyAntEngine {
configurePluginService(project, easyantIvySettings);
// Profile
- if (configuration.getActiveBuildConfigurations().size() != 0) {
+ if (!configuration.getActiveBuildConfigurations().isEmpty()) {
String buildConfigurations = null;
for (String conf : configuration.getActiveBuildConfigurations()) {
if (buildConfigurations == null) {
@@ -456,7 +456,7 @@ public class EasyAntEngine {
}
public void loadSystemPlugins(Project project, boolean isRootProject) {
- if (isRootProject && configuration.getSystemPlugins().size() > 0) {
+ if (isRootProject && !configuration.getSystemPlugins().isEmpty()) {
project.log("Loading System Plugins...");
}
for (PluginDescriptor systemPlugin : configuration.getSystemPlugins()) {
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/370e5b4b/src/main/java/org/apache/easyant/core/EasyAntMain.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/core/EasyAntMain.java b/src/main/java/org/apache/easyant/core/EasyAntMain.java
index cd818b8..8a6db9d 100755
--- a/src/main/java/org/apache/easyant/core/EasyAntMain.java
+++ b/src/main/java/org/apache/easyant/core/EasyAntMain.java
@@ -17,48 +17,18 @@
*/
package org.apache.easyant.core;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.GnuParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.*;
import org.apache.easyant.core.ant.ProjectUtils;
import org.apache.easyant.core.configuration.EasyAntConfiguration;
import org.apache.easyant.core.configuration.EasyantConfigurationFactory;
-import org.apache.easyant.man.Describe;
-import org.apache.easyant.man.EasyantOption;
-import org.apache.easyant.man.ListExtensionPoints;
-import org.apache.easyant.man.ListParameters;
-import org.apache.easyant.man.ListPlugins;
-import org.apache.easyant.man.ListProps;
-import org.apache.easyant.man.ListTargets;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Diagnostics;
-import org.apache.tools.ant.ExitStatusException;
-import org.apache.tools.ant.ExtensionPoint;
-import org.apache.tools.ant.Main;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
+import org.apache.easyant.man.*;
+import org.apache.tools.ant.*;
import org.apache.tools.ant.launch.AntMain;
import org.apache.tools.ant.util.FileUtils;
+import java.io.*;
+import java.util.*;
+
/**
* Command line entry point into EasyAnt. This class is entered via the canonical `public static void main` entry point
* and reads the command line arguments. It then assembles and executes an Ant project.
@@ -73,6 +43,7 @@ public class EasyAntMain implements AntMain {
*/
private static final Set<String> LAUNCH_COMMANDS = new HashSet<String>();
private boolean isLogFileUsed;
+
static {
LAUNCH_COMMANDS.add("-lib");
LAUNCH_COMMANDS.add("-cp");
@@ -81,6 +52,7 @@ public class EasyAntMain implements AntMain {
LAUNCH_COMMANDS.add("-nouserlib");
LAUNCH_COMMANDS.add("-main");
}
+
private EasyAntConfiguration easyAntConfiguration;
private boolean projectHelp;
@@ -94,9 +66,8 @@ public class EasyAntMain implements AntMain {
/**
* Prints the message of the Throwable if it (the message) is not <code>null</code>.
- *
- * @param t
- * Throwable to print the message of. Must not be <code>null</code>.
+ *
+ * @param t Throwable to print the message of. Must not be <code>null</code>.
*/
private static void printMessage(Throwable t) {
String message = t.getMessage();
@@ -108,15 +79,12 @@ public class EasyAntMain implements AntMain {
/**
* Creates a new instance of this class using the arguments specified, gives it any extra user properties which have
* been specified, and then runs the build using the classloader provided.
- *
- * @param args
- * Command line arguments. Must not be <code>null</code>.
- * @param additionalUserProperties
- * Any extra properties to use in this build. May be <code>null</code>, which is the equivalent to
- * passing in an empty set of properties.
- * @param coreLoader
- * Classloader used for core classes. May be <code>null</code> in which case the system classloader is
- * used.
+ *
+ * @param args Command line arguments. Must not be <code>null</code>.
+ * @param additionalUserProperties Any extra properties to use in this build. May be <code>null</code>, which is the equivalent to
+ * passing in an empty set of properties.
+ * @param coreLoader Classloader used for core classes. May be <code>null</code> in which case the system classloader is
+ * used.
*/
public static void start(String[] args, Properties additionalUserProperties, ClassLoader coreLoader) {
EasyAntMain m = new EasyAntMain();
@@ -125,14 +93,10 @@ public class EasyAntMain implements AntMain {
/**
* Start Ant
- *
- * @param args
- * command line args
- * @param additionalUserProperties
- * properties to set beyond those that may be specified on the args list
- * @param coreLoader
- * - not used
- *
+ *
+ * @param args command line args
+ * @param additionalUserProperties properties to set beyond those that may be specified on the args list
+ * @param coreLoader - not used
* @since Ant 1.6
*/
public void startAnt(String[] args, Properties additionalUserProperties, ClassLoader coreLoader) {
@@ -188,9 +152,8 @@ public class EasyAntMain implements AntMain {
/**
* This operation is expected to call {@link System#exit(int)}, which is what the base version does. However, it is
* possible to do something else.
- *
- * @param exitCode
- * code to exit with
+ *
+ * @param exitCode code to exit with
*/
protected void exit(int exitCode) {
System.exit(exitCode);
@@ -198,7 +161,7 @@ public class EasyAntMain implements AntMain {
/**
* Close logfiles, if we have been writing to them.
- *
+ *
* @since Ant 1.6
*/
private void handleLogfile() {
@@ -211,9 +174,8 @@ public class EasyAntMain implements AntMain {
/**
* Command line entry point. This method kicks off the building of a project object and executes a build using
* either a given target or the default target.
- *
- * @param args
- * Command line arguments. Must not be <code>null</code>.
+ *
+ * @param args Command line arguments. Must not be <code>null</code>.
*/
public static void main(String[] args) {
start(args, null, null);
@@ -229,7 +191,7 @@ public class EasyAntMain implements AntMain {
/**
* Process command line arguments. When ant is started from Launcher, launcher-only arguments do not get passed
* through to this routine.
- *
+ *
* @since Ant 1.6
*/
private void processArgs(CommandLine line) {
@@ -372,7 +334,7 @@ public class EasyAntMain implements AntMain {
if (line.hasOption("autoproxy")) {
easyAntConfiguration.setProxy(true);
}
- if (line.getArgList().size() > 0) {
+ if (!line.getArgList().isEmpty()) {
for (Object o : line.getArgList()) {
String target = (String) o;
easyAntConfiguration.getTargets().add(target);
@@ -395,7 +357,9 @@ public class EasyAntMain implements AntMain {
// other methods
// --------------------------------------------------------
- /** Load the property files specified by -propertyfile */
+ /**
+ * Load the property files specified by -propertyfile
+ */
private void loadPropertyFiles() {
for (String filename : propertyFiles) {
Properties props = new Properties();
@@ -423,9 +387,8 @@ public class EasyAntMain implements AntMain {
/**
* Executes the build. If the constructor for this instance failed (e.g. returned after issuing a warning), this
* method returns immediately.
- *
- * @exception BuildException
- * if the build fails
+ *
+ * @throws BuildException if the build fails
*/
private void runBuild(CommandLine line) throws BuildException {
if (!readyToRun) {
@@ -456,9 +419,8 @@ public class EasyAntMain implements AntMain {
/**
* Prints the description of a project (if there is one) to <code>System.out</code>.
- *
- * @param project
- * The project to display a description of. Must not be <code>null</code>.
+ *
+ * @param project The project to display a description of. Must not be <code>null</code>.
*/
protected void printDescription(Project project) {
if (project.getDescription() != null) {
@@ -468,12 +430,9 @@ public class EasyAntMain implements AntMain {
/**
* Searches for the correct place to insert a name into a list so as to keep the list sorted alphabetically.
- *
- * @param names
- * The current list of names. Must not be <code>null</code>.
- * @param name
- * The name to find a place for. Must not be <code>null</code>.
- *
+ *
+ * @param names The current list of names. Must not be <code>null</code>.
+ * @param name The name to find a place for. Must not be <code>null</code>.
* @return the correct place in the list for the given name
*/
private static int findTargetPosition(List<String> names, String name) {
@@ -488,23 +447,17 @@ public class EasyAntMain implements AntMain {
/**
* Writes a formatted list of target names to <code>System.out</code> with an optional description.
- *
- *
- * @param project
- * the project instance.
- * @param names
- * The names to be printed. Must not be <code>null</code>.
- * @param descriptions
- * The associated target descriptions. May be <code>null</code>, in which case no descriptions are
- * displayed. If non- <code>null</code>, this should have as many elements as <code>names</code>.
- * @param heading
- * The heading to display. Should not be <code>null</code>.
- * @param maxlen
- * The maximum length of the names of the targets. If descriptions are given, they are padded to this
- * position so they line up (so long as the names really <i>are</i> shorter than this).
+ *
+ * @param project the project instance.
+ * @param names The names to be printed. Must not be <code>null</code>.
+ * @param descriptions The associated target descriptions. May be <code>null</code>, in which case no descriptions are
+ * displayed. If non- <code>null</code>, this should have as many elements as <code>names</code>.
+ * @param heading The heading to display. Should not be <code>null</code>.
+ * @param maxlen The maximum length of the names of the targets. If descriptions are given, they are padded to this
+ * position so they line up (so long as the names really <i>are</i> shorter than this).
*/
private static void printTargets(Project project, List<String> names, List<String> descriptions, String heading,
- int maxlen) {
+ int maxlen) {
if (!names.isEmpty()) {
// now, start printing the targets and their descriptions
String lSep = System.getProperty("line.separator");
@@ -527,11 +480,9 @@ public class EasyAntMain implements AntMain {
/**
* Prints a list of all targets in the specified project to <code>System.out</code>, optionally including
* subtargets.
- *
- * @param project
- * The project to display a description of. Must not be <code>null</code>.
- * @param printSubTargets
- * Whether or not subtarget names should also be printed.
+ *
+ * @param project The project to display a description of. Must not be <code>null</code>.
+ * @param printSubTargets Whether or not subtarget names should also be printed.
*/
protected static void printTargets(Project project, boolean printSubTargets) {
// find the target with the longest name
@@ -576,7 +527,7 @@ public class EasyAntMain implements AntMain {
printTargets(project, topNames, topDescriptions, "Main targets:", maxLength);
// if there were no main targets, we list all subtargets
// as it means nothing has a description
- if (topNames.size() == 0) {
+ if (topNames.isEmpty()) {
printSubTargets = true;
}
if (printSubTargets) {
@@ -700,9 +651,8 @@ public class EasyAntMain implements AntMain {
/**
* Prints the EasyAnt version information to <code>System.out</code>.
- *
- * @exception BuildException
- * if the version information is unavailable
+ *
+ * @throws BuildException if the version information is unavailable
*/
private static void printVersion() throws BuildException {
System.out.println(EasyAntEngine.getEasyAntVersion());
@@ -717,11 +667,9 @@ public class EasyAntMain implements AntMain {
/**
* Returns the Ant version information, if available. Once the information has been loaded once, it's cached and
* returned from the cache on future calls.
- *
+ *
* @return the Ant version information as a String (always non- <code>null</code>)
- *
- * @exception BuildException
- * if the version information is unavailable
+ * @throws BuildException if the version information is unavailable
*/
public static synchronized String getAntVersion() throws BuildException {
if (antVersion == null) {
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/370e5b4b/src/main/java/org/apache/easyant/core/ant/MetaBuildExecutor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/core/ant/MetaBuildExecutor.java b/src/main/java/org/apache/easyant/core/ant/MetaBuildExecutor.java
index 7a68aa5..aa38d7a 100644
--- a/src/main/java/org/apache/easyant/core/ant/MetaBuildExecutor.java
+++ b/src/main/java/org/apache/easyant/core/ant/MetaBuildExecutor.java
@@ -17,10 +17,6 @@
*/
package org.apache.easyant.core.ant;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
import org.apache.easyant.core.EasyAntConstants;
import org.apache.easyant.core.EasyAntMagicNames;
import org.apache.easyant.tasks.SubModule;
@@ -31,6 +27,10 @@ import org.apache.tools.ant.helper.DefaultExecutor;
import org.apache.tools.ant.types.Reference;
import org.apache.tools.ant.util.StringUtils;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
/**
* Recursively executes build targets on sub-modules for a multi-module project.
*/
@@ -103,7 +103,7 @@ public class MetaBuildExecutor extends DefaultExecutor {
// print all sub modules and order in which they will
// be executed
String sortedModules = project.getProperty("ivy.sorted.modules");
- if (sortedModules != null && sortedModules.length() > 0) {
+ if (sortedModules != null && !sortedModules.isEmpty()) {
StringBuilder sb = new StringBuilder();
sb.append(DEMARKER).append(StringUtils.LINE_SEP);
sb.append("Build Order for Sub Modules").append(StringUtils.LINE_SEP);
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/370e5b4b/src/main/java/org/apache/easyant/core/ant/helper/EasyAntProjectHelper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/core/ant/helper/EasyAntProjectHelper.java b/src/main/java/org/apache/easyant/core/ant/helper/EasyAntProjectHelper.java
index 7afb585..2750656 100644
--- a/src/main/java/org/apache/easyant/core/ant/helper/EasyAntProjectHelper.java
+++ b/src/main/java/org/apache/easyant/core/ant/helper/EasyAntProjectHelper.java
@@ -17,25 +17,19 @@
*/
package org.apache.easyant.core.ant.helper;
-import java.util.Map;
-
import org.apache.easyant.core.ant.Phase;
import org.apache.easyant.core.ant.ProjectUtils;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.ExtensionPoint;
-import org.apache.tools.ant.Location;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.ProjectHelper;
-import org.apache.tools.ant.Target;
+import org.apache.tools.ant.*;
import org.apache.tools.ant.helper.AntXMLContext;
import org.apache.tools.ant.helper.ProjectHelper2;
import org.apache.tools.ant.types.Resource;
import org.xml.sax.Attributes;
import org.xml.sax.SAXParseException;
+import java.util.Map;
+
/**
* This class is the custom project helper used by easyant introducing support for phase concept
- *
*/
public class EasyAntProjectHelper extends ProjectHelper2 {
@@ -58,22 +52,15 @@ public class EasyAntProjectHelper extends ProjectHelper2 {
/**
* Handles the start of a top-level element within the project. An appropriate handler is created and
* initialised with the details of the element.
- *
- * @param uri
- * The namespace URI for this element.
- * @param name
- * The name of the element being started. Will not be <code>null</code>.
- * @param qname
- * The qualified name for this element.
- * @param attrs
- * Attributes of the element being started. Will not be <code>null</code>.
- * @param context
- * The context for this element.
+ *
+ * @param uri The namespace URI for this element.
+ * @param name The name of the element being started. Will not be <code>null</code>.
+ * @param qname The qualified name for this element.
+ * @param attrs Attributes of the element being started. Will not be <code>null</code>.
+ * @param context The context for this element.
* @return a target or an element handler.
- *
- * @exception org.xml.sax.SAXParseException
- * if the tag given is not <code>"taskdef"</code>, <code>"typedef"</code>,
- * <code>"property"</code>, <code>"target"</code>, <code>"phase"</code> or a data type definition
+ * @throws org.xml.sax.SAXParseException if the tag given is not <code>"taskdef"</code>, <code>"typedef"</code>,
+ * <code>"property"</code>, <code>"target"</code>, <code>"phase"</code> or a data type definition
*/
public AntHandler onStartChild(String uri, String name, String qname, Attributes attrs, AntXMLContext context)
throws SAXParseException {
@@ -92,21 +79,14 @@ public class EasyAntProjectHelper extends ProjectHelper2 {
* Initialisation routine called after handler creation with the element name and attributes. The attributes
* which this handler can deal with are: <code>"name"</code>, <code>"depends"</code>, <code>"if"</code>,
* <code>"unless"</code>, <code>"id"</code> and <code>"description"</code>.
- *
- * @param uri
- * The namespace URI for this element.
- * @param tag
- * Name of the element which caused this handler to be created. Should not be <code>null</code>.
- * Ignored in this implementation.
- * @param qname
- * The qualified name for this element.
- * @param attrs
- * Attributes of the element which caused this handler to be created. Must not be <code>null</code>.
- * @param context
- * The current context.
- *
- * @exception SAXParseException
- * if an unexpected attribute is encountered or if the <code>"name"</code> attribute is missing.
+ *
+ * @param uri The namespace URI for this element.
+ * @param tag Name of the element which caused this handler to be created. Should not be <code>null</code>.
+ * Ignored in this implementation.
+ * @param qname The qualified name for this element.
+ * @param attrs Attributes of the element which caused this handler to be created. Must not be <code>null</code>.
+ * @param context The current context.
+ * @throws SAXParseException if an unexpected attribute is encountered or if the <code>"name"</code> attribute is missing.
*/
public void onStartElement(String uri, String tag, String qname, Attributes attrs, AntXMLContext context)
throws SAXParseException {
@@ -208,7 +188,7 @@ public class EasyAntProjectHelper extends ProjectHelper2 {
usedTarget = true;
}
- if (depends.length() > 0) {
+ if (!depends.isEmpty()) {
if (!isInIncludeMode) {
target.setDepends(depends);
} else {
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/370e5b4b/src/main/java/org/apache/easyant/man/ListParameters.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/man/ListParameters.java b/src/main/java/org/apache/easyant/man/ListParameters.java
index af5c88b..17ccb86 100644
--- a/src/main/java/org/apache/easyant/man/ListParameters.java
+++ b/src/main/java/org/apache/easyant/man/ListParameters.java
@@ -17,11 +17,11 @@
*/
package org.apache.easyant.man;
-import java.util.List;
-
import org.apache.easyant.core.report.ImportedModuleReport;
import org.apache.easyant.core.report.ParameterReport;
+import java.util.List;
+
/**
* Lists all parameters (deep search - includes all imported modules) available in the specified build module.
*/
@@ -48,7 +48,7 @@ public class ListParameters extends EasyantOption {
getProject().log(LINE_SEP + "No plugin specified. Listing all parameters available in the project.");
List<ParameterReport> parameterReports = getEareport().getParameterReports();
- if (parameterReports.size() > 0) {
+ if (!parameterReports.isEmpty()) {
printParameters(parameterReports);
} else {
@@ -64,7 +64,7 @@ public class ListParameters extends EasyantOption {
getProject().log("\tNo Module / Plugin found by given name: " + plugin);
} else {
List<ParameterReport> parameterReports = moduleRep.getEasyantReport().getParameterReports();
- if (parameterReports.size() > 0) {
+ if (!parameterReports.isEmpty()) {
printParameters(parameterReports);
} else {
getProject().log(LINE_SEP + "No parameter found in the plugin: " + plugin);
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/370e5b4b/src/main/java/org/apache/easyant/man/ListProps.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/man/ListProps.java b/src/main/java/org/apache/easyant/man/ListProps.java
index 6c66626..1ad0881 100644
--- a/src/main/java/org/apache/easyant/man/ListProps.java
+++ b/src/main/java/org/apache/easyant/man/ListProps.java
@@ -17,12 +17,12 @@
*/
package org.apache.easyant.man;
-import java.util.Map;
-import java.util.Map.Entry;
-
import org.apache.easyant.core.descriptor.PropertyDescriptor;
import org.apache.easyant.core.report.ImportedModuleReport;
+import java.util.Map;
+import java.util.Map.Entry;
+
/**
* Lists all properties (deep search - includes all imported modules) available in the specified build module.
*/
@@ -50,7 +50,7 @@ public class ListProps extends EasyantOption {
getProject().log(LINE_SEP + "No plugin specified. Listing all properties available in the project.");
Map<String, PropertyDescriptor> allProjectProps = getEareport().getPropertyDescriptors();
- if (allProjectProps.size() > 0) {
+ if (!allProjectProps.isEmpty()) {
printProperties(allProjectProps);
} else {
@@ -67,7 +67,7 @@ public class ListProps extends EasyantOption {
} else {
Map<String, PropertyDescriptor> allprops = moduleRep.getEasyantReport().getPropertyDescriptors();
- if (allprops.size() > 0) {
+ if (!allprops.isEmpty()) {
printProperties(allprops);
} else {
getProject().log(LINE_SEP + "No property found in the plugin: " + plugin);
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/370e5b4b/src/main/java/org/apache/easyant/tasks/CheckResolver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/tasks/CheckResolver.java b/src/main/java/org/apache/easyant/tasks/CheckResolver.java
index 659d1bf..008c016 100644
--- a/src/main/java/org/apache/easyant/tasks/CheckResolver.java
+++ b/src/main/java/org/apache/easyant/tasks/CheckResolver.java
@@ -22,7 +22,6 @@ import org.apache.tools.ant.BuildException;
/**
* This task is responsible of checking existance of a resolver in a given ivy instance
- *
*/
public class CheckResolver extends IvyTask {
@@ -59,7 +58,7 @@ public class CheckResolver extends IvyTask {
/**
* Get property resolver name to check
- *
+ *
* @return the property name representing the resolver
*/
public String getResolver() {
@@ -68,9 +67,8 @@ public class CheckResolver extends IvyTask {
/**
* Set the property resolver name to check
- *
- * @param resolver
- * a property name representing the resolver
+ *
+ * @param resolver a property name representing the resolver
*/
public void setResolver(String resolver) {
this.resolver = resolver;
@@ -78,7 +76,7 @@ public class CheckResolver extends IvyTask {
/**
* Get a description to the property / path / extension-point
- *
+ *
* @return the description
*/
public String getDescription() {
@@ -87,9 +85,8 @@ public class CheckResolver extends IvyTask {
/**
* set a description to the property / path / extension-point
- *
- * @param description
- * the description
+ *
+ * @param description the description
*/
public void setDescription(String description) {
this.description = description;
@@ -97,11 +94,11 @@ public class CheckResolver extends IvyTask {
/**
* Appends CDATA text inside the Ant task to description
- *
+ *
* @see #setDescription(String)
*/
public void addText(String descriptionText) {
- if (descriptionText.trim().length() > 0) {
+ if (!descriptionText.trim().isEmpty()) {
descriptionText = getProject().replaceProperties(descriptionText);
if (getDescription() == null) {
setDescription(descriptionText);
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/370e5b4b/src/main/java/org/apache/easyant/tasks/CoreRevisionCheckerTask.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/tasks/CoreRevisionCheckerTask.java b/src/main/java/org/apache/easyant/tasks/CoreRevisionCheckerTask.java
index c3c49c7..8feee25 100644
--- a/src/main/java/org/apache/easyant/tasks/CoreRevisionCheckerTask.java
+++ b/src/main/java/org/apache/easyant/tasks/CoreRevisionCheckerTask.java
@@ -17,15 +17,15 @@
*/
package org.apache.easyant.tasks;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
import org.apache.easyant.core.EasyAntMagicNames;
import org.apache.ivy.core.module.id.ModuleRevisionId;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
/**
* <p>
* The core-version task is used to define the compatibility between core and modules.
@@ -54,11 +54,11 @@ public class CoreRevisionCheckerTask extends AbstractEasyAntTask {
/**
* Appends CDATA text inside the Ant task to the error message used if the revision check fails.
- *
+ *
* @see #setMessage(String)
*/
public void addText(String messageText) {
- if (messageText.trim().length() > 0) {
+ if (!messageText.trim().isEmpty()) {
messageText = getProject().replaceProperties(messageText);
if (this.message == null) {
this.message = messageText;
@@ -70,7 +70,7 @@ public class CoreRevisionCheckerTask extends AbstractEasyAntTask {
/**
* Get the requiredRevision
- *
+ *
* @return a string that represent the required revision
*/
public String getRequiredRevision() {
@@ -79,9 +79,8 @@ public class CoreRevisionCheckerTask extends AbstractEasyAntTask {
/**
* Set the requiredRevision
- *
- * @param requiredRevision
- * a string that represent the required revision
+ *
+ * @param requiredRevision a string that represent the required revision
*/
public void setRequiredRevision(String requiredRevision) {
this.requiredRevision = requiredRevision;
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/370e5b4b/src/main/java/org/apache/easyant/tasks/IvyDependencyUpdateChecker.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/tasks/IvyDependencyUpdateChecker.java b/src/main/java/org/apache/easyant/tasks/IvyDependencyUpdateChecker.java
index f3d21ad..a3e97ba 100644
--- a/src/main/java/org/apache/easyant/tasks/IvyDependencyUpdateChecker.java
+++ b/src/main/java/org/apache/easyant/tasks/IvyDependencyUpdateChecker.java
@@ -17,11 +17,6 @@
*/
package org.apache.easyant.tasks;
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.ivy.ant.IvyPostResolveTask;
import org.apache.ivy.core.module.descriptor.Configuration;
import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
@@ -33,9 +28,13 @@ import org.apache.ivy.core.resolve.IvyNode;
import org.apache.ivy.core.resolve.ResolveOptions;
import org.apache.tools.ant.BuildException;
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Backport of IvyDependencyUpdateChecker until a new version of ivy will be released
- *
*/
public class IvyDependencyUpdateChecker extends IvyPostResolveTask {
@@ -138,7 +137,7 @@ public class IvyDependencyUpdateChecker extends IvyPostResolveTask {
}
}
- if (listOfMissingDependencyOnLatest.size() > 0) {
+ if (!listOfMissingDependencyOnLatest.isEmpty()) {
log("List of missing dependency on latest resolve :");
for (Object aListOfMissingDependencyOnLatest : listOfMissingDependencyOnLatest) {
ModuleRevisionId moduleRevisionId = (ModuleRevisionId) aListOfMissingDependencyOnLatest;
@@ -163,7 +162,7 @@ public class IvyDependencyUpdateChecker extends IvyPostResolveTask {
listOfNewDependencyOnLatest.add(latest.getId());
}
}
- if (listOfNewDependencyOnLatest.size() > 0) {
+ if (!listOfNewDependencyOnLatest.isEmpty()) {
log("List of new dependency on latest resolve :");
for (Object aListOfNewDependencyOnLatest : listOfNewDependencyOnLatest) {
ModuleRevisionId moduleRevisionId = (ModuleRevisionId) aListOfNewDependencyOnLatest;
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/370e5b4b/src/main/java/org/apache/easyant/tasks/LoadModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/tasks/LoadModule.java b/src/main/java/org/apache/easyant/tasks/LoadModule.java
index ff6ef5a..78c51af 100644
--- a/src/main/java/org/apache/easyant/tasks/LoadModule.java
+++ b/src/main/java/org/apache/easyant/tasks/LoadModule.java
@@ -17,21 +17,10 @@
*/
package org.apache.easyant.tasks;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
import org.apache.easyant.core.BuildConfigurationHelper;
import org.apache.easyant.core.EasyAntConstants;
import org.apache.easyant.core.EasyAntMagicNames;
-import org.apache.easyant.core.descriptor.AdvancedInheritableItem;
-import org.apache.easyant.core.descriptor.ConfigureProjectDescriptor;
-import org.apache.easyant.core.descriptor.EasyAntModuleDescriptor;
-import org.apache.easyant.core.descriptor.ExtensionPointMappingDescriptor;
-import org.apache.easyant.core.descriptor.PluginDescriptor;
-import org.apache.easyant.core.descriptor.PropertyDescriptor;
+import org.apache.easyant.core.descriptor.*;
import org.apache.easyant.core.ivy.InheritableScope;
import org.apache.easyant.core.ivy.IvyInstanceHelper;
import org.apache.easyant.core.parser.DefaultEasyAntXmlModuleDescriptorParser;
@@ -51,6 +40,12 @@ import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.ImportTask;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
/**
* This task is the main class, used to parse module.ivy and execute the all the statement behind the easyant tag.
*/
@@ -63,7 +58,7 @@ public class LoadModule extends AbstractEasyAntTask {
/**
* Get the file name that will be loaded
- *
+ *
* @return a file that represents a module descriptor
*/
public File getBuildModule() {
@@ -72,9 +67,8 @@ public class LoadModule extends AbstractEasyAntTask {
/**
* set the file name that will be loaded
- *
- * @param file
- * represents a module descriptor
+ *
+ * @param file represents a module descriptor
*/
public void setBuildModule(File file) {
this.buildModule = file;
@@ -94,7 +88,7 @@ public class LoadModule extends AbstractEasyAntTask {
/**
* Set the classname of the easyant parser you want to use
- *
+ *
* @param easyAntMDParserClassName
*/
public void setEasyAntMDParserClassName(String easyAntMDParserClassName) {
@@ -164,7 +158,6 @@ public class LoadModule extends AbstractEasyAntTask {
/**
* Configure project offline repository If offline mode is enabled, it will acts as dictator resolver
- *
*/
private void configureProjectOfflineResolver() {
if (EasyAntMagicNames.EASYANT_IVY_INSTANCE.equals(IvyInstanceHelper.getProjectIvyInstanceName(getProject()))) {
@@ -186,7 +179,7 @@ public class LoadModule extends AbstractEasyAntTask {
}
/**
- *
+ *
*/
private void configureProjectIvyinstance(String projectIvyInstanceName) {
IvyConfigure projectIvyInstance = new IvyConfigure();
@@ -402,11 +395,9 @@ public class LoadModule extends AbstractEasyAntTask {
/**
* Check if an inheritable item can be inherited by verifying {@link InheritableScope}
- *
- * @param inheritableItem
- * a given {@link AdvancedInheritableItem}
- * @param currentModule
- * current module
+ *
+ * @param inheritableItem a given {@link AdvancedInheritableItem}
+ * @param currentModule current module
* @return true if item can be inherited
*/
private boolean canInherit(AdvancedInheritableItem inheritableItem, ModuleRevisionId currentModule) {
@@ -441,7 +432,7 @@ public class LoadModule extends AbstractEasyAntTask {
log("removing unused configuration " + conf, Project.MSG_DEBUG);
}
}
- if (mainConfsList.size() > 0) {
+ if (!mainConfsList.isEmpty()) {
String mainConfs = StringUtils.join(mainConfsList.toArray(new String[mainConfsList.size()]), ",");
log("updating main.confs with active profile for current project :" + mainConfs, Project.MSG_DEBUG);
getProject().setProperty(EasyAntMagicNames.MAIN_CONFS, mainConfs);
@@ -487,7 +478,7 @@ public class LoadModule extends AbstractEasyAntTask {
/**
* @return true if this module should use a build-scoped repository and cache to find artifacts generated by other
- * modules in the same build.
+ * modules in the same build.
*/
private boolean shouldUseBuildRepository() {
// if a value has been provided by task attribute, return it
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/370e5b4b/src/main/java/org/apache/easyant/tasks/ParameterTask.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/tasks/ParameterTask.java b/src/main/java/org/apache/easyant/tasks/ParameterTask.java
index 713ff05..7a5dd51 100644
--- a/src/main/java/org/apache/easyant/tasks/ParameterTask.java
+++ b/src/main/java/org/apache/easyant/tasks/ParameterTask.java
@@ -17,9 +17,6 @@
*/
package org.apache.easyant.tasks;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.easyant.core.EasyAntMagicNames;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
@@ -27,14 +24,16 @@ import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.Property;
import org.apache.tools.ant.types.Path;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* parameter tasks is used to :
- *
+ * <p/>
* document properties / paths check if properties /paths are required set default values if properties are not set
- *
+ * <p/>
* This could be usefull in precondition of each modules, to check if property/path are set. And much more usefull to
* document our modules.
- *
*/
public class ParameterTask extends Task {
private String property;
@@ -48,7 +47,7 @@ public class ParameterTask extends Task {
/**
* Get a description to the property / path
- *
+ *
* @return the description
*/
public String getDescription() {
@@ -57,9 +56,8 @@ public class ParameterTask extends Task {
/**
* set a description to the property / path
- *
- * @param description
- * the description
+ *
+ * @param description the description
*/
public void setDescription(String description) {
this.description = description;
@@ -67,11 +65,11 @@ public class ParameterTask extends Task {
/**
* Appends CDATA text inside the Ant task to description
- *
+ *
* @see #setDescription(String)
*/
public void addText(String descriptionText) {
- if (descriptionText.trim().length() > 0) {
+ if (!descriptionText.trim().isEmpty()) {
descriptionText = getProject().replaceProperties(descriptionText);
if (getDescription() == null) {
setDescription(descriptionText);
@@ -83,7 +81,7 @@ public class ParameterTask extends Task {
/**
* Get the property name to check
- *
+ *
* @return a property name
*/
public String getProperty() {
@@ -92,9 +90,8 @@ public class ParameterTask extends Task {
/**
* Set the property name to check
- *
- * @param property
- * a property name
+ *
+ * @param property a property name
*/
public void setProperty(String property) {
this.property = property;
@@ -102,7 +99,7 @@ public class ParameterTask extends Task {
/**
* Get the path to check
- *
+ *
* @return a pathId
*/
public String getPath() {
@@ -111,7 +108,7 @@ public class ParameterTask extends Task {
/**
* Set the path to check
- *
+ *
* @param path
*/
public void setPath(String path) {
@@ -120,7 +117,7 @@ public class ParameterTask extends Task {
/**
* Get the default value (only available for property)
- *
+ *
* @return a string that represents the default value
*/
public String getDefault() {
@@ -129,9 +126,8 @@ public class ParameterTask extends Task {
/**
* Set the default value (only available for property)
- *
- * @param defaultValue
- * a string that represents the default value
+ *
+ * @param defaultValue a string that represents the default value
*/
public void setDefault(String defaultValue) {
this.defaultValue = defaultValue;
@@ -139,7 +135,7 @@ public class ParameterTask extends Task {
/**
* Is the refererenced property / path required?
- *
+ *
* @return
*/
public boolean isRequired() {
@@ -153,7 +149,7 @@ public class ParameterTask extends Task {
/**
* specify if the property / path is mandatory
- *
+ *
* @param required
*/
public void setRequired(boolean required) {
@@ -162,7 +158,7 @@ public class ParameterTask extends Task {
/**
* Get list of possible values of a property
- *
+ *
* @return a list of values
*/
public List<String> getPossibleValues() {
@@ -171,9 +167,8 @@ public class ParameterTask extends Task {
/**
* Set list of possible values of a property
- *
- * @param possibleValuesAsString
- * a comma separated list of values
+ *
+ * @param possibleValuesAsString a comma separated list of values
*/
public void setPossibleValues(String possibleValuesAsString) {
if (possibleValuesAsString != null) {
[5/6] ant-easyant-core git commit: use foreach loops
Posted by jl...@apache.org.
use foreach loops
Project: http://git-wip-us.apache.org/repos/asf/ant-easyant-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-easyant-core/commit/12b28d09
Tree: http://git-wip-us.apache.org/repos/asf/ant-easyant-core/tree/12b28d09
Diff: http://git-wip-us.apache.org/repos/asf/ant-easyant-core/diff/12b28d09
Branch: refs/heads/master
Commit: 12b28d093fca2f5e9da1d5bd13133b889e900bad
Parents: 370e5b4
Author: Jean-Louis Boudart <je...@gmail.com>
Authored: Tue Nov 25 00:20:40 2014 +0100
Committer: Jean-Louis Boudart <je...@gmail.com>
Committed: Tue Nov 25 00:20:40 2014 +0100
----------------------------------------------------------------------
src/main/java/org/apache/easyant/core/EasyAntEngine.java | 3 +--
src/main/java/org/apache/easyant/tasks/SubModule.java | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/12b28d09/src/main/java/org/apache/easyant/core/EasyAntEngine.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/core/EasyAntEngine.java b/src/main/java/org/apache/easyant/core/EasyAntEngine.java
index 1ea1199..e41cead 100755
--- a/src/main/java/org/apache/easyant/core/EasyAntEngine.java
+++ b/src/main/java/org/apache/easyant/core/EasyAntEngine.java
@@ -249,8 +249,7 @@ public class EasyAntEngine {
// Add the default listener
project.addBuildListener(createLogger());
- for (int i = 0; i < configuration.getListeners().size(); i++) {
- String className = configuration.getListeners().get(i);
+ for (String className : configuration.getListeners()) {
BuildListener listener = (BuildListener) ClasspathUtils.newInstance(className,
EasyAntEngine.class.getClassLoader(), BuildListener.class);
project.setProjectReference(listener);
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/12b28d09/src/main/java/org/apache/easyant/tasks/SubModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/tasks/SubModule.java b/src/main/java/org/apache/easyant/tasks/SubModule.java
index 987dcfd..7d05658 100644
--- a/src/main/java/org/apache/easyant/tasks/SubModule.java
+++ b/src/main/java/org/apache/easyant/tasks/SubModule.java
@@ -252,8 +252,7 @@ public class SubModule extends AbstractEasyAntTask {
subModule.setNewProperty(EasyAntMagicNames.SUBMODULE, "true");
subModule.setJavaVersionProperty();
- for (int i = 0; i < getProject().getBuildListeners().size(); i++) {
- BuildListener buildListener = getProject().getBuildListeners().elementAt(i);
+ for (BuildListener buildListener : getProject().getBuildListeners()) {
subModule.addBuildListener(buildListener);
}
// copy all User properties
[6/6] ant-easyant-core git commit: remove deadcode
Posted by jl...@apache.org.
remove deadcode
Project: http://git-wip-us.apache.org/repos/asf/ant-easyant-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-easyant-core/commit/0b161f88
Tree: http://git-wip-us.apache.org/repos/asf/ant-easyant-core/tree/0b161f88
Diff: http://git-wip-us.apache.org/repos/asf/ant-easyant-core/diff/0b161f88
Branch: refs/heads/master
Commit: 0b161f88f2c972ca8192383cf4935be5c7fdd5d8
Parents: 12b28d0
Author: Jean-Louis Boudart <je...@gmail.com>
Authored: Tue Nov 25 00:44:37 2014 +0100
Committer: Jean-Louis Boudart <je...@gmail.com>
Committed: Tue Nov 25 00:44:37 2014 +0100
----------------------------------------------------------------------
.../core/ant/listerners/MultiModuleLogger.java | 3 +-
.../org/apache/easyant/tasks/GoOfflineTest.java | 60 ++++++++++----------
2 files changed, 31 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/0b161f88/src/main/java/org/apache/easyant/core/ant/listerners/MultiModuleLogger.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/core/ant/listerners/MultiModuleLogger.java b/src/main/java/org/apache/easyant/core/ant/listerners/MultiModuleLogger.java
index 6df22a6..d96d169 100644
--- a/src/main/java/org/apache/easyant/core/ant/listerners/MultiModuleLogger.java
+++ b/src/main/java/org/apache/easyant/core/ant/listerners/MultiModuleLogger.java
@@ -184,12 +184,11 @@ public class MultiModuleLogger extends DefaultEasyAntLogger implements SubBuildL
private void printExecutionSubBuildsExecutionTimes(Project project) {
List<ExecutionResult> allSubBuildResults = project.getReference(EXECUTION_TIMER_BUILD_RESULTS);
if (allSubBuildResults != null && !allSubBuildResults.isEmpty()) {
- project.log(LINE_SEP + "Project Sub-modules Summary: " + LINE_SEP + formatExecutionResults(allSubBuildResults));
+ project.log(LINE_SEP + "Project Sub-modules Summary: " + LINE_SEP + formatExecutionResults(allSubBuildResults));
}
}
private String formatExecutionResults(List<ExecutionResult> results) {
- String formattedResults;
int maxUnitNameLength = 0;
int maxExecTimeLength = 0;
for (ExecutionResult result : results) {
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/0b161f88/src/test/java/org/apache/easyant/tasks/GoOfflineTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/easyant/tasks/GoOfflineTest.java b/src/test/java/org/apache/easyant/tasks/GoOfflineTest.java
index c9b8c45..15c7adc 100644
--- a/src/test/java/org/apache/easyant/tasks/GoOfflineTest.java
+++ b/src/test/java/org/apache/easyant/tasks/GoOfflineTest.java
@@ -17,18 +17,11 @@
*/
package org.apache.easyant.tasks;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
-
import org.apache.easyant.core.EasyAntMagicNames;
import org.apache.easyant.core.ant.ProjectUtils;
import org.apache.easyant.core.ivy.IvyInstanceHelper;
-import org.apache.easyant.core.services.PluginService;
import org.apache.easyant.core.services.DefaultPluginService;
+import org.apache.easyant.core.services.PluginService;
import org.apache.ivy.Ivy;
import org.apache.ivy.ant.IvyAntSettings;
import org.apache.ivy.ant.IvyConfigure;
@@ -41,6 +34,13 @@ import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.rules.TemporaryFolder;
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class GoOfflineTest extends AntTaskBaseTest {
private static final String EASYANT_BUILDSCOPE_REP = "easyant-buildscope-rep";
@@ -84,49 +84,49 @@ public class GoOfflineTest extends AntTaskBaseTest {
}
- private void configureEasyantSettings(Project project) throws URISyntaxException{
+ private void configureEasyantSettings(Project project) throws URISyntaxException {
configureSettings(project, EasyAntMagicNames.EASYANT_IVY_INSTANCE, "/repositories/easyant-ivysettings-test.xml");
}
-
- private void configureProjectSettings(Project project) throws URISyntaxException{
+
+ private void configureProjectSettings(Project project) throws URISyntaxException {
configureSettings(project, IvyInstanceHelper.getProjectIvyInstanceName(project), "/ivysettings-test.xml");
}
-
- private void configureSettings(Project project, String settingsId, String settingsFile) throws URISyntaxException{
+
+ private void configureSettings(Project project, String settingsId, String settingsFile) throws URISyntaxException {
IvyConfigure configure = new IvyConfigure();
configure.setSettingsId(settingsId);
configure.setProject(project);
configure.setFile(new File(this.getClass().getResource(settingsFile).toURI()));
configure.execute();
}
-
+
private void configureEasyantBuildScopeRepository(Project project) throws IOException {
easyantBuildScopeRepoFolder = folder.newFolder("ea-build-repo");
- FileSystemResolver resolver = newResolver(project, easyantBuildScopeRepoFolder, EASYANT_BUILDSCOPE_REP);
-
+ FileSystemResolver resolver = newResolver(easyantBuildScopeRepoFolder, EASYANT_BUILDSCOPE_REP);
+
Ivy easyantIvyInstance = IvyInstanceHelper.getEasyAntIvyAntSettings(project)
.getConfiguredIvyInstance(goOffline);
easyantIvyInstance.getSettings().addResolver(resolver);
}
-
+
private void configureProjectBuildScopeRepository(Project project) throws IOException {
projectBuildScopeRepoFolder = folder.newFolder("project-build-repo");
- FileSystemResolver resolver = newResolver(project, projectBuildScopeRepoFolder, PROJECT_BUILDSCOPE_REP);
-
+ FileSystemResolver resolver = newResolver(projectBuildScopeRepoFolder, PROJECT_BUILDSCOPE_REP);
+
Ivy projecttIvyInstance = IvyInstanceHelper.getProjectIvyAntSettings(project)
.getConfiguredIvyInstance(goOffline);
projecttIvyInstance.getSettings().addResolver(resolver);
}
-
- private FileSystemResolver newResolver(Project project, File repoFolder, String resolverName ) throws IOException {
-
+
+ private FileSystemResolver newResolver(File repoFolder, String resolverName) {
+
FileSystemResolver resolver = new FileSystemResolver();
resolver.setName(resolverName);
resolver.addArtifactPattern(repoFolder.getAbsolutePath()
+ "/[organisation]/[module]/[revision]/[artifact](-[classifier]).[ext]");
resolver.addIvyPattern(repoFolder.getAbsolutePath()
+ "/[organisation]/[module]/[revision]/[artifact](-[classifier]).[ext]");
-
+
return resolver;
}
@@ -173,25 +173,25 @@ public class GoOfflineTest extends AntTaskBaseTest {
+ "/mycompany/simpleplugin/0.1/simpleplugin.ant");
assertThat(antFile.exists(), is(true));
}
-
+
@Test
public void shouldInstallPluginsAndDependenciesTransitive() throws URISyntaxException {
goOffline.setEasyantResolverName(EASYANT_BUILDSCOPE_REP);
goOffline.setProjectResolverName(PROJECT_BUILDSCOPE_REP);
goOffline.setModuleIvy(new File(this.getClass().getResource("dependencies/module.ivy").toURI()));
goOffline.execute();
-
+
assertLogContaining("installing mycompany#simpleplugin;0.1");
assertLogContaining("installing junit#junit;4.4");
assertLogContaining("installing org.mortbay.jetty#jetty;6.1.14");
-
- assertFileExists(easyantBuildScopeRepoFolder,"/mycompany/simpleplugin/0.1/ivy.xml");
- assertFileExists(easyantBuildScopeRepoFolder,"/mycompany/simpleplugin/0.1/simpleplugin.ant");
-
+
+ assertFileExists(easyantBuildScopeRepoFolder, "/mycompany/simpleplugin/0.1/ivy.xml");
+ assertFileExists(easyantBuildScopeRepoFolder, "/mycompany/simpleplugin/0.1/simpleplugin.ant");
+
assertFileExists(projectBuildScopeRepoFolder, "/junit/junit/4.4/junit.jar");
assertFileExists(projectBuildScopeRepoFolder, "/org.mortbay.jetty/jetty/6.1.14/jetty.jar");
assertFileExists(projectBuildScopeRepoFolder, "/org.mortbay.jetty/jetty-util/6.1.14/jetty-util.jar");
}
-
+
}
[2/6] ant-easyant-core git commit: remove unused import
Posted by jl...@apache.org.
remove unused import
Project: http://git-wip-us.apache.org/repos/asf/ant-easyant-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-easyant-core/commit/e031538a
Tree: http://git-wip-us.apache.org/repos/asf/ant-easyant-core/tree/e031538a
Diff: http://git-wip-us.apache.org/repos/asf/ant-easyant-core/diff/e031538a
Branch: refs/heads/master
Commit: e031538a5c56569bf0cd6548ef2043d3799dd4e5
Parents: 34eeaea
Author: Jean-Louis Boudart <je...@gmail.com>
Authored: Mon Nov 24 20:48:13 2014 +0100
Committer: Jean-Louis Boudart <je...@gmail.com>
Committed: Mon Nov 24 20:48:13 2014 +0100
----------------------------------------------------------------------
src/main/java/org/apache/easyant/core/EasyAntMain.java | 1 -
src/main/java/org/apache/easyant/core/ant/ProjectUtils.java | 1 -
.../org/apache/easyant/core/ant/helper/EasyAntProjectHelper.java | 1 -
.../core/parser/DefaultEasyAntXmlModuleDescriptorParser.java | 1 -
src/main/java/org/apache/easyant/man/ListProps.java | 1 -
src/main/java/org/apache/easyant/tasks/AbstractImport.java | 1 -
src/main/java/org/apache/easyant/tasks/BindTarget.java | 1 -
src/main/java/org/apache/easyant/tasks/GoOffline.java | 1 -
src/main/java/org/apache/easyant/tasks/ImportDeferred.java | 1 -
.../java/org/apache/easyant/tasks/IvyDependencyUpdateChecker.java | 1 -
src/main/java/org/apache/easyant/tasks/LoadModule.java | 1 -
src/main/java/org/apache/easyant/tasks/PluginReport.java | 1 -
12 files changed, 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/e031538a/src/main/java/org/apache/easyant/core/EasyAntMain.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/core/EasyAntMain.java b/src/main/java/org/apache/easyant/core/EasyAntMain.java
index 1f2b8aa..7c91c6f 100755
--- a/src/main/java/org/apache/easyant/core/EasyAntMain.java
+++ b/src/main/java/org/apache/easyant/core/EasyAntMain.java
@@ -26,7 +26,6 @@ import java.io.PrintStream;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/e031538a/src/main/java/org/apache/easyant/core/ant/ProjectUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/core/ant/ProjectUtils.java b/src/main/java/org/apache/easyant/core/ant/ProjectUtils.java
index 3cfbf65..d801337 100644
--- a/src/main/java/org/apache/easyant/core/ant/ProjectUtils.java
+++ b/src/main/java/org/apache/easyant/core/ant/ProjectUtils.java
@@ -21,7 +21,6 @@ import java.io.File;
import java.io.PrintStream;
import java.lang.reflect.Field;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import org.apache.easyant.core.EasyAntMagicNames;
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/e031538a/src/main/java/org/apache/easyant/core/ant/helper/EasyAntProjectHelper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/core/ant/helper/EasyAntProjectHelper.java b/src/main/java/org/apache/easyant/core/ant/helper/EasyAntProjectHelper.java
index ce44ac2..7afb585 100644
--- a/src/main/java/org/apache/easyant/core/ant/helper/EasyAntProjectHelper.java
+++ b/src/main/java/org/apache/easyant/core/ant/helper/EasyAntProjectHelper.java
@@ -17,7 +17,6 @@
*/
package org.apache.easyant.core.ant.helper;
-import java.util.Iterator;
import java.util.Map;
import org.apache.easyant.core.ant.Phase;
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/e031538a/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java b/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java
index a8bbf4e..cfbda06 100644
--- a/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java
+++ b/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java
@@ -25,7 +25,6 @@ import java.net.URL;
import java.text.ParseException;
import java.util.Arrays;
import java.util.Enumeration;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/e031538a/src/main/java/org/apache/easyant/man/ListProps.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/man/ListProps.java b/src/main/java/org/apache/easyant/man/ListProps.java
index 87dacf2..6c66626 100644
--- a/src/main/java/org/apache/easyant/man/ListProps.java
+++ b/src/main/java/org/apache/easyant/man/ListProps.java
@@ -17,7 +17,6 @@
*/
package org.apache.easyant.man;
-import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/e031538a/src/main/java/org/apache/easyant/tasks/AbstractImport.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/tasks/AbstractImport.java b/src/main/java/org/apache/easyant/tasks/AbstractImport.java
index 91c8996..bb3e683 100644
--- a/src/main/java/org/apache/easyant/tasks/AbstractImport.java
+++ b/src/main/java/org/apache/easyant/tasks/AbstractImport.java
@@ -18,7 +18,6 @@
package org.apache.easyant.tasks;
import java.io.File;
-import java.util.Iterator;
import org.apache.easyant.core.EasyAntMagicNames;
import org.apache.ivy.core.LogOptions;
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/e031538a/src/main/java/org/apache/easyant/tasks/BindTarget.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/tasks/BindTarget.java b/src/main/java/org/apache/easyant/tasks/BindTarget.java
index 8d38f26..d49c806 100644
--- a/src/main/java/org/apache/easyant/tasks/BindTarget.java
+++ b/src/main/java/org/apache/easyant/tasks/BindTarget.java
@@ -18,7 +18,6 @@
package org.apache.easyant.tasks;
import java.util.Enumeration;
-import java.util.Iterator;
import org.apache.easyant.core.BuildConfigurationHelper;
import org.apache.tools.ant.BuildException;
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/e031538a/src/main/java/org/apache/easyant/tasks/GoOffline.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/tasks/GoOffline.java b/src/main/java/org/apache/easyant/tasks/GoOffline.java
index d67041e..accd86a 100644
--- a/src/main/java/org/apache/easyant/tasks/GoOffline.java
+++ b/src/main/java/org/apache/easyant/tasks/GoOffline.java
@@ -18,7 +18,6 @@
package org.apache.easyant.tasks;
import java.io.File;
-import java.util.Iterator;
import org.apache.easyant.core.EasyAntMagicNames;
import org.apache.easyant.core.ivy.IvyInstanceHelper;
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/e031538a/src/main/java/org/apache/easyant/tasks/ImportDeferred.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/tasks/ImportDeferred.java b/src/main/java/org/apache/easyant/tasks/ImportDeferred.java
index 2637a22..821229d 100644
--- a/src/main/java/org/apache/easyant/tasks/ImportDeferred.java
+++ b/src/main/java/org/apache/easyant/tasks/ImportDeferred.java
@@ -18,7 +18,6 @@
package org.apache.easyant.tasks;
import java.io.File;
-import java.util.Iterator;
import org.apache.easyant.core.BuildConfigurationHelper;
import org.apache.easyant.core.EasyAntMagicNames;
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/e031538a/src/main/java/org/apache/easyant/tasks/IvyDependencyUpdateChecker.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/tasks/IvyDependencyUpdateChecker.java b/src/main/java/org/apache/easyant/tasks/IvyDependencyUpdateChecker.java
index ec3ed25..8caeb1c 100644
--- a/src/main/java/org/apache/easyant/tasks/IvyDependencyUpdateChecker.java
+++ b/src/main/java/org/apache/easyant/tasks/IvyDependencyUpdateChecker.java
@@ -20,7 +20,6 @@ package org.apache.easyant.tasks;
import java.io.IOException;
import java.text.ParseException;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.apache.ivy.ant.IvyPostResolveTask;
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/e031538a/src/main/java/org/apache/easyant/tasks/LoadModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/tasks/LoadModule.java b/src/main/java/org/apache/easyant/tasks/LoadModule.java
index 95eee5d..ff6ef5a 100644
--- a/src/main/java/org/apache/easyant/tasks/LoadModule.java
+++ b/src/main/java/org/apache/easyant/tasks/LoadModule.java
@@ -21,7 +21,6 @@ import java.io.File;
import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
import org.apache.easyant.core.BuildConfigurationHelper;
http://git-wip-us.apache.org/repos/asf/ant-easyant-core/blob/e031538a/src/main/java/org/apache/easyant/tasks/PluginReport.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/easyant/tasks/PluginReport.java b/src/main/java/org/apache/easyant/tasks/PluginReport.java
index bee1624..1557997 100644
--- a/src/main/java/org/apache/easyant/tasks/PluginReport.java
+++ b/src/main/java/org/apache/easyant/tasks/PluginReport.java
@@ -26,7 +26,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.xml.transform.Source;