Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames2002-01-30 16:04:41 +0000
committerjames2002-01-30 16:04:41 +0000
commitb712681ab2695bf4e31555aa71874f6611e370fb (patch)
tree5bcf88042f988db9ca066a5001d2f99b45cd643d
parent8630f8630e8c20200017cb7657040d9025d8e83b (diff)
downloadeclipse.platform.team-b712681ab2695bf4e31555aa71874f6611e370fb.tar.gz
eclipse.platform.team-b712681ab2695bf4e31555aa71874f6611e370fb.tar.xz
eclipse.platform.team-b712681ab2695bf4e31555aa71874f6611e370fb.zip
Fix NPE in error handling
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java
index 7b72c31e4..e34149aa0 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java
@@ -14,16 +14,17 @@ import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Shell;
import org.eclipse.team.ccvs.core.CVSProviderPlugin;
import org.eclipse.team.ccvs.core.ICVSRepositoryLocation;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.internal.ccvs.core.client.Session;
import org.eclipse.team.internal.ccvs.core.resources.CVSEntryLineTag;
import org.eclipse.team.internal.ccvs.core.resources.ICVSFolder;
-import org.eclipse.team.internal.ccvs.core.syncinfo.*;
import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo;
import org.eclipse.team.internal.ccvs.ui.Policy;
@@ -68,7 +69,7 @@ public class ConfigurationWizardAutoconnectPage extends CVSWizardPage {
createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.port"));
String port = properties.getProperty("port");
if (port == null) {
- createLabel(composite, "ConfigurationWizardAutoconnectPage.default");
+ createLabel(composite, Policy.bind("ConfigurationWizardAutoconnectPage.default"));
} else {
createLabel(composite, port);
}
@@ -129,7 +130,9 @@ public class ConfigurationWizardAutoconnectPage extends CVSWizardPage {
properties.setProperty("tag", tag.getName());
}
} catch (TeamException e) {
- ErrorDialog.openError(getContainer().getShell(), null, null, e.getStatus());
+ Shell shell = new Shell(Display.getDefault());
+ ErrorDialog.openError(shell, null, null, e.getStatus());
+ shell.dispose();
}
}
}

Back to the top