You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ivy-commits@incubator.apache.org by gs...@apache.org on 2007/06/07 15:07:29 UTC
svn commit: r545209 - in /incubator/ivy/core/trunk/src/java/org/apache/ivy:
ant/ core/sort/
Author: gscokart
Date: Thu Jun 7 08:07:28 2007
New Revision: 545209
URL: http://svn.apache.org/viewvc?view=rev&rev=545209
Log:
code cleaning
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildList.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/CollectionOfModulesToSort.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/DefaultNonMatchingVersionReporter.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/ModuleDescriptorSorter.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/ModuleInSort.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/SortEngine.java
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildList.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildList.java?view=diff&rev=545209&r1=545208&r2=545209
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildList.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildList.java Thu Jun 7 08:07:28 2007
@@ -173,8 +173,8 @@
} else {
Message.verbose("no ivy file for " + buildFile + ": ivyfile=" + ivyFile
+ ": adding it at the beginning of the path");
- Message
- .verbose("\t(set skipbuildwithoutivy to true if you don't want this file to be added to the path)");
+ Message.verbose("\t(set skipbuildwithoutivy to true if you don't want this"
+ + " file to be added to the path)");
independent.add(buildFile);
}
} else {
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/CollectionOfModulesToSort.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/CollectionOfModulesToSort.java?view=diff&rev=545209&r1=545208&r2=545209
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/CollectionOfModulesToSort.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/CollectionOfModulesToSort.java Thu Jun 7 08:07:28 2007
@@ -95,8 +95,9 @@
public ModuleInSort getModuleDescriptorDependency(DependencyDescriptor descriptor) {
Collection modulesOfSameId = (Collection) modulesByModuleId.get(descriptor
.getDependencyId());
- if (modulesOfSameId == null)
+ if (modulesOfSameId == null) {
return null;
+ }
for (Iterator it = modulesOfSameId.iterator(); it.hasNext();) {
ModuleInSort mdInSort = (ModuleInSort) it.next();
if (mdInSort.match(descriptor, versionMatcher)) {
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/DefaultNonMatchingVersionReporter.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/DefaultNonMatchingVersionReporter.java?view=diff&rev=545209&r1=545208&r2=545209
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/DefaultNonMatchingVersionReporter.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/DefaultNonMatchingVersionReporter.java Thu Jun 7 08:07:28 2007
@@ -36,7 +36,7 @@
if (parentRevisionId == null) {
// There are some rare case where DependencyDescriptor have no parent.
// This is should not be used in the SortEngine, but if it is, we show a decent trace.
- Message.warn("Non matching revision detected. Dependency " + dependencyRevisionId
+ Message.warn("Non matching revision detected in sort. Dependency " + dependencyRevisionId
+ " doesn't match " + md);
} else {
ModuleId parentModuleId = parentRevisionId.getModuleId();
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/ModuleDescriptorSorter.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/ModuleDescriptorSorter.java?view=diff&rev=545209&r1=545208&r2=545209
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/ModuleDescriptorSorter.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/ModuleDescriptorSorter.java Thu Jun 7 08:07:28 2007
@@ -60,9 +60,9 @@
*/
public List sortModuleDescriptors() throws CircularDependencyException {
Message.debug("Nbr of module to sort : " + moduleDescriptors.size());
- Iterator _moduleDescriptorsIterator = moduleDescriptors.iterator();
- while (_moduleDescriptorsIterator.hasNext()) {
- ModuleInSort next = (ModuleInSort) _moduleDescriptorsIterator.next();
+ Iterator moduleDescriptorsIterator = moduleDescriptors.iterator();
+ while (moduleDescriptorsIterator.hasNext()) {
+ ModuleInSort next = (ModuleInSort) moduleDescriptorsIterator.next();
sortModuleDescriptorsHelp(next, next);
}
return sorted;
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/ModuleInSort.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/ModuleInSort.java?view=diff&rev=545209&r1=545208&r2=545209
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/ModuleInSort.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/ModuleInSort.java Thu Jun 7 08:07:28 2007
@@ -35,7 +35,8 @@
* ModuleInSort can be used in only one ModuleDescriptorSorter at a time.<br>
* The added fields are : <br>
* <ul>
- * <li><code>isSorted</code> : is true iff this module has already been added to the sorted list.</li>
+ * <li><code>isSorted</code> : is true iff this module has already been added to the sorted list.
+ * </li>
* <li><code>loopElements</code> : When the module is the root of a loop (=the first element of a
* loop met during the sort), <code>loopElements</code> contains all ModuleInSort of the loop
* (excluding the root itself.</li>
@@ -96,10 +97,10 @@
if (caller != null) {
LinkedList elemOfLoop = new LinkedList();
elemOfLoop.add(this.module.getModuleRevisionId());
- for (ModuleInSort stackElem = futurCaller; stackElem != this; stackElem = stackElem.caller) {
- elemOfLoop.add(stackElem.module.getModuleRevisionId());
- stackElem.isLoopIntermediateElement = true;
- loopElements.add(stackElem);
+ for (ModuleInSort stackEl = futurCaller; stackEl != this; stackEl = stackEl.caller) {
+ elemOfLoop.add(stackEl.module.getModuleRevisionId());
+ stackEl.isLoopIntermediateElement = true;
+ loopElements.add(stackEl);
}
elemOfLoop.add(this.module.getModuleRevisionId());
ModuleRevisionId[] mrids = (ModuleRevisionId[]) elemOfLoop
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/SortEngine.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/SortEngine.java?view=diff&rev=545209&r1=545208&r2=545209
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/SortEngine.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/SortEngine.java Thu Jun 7 08:07:28 2007
@@ -61,8 +61,7 @@
}
List list = sortModuleDescriptors(dependenciesMap.keySet());
List ret = new ArrayList((int) (list.size() * 1.3 + nulls.size())); // attempt to adjust the
- // size to avoid too
- // much list resizing
+ // size to avoid too much list resizing
for (int i = 0; i < list.size(); i++) {
ModuleDescriptor md = (ModuleDescriptor) list.get(i);
List n = (List) dependenciesMap.get(md);