Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Aug 14, 2015
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 17 additions & 10 deletions ...rc/org/jboss/tools/openshift/internal/common/ui/connection/ConnectionWizardPageModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down