You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2012/01/15 20:07:51 UTC
svn commit: r1231730 - in
/ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve:
IvyNodeCallers.java ResolveEngine.java VisitNode.java
Author: hibou
Date: Sun Jan 15 19:07:50 2012
New Revision: 1231730
URL: http://svn.apache.org/viewvc?rev=1231730&view=rev
Log:
Add some comments
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNodeCallers.java
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitNode.java
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNodeCallers.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNodeCallers.java?rev=1231730&r1=1231729&r2=1231730&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNodeCallers.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNodeCallers.java Sun Jan 15 19:07:50 2012
@@ -138,7 +138,7 @@ public class IvyNodeCallers {
// easily get a caller by its mrid
private Map callersByRootConf = new HashMap();
- // this map contains all the module ids calling this one (including transitively) as keys
+ // this map contains all the module ids calling this one (including transitively) as keys.
// the mapped nodes (values) correspond to a direct caller from which the transitive caller
// comes
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java?rev=1231730&r1=1231729&r2=1231730&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java Sun Jan 15 19:07:50 2012
@@ -771,7 +771,7 @@ public class ResolveEngine {
// now we can actually resolve this configuration dependencies
if (!isDependenciesFetched(node.getNode(), conf) && node.isTransitive()) {
- Collection dependencies = node.getDependencies(conf);
+ Collection/*<VisitNode>*/ dependencies = node.getDependencies(conf);
for (Iterator iter = dependencies.iterator(); iter.hasNext();) {
VisitNode dep = (VisitNode) iter.next();
dep.useRealNode(); // the node may have been resolved to another real one while
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitNode.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitNode.java?rev=1231730&r1=1231729&r2=1231730&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitNode.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitNode.java Sun Jan 15 19:07:50 2012
@@ -309,9 +309,9 @@ public class VisitNode {
return loaded;
}
- public Collection getDependencies(String conf) {
- Collection deps = node.getDependencies(rootModuleConf, conf, requestedConf);
- Collection ret = new ArrayList(deps.size());
+ public Collection/*<VisitNode>*/ getDependencies(String conf) {
+ Collection/*<IvyNode>*/ deps = node.getDependencies(rootModuleConf, conf, requestedConf);
+ Collection/*<VisitNode>*/ ret = new ArrayList(deps.size());
for (Iterator iter = deps.iterator(); iter.hasNext();) {
IvyNode depNode = (IvyNode) iter.next();
ret.add(traverseChild(conf, depNode));