You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by xa...@apache.org on 2008/04/03 12:54:19 UTC
svn commit: r644257 - in /ant/ivy/core/trunk/src/java/org/apache/ivy:
ant/IvyBuildList.java ant/IvyPostResolveTask.java
plugins/resolver/RepositoryResolver.java
Author: xavier
Date: Thu Apr 3 03:54:18 2008
New Revision: 644257
URL: http://svn.apache.org/viewvc?rev=644257&view=rev
Log:
fix style
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildList.java
ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildList.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildList.java?rev=644257&r1=644256&r2=644257&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildList.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildList.java Thu Apr 3 03:54:18 2008
@@ -280,11 +280,12 @@
getProject().setProperty("ivy.sorted.modules", order.toString());
}
- private List convertModuleNamesToModuleDescriptors(Collection mds, Set moduleNames, String kind) {
+ private List convertModuleNamesToModuleDescriptors(
+ Collection mds, Set moduleNames, String kind) {
List result = new ArrayList();
Set foundModuleNames = new HashSet();
- for (Iterator it = mds.iterator(); it.hasNext(); ) {
+ for (Iterator it = mds.iterator(); it.hasNext();) {
ModuleDescriptor md = (ModuleDescriptor) it.next();
String name = md.getModuleRevisionId().getModuleId().getName();
if (moduleNames.contains(name)) {
@@ -299,14 +300,14 @@
StringBuffer missingNames = new StringBuffer();
String sep = "";
- for (Iterator it = missingModules.iterator(); it.hasNext(); ) {
+ for (Iterator it = missingModules.iterator(); it.hasNext();) {
missingNames.append(sep);
missingNames.append(it.next());
sep = ", ";
}
- throw new BuildException("unable to find " + kind + " module(s) " + missingNames.toString()
- + " in build fileset");
+ throw new BuildException("unable to find " + kind + " module(s) "
+ + missingNames.toString() + " in build fileset");
}
return result;
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java?rev=644257&r1=644256&r2=644257&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java Thu Apr 3 03:54:18 2008
@@ -252,7 +252,7 @@
// for each resolved configuration, check if the report still exists
ResolutionCacheManager cache = getSettings().getResolutionCacheManager();
- for (Iterator it = rconfsSet.iterator(); it.hasNext(); ) {
+ for (Iterator it = rconfsSet.iterator(); it.hasNext();) {
String resolvedConf = (String) it.next();
String resolveId = getResolveId();
if (resolveId == null) {
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java?rev=644257&r1=644256&r2=644257&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java Thu Apr 3 03:54:18 2008
@@ -97,8 +97,10 @@
File temp = File.createTempFile("ivy", artifact.getExt());
temp.deleteOnExit();
repository.get(res.getName(), temp);
- ModuleDescriptorParser parser = ModuleDescriptorParserRegistry.getInstance().getParser(res);
- ModuleDescriptor md = parser.parseDescriptor(getSettings(), temp.toURL(), res, false);
+ ModuleDescriptorParser parser =
+ ModuleDescriptorParserRegistry.getInstance().getParser(res);
+ ModuleDescriptor md =
+ parser.parseDescriptor(getSettings(), temp.toURL(), res, false);
revision = md.getRevision();
if ((revision == null) || (revision.length() == 0)) {
revision = "working@" + name;