Merge pull request #396 from mdrillin/TEIIDDES-2295

TEIIDDES-2295 Fixes several windows specific issues
Teiid-Designer · Aug 20, 2014 · 0438a54 · 0438a54
2 parents f43e6bf + a987d12
commit 0438a54
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 16 deletions.
diff --git a/.../org.teiid.designer.roles.ui/src/org/teiid/designer/roles/ui/wizard/panels/CrudPanel.java b/.../org.teiid.designer.roles.ui/src/org/teiid/designer/roles/ui/wizard/panels/CrudPanel.java
@@ -50,7 +50,7 @@ public CrudPanel(Composite parent, DataRoleWizard wizard) {
 	 */
 	@Override
 	void createControl() {
-        treeViewer = new TreeViewer(getPrimaryPanel(), SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
+        treeViewer = new TreeViewer(getPrimaryPanel(), SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
         Tree tree = treeViewer.getTree();
 
         final GridData gridData = new GridData(GridData.FILL_BOTH);

diff --git a/...rmation.ui/src/org/teiid/designer/transformation/ui/editors/ViewProcedureEditorPanel.java b/...rmation.ui/src/org/teiid/designer/transformation/ui/editors/ViewProcedureEditorPanel.java
@@ -420,12 +420,12 @@ public void widgetSelected(SelectionEvent e) {
 
 		});
 
-    	Table columnTable = new Table(thePanel, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER );
+        this.columnsViewer = new TableViewer(thePanel, SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
+    	Table columnTable = this.columnsViewer.getTable();
     	columnTable.setHeaderVisible(true);
     	columnTable.setLinesVisible(true);
     	columnTable.setLayout(new TableLayout());
 
-        this.columnsViewer = new TableViewer(columnTable);
         GridDataFactory.fillDefaults().grab(true, false).hint(SWT.DEFAULT, 100).applyTo(this.columnsViewer.getControl());
 
         // create columns
@@ -534,7 +534,7 @@ public void widgetSelected( SelectionEvent e ) {
 				gd.horizontalSpan=4;
 				restGroup.setLayoutData(gd);
 
-				this.applyRestWarPropertiesCB = WidgetFactory.createCheckBox(restGroup, Messages.enableRestForThisProcedure); //$NON-NLS-1$
+				this.applyRestWarPropertiesCB = WidgetFactory.createCheckBox(restGroup, Messages.enableRestForThisProcedure);
 				this.applyRestWarPropertiesCB.setEnabled(true);
 				this.applyRestWarPropertiesCB.setSelection(true);
 
@@ -1006,12 +1006,12 @@ public void widgetSelected(SelectionEvent e) {
 
 		});
 
-    	Table columnTable = new Table(thePanel, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER );
+    	this.parametersViewer = new TableViewer(thePanel, SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
+    	Table columnTable = this.parametersViewer.getTable();
     	columnTable.setHeaderVisible(true);
     	columnTable.setLinesVisible(true);
     	columnTable.setLayout(new TableLayout());
 
-        this.parametersViewer = new TableViewer(columnTable);
         GridDataFactory.fillDefaults().grab(true, false).hint(SWT.DEFAULT, 150).applyTo(this.parametersViewer.getControl());
 
         // create columns

diff --git a/...nsformation.ui/src/org/teiid/designer/transformation/ui/editors/ViewTableEditorPanel.java b/...nsformation.ui/src/org/teiid/designer/transformation/ui/editors/ViewTableEditorPanel.java
@@ -1096,12 +1096,12 @@ public void widgetSelected(SelectionEvent e) {
 
 		});
 
-    	Table columnTable = new Table(thePanel, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER );
+    	this.columnsViewer = new TableViewer(thePanel, SWT.SINGLE | SWT.FULL_SELECTION |SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER );
+    	Table columnTable = this.columnsViewer.getTable();
     	columnTable.setHeaderVisible(true);
     	columnTable.setLinesVisible(true);
     	columnTable.setLayout(new TableLayout());
 
-        this.columnsViewer = new TableViewer(columnTable);
         GridDataFactory.fillDefaults().grab(true, true).applyTo(columnsViewer.getControl());
         //GridDataFactory.fillDefaults().grab(true, false).hint(SWT.DEFAULT, 200).applyTo(columnsViewer.getControl());
 

diff --git a/...rmation.ui/src/org/teiid/designer/transformation/ui/wizards/xmlfile/TeiidXmlFileInfo.java b/...rmation.ui/src/org/teiid/designer/transformation/ui/wizards/xmlfile/TeiidXmlFileInfo.java
@@ -13,15 +13,16 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.teiid.core.designer.util.CoreArgCheck;
 import org.teiid.core.designer.util.I18nUtil;
-import org.teiid.core.designer.util.StringUtilities;
-import org.teiid.datatools.connectivity.model.Parameter;
+import org.teiid.core.designer.util.StringConstants;
 import org.teiid.designer.core.ModelerCore;
 import org.teiid.designer.query.IProcedureService;
 import org.teiid.designer.query.IQueryService;
@@ -70,12 +71,12 @@ private static String getString( final String id, final Object arg1) {
      * Usually of the form '$d/MedlineCitationSet/MedlineCitation'. In this case, the expression defines the initial path
      * inside the XML structure that the COLUMN PATH's are relative to
      */
-	private String rootPath = StringUtilities.EMPTY_STRING;
+	private String rootPath = StringConstants.EMPTY_STRING;
 
 	/**
 	 * Common Root path
 	 */
-	private String commonRootPath = StringUtilities.EMPTY_STRING;
+	private String commonRootPath = StringConstants.EMPTY_STRING;
 
 	/**
 	 * Indicator for the import processor to attempt to create a View Table given the info in this object.
@@ -156,13 +157,13 @@ public void inject(TeiidXmlFileInfo info) {
 		if( info.getViewTableName() != null ) {
 			setViewTableName(info.getViewTableName());
 		} else {
-			setViewTableName(StringUtilities.EMPTY_STRING);
+			setViewTableName(StringConstants.EMPTY_STRING);
 		}
 
 		if( info.getViewProcedureName() != null ) {
 			setViewProcedureName(info.getViewProcedureName());
 		} else {
-			setViewProcedureName(StringUtilities.EMPTY_STRING);
+			setViewProcedureName(StringConstants.EMPTY_STRING);
 		}
 
 		validate();
@@ -672,7 +673,7 @@ private void addChildPaths(XmlElement element, List<String> segmentList ) {
 	 */
 	@Override
 	public Map<String, Object> getParameterMap() {
-		return this.parameterMap;
+		return this.parameterMap==null ? Collections.EMPTY_MAP : this.parameterMap;
 	}
 
 	/**

diff --git a/....teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/editor/panels/ModelDetailsPanel.java b/....teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/editor/panels/ModelDetailsPanel.java
@@ -241,7 +241,7 @@ public void widgetSelected(SelectionEvent e) {
 			// Table containing Source  binding NAME, TRANSLATOR NAME, JNDI NAME
 			BINDING_TABLE : {
 		        // Create Table Viewer
-		        int tableStyle = SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER;
+		        int tableStyle = SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER;
 		        bindingsViewer = new TableViewer(lowerPanel, tableStyle);
 
 		        Table table = bindingsViewer.getTable();