Merge pull request #247 from mdrillin/TEIIDDES-1909

TEIIDDES-1909 DDL Importer - default to 'auto-select' the dialect
Teiid-Designer · Oct 31, 2013 · 7d0c71d · 7d0c71d
2 parents a731eff + 088b8e8
commit 7d0c71d
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/...eiid.designer.ddl.importer.ui/src/org/teiid/designer/ddl/importer/ui/DdlImporterPage.java b/...eiid.designer.ddl.importer.ui/src/org/teiid/designer/ddl/importer/ui/DdlImporterPage.java
@@ -316,23 +316,25 @@ public void widgetSelected( final SelectionEvent event ) {
             }
         });
 
-        // Initial selection is 'TEIID'
-        int teiidIndx = dialectCombo.indexOf(TEIID_DIALECT);
-        dialectCombo.select(teiidIndx);
-        selectDialect(TEIID_DIALECT);
+        // Initial selection - 'auto-select'
+        selectDialect(null);
+
+        // 'Auto-select' checkbox is checked initially
         autoSelectDialectCheckBox = WidgetFactory.createCheckBox(dialectPanel,
         		DdlImporterUiI18n.AUTO_SELECT_DIALECT_CHECKBOX,
         		0,
         		1,
-        		false);
+        		true);
         autoSelectDialectCheckBox.addSelectionListener(new SelectionAdapter() {
 
         	@Override
         	public void widgetSelected( final SelectionEvent event ) {
         		autoSelectDialectChanged();
         	}
         });
-
+
+        // Disable Combo initially - auto-select is checked
+        dialectCombo.setEnabled(false);
 
         // ----------------------------------------
         // Model Folder controls
@@ -534,8 +536,16 @@ void autoSelectDialectChanged( ) {
     	} else {
     		this.dialectCombo.setEnabled(true);
             int comboIndx = dialectCombo.getSelectionIndex();
-            String dialect = dialectCombo.getItem(comboIndx);
-            selectDialect(dialect);
+            // No Combo selection - default to SQL_92
+            if(comboIndx==-1) {
+                int teiidIndx = dialectCombo.indexOf(SQL92_DIALECT);
+                dialectCombo.select(teiidIndx);
+                selectDialect(SQL92_DIALECT);
+            // Set dialect to Combo selection
+            } else {
+            	String dialect = dialectCombo.getItem(comboIndx);
+            	selectDialect(dialect);
+            }
     	}
     }