Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkersten2006-01-13 19:46:10 -0500
committermkersten2006-01-13 19:46:10 -0500
commit232a743f1a56a6f7e50c4332b1ba1fddeeb2e3e6 (patch)
treeaf9cae16bd9b2196cb40387dff744286c546a107
parente69034de8516e5e0663cb69d62a1a865f88eeb67 (diff)
downloadorg.eclipse.mylyn.tasks-232a743f1a56a6f7e50c4332b1ba1fddeeb2e3e6.tar.gz
org.eclipse.mylyn.tasks-232a743f1a56a6f7e50c4332b1ba1fddeeb2e3e6.tar.xz
org.eclipse.mylyn.tasks-232a743f1a56a6f7e50c4332b1ba1fddeeb2e3e6.zip
Progress on: Bug 117035: Bugzilla plugin ignores encoding
https://bugs.eclipse.org/bugs/show_bug.cgi?id=117035
-rw-r--r--org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaRepositorySettingsPage.java2
-rw-r--r--org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/IBugzillaConstants.java3
-rw-r--r--org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/BugParser.java2
-rw-r--r--org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/KeywordParser.java3
-rw-r--r--org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/ProductParser.java2
-rw-r--r--org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaQueryPageParser.java2
-rw-r--r--org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchEngine.java2
7 files changed, 10 insertions, 6 deletions
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaRepositorySettingsPage.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaRepositorySettingsPage.java
index a976870f5..248524648 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaRepositorySettingsPage.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaRepositorySettingsPage.java
@@ -40,7 +40,7 @@ public class BugzillaRepositorySettingsPage extends RepositorySettingsPage {
protected void createAdditionalControls(Composite parent) {
validateServerButton = new Button(parent, SWT.PUSH);
- validateServerButton.setText("Validate Bugzilla Server");
+ validateServerButton.setText("Validate Server URL");
validateServerButton.addMouseListener(new MouseListener() {
public void mouseDoubleClick(MouseEvent e) {
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/IBugzillaConstants.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/IBugzillaConstants.java
index c0cf44911..b36bfa903 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/IBugzillaConstants.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/IBugzillaConstants.java
@@ -91,4 +91,7 @@ public interface IBugzillaConstants {
static final String[] DEFAULT_TARGET_VALUES = { };
public static final String TITLE_MESSAGE_DIALOG = "Mylar Bugzilla Client";
+
+ public static final String MESSAGE_LOGIN_FAILURE = "Bugzilla login information or repository version incorrect";
+
}
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/BugParser.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/BugParser.java
index 9b5cdac1d..5a01e5390 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/BugParser.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/BugParser.java
@@ -727,7 +727,7 @@ public class BugParser {
// problem, assume that there was a login problem
if (bug.getCreated() == null && bug.getAttributes().isEmpty()) {
if (possibleBadLogin) {
- throw new LoginException("Bugzilla login information incorrect");
+ throw new LoginException(IBugzillaConstants.MESSAGE_LOGIN_FAILURE);
} else {
return null;
}
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/KeywordParser.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/KeywordParser.java
index a38593922..32ba8ca89 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/KeywordParser.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/KeywordParser.java
@@ -18,6 +18,7 @@ import java.util.List;
import javax.security.auth.login.LoginException;
+import org.eclipse.mylar.bugzilla.core.IBugzillaConstants;
import org.eclipse.mylar.bugzilla.core.internal.HtmlStreamTokenizer.Token;
/**
@@ -111,7 +112,7 @@ public class KeywordParser {
// if we don't have any keywords and suspect that there was a login
// problem, assume we had a login problem
if (keywords == null && possibleBadLogin)
- throw new LoginException("Bugzilla login information incorrect");
+ throw new LoginException(IBugzillaConstants.MESSAGE_LOGIN_FAILURE);
return keywords;
}
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/ProductParser.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/ProductParser.java
index 9dac65e12..970451844 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/ProductParser.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/ProductParser.java
@@ -114,7 +114,7 @@ public class ProductParser
//
// // if we have no products and we suspect a login error, assume that it was a login error
// if(products == null && possibleBadLogin)
-// throw new LoginException("Bugzilla login information incorrect");
+// throw new LoginException(IBugzillaConstants.MESSAGE_LOGIN_FAILURE);
// return products;
}
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaQueryPageParser.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaQueryPageParser.java
index 773c31ff0..c9ce0db3f 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaQueryPageParser.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaQueryPageParser.java
@@ -438,7 +438,7 @@ public class BugzillaQueryPageParser {
// if all of the lists are empty and we suspect bad login info, assume
// that it was a bad login
if (possibleBadLogin && allListsEmpty())
- throw new LoginException("Bugzilla login information incorrect");
+ throw new LoginException(IBugzillaConstants.MESSAGE_LOGIN_FAILURE);
}
/**
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchEngine.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchEngine.java
index be6c12b57..4fa74ad54 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchEngine.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchEngine.java
@@ -293,7 +293,7 @@ public class BugzillaSearchEngine {
// if we haven't collected any serach results and we suspect a bad login, we assume it was a bad login
if(numCollected == 0 && possibleBadLogin)
- throw new LoginException("Bugzilla login information incorrect");
+ throw new LoginException(IBugzillaConstants.MESSAGE_LOGIN_FAILURE);
if(status == null)
return new Status(IStatus.OK, NewSearchUI.PLUGIN_ID, IStatus.OK, "", null);

Back to the top