Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java3
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracRepositorySettingsPage.java7
2 files changed, 7 insertions, 3 deletions
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java
index 731c489a6..5a266029e 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java
@@ -21,6 +21,7 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaClient;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaClientFactory;
@@ -299,6 +300,8 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa
public void run(IProgressMonitor monitor) throws CoreException {
try {
validate(monitor);
+ } catch (OperationCanceledException e) {
+ throw e;
} catch (Exception e) {
displayError(repository.getRepositoryUrl(), e);
}
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracRepositorySettingsPage.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracRepositorySettingsPage.java
index d67a1b026..7684ee45e 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracRepositorySettingsPage.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracRepositorySettingsPage.java
@@ -159,6 +159,7 @@ public class TracRepositorySettingsPage extends AbstractRepositorySettingsPage {
if (((TracValidator) validator).getResult() != null) {
setTracVersion(((TracValidator) validator).getResult());
+ getContainer().updateButtons();
}
}
@@ -191,9 +192,9 @@ public class TracRepositorySettingsPage extends AbstractRepositorySettingsPage {
if (e.isNtlmAuthRequested()) {
AuthenticationCredentials credentials = taskRepository.getCredentials(AuthenticationType.REPOSITORY);
if (!credentials.getUserName().contains("\\")) { //$NON-NLS-1$
- throw new CoreException(
- RepositoryStatus.createStatus(repositoryUrl, IStatus.ERROR, TracUiPlugin.ID_PLUGIN,
- Messages.TracRepositorySettingsPage_NTLM_authentication_requested_Error));
+ throw new CoreException(RepositoryStatus.createStatus(repositoryUrl, IStatus.ERROR,
+ TracUiPlugin.ID_PLUGIN,
+ Messages.TracRepositorySettingsPage_NTLM_authentication_requested_Error));
}
}
throw new CoreException(RepositoryStatus.createStatus(repositoryUrl, IStatus.ERROR,

Back to the top