svn commit: r551343 - /incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java

[ma...@apache.org]

Author: maartenc
Date: Wed Jun 27 14:42:32 2007
New Revision: 551343

URL: http://svn.apache.org/viewvc?view=rev&rev=551343
Log:
Internal refactoring to make checkstyle happy

Modified:
    incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java?view=diff&rev=551343&r1=551342&r2=551343
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java Wed Jun 27 14:42:32 2007
@@ -138,9 +138,7 @@
             // there (TODO: maybe we can check which reports exist and extract the configurations
             // from these report names?)
             if (!orgAndModSetManually) {
-                ensureResolved(isHaltonfailure(), isUseOrigin(), isTransitive(), getOrganisation(),
-                    getModule(), getProperty(conf, settings, "ivy.resolved.configurations"),
-                    resolveId, cache);
+                ensureResolved(settings);
             }
 
             conf = getProperty(conf, settings, "ivy.resolved.configurations");
@@ -177,24 +175,25 @@
         artifactFilter = FilterHelper.getArtifactTypeFilter(type);
     }
 
-    protected void ensureResolved(boolean haltOnFailure, boolean useOrigin, boolean transitive,
-            String org, String module, String conf, String resolveId, File cache) {
+    protected void ensureResolved(IvySettings settings) {
         ensureMessageInitialised();
+        
+        String requestedConfigs = getProperty(getConf(), settings, "ivy.resolved.configurations");
 
         String[] confs = null;
-        if (resolveId != null) {
-            confs = getConfsToResolve(resolveId, conf);
+        if (getResolveId() != null) {
+            confs = getConfsToResolve(getResolveId(), requestedConfigs);
         } else {
-            confs = getConfsToResolve(org, module, conf, false);
+            confs = getConfsToResolve(getOrganisation(), getModule(), requestedConfigs, false);
         }
 
         if (confs.length > 0) {
-            IvyResolve resolve = createResolve(haltOnFailure, useOrigin);
-            resolve.setFile(file);
-            resolve.setCache(cache);
-            resolve.setTransitive(transitive);
+            IvyResolve resolve = createResolve(isHaltonfailure(), isUseOrigin());
+            resolve.setFile(getFile());
+            resolve.setCache(getCache());
+            resolve.setTransitive(isTransitive());
             resolve.setConf(StringUtils.join(confs, ", "));
-            resolve.setResolveId(resolveId);
+            resolve.setResolveId(getResolveId());
             resolve.execute();
         }
     }