Merge pull request #53 from maoueh/gh-52

Fixed InvalidThreadAccess when trying to set selection (GH-52)
pulse00 · Mar 8, 2012 · aa2b4c5 · aa2b4c5
2 parents 0998afc + 1422722
commit aa2b4c5
Showing 1 changed file with 22 additions and 9 deletions.
diff --git a/com.dubture.twig.ui/src/com/dubture/twig/ui/editor/TwigStructuredEditor.java b/com.dubture.twig.ui/src/com/dubture/twig/ui/editor/TwigStructuredEditor.java
@@ -1,8 +1,8 @@
 /*******************************************************************************
  * This file is part of the Twig eclipse plugin.
- * 
+ *
  * (c) Robert Gruendler <r.gruendler@gmail.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  ******************************************************************************/
@@ -55,6 +55,7 @@
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.IStorageEditorInput;
@@ -72,14 +73,14 @@
 import com.dubture.twig.ui.actions.TwigRefactorActionGroup;
 
 /**
- * 
+ *
  * A modified {@link PHPStructuredEditor} for Twig templates.
- * 
+ *
  * Modifications concerning:
- * 
+ *
  * - attaching {@link TwigSourceParser} instead of {@link PhpSourceParser} -
  * finding occurences
- * 
+ *
  */
 @SuppressWarnings({"restriction", "unchecked"})
 public class TwigStructuredEditor extends PHPStructuredEditor
@@ -97,7 +98,7 @@ public class TwigStructuredEditor extends PHPStructuredEditor
 
     /**
      * Holds the current occurrence annotations.
-     * 
+     *
      * @since 3.4
      */
     private Annotation[] fOccurrenceAnnotations = null;
@@ -303,7 +304,7 @@ public void inputDocumentChanged(IDocument oldInput, IDocument newInput)
 
     /**
      * Finds and marks occurrence annotations.
-     * 
+     *
      * @since 3.0
      */
     class OccurrencesFinderJob extends Job
@@ -492,7 +493,19 @@ protected void setSelection(ISourceReference reference, boolean moveCursor)
     {
         if (getSelectionProvider() == null)
             return;
-        ISelection selection = getSelectionProvider().getSelection();
+
+        final ISelection[] selections = new ISelection[1];
+        Display.getDefault().syncExec(new Runnable() {
+            public void run() {
+                selections[0] = getSelectionProvider().getSelection();
+            }
+        });
+
+        if (selections[0] == null) {
+            return;
+        }
+
+        final ISelection selection = selections[0];
         if (selection instanceof TextSelection) {
             TextSelection textSelection = (TextSelection) selection;
             if (textSelection instanceof IStructuredSelection) {