From 95343e2ab387dacfc3b5186a1d92779e240966a9 Mon Sep 17 00:00:00 2001
From: vladt
Date: Wed, 30 Mar 2011 14:50:44 -0400
Subject: 341413: Eclipse blocks/hangs if a pom file is saved during a build
 operation

---
 .../org/eclipse/m2e/editor/pom/MavenPomEditor.java    | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'org.eclipse.m2e.editor')

diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditor.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditor.java
index 75b396d9..f100b7b9 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditor.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditor.java
@@ -161,7 +161,7 @@ public class MavenPomEditor extends FormEditor implements IResourceChangeListene
 
   List<IPomFileChangedListener> fileChangeListeners = new ArrayList<IPomFileChangedListener>();
 
-  protected boolean resourceChangeEventSkip = false;
+  private boolean resourceChangeEventSkip = false;
 
   public MavenPomEditor() {
     modelManager = StructuredModelManager.getModelManager();
@@ -770,17 +770,12 @@ public class MavenPomEditor extends FormEditor implements IResourceChangeListene
    * Saves structured editor XXX form model need to be synchronized
    */
   public void doSave(IProgressMonitor monitor) {
-    new UIJob(Messages.MavenPomEditor_job_saving) {
-      public IStatus runInUIThread(IProgressMonitor monitor) {
-        resourceChangeEventSkip = true;
-        try {
-          sourcePage.doSave(monitor);
-        } finally {
-          resourceChangeEventSkip  = false;
-        }
-        return Status.OK_STATUS;
-      }
-    }.schedule();
+    resourceChangeEventSkip = true;
+    try {
+      sourcePage.doSave(monitor);
+    } finally {
+      resourceChangeEventSkip = false;
+    }
   }
 
   public void doSaveAs() {
-- 
cgit v1.2.3