Return-Path: X-Original-To: apmail-ant-notifications-archive@minotaur.apache.org Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4DFC891FB for ; Sun, 15 Jan 2012 19:08:16 +0000 (UTC) Received: (qmail 48267 invoked by uid 500); 15 Jan 2012 19:08:16 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 48213 invoked by uid 500); 15 Jan 2012 19:08:15 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 48204 invoked by uid 99); 15 Jan 2012 19:08:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 15 Jan 2012 19:08:15 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 15 Jan 2012 19:08:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6ACCA23888FE for ; Sun, 15 Jan 2012 19:07:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1231730 - in /ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve: IvyNodeCallers.java ResolveEngine.java VisitNode.java Date: Sun, 15 Jan 2012 19:07:51 -0000 To: notifications@ant.apache.org From: hibou@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120115190751.6ACCA23888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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/**/ 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/**/ getDependencies(String conf) { + Collection/**/ deps = node.getDependencies(rootModuleConf, conf, requestedConf); + Collection/**/ ret = new ArrayList(deps.size()); for (Iterator iter = deps.iterator(); iter.hasNext();) { IvyNode depNode = (IvyNode) iter.next(); ret.add(traverseChild(conf, depNode));