svn commit: r611750 - in /ant/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse: cpcontainer/IvyClasspathContainer.java ui/core/model/IvyModel.java

[xavier]

Author: xavier
Date: Mon Jan 14 02:17:24 2008
New Revision: 611750

URL: http://svn.apache.org/viewvc?rev=611750&view=rev
Log:
upgrade to latest API changes in Ivy

Modified:
    
ant/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
    
ant/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/ui/core/model/IvyModel.java

Modified: 
ant/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
URL: 
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java?rev=611750&r1=611749&r2=611750&view=diff
==============================================================================
--- 
ant/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
 (original)
+++ 
ant/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
 Mon Jan 14 02:17:24 2008
@@ -393,7 +393,7 @@
                                        extraAtt
                        );
             RepositoryCacheManager cache = _ivy.getSettings()
-                       
.getResolver(artifact.getModuleRevisionId().getModuleId())
+                       .getResolver(artifact.getModuleRevisionId())
                    .getRepositoryCacheManager();
                        if (cache instanceof DefaultRepositoryCacheManager) {
                                File metaArtifactFile = 
((DefaultRepositoryCacheManager)cache).getArchiveFileInCache(metaArtifact);

Modified: 
ant/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/ui/core/model/IvyModel.java
URL: 
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/ui/core/model/IvyModel.java?rev=611750&r1=611749&r2=611750&view=diff
==============================================================================
--- 
ant/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/ui/core/model/IvyModel.java
 (original)
+++ 
ant/ivy/ivyde/trunk/src/java/org/apache/ivyde/eclipse/ui/core/model/IvyModel.java
 Mon Jan 14 02:17:24 2008
@@ -320,7 +320,7 @@
                 ModuleRevisionId mrid = ModuleRevisionId.newInstance(org, 
name, branch, rev, otherAtts);
                 DefaultDependencyDescriptor ddd = new 
DefaultDependencyDescriptor(mrid, false);
                 try {
-                    DependencyResolver resolver = 
getIvySettings().getResolver(mrid.getModuleId());
+                    DependencyResolver resolver = 
getIvySettings().getResolver(mrid);
                     if (resolver == null) {
                         return null;
                     }
@@ -366,7 +366,7 @@
                         ModuleRevisionId mrid = 
ModuleRevisionId.newInstance(org, (String)otherAttValues.get("name"), 
(String)otherAttValues.get("rev"));
                         DefaultDependencyDescriptor ddd = new 
DefaultDependencyDescriptor(mrid, false);
                         try {
-                            String[] confs = 
getIvySettings().getResolver(mrid.getModuleId()).getDependency(ddd, 
data).getDescriptor().getConfigurationsNames();
+                            String[] confs = 
getIvySettings().getResolver(mrid).getDependency(ddd, 
data).getDescriptor().getConfigurationsNames();
                             for (int i = 0; i < confs.length; i++) {
                                 confs[i] = base + confs[i];
                             }
@@ -399,7 +399,7 @@
                             ModuleRevisionId mrid = 
ModuleRevisionId.newInstance(org, (String)otherAttValues.get("name"), 
(String)otherAttValues.get("rev"));
                             DefaultDependencyDescriptor ddd = new 
DefaultDependencyDescriptor(mrid, false);
                             try {
-                                String[] confs = 
getIvySettings().getResolver(mrid.getModuleId()).getDependency(ddd, 
data).getDescriptor().getConfigurationsNames();
+                                String[] confs = 
getIvySettings().getResolver(mrid).getDependency(ddd, 
data).getDescriptor().getConfigurationsNames();
                                 List ret = new ArrayList(Arrays.asList(confs));
                                 ret.add("*");
                                 return (String[])ret.toArray(new 
String[ret.size()]);