Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkersten2005-11-04 18:50:28 -0500
committermkersten2005-11-04 18:50:28 -0500
commite0585963d6415b2b9656625939c1d2145719eafc (patch)
tree144f9f25fe993fa9b764029e47e325cae3da6403
parentd92abdb89e708224bbcc8f88f20657b59365287f (diff)
downloadorg.eclipse.mylyn.tasks-e0585963d6415b2b9656625939c1d2145719eafc.tar.gz
org.eclipse.mylyn.tasks-e0585963d6415b2b9656625939c1d2145719eafc.tar.xz
org.eclipse.mylyn.tasks-e0585963d6415b2b9656625939c1d2145719eafc.zip
Fixed Bugzilla Bug 115179: new bug creation fails on with bugzilla 2.20
-rw-r--r--org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugPost.java20
-rw-r--r--org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaRepository.java2
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditor.java2
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditor.java6
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractBugWizard.java5
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/NewBugWizard.java35
-rw-r--r--org.eclipse.mylyn.help.ui/doc/new.html11
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/MylarTasklistPlugin.java19
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/TaskEditor.java6
9 files changed, 55 insertions, 51 deletions
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugPost.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugPost.java
index 38ca657b1..ec8f93195 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugPost.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugPost.java
@@ -158,19 +158,17 @@ public class BugPost {
error = "";
while (aString != null) {
- if (isDebug)
- System.out.println(aString);
+// System.err.println(">>>> " + aString);
error += aString==null?"":aString + "\n";
- // check if we have run into an error
- if(result == null && (aString.toLowerCase().indexOf("check e-mail") != -1 || aString.toLowerCase().indexOf("error") != -1))
- {
- throw new LoginException("Bugzilla login information incorrect");
+// // check if we have run into an error
+ if(result == null && (aString.toLowerCase().indexOf("check e-mail") != -1 || aString.toLowerCase().indexOf("error") != -1)) {
+// error handling is now passed up
+// throw new LoginException("Bugzilla login problem");
} else if( aString.toLowerCase().matches(".*bug\\s+processed.*")){
possibleFailure = false;
- }
-
- // get the bug number if it is required
+ }
+// // get the bug number if it is required
if (prefix != null && postfix1 != null && postfix2 != null && result == null) {
int startIndex = aString.toLowerCase().indexOf(prefix.toLowerCase());
if (startIndex > -1) {
@@ -181,10 +179,6 @@ public class BugPost {
if (stopIndex > -1) {
result = (aString.substring(startIndex, stopIndex)).trim();
possibleFailure = false;
- // need this to get the whole error message
-// if (!isDebug) {
-// break;
-// }
}
}
}
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaRepository.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaRepository.java
index ebe9877a0..bf34876a3 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaRepository.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaRepository.java
@@ -223,7 +223,7 @@ public class BugzillaRepository
urlText += "?GoAheadAndLogIn=1&Bugzilla_login=" + URLEncoder.encode(BugzillaPreferencePage.getUserName(), "UTF-8") + "&Bugzilla_password=" + URLEncoder.encode(BugzillaPreferencePage.getPassword(), "UTF-8");
}
- URL url = new URL(bugzillaUrl + "/enter_bug.cgi"+urlText);
+ URL url = new URL(bugzillaUrl + "/enter_bug.cgi" + urlText);
URLConnection cntx = BugzillaPlugin.getDefault().getUrlConnection(url);
if(cntx != null){
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditor.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditor.java
index 051655d81..dbe817a22 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditor.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditor.java
@@ -413,7 +413,7 @@ public class ExistingBugEditor extends AbstractBugEditor
PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
public void run() {
WebBrowserDialog.openAcceptAgreement(null,
- "Possible Bugzilla Failure",
+ "Possible Bugzilla Client Failure",
"Bugzilla may not have posted your bug.\n" + e.getMessage(),
form.getError());
BugzillaPlugin.log(e);
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditor.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditor.java
index d2c29e7d8..c06dd4736 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditor.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditor.java
@@ -245,13 +245,13 @@ public class NewBugEditor extends AbstractBugEditor {
WebBrowserDialog
.openAcceptAgreement(
null,
- "Possible Bugzilla Failure",
+ "Possible Bugzilla Client Failure",
"Bugzilla may not have posted your bug.\n" + e.getMessage(), form.getError());
BugzillaPlugin.log(e);
}catch (LoginException e) {
+ e.printStackTrace();
// if we had an error with logging in, display an error
- MessageDialog
- .openError(
+ MessageDialog.openError(
null,
"Posting Error",
"Bugzilla could not post your bug since your login name or password is incorrect."
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractBugWizard.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractBugWizard.java
index 7ccc49660..8ce6dab6d 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractBugWizard.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractBugWizard.java
@@ -229,6 +229,9 @@ public abstract class AbstractBugWizard extends Wizard implements INewWizard {
// add the summary to the bug post
form.add("short_desc", model.getSummary());
+
+ // dummy target milestone
+ form.add("target_milestone", "---");
// format the description of the bug so that it is roughly in 80
// character lines
@@ -259,7 +262,7 @@ public abstract class AbstractBugWizard extends Wizard implements INewWizard {
WebBrowserDialog
.openAcceptAgreement(
null,
- "Possible Bugzilla Failure",
+ "Possible Bugzilla Client Failure",
"Bugzilla may not have posted your bug.\n" + e.getMessage(), form.getError());
BugzillaPlugin.log(e);
} catch (LoginException e) {
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/NewBugWizard.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/NewBugWizard.java
index d90471032..f075bdd4b 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/NewBugWizard.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/NewBugWizard.java
@@ -94,26 +94,25 @@ public class NewBugWizard extends AbstractBugWizard {
}
try {
- if (WizardProductPage.products != null && WizardProductPage.products.size() != 0
- && BugzillaPlugin.getDefault().getProductConfiguration()
- .getProducts().length > 1) {
+ if (WizardProductPage.products != null && WizardProductPage.products.size() > 0) {
+// && BugzillaPlugin.getDefault().getProductConfiguration()
+// .getProducts().length > 1) {
productPage = new WizardProductPage(workbenchInstance, this);
addPage(productPage);
- } else {
- // There wasn't a list of products so there must only be 1
- if (!model.hasParsedAttributes()) {
- if (model.isConnected()) {
- BugzillaRepository.getInstance().getnewBugAttributes(model, true);
- } else {
- BugzillaRepository.getInstance().getProdConfigAttributes(model);
- }
- model.setParsedAttributesStatus(true);
- }
-
- // add the attributes page to the wizard
- attributePage = new WizardAttributesPage(workbenchInstance);
- addPage(attributePage);
- }
+ }
+// else {
+// // There wasn't a list of products so there must only be 1
+// if (!model.hasParsedAttributes()) {
+// if (model.isConnected()) {
+// BugzillaRepository.getInstance().getnewBugAttributes(model, true);
+// } else {
+// BugzillaRepository.getInstance().getProdConfigAttributes(model);
+// }
+// model.setParsedAttributesStatus(true);
+// }
+// attributePage = new WizardAttributesPage(workbenchInstance);
+// addPage(attributePage);
+// }
} catch (NullPointerException e) {
throw new CoreException(
new Status(IStatus.ERROR,
diff --git a/org.eclipse.mylyn.help.ui/doc/new.html b/org.eclipse.mylyn.help.ui/doc/new.html
index 0d28cb141..ed3e0d986 100644
--- a/org.eclipse.mylyn.help.ui/doc/new.html
+++ b/org.eclipse.mylyn.help.ui/doc/new.html
@@ -13,7 +13,7 @@
<p>Released November 4th, 2005. Send questions to <a href="mailto:mylar-users@eclipse.org">mylar-users@eclipse.org</a>.&nbsp;
Submit feature requests to
<a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Mylar">Bugzilla</a>.</p>
-<h4><a href="new-0.4.0.html">New and Noteworthy covering Mylar 0.3.1 - 0.4.1</a></h4>
+<h4><a href="new-0.4.0.html">New and Noteworthy covering Mylar 0.3 releases</a></h4>
<table cellpadding="10" cellspacing="0" width="600" id="table78">
<tr>
@@ -22,9 +22,12 @@ Submit feature requests to
</td>
<td valign="top" width="70%">
<span style="background-color: #FFFF00">New editor tab makes it
- quicker to flip into browser view, now default, chage pref.</span><p>
- <span style="background-color: #FFFF00">Have to update your queries
- by double-clicking them and hitting &quot;update&quot;, then OK.</span></p>
+ quicker to flip into browser view, now default, can control with
+ preference.</span><p><span style="background-color: #FFFF00">Have to
+ update your queries by double-clicking them and hitting &quot;update&quot;,
+ then OK.</span></p>
+ <p><span style="background-color: #FFFF00">Default is now 2.20, so
+ change that if you're using 2.18.</span></p>
<p>
&nbsp;</td>
</tr>
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/MylarTasklistPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/MylarTasklistPlugin.java
index 8f0d87494..3351449e9 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/MylarTasklistPlugin.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/MylarTasklistPlugin.java
@@ -405,15 +405,18 @@ public class MylarTasklistPlugin extends AbstractUIPlugin implements IStartup {
}
}
+ /**
+ * TODO: remove
+ */
public ReportOpenMode getReportMode() {
-// return ReportOpenMode.EDITOR;
- if (getPrefs().getBoolean(REPORT_OPEN_EDITOR)) {
- return ReportOpenMode.EDITOR;
- } else if (getPrefs().getBoolean(REPORT_OPEN_INTERNAL)) {
- return ReportOpenMode.INTERNAL_BROWSER;
- } else {
- return ReportOpenMode.EXTERNAL_BROWSER;
- }
+ return ReportOpenMode.EDITOR;
+// if (getPrefs().getBoolean(REPORT_OPEN_EDITOR)) {
+// return ReportOpenMode.EDITOR;
+// } else if (getPrefs().getBoolean(REPORT_OPEN_INTERNAL)) {
+// return ReportOpenMode.INTERNAL_BROWSER;
+// } else {
+// return ReportOpenMode.EXTERNAL_BROWSER;
+// }
}
public TaskListExternalizer getTaskListExternalizer() {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/TaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/TaskEditor.java
index c3951a78b..188bc44a0 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/TaskEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/TaskEditor.java
@@ -130,8 +130,10 @@ public class TaskEditor extends MultiPageEditorPart {
int index = addPage(webBrowser);
setPageText(index, ISSUE_WEB_PAGE_LABEL);
webBrowser.setUrl(task.getIssueReportURL());
-// if (task.isDirectlyModifiable())
- setActivePage(index);
+
+ boolean openWithBrowser = MylarTasklistPlugin.getPrefs().getBoolean(
+ MylarTasklistPlugin.REPORT_OPEN_INTERNAL);
+ if (task.isDirectlyModifiable() || openWithBrowser) setActivePage(index);
} catch (RuntimeException e) {
MylarPlugin.fail(e, "could not open issue report web page", false);
}

Back to the top