Merge pull request #590 from mkralik3/TEIID-3087

TEIIDDES-3087
Teiid-Designer · Dec 4, 2018 · d2d682a · d2d682a
2 parents 3666239 + bc37745
commit d2d682a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/...rg.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/editor/panels/PropertiesPanel.java b/...rg.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/editor/panels/PropertiesPanel.java
@@ -63,7 +63,6 @@ public class PropertiesPanel {
 	Button removeLanguageButton;
 
 	/*
-	 
     	NONE- disallow new connections.
     	BY_VERSION- the default setting. Allow connections only if the version is specified or if this is the earliest BY_VERSION vdb and there are no vdbs marked as ANY.
     	ANY- allow connections with or without a version specified.
@@ -138,10 +137,10 @@ public void modifyText(ModifyEvent e) {
         String type = vdb.getConnectionType();
         if( VdbConstants.ConnectionTypes.ANY.equalsIgnoreCase(type) ) {
         	connectionType.select(2);
-        } else if( VdbConstants.ConnectionTypes.BY_VERSION.equalsIgnoreCase(type) ) {
-        	connectionType.select(1);
-        } else {
-            connectionType.select(0);
+        } else if( VdbConstants.ConnectionTypes.NONE.equalsIgnoreCase(type) ) {
+        	connectionType.select(0);
+        } else { //BY_VERSION which is default
+            connectionType.select(1);
         }
 
         this.connectionType.addModifyListener(new ModifyListener() {

diff --git a/plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/BasicVdb.java b/plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/BasicVdb.java
@@ -91,7 +91,7 @@ public String getKey(VdbImportVdbEntry value) {
 	/*
 	 * NONE, BY_VERSION, ANY
 	 */
-	private String connectionType = VdbConstants.ConnectionTypes.NONE;
+	private String connectionType = VdbConstants.ConnectionTypes.BY_VERSION;
 	// known properties
 	/*
 		<property name="preview" value="false"/>