svn commit: r725281 - in /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse: CHANGES.txt src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java

[hibou]

Author: hibou
Date: Wed Dec 10 05:40:49 2008
New Revision: 725281

URL: http://svn.apache.org/viewvc?rev=725281&view=rev
Log:
IVYDE-137: handle '*' in the retrieve's type configuration

Modified:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt
    
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt?rev=725281&r1=725280&r2=725281&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt Wed Dec 10 
05:40:49 2008
@@ -4,6 +4,7 @@
   version 2.0.0 final
 ==========================
 - FIX: When migrating from ivyde alpha to ivyde beta eclipse is throwing NPE 
at startup (IVYDE-136) (thanks to Daniel Becheanu)
+- FIX: The retrieve configuration doesn't support '*' as accepted types 
(IVYDE-137) (thanks to Daniel Becheanu)
 
   version 2.0.0 beta1
 ==========================

Modified: 
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
URL: 
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java?rev=725281&r1=725280&r2=725281&view=diff
==============================================================================
--- 
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
 (original)
+++ 
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
 Wed Dec 10 05:40:49 2008
@@ -56,7 +56,6 @@
 import org.apache.ivy.plugins.repository.TransferListener;
 import org.apache.ivy.util.Message;
 import org.apache.ivy.util.filter.ArtifactTypeFilter;
-import org.apache.ivy.util.filter.Filter;
 import org.apache.ivyde.eclipse.IvyDEException;
 import org.apache.ivyde.eclipse.IvyPlugin;
 import org.eclipse.core.resources.IFile;
@@ -265,7 +264,7 @@
                                     confs = r.getConfigurations();
                                     dependencies = listDependencies(r);
                                     
problemMessages.addAll(r.getAllProblemMessages());
-                                    maybeRetrieve(md, confs);
+                                    maybeRetrieve(md);
 
                                     break;
                                 }
@@ -289,7 +288,7 @@
                                 return;
                             }
 
-                            maybeRetrieve(md, confs);
+                            maybeRetrieve(md);
                         }
 
                         warnIfDuplicates(all);
@@ -443,16 +442,19 @@
         }
     }
 
-    private void maybeRetrieve(ModuleDescriptor md, String[] confs) throws 
IOException {
+    private void maybeRetrieve(ModuleDescriptor md) throws IOException {
         if (conf.getInheritedDoRetrieve()) {
             String pattern = 
conf.javaProject.getProject().getLocation().toPortableString() + "/"
                     + conf.getInheritedRetrievePattern();
             monitor.setTaskName("retrieving dependencies in " + pattern);
-            RetrieveOptions c = new RetrieveOptions().setConfs(confs);
+            RetrieveOptions c = new RetrieveOptions();
             c.setSync(conf.getInheritedRetrieveSync());
             c.setConfs(conf.getInheritedRetrieveConfs().split(","));
-            c.setArtifactFilter(new 
ArtifactTypeFilter(IvyClasspathUtil.split(conf
-                    .getInheritedRetrieveTypes())));
+            String inheritedRetrieveTypes = conf.getInheritedRetrieveTypes();
+            if (inheritedRetrieveTypes != null && 
!inheritedRetrieveTypes.equals("*")) {
+                c.setArtifactFilter(new ArtifactTypeFilter(IvyClasspathUtil
+                        .split(inheritedRetrieveTypes)));
+            }
             ivy.retrieve(md.getModuleRevisionId(), pattern, c);
         }
     }