TEIIDDES-1713 added preventitive constant so tab selection doesn't ge…

…t into loop on internalSetFocus()
Teiid-Designer · May 22, 2013 · 2a3373d · 2a3373d
1 parent 15f66b5
commit 2a3373d
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/editors/MultiPageModelEditor.java b/plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/editors/MultiPageModelEditor.java
@@ -91,6 +91,8 @@ public abstract class MultiPageModelEditor extends EditorPart implements IGotoMa
     // otherwise, the OperationObjectEditorPage gets focus when it shouldn't
     // ----------------------------
     private boolean ignoreInternalFocus = false;
+
+    private boolean tabFolderSelectionInProgress = false;
 
     /**
      * Creates an empty multi-page editor with no pages.
@@ -437,6 +439,7 @@ private void createContainer( Composite parent ) {
 
             @Override
             public void widgetSelected( final SelectionEvent e ) {
+            	tabFolderSelectionInProgress = true;
                 // System.out.println("MultiPageModelEditor.createContainer()$SelectionAdapter.widgetSelected"); //$NON-NLS-1$
                 UiBusyIndicator.showWhile(Display.getCurrent(), new Runnable() {
 
@@ -452,6 +455,7 @@ public void run() {
 	                        int newPageIndex = tabFolder.indexOf(item);
 	                        pageChange(newPageIndex);
                         }
+                        tabFolderSelectionInProgress = false;
                     }
                 });
             }
@@ -901,7 +905,9 @@ void internalSetFocus() {
                 event.widget = getTabFolder();
                 event.item = item;
                 event.type = SWT.Selection;
-                getTabFolder().notifyListeners(SWT.Selection, event);
+                if( !tabFolderSelectionInProgress ) {
+                	getTabFolder().notifyListeners(SWT.Selection, event);
+                }
                 break;
             }
         }