simplify some loops
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.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 @@
+ 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 @@
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 @@
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()) + "\"");
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 @@
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 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);
}
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 @@
eaEngine.doBuild();
} else {
eaEngine.configureEasyAnt(getProject());
- eaEngine.loadProject(getProject());;
+ eaEngine.loadProject(getProject());
getProject().executeTargets(new Vector(getEasyantConfiguration().getTargets()));
}
}
@@ -85,9 +86,7 @@
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);
}
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.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 @@
}
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 @@
}
/**
- *
* @return the ivy instance corresponding to the ivysettings.xml provided by the end user
*/
private Ivy getExternalIvy() {
@@ -346,7 +339,7 @@
*/
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 @@
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(),
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 @@
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
