TEIIDDES-2159 maded copy of editor list and added check for disposed …

…editor page control
Teiid-Designer · May 15, 2014 · 1b81bff · 1b81bff
1 parent 6b90273
commit 1b81bff
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/editors/ModelEditorManager.java b/plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/editors/ModelEditorManager.java
@@ -10,10 +10,13 @@
 import static org.teiid.designer.ui.PluginConstants.Prefs.General.AUTO_OPEN_EDITOR_IF_NEEDED;
 import static org.teiid.designer.ui.UiConstants.Util;
 import static org.teiid.designer.ui.UiConstants.Extensions.MODEL_EDITOR;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.List;
+
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IPath;
@@ -173,10 +176,12 @@ public static void autoSelectEditor( final ModelEditor editor,
         Display.getDefault().asyncExec(new Runnable() {
             @Override
             public void run() {
-                for (Iterator iter = editor.getAllEditors().iterator(); iter.hasNext();) {
-                    Object nextPage = iter.next();
-                    if (nextPage == thePage) {
-                        editor.selectPage(thePage);
+            	List copyOfAllEditors = new ArrayList(editor.getAllEditors());
+                for (Object nextPage : copyOfAllEditors) {
+                    if( nextPage instanceof ModelEditorPage ) {
+	                    if (nextPage == thePage && !((ModelEditorPage)nextPage).getControl().isDisposed()) {
+	                        editor.selectPage(thePage);
+	                    }
                     }
                 }
             }