ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r987770 - in /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer: IvyClasspathContainerConfiguration.java IvyResolveJob.java IvyResolveJobListener.java IvyResolveJobThread.java
Date Sat, 21 Aug 2010 15:23:44 GMT
Author: hibou
Date: Sat Aug 21 15:23:43 2010
New Revision: 987770

URL: http://svn.apache.org/viewvc?rev=987770&view=rev
Log:
IVYDE-177
 * make the resolve progress more clear 

Modified:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJobListener.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJobThread.java

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java?rev=987770&r1=987769&r2=987770&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java
Sat Aug 21 15:23:43 2010
@@ -330,7 +330,7 @@ public class IvyClasspathContainerConfig
     }
 
     public String toString() {
-        return ivyXmlPath
+        return ivyXmlPath + confs
                 + (javaProject == null ? "" : " in '" + javaProject.getProject().getName()
+ "'");
     }
 

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=987770&r1=987769&r2=987770&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
Sat Aug 21 15:23:43 2010
@@ -55,7 +55,7 @@ public class IvyResolveJob extends Job {
     private final List resolveQueue = new ArrayList();
 
     public IvyResolveJob() {
-        super("Ivy resolve job");
+        super("IvyDE resolve job");
         setUser(false);
         // computing the classpath is somehow building
         setRule(ResourcesPlugin.getWorkspace().getRuleFactory().buildRule());

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJobListener.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJobListener.java?rev=987770&r1=987769&r2=987770&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJobListener.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJobListener.java
Sat Aug 21 15:23:43 2010
@@ -57,7 +57,7 @@ public class IvyResolveJobListener imple
     public void transferProgress(TransferEvent evt) {
         switch (evt.getEventType()) {
             case TransferEvent.TRANSFER_INITIATED:
-                monitor.setTaskName("downloading " + evt.getResource());
+                monitor.subTask("downloading " + evt.getResource());
                 break;
             case TransferEvent.TRANSFER_STARTED:
                 currentLength = 0;
@@ -73,7 +73,7 @@ public class IvyResolveJobListener imple
                     int progress = (int) (currentLength * DOWNLOAD_MONITOR_LENGTH
                             / expectedTotalLength);
                     dlmonitor.worked(progress);
-                    monitor.subTask((currentLength / KILO_BITS_UNIT) + " / "
+                    monitor.subTask("downloading " + evt.getResource() + ": " + (currentLength
/ KILO_BITS_UNIT) + " / "
                             + (expectedTotalLength / KILO_BITS_UNIT) + "kB");
                 }
                 break;
@@ -94,7 +94,7 @@ public class IvyResolveJobListener imple
             }
         } else if (event instanceof StartArtifactDownloadEvent) {
             StartArtifactDownloadEvent evt = (StartArtifactDownloadEvent) event;
-            monitor.setTaskName("downloading " + evt.getArtifact());
+            monitor.subTask("downloading " + evt.getArtifact());
             if (dlmonitor != null) {
                 dlmonitor.done();
             }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJobThread.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJobThread.java?rev=987770&r1=987769&r2=987770&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJobThread.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJobThread.java
Sat Aug 21 15:23:43 2010
@@ -110,8 +110,8 @@ public class IvyResolveJobThread extends
             IvyResolveJobListener ivyResolveJobListener = new IvyResolveJobListener(monitor);
             ivy.getEventManager().addIvyListener(ivyResolveJobListener);
 
-            monitor.beginTask("resolving dependencies", MONITOR_LENGTH);
-            monitor.setTaskName("resolving dependencies...");
+            monitor.beginTask("Resolve of " + conf.toString(), MONITOR_LENGTH);
+            monitor.setTaskName("Resolve of " + conf.toString());
 
             // context Classloader hook for commons logging used by httpclient
             // It will also be used by the SaxParserFactory in Ivy



Mime
View raw message