1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 18:26:01 +02:00

Bug 436390 - Allow newly-added connection to be opened

Change-Id: I258bf040afd566d1b1472ed69aaf709e01623dba
Signed-off-by: Greg Watson <g.watson@computer.org>
This commit is contained in:
Greg Watson 2014-06-02 16:44:53 -04:00
parent b447139584
commit e9ea3eaa16

View file

@ -213,8 +213,8 @@ public class ConnectionsPreferencePage extends PreferencePage implements IWorkbe
private void addConnection() { private void addConnection() {
if (fIsDirty) { if (fIsDirty) {
MessageDialog dialog = new MessageDialog(getShell(), Messages.ConnectionsPreferencePage_Confirm_Actions, null, MessageDialog dialog = new MessageDialog(getShell(), Messages.ConnectionsPreferencePage_Confirm_Actions, null,
Messages.ConnectionsPreferencePage_There_are_unsaved_changes, MessageDialog.QUESTION, Messages.ConnectionsPreferencePage_There_are_unsaved_changes, MessageDialog.QUESTION, new String[] {
new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL }, 0); IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL }, 0);
switch (dialog.open()) { switch (dialog.open()) {
case 0: case 0:
performOk(); performOk();
@ -490,6 +490,7 @@ public class ConnectionsPreferencePage extends PreferencePage implements IWorkbe
} else { } else {
if (conn instanceof IRemoteConnectionWorkingCopy) { if (conn instanceof IRemoteConnectionWorkingCopy) {
IRemoteConnectionWorkingCopy wc = (IRemoteConnectionWorkingCopy) conn; IRemoteConnectionWorkingCopy wc = (IRemoteConnectionWorkingCopy) conn;
conn = wc.getOriginal();
if (wc.isDirty()) { if (wc.isDirty()) {
MessageDialog dialog = new MessageDialog(getShell(), Messages.ConnectionsPreferencePage_Confirm_Actions, MessageDialog dialog = new MessageDialog(getShell(), Messages.ConnectionsPreferencePage_Confirm_Actions,
null, Messages.ConnectionsPreferencePage_This_connection_contains_unsaved_changes, null, Messages.ConnectionsPreferencePage_This_connection_contains_unsaved_changes,
@ -500,7 +501,6 @@ public class ConnectionsPreferencePage extends PreferencePage implements IWorkbe
wc.save(); wc.save();
break; break;
case 1: case 1:
conn = wc.getOriginal();
break; break;
case 2: case 2:
return; return;