ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r987744 - in /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde: common/ivyfile/ eclipse/ eclipse/cpcontainer/ eclipse/ui/ eclipse/ui/actions/ eclipse/ui/editors/
Date Sat, 21 Aug 2010 12:30:12 GMT
Author: hibou
Date: Sat Aug 21 12:30:12 2010
New Revision: 987744

URL: http://svn.apache.org/viewvc?rev=987744&view=rev
Log:
IVYDE-177
  The resolve job will always be "non-user" (the Eclipse API doesn't allow it to change between
different use of the job)

Modified:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileResourceListener.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDERuntimeClasspathEntryResolver.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathInitializer.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/IvydeContainerPage.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/NewIvyDEContainerWizard.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/RefreshAction.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/ResolveAction.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvySettingsEditor.java

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileResourceListener.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileResourceListener.java?rev=987744&r1=987743&r2=987744&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileResourceListener.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileResourceListener.java
Sat Aug 21 12:30:12 2010
@@ -73,7 +73,7 @@ public class IvyFileResourceListener imp
                 IvyClasspathContainer container = (IvyClasspathContainer) containerIter.next();
                 File containerIvyFile = container.getState().getIvyFile();
                 if (containerIvyFile.equals(resourceFile.getLocation().toFile())) {
-                    container.launchResolve(false, false, null);
+                    container.launchResolve(false, null);
                     return;
                 }
             }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDERuntimeClasspathEntryResolver.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDERuntimeClasspathEntryResolver.java?rev=987744&r1=987743&r2=987744&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDERuntimeClasspathEntryResolver.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDERuntimeClasspathEntryResolver.java
Sat Aug 21 12:30:12 2010
@@ -71,7 +71,7 @@ public class IvyDERuntimeClasspathEntryR
         }
         IvyClasspathContainer ivycp = (IvyClasspathContainer) container;
         if (ivycp.getConf().isInheritedResolveBeforeLaunch()) {
-            IStatus status = ivycp.launchResolve(false, false, new NullProgressMonitor());
+            IStatus status = ivycp.launchResolve(false, new NullProgressMonitor());
             if (status.getCode() != IStatus.OK) {
                 throw new CoreException(status);
             }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java?rev=987744&r1=987743&r2=987744&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java
Sat Aug 21 12:30:12 2010
@@ -173,7 +173,7 @@ public class IvyPlugin extends AbstractU
             while (itContainers.hasNext()) {
                 IvyClasspathContainer ivycp = (IvyClasspathContainer) itContainers.next();
                 if (!ivycp.getConf().isSettingsProjectSpecific()) {
-                    ivycp.launchResolve(false, false, null);
+                    ivycp.launchResolve(false, null);
                 }
             }
         }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java?rev=987744&r1=987743&r2=987744&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
Sat Aug 21 12:30:12 2010
@@ -53,8 +53,7 @@ import org.osgi.framework.Constants;
  */
 public class IvyClasspathContainer implements IClasspathContainer {
 
-    public static final String CONTAINER_ID =
-        "org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER";
+    public static final String CONTAINER_ID = "org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER";
 
     private IClasspathEntry[] classpathEntries;
 
@@ -127,11 +126,9 @@ public class IvyClasspathContainer imple
         return classpathEntries;
     }
 
-    public IStatus launchResolve(boolean usePreviousResolveIfExist, boolean isUser,
-            IProgressMonitor monitor) {
+    public IStatus launchResolve(boolean usePreviousResolveIfExist, IProgressMonitor monitor)
{
         ResolveRequest request = new ResolveRequest(this, usePreviousResolveIfExist);
         IvyResolveJob resolveJob = IvyPlugin.getDefault().getIvyResolveJob();
-        resolveJob.setUser(isUser);
         if (monitor != null) {
             return resolveJob.launchRequest(request, monitor);
         }
@@ -234,7 +231,7 @@ public class IvyClasspathContainer imple
 
     public void reloadSettings() {
         state.setIvySettingsLastModified(-1);
-        launchResolve(false, true, null);
+        launchResolve(false,  null);
     }
 
 }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathInitializer.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathInitializer.java?rev=987744&r1=987743&r2=987744&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathInitializer.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathInitializer.java
Sat Aug 21 12:30:12 2010
@@ -95,7 +95,7 @@ public class IvyClasspathInitializer ext
                 boolean refresh = startupMode == ON_STARTUP_REFRESH;
 
                 // now refresh the container to be synchronized with the ivy.xml
-                ivycp.launchResolve(refresh, false, null);
+                ivycp.launchResolve(refresh, null);
             } catch (Exception ex) {
                 IStatus status = new Status(IStatus.ERROR, IvyPlugin.ID, IStatus.OK,
                         "Unable to set container for " + containerPath.toString(), ex);

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=987744&r1=987743&r2=987744&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 12:30:12 2010
@@ -56,6 +56,7 @@ public class IvyResolveJob extends Job {
 
     public IvyResolveJob() {
         super("Ivy 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/IvydeContainerPage.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvydeContainerPage.java?rev=987744&r1=987743&r2=987744&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvydeContainerPage.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvydeContainerPage.java
Sat Aug 21 12:30:12 2010
@@ -238,7 +238,7 @@ public class IvydeContainerPage extends 
                     new IClasspathEntry[0], atts);
             JavaCore.setClasspathContainer(path, new IJavaProject[] {project},
                 new IClasspathContainer[] {ivycp}, null);
-            ivycp.launchResolve(false, true, null);
+            ivycp.launchResolve(false, null);
         } catch (JavaModelException e) {
             IvyPlugin.log(e);
         }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/NewIvyDEContainerWizard.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/NewIvyDEContainerWizard.java?rev=987744&r1=987743&r2=987744&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/NewIvyDEContainerWizard.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/NewIvyDEContainerWizard.java
Sat Aug 21 12:30:12 2010
@@ -64,7 +64,7 @@ public class NewIvyDEContainerWizard ext
             entries = (IClasspathEntry[]) newEntries
                     .toArray(new IClasspathEntry[newEntries.size()]);
             project.setRawClasspath(entries, project.getOutputLocation(), null);
-            ivycp.launchResolve(false, true, null);
+            ivycp.launchResolve(false, null);
         } catch (JavaModelException e) {
             IvyPlugin.log(e);
             return false;

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/RefreshAction.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/RefreshAction.java?rev=987744&r1=987743&r2=987744&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/RefreshAction.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/RefreshAction.java
Sat Aug 21 12:30:12 2010
@@ -29,7 +29,7 @@ public class RefreshAction extends IvyDE
     }
 
     public void run(IAction action) {
-        cp.launchResolve(true, true, null);
+        cp.launchResolve(true, null);
     }
 
 }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/ResolveAction.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/ResolveAction.java?rev=987744&r1=987743&r2=987744&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/ResolveAction.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/ResolveAction.java
Sat Aug 21 12:30:12 2010
@@ -29,7 +29,7 @@ public class ResolveAction extends IvyDE
     }
 
     public void run(IAction action) {
-        cp.launchResolve(false, true, null);
+        cp.launchResolve(false, null);
     }
 
 }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvySettingsEditor.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvySettingsEditor.java?rev=987744&r1=987743&r2=987744&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvySettingsEditor.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvySettingsEditor.java
Sat Aug 21 12:30:12 2010
@@ -125,7 +125,7 @@ public class IvySettingsEditor extends F
         Iterator/* <IvyClasspathContainer> */itContainers = containers.iterator();
         while (itContainers.hasNext()) {
             IvyClasspathContainer ivycp = (IvyClasspathContainer) itContainers.next();
-            ivycp.launchResolve(false, true, null);
+            ivycp.launchResolve(false, null);
         }
     }
 



Mime
View raw message