ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r992639 - in /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse: handlers/AbstractIvyDEHandler.java resolve/IvyResolveJob.java resolve/IvyResolveJobListener.java resolve/IvyResolver.java resolve/ResolveResult.java
Date Sat, 04 Sep 2010 16:44:01 GMT
Author: hibou
Date: Sat Sep  4 16:44:01 2010
New Revision: 992639

URL: http://svn.apache.org/viewvc?rev=992639&view=rev
Log:
fix some checkstyle errors

Modified:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/handlers/AbstractIvyDEHandler.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolveJob.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolveJobListener.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/ResolveResult.java

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/handlers/AbstractIvyDEHandler.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/handlers/AbstractIvyDEHandler.java?rev=992639&r1=992638&r2=992639&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/handlers/AbstractIvyDEHandler.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/handlers/AbstractIvyDEHandler.java
Sat Sep  4 16:44:01 2010
@@ -47,7 +47,8 @@ public abstract class AbstractIvyDEHandl
             return null;
         }
 
-        Map/* <IProject, Set<IvyClasspathContainer>> */projects = getProjectAndContainers((IStructuredSelection)
selection);
+        // Map<IProject, Set<IvyClasspathContainer>>
+        Map projects = getProjectAndContainers((IStructuredSelection) selection);
 
         if (projects.size() > 0) {
             handleProjects(projects);

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolveJob.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolveJob.java?rev=992639&r1=992638&r2=992639&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolveJob.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolveJob.java
Sat Sep  4 16:44:01 2010
@@ -47,6 +47,8 @@ import org.eclipse.core.runtime.jobs.Job
  */
 public class IvyResolveJob extends Job {
 
+    private static final int WAIT_BEFORE_LAUNCH = 1000;
+
     private final List resolveQueue = new ArrayList();
 
     public IvyResolveJob() {
@@ -67,7 +69,7 @@ public class IvyResolveJob extends Job {
         synchronized (resolveQueue) {
             resolveQueue.add(request);
         }
-        schedule(1000);
+        schedule(WAIT_BEFORE_LAUNCH);
     }
 
     protected IStatus run(IProgressMonitor monitor) {
@@ -140,11 +142,11 @@ public class IvyResolveJob extends Job {
             VersionMatcher versionMatcher = ((Ivy) ivys.get(request)).getSettings()
                     .getVersionMatcher();
 
-            WarningNonMatchingVersionReporter nonMatchingVersionReporter = new WarningNonMatchingVersionReporter();
+            WarningNonMatchingVersionReporter vReporter = new WarningNonMatchingVersionReporter();
             CircularDependencyStrategy circularDependencyStrategy = WarnCircularDependencyStrategy
                     .getInstance();
             ModuleDescriptorSorter sorter = new ModuleDescriptorSorter(inworkspaceModules.keySet(),
-                    versionMatcher, nonMatchingVersionReporter, circularDependencyStrategy);
+                    versionMatcher, vReporter, circularDependencyStrategy);
             List sortedModuleDescriptors = sorter.sortModuleDescriptors();
 
             Iterator it = sortedModuleDescriptors.iterator();

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolveJobListener.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolveJobListener.java?rev=992639&r1=992638&r2=992639&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolveJobListener.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolveJobListener.java
Sat Sep  4 16:44:01 2010
@@ -73,7 +73,8 @@ public class IvyResolveJobListener imple
                     int progress = (int) (currentLength * DOWNLOAD_MONITOR_LENGTH
                             / expectedTotalLength);
                     dlmonitor.worked(progress);
-                    monitor.subTask("downloading " + evt.getResource() + ": " + (currentLength
/ KILO_BITS_UNIT) + " / "
+                    monitor.subTask("downloading " + evt.getResource() + ": "
+                            + (currentLength / KILO_BITS_UNIT) + " / "
                             + (expectedTotalLength / KILO_BITS_UNIT) + "kB");
                 }
                 break;

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java?rev=992639&r1=992638&r2=992639&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java
Sat Sep  4 16:44:01 2010
@@ -281,7 +281,8 @@ public class IvyResolver {
         options.setResolveId(result.getReport().getResolveId());
         options.setConfs(confs);
         if (retrieveTypes != null && !retrieveTypes.equals("*")) {
-            options.setArtifactFilter(new ArtifactTypeFilter(IvyClasspathUtil.split(retrieveTypes)));
+            List typeList = IvyClasspathUtil.split(retrieveTypes);
+            options.setArtifactFilter(new ArtifactTypeFilter(typeList));
         }
 
         // Actually do the retrieve

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/ResolveResult.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/ResolveResult.java?rev=992639&r1=992638&r2=992639&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/ResolveResult.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/ResolveResult.java
Sat Sep  4 16:44:01 2010
@@ -28,7 +28,6 @@ import org.apache.ivy.core.module.descri
 import org.apache.ivy.core.module.id.ModuleRevisionId;
 import org.apache.ivy.core.report.ArtifactDownloadReport;
 import org.apache.ivy.core.report.ResolveReport;
-import org.eclipse.core.runtime.MultiStatus;
 
 /**
  * Container of result of an Ivy resolve and maybe retrieve
@@ -43,7 +42,7 @@ public class ResolveResult {
 
     private final ResolveReport report;
 
-    protected Map/* <ModuleRevisionId, Artifact[]> */artifactsByDependency = new HashMap();
+    private Map/* <ModuleRevisionId, Artifact[]> */artifactsByDependency = new HashMap();
 
     /**
      * Mapping of resolved artifact to their retrieved path, <code>null</code>
if there were no



Mime
View raw message