Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@ant.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r988102 -
 /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyNature.java
Date: Mon, 23 Aug 2010 12:35:35 -0000
To: notifications@ant.apache.org
From: hibou@apache.org
Message-Id: <20100823123535.66DE923889ED@eris.apache.org>

Author: hibou
Date: Mon Aug 23 12:35:35 2010
New Revision: 988102

URL: http://svn.apache.org/viewvc?rev=988102&view=rev
Log:
Add nature asynchronously, otherwise there are some concurrent modification errors happening on old project opening

Modified:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyNature.java

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyNature.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyNature.java?rev=988102&r1=988101&r2=988102&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyNature.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyNature.java Mon Aug 23 12:35:35 2010
@@ -29,6 +29,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.swt.widgets.Display;
 
 public class IvyNature implements IProjectNature {
 
@@ -73,33 +74,44 @@ public class IvyNature implements IProje
         try {
             return project.hasNature(IVY_NATURE);
         } catch (CoreException e) {
-            IvyPlugin.log(IStatus.ERROR, "Unable to get the Ivy nature of the project "
-                    + project.getName(), e);
+            IvyPlugin.log(IStatus.ERROR,
+                "Unable to get the Ivy nature of the project " + project.getName(), e);
             return false;
         }
     }
 
     public static void addNature(final IProject project) {
-        try {
-            if (hasNature(project)) {
-                return;
-            }
+        if (hasNature(project)) {
+            return;
+        }
 
-            final IProjectDescription description = project.getDescription();
-            final String[] ids = description.getNatureIds();
+        final IProjectDescription description;
+        try {
+            description = project.getDescription();
+        } catch (CoreException e) {
+            IvyPlugin.log(IStatus.ERROR,
+                "Failed to add Ivy dependency management on " + project.getName(), e);
+            return;
+        }
+        final String[] ids = description.getNatureIds();
 
-            final String[] newIds = new String[ids == null ? 1 : ids.length + 1];
-            if (ids != null) {
-                System.arraycopy(ids, 0, newIds, 0, ids.length);
+        final String[] newIds = new String[ids == null ? 1 : ids.length + 1];
+        if (ids != null) {
+            System.arraycopy(ids, 0, newIds, 0, ids.length);
+        }
+        newIds[ids == null ? 0 : ids.length] = IVY_NATURE;
+
+        description.setNatureIds(newIds);
+        Display.getDefault().asyncExec(new Runnable() {
+            public void run() {
+                try {
+                    project.setDescription(description, null);
+                } catch (CoreException e) {
+                    IvyPlugin.log(IStatus.ERROR, "Failed to add Ivy dependency management on "
+                            + project.getName(), e);
+                }
             }
-            newIds[ids == null ? 0 : ids.length] = IVY_NATURE;
-
-            description.setNatureIds(newIds);
-            project.setDescription(description, null);
-        } catch (Exception e) {
-            IvyPlugin.log(IStatus.ERROR, "Failed to add Ivy dependency management on "
-                    + project.getName(), e);
-        }
+        });
     }
 
     public static void removeNature(final IProject project) {
@@ -137,8 +149,8 @@ public class IvyNature implements IProje
             description.setNatureIds(newIds);
             project.setDescription(description, null);
         } catch (Exception e) {
-            IvyPlugin.log(IStatus.ERROR, "Failed to remove Ivy dependency management on "
-                    + project.getName(), e);
+            IvyPlugin.log(IStatus.ERROR,
+                "Failed to remove Ivy dependency management on " + project.getName(), e);
         }
     }