From e1651ff166f57740d6459cef6ebf8d0001238dd7 Mon Sep 17 00:00:00 2001 From: Greg Watson Date: Mon, 28 Sep 2015 09:54:01 -0400 Subject: [PATCH] Bug 478544 - Add disposed check for table. Change-Id: I54791dcd902b9013ba3e8495934f1cd0e5161086 Signed-off-by: Greg Watson --- .../preferences/ConnectionsPreferencePage.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/ConnectionsPreferencePage.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/ConnectionsPreferencePage.java index b83f90a0caf..0d1a752820d 100644 --- a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/ConnectionsPreferencePage.java +++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/ConnectionsPreferencePage.java @@ -236,8 +236,8 @@ public class ConnectionsPreferencePage extends PreferencePage implements IWorkbe private void addConnection() { if (fIsDirty) { MessageDialog dialog = new MessageDialog(getShell(), Messages.ConnectionsPreferencePage_Confirm_Actions, null, - Messages.ConnectionsPreferencePage_There_are_unsaved_changes, MessageDialog.QUESTION, new String[] { - IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL }, 0); + Messages.ConnectionsPreferencePage_There_are_unsaved_changes, MessageDialog.QUESTION, + new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL }, 0); if (dialog.open() == 1) { return; } @@ -250,7 +250,9 @@ public class ConnectionsPreferencePage extends PreferencePage implements IWorkbe IRemoteConnectionWorkingCopy conn = wizard.open(); if (conn != null) { fWorkingCopies.put(conn.getName(), conn); - fConnectionViewer.refresh(); + if (!fConnectionViewer.getTable().isDisposed()) { + fConnectionViewer.refresh(); + } fIsDirty = true; } } @@ -595,17 +597,14 @@ public class ConnectionsPreferencePage extends PreferencePage implements IWorkbe IRemoteConnection conn = getOriginalIfClean(fSelectedConnection); if (conn.hasService(IRemoteConnectionControlService.class)) { if (!conn.isOpen()) { - fEditButton - .setEnabled(conn.getConnectionType().canEdit()); - fRemoveButton - .setEnabled(conn.getConnectionType().canRemove()); + fEditButton.setEnabled(conn.getConnectionType().canEdit()); + fRemoveButton.setEnabled(conn.getConnectionType().canRemove()); fOpenButton.setEnabled(true); } else { fCloseButton.setEnabled(true); } } else { - fEditButton - .setEnabled(conn.getConnectionType().canEdit()); + fEditButton.setEnabled(conn.getConnectionType().canEdit()); } } }