[JBIDE-20456] conn wiz: corrected "use default server" behaviour

jbosstools · Aug 14, 2015 · 68a29da · 68a29da
1 parent d33667a
commit 68a29da
Showing 1 changed file with 17 additions and 10 deletions.
diff --git a/...rc/org/jboss/tools/openshift/internal/common/ui/connection/ConnectionWizardPageModel.java b/...rc/org/jboss/tools/openshift/internal/common/ui/connection/ConnectionWizardPageModel.java
@@ -181,21 +181,28 @@ private String updateHost(String host, boolean useDefaultHost, IConnection selec
 	}
 
 	private boolean updateUseDefaultHost(boolean useDefaultHost, IConnection selectedConnection, IConnectionFactory factory) {
-		if (factory != null
+		if (selectedConnection != null
+			&& !selectedConnection.equals(this.selectedConnection)) {
+			// connection changed
+			if (selectedConnection instanceof NewConnectionMarker) {
+				// <New Connection> selected
+				useDefaultHost = factory.hasDefaultHost();
+			} else {
+				// existing connection selected
+				useDefaultHost = selectedConnection.isDefaultHost();
+			}
+		} else if (factory != null
 				&& !factory.equals(connectionFactory)) {
 			// server type changed
-			if (selectedConnection instanceof NewConnectionMarker
-					&& factory.hasDefaultHost()) {
-				// <New Connection> selected
-				useDefaultHost = true; 
-			} else if (useDefaultHost
+			if (useDefaultHost
 					|| StringUtils.isEmpty(this.host)) {
 				useDefaultHost = factory.hasDefaultHost();
 			}
-		} else if (selectedConnection != null
-				&& !selectedConnection.equals(this.selectedConnection)) {
-				// connection changed
-				useDefaultHost = selectedConnection.isDefaultHost();
+		} else if (useDefaultHost) {
+			// use default host clicked
+			if (!factory.hasDefaultHost()) {
+				useDefaultHost = false;
+			}
 		};
 		return useDefaultHost;
 	}