diff options
| author | mkersten | 2007-02-16 19:43:33 +0000 |
|---|---|---|
| committer | mkersten | 2007-02-16 19:43:33 +0000 |
| commit | 42e879f2c9eeb3eec8eecdbbf9661427f4aaefae (patch) | |
| tree | af838cde6b8d02080c447ded2775767450368106 | |
| parent | f381914341845446b8399c5e1316f764fca48d12 (diff) | |
| download | org.eclipse.mylyn.tasks-42e879f2c9eeb3eec8eecdbbf9661427f4aaefae.tar.gz org.eclipse.mylyn.tasks-42e879f2c9eeb3eec8eecdbbf9661427f4aaefae.tar.xz org.eclipse.mylyn.tasks-42e879f2c9eeb3eec8eecdbbf9661427f4aaefae.zip | |
Version update
56 files changed, 365 insertions, 1468 deletions
diff --git a/org.eclipse.mylyn-feature/feature.xml b/org.eclipse.mylyn-feature/feature.xml index 9198e6b85..506607746 100644 --- a/org.eclipse.mylyn-feature/feature.xml +++ b/org.eclipse.mylyn-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.mylar_feature" label="Mylar Task List (Required)" - version="1.0.1.v20070214-0830" + version="1.0.1.v20070216-0900" provider-name="Eclipse.org" plugin="org.eclipse.mylar"> @@ -237,56 +237,56 @@ litigation. id="org.eclipse.mylar.doc" download-size="0" install-size="0" - version="1.0.1.v20070214-0830" + version="1.0.1.v20070216-0900" unpack="false"/> <plugin id="org.eclipse.mylar" download-size="0" install-size="0" - version="1.0.1.v20070214-0830" + version="1.0.1.v20070216-0900" unpack="false"/> <plugin id="org.eclipse.mylar.context.core" download-size="0" install-size="0" - version="1.0.1.v20070214-0830" + version="1.0.1.v20070216-0900" unpack="false"/> <plugin id="org.eclipse.mylar.tasks.ui" download-size="0" install-size="0" - version="1.0.1.v20070214-0830" + version="1.0.1.v20070216-0900" unpack="false"/> <plugin id="org.eclipse.mylar.tasks.core" download-size="0" install-size="0" - version="1.0.1.v20070214-0830" + version="1.0.1.v20070216-0900" unpack="false"/> <plugin id="org.eclipse.mylar.tasks.web" download-size="0" install-size="0" - version="1.0.1.v20070214-0830" + version="1.0.1.v20070216-0900" unpack="false"/> <plugin id="org.eclipse.mylar.monitor.core" download-size="0" install-size="0" - version="1.0.1.v20070214-0830" + version="1.0.1.v20070216-0900" unpack="false"/> <plugin id="org.eclipse.mylar.monitor.ui" download-size="0" install-size="0" - version="1.0.1.v20070214-0830" + version="1.0.1.v20070216-0900" unpack="false"/> </feature> diff --git a/org.eclipse.mylyn.bugzilla-feature/feature.xml b/org.eclipse.mylyn.bugzilla-feature/feature.xml index 8b80cd71f..3ce727468 100644 --- a/org.eclipse.mylyn.bugzilla-feature/feature.xml +++ b/org.eclipse.mylyn.bugzilla-feature/feature.xml @@ -2,11 +2,11 @@ <feature id="org.eclipse.mylar.bugzilla_feature" label="Mylar Connector: Bugzilla" - version="1.0.1.v20070214-0830" + version="1.0.1.v20070216-0900" provider-name="Eclipse.org" plugin="org.eclipse.mylar"> - <description> + <description> Bugzilla client integrated with Eclipse and Mylar, can be used standalone. </description> @@ -243,14 +243,14 @@ litigation. id="org.eclipse.mylar.bugzilla.core" download-size="0" install-size="0" - version="1.0.1.v20070214-0830" + version="1.0.1.v20070216-0900" unpack="false"/> <plugin id="org.eclipse.mylar.bugzilla.ui" download-size="0" install-size="0" - version="1.0.1.v20070214-0830" + version="1.0.1.v20070216-0900" unpack="false"/> </feature> diff --git a/org.eclipse.mylyn.bugzilla.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.bugzilla.ui/.settings/org.eclipse.jdt.core.prefs index 398008f59..54a86aa77 100644 --- a/org.eclipse.mylyn.bugzilla.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.mylyn.bugzilla.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Mon Feb 13 11:20:13 PST 2006 +#Mon Feb 05 18:45:12 PST 2007 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 @@ -85,6 +85,7 @@ org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 org.eclipse.jdt.core.formatter.blank_lines_before_method=1 org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line @@ -98,9 +99,14 @@ org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true org.eclipse.jdt.core.formatter.comment.format_comments=true org.eclipse.jdt.core.formatter.comment.format_header=false org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true org.eclipse.jdt.core.formatter.comment.format_source_code=true org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true org.eclipse.jdt.core.formatter.comment.indent_root_tags=true @@ -275,6 +281,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=inser org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert diff --git a/org.eclipse.mylyn.bugzilla.ui/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.bugzilla.ui/.settings/org.eclipse.jdt.ui.prefs index ea5da51b5..e0802aadf 100644 --- a/org.eclipse.mylyn.bugzilla.ui/.settings/org.eclipse.jdt.ui.prefs +++ b/org.eclipse.mylyn.bugzilla.ui/.settings/org.eclipse.jdt.ui.prefs @@ -1,6 +1,6 @@ -#Mon Feb 13 11:20:13 PST 2006 +#Mon Feb 05 18:45:12 PST 2007 eclipse.preferences.version=1 formatter_profile=_Mylar based on Eclipse [built-in] -formatter_settings_version=10 +formatter_settings_version=11 internal.default.compliance=default org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"></template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004 - 2006 University Of British Columbia and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n * University Of British Columbia - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF index e4d331245..b1ce9f7e7 100644 --- a/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF @@ -2,10 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Mylar Bugzilla Client Ui Plug-in Bundle-SymbolicName: org.eclipse.mylar.bugzilla.ui; singleton:=true -Bundle-Version: 1.0.1.v20070112-1800 +Bundle-Version: 1.0.1.v20070216-0900 Bundle-Activator: org.eclipse.mylar.internal.bugzilla.ui.BugzillaUiPlugin Bundle-Vendor: Eclipse.org -Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.core.resources, @@ -23,7 +22,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.mylar.bugzilla.core, org.eclipse.mylar.context.core, org.eclipse.mylar.tasks.ui, - org.eclipse.mylar.tasks.core + org.eclipse.mylar.tasks.core, + org.eclipse.mylar Eclipse-AutoStart: true Export-Package: org.eclipse.mylar.internal.bugzilla.ui, org.eclipse.mylar.internal.bugzilla.ui.editor, diff --git a/org.eclipse.mylyn.bugzilla.ui/bugzilla-help.xml b/org.eclipse.mylyn.bugzilla.ui/bugzilla-help.xml deleted file mode 100644 index 78b55ca14..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/bugzilla-help.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<contexts> - - <context id="bugzillaSearchContext"> - <description>Enter a Bug ID or some text to search the Bugzilla database for related bugs.</description> - <topic href="docs/html/start/bugzillaSearch.html" label="Bugzilla Search"/> - <topic href="http://www.bugzilla.org" label="Bugzilla Website"/> - </context> - - <context id="bugzillaEditorContext"> - <description>View the bug with the "Preview" tab, and submit changes with the "Submit" tab.</description> - <topic href="docs/html/start/submitEditor.html" label="Bugzilla Editor"/> - </context> - -</contexts>
\ No newline at end of file diff --git a/org.eclipse.mylyn.bugzilla.ui/build.properties b/org.eclipse.mylyn.bugzilla.ui/build.properties index efa779c19..2b2a2688e 100644 --- a/org.eclipse.mylyn.bugzilla.ui/build.properties +++ b/org.eclipse.mylyn.bugzilla.ui/build.properties @@ -2,14 +2,11 @@ bin.includes = META-INF/,\ plugin.xml,\ icons/,\ about.html,\ - doc/,\ - bugzilla-help.xml,\ . src.includes = src/,\ plugin.xml,\ META-INF/,\ about.html,\ - icons/,\ - doc/ + icons/ jre.compilation.profile = J2SE-1.5 source.. = src/ diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/Bugzilla.gif b/org.eclipse.mylyn.bugzilla.ui/doc/html/Bugzilla.gif Binary files differdeleted file mode 100644 index ec6d66ce3..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/Bugzilla.gif +++ /dev/null diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/book.html b/org.eclipse.mylyn.bugzilla.ui/doc/html/book.html deleted file mode 100644 index ddec74b4e..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/book.html +++ /dev/null @@ -1,29 +0,0 @@ -<!DOCTYPE doctype PUBLIC "-//w3c//dtd html 4.0 transitional//en"> - -<html> - -<head> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <meta name="GENERATOR" content="Mozilla/4.73 [en] (Win98; U) [Netscape]"> - <title>Bugzilla: Bugzilla Database Server Querying</title> -</head> - -<body > - <font face="arial, lucida console" size="+3"> - <table cellpadding="5"> - <tr> - <td><img src="Bugzilla.gif" alt="Bugzilla"></td> - <td valign=bottom><b>Bugzilla Client</b><br><br></td> - </tr> - </table> - </font> - - <br> - <br> - <br> - <br> - <br> - -</body> - -</html> diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start.html b/org.eclipse.mylyn.bugzilla.ui/doc/html/start.html deleted file mode 100644 index e59973752..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start.html +++ /dev/null @@ -1,17 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> - -<html> - -<head> - <title>Getting Started</title> -</head> - -<body> - <font face="arial, lucida console"> - <h3>Getting Started</h3> - <br> - <p>Setting up and configuring Bugzilla, as well as instructions on its use. - </font> -</body> - -</html> diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/bugEditor.html b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/bugEditor.html deleted file mode 100644 index 908bc204f..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/bugEditor.html +++ /dev/null @@ -1,63 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> - -<html> - -<head> - <title>Getting Started</title> -</head> - -<body> - <font face="arial, lucida console"> - - <h3>Bugzilla Editor</h3> - <br> - - <p><b>NOTE:</b> It is required that you have entered your Bugzilla login name and password - into the Bugzilla plugin preferences if you wish to create new bugs. - </p> - - <p>The bug editor is opened when you view a bug. Here, you can edit the bug and submit the changes. - Once you are finished modifying the bug, you can click the "Submit" button at the - bottom of the editor to submit it to the Bugzilla server. Also, if you have made - changes to the bug, you can click the "Compare" button to inspect any changes between - your version of the bug and the online version. - </p> - - <p>You can save the current version of the bug offline on your - hard-drive using Ctrl+s or File -> Save. The locally saved bug report will be accessible from the Offline Reports View. Any - time you try to view a bug with this id, your offline copy will be shown instead of the one - from the server. You can continue to make and save changes until you either delete the offline - version or submit your changes to the server. - </p> - <p>At the top of the editor, there is a hyperlink that says "Open in - browser". This will open the current bug in the default web browser - specified in eclipse. This is useful for if the bug editor does not - currently support an option that you wish to use such as voting. If - you wish to have the bug editor close and the web browser open, you can - Alt+click on the link.</p> - - - <img src="./images/existing-bug-editor.png"><br> - - <p>A bug saved from the New Bug Wizard will open in a simpler editor, since it does - not yet exist on a server, and so there are fewer tasks you can perform on it. - The most notable change is that there is no button to allow you to compare it with - the online version. - and the only action is to submit the report to the server. - </p> - - <br> - <br> - <br> - <br> - <br> - <br> - <br> - <br> - <br> - <br> - - </font> - -</body> -</html>
\ No newline at end of file diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/bugWizard.html b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/bugWizard.html deleted file mode 100644 index f061907c8..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/bugWizard.html +++ /dev/null @@ -1,61 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> - -<html> - -<head> - <title>New Bug Wizard</title> -</head> - -<body> - <font face="arial, lucida console"> - - <h3>New Bug Wizard</h3> - <br> - - <p><b>NOTE:</b> It is required that you have entered your Bugzilla login name and password - into the Bugzilla plugin preferences if you wish to create new bugs. - </p> - - <p>This Bugzilla plugin allows you to submit new bugs. To do this, go to "File->New->Other..." - and then choose "Bugzilla Wizards" and "New Bug Report". - </p> - - <img src="./images/new-bug-wizard.png"><br> - - <p>When you click "Next", you will be presented with a dialog that contains the list - of products that you can submit a bug for. Choose the product that you wish to submit - the bug for and click "Next". If there is only one product to choose from, then this - screen will be skipped over automatically. - </p> - - <img src="./images/new-bug-wizard-products.png"><br> - - <p>Now, you can modify the required attributes for the new bug. When you are finished, - you can submit the bug to the server. To do so, select "Submit bug report to the server." - and click the "Finish" button. This will submit your new bug to the server. If no - problems occured, the new bug will be opened in a Bugzilla editor so that you can review - your submission. - </p> - - <img src="./images/new-bug-wizard-attributes.png"><br> - - <p>Alternatively, you can save the bug offline on your hard-drive. Select "Save bug - report offline." and click the "Finish" button. The locally saved bug report will be - accessible from the Offline Reports View and can be submitted later.</p> - - <br> - <br> - <br> - <br> - <br> - <br> - <br> - <br> - <br> - <br> - <br> - - </font> - -</body> -</html>
\ No newline at end of file diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/bugzillaFavorites.html b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/bugzillaFavorites.html deleted file mode 100644 index 409582f61..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/bugzillaFavorites.html +++ /dev/null @@ -1,47 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> - -<head> - <title>Getting Started</title> -</head> - -<body> - <font face="arial, lucida console"> - - <h3>Saving Favorites</h3> - <br> - - <p> - Bugzilla has the ability to save bugs that are frequently accessed as a favorite - similar to a web browser. To do this, after a search is done right click on the bug - in the Search results window that you would like to save and choose "Mark Result as Favorite". - Favorites can also be added through the context menu in the bug editor.</p> - - <img src="./images/bugzilla-search-context.png"><br> - - <p> - A new window will now open that contains your specific list of favorites. To access - any of the bugs in the favorites view, just double click on the one that you want to - open and a Bugzilla bug editor will open containing the specific bug. To access the favorites - menu without adding a new bug, go to Window --> Show View --> Other... --> Bugzilla and click - on Bugzilla Favorites. - </p> - - <img src="./images/bugzilla-favorites-window.png"><br> - - - <br> - <br> - <br> - <br> - <br> - <br> - <br> - <br> - <br> - <br> - - </font> -</body> - -</html> diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/bugzillaSearch.html b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/bugzillaSearch.html deleted file mode 100644 index 45d93835f..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/bugzillaSearch.html +++ /dev/null @@ -1,74 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> - -<head> - <title>Getting Started</title> -</head> - -<body> - <font face="arial, lucida console"> - - <h3>Searching Reports</h3> - <br> - - <p> - A Bugzilla Search tab has also been added to the Eclipse Search pane. You can enter - a bug ID or keywords in the text field and, if desired, limit the - search by selecting particular attributes that the bug must have. - Press Enter or click "Search" to proceed with the query to the Bugzilla server. - </p> - <p> - <i>Note:</i> - There is an update button near the bottom of the Bugzilla search dialog. - When this button is clicked, it will query the Bugzilla server for new - options. These options are for the bug attributes such as milestone, product, etc. - This allows Bugzilla to contain the latest information so that you can - perform a better search. - </p> - - <img src="./images/bugzilla-search-dialog.png"><br> - - <p> - If a Bugzilla ID was entered, that particular bug report will open in - the Bugzilla bug viewer. - </p> - - <img src="./images/bugzilla-bug-editor.png"><br> - - <p> - If a bug id was not entered, the results will appear in the Search results tab. - From here, you can open any of the items by double-clicking on them. - </p> - - <img src="./images/bugzilla-searchresults.png"> - - <p> - By default, all of the results are sorted by Bug ID. They can also be sorted by - priority, severity, or status. To change the way the items are sorted, right-click - any bug and choose from the "Sort By" submenu. - </p> - - <img src="./images/bugzilla-search-sorting.png"> - - <p> - Previous Bugzilla queries are accessible through the drop-down - history menu at the right end of the view's toolbar. - </p> - - <img src="./images/previous-searches.png"><br> - - <br> - <br> - <br> - <br> - <br> - <br> - <br> - <br> - <br> - <br> - - </font> -</body> - -</html> diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/Icons/remove-all.gif b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/Icons/remove-all.gif Binary files differdeleted file mode 100644 index 2c069ab3f..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/Icons/remove-all.gif +++ /dev/null diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/Icons/remove.gif b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/Icons/remove.gif Binary files differdeleted file mode 100644 index 12a9167c5..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/Icons/remove.gif +++ /dev/null diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/bugzilla-bug-editor.png b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/bugzilla-bug-editor.png Binary files differdeleted file mode 100644 index ca477bd91..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/bugzilla-bug-editor.png +++ /dev/null diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/bugzilla-favorites-window.png b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/bugzilla-favorites-window.png Binary files differdeleted file mode 100644 index 57f2e2bdd..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/bugzilla-favorites-window.png +++ /dev/null diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/bugzilla-search-context.png b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/bugzilla-search-context.png Binary files differdeleted file mode 100644 index 2160aaa11..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/bugzilla-search-context.png +++ /dev/null diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/bugzilla-search-dialog.png b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/bugzilla-search-dialog.png Binary files differdeleted file mode 100644 index d00221612..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/bugzilla-search-dialog.png +++ /dev/null diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/bugzilla-search-sorting.png b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/bugzilla-search-sorting.png Binary files differdeleted file mode 100644 index c2ccdc703..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/bugzilla-search-sorting.png +++ /dev/null diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/bugzilla-searchresults.png b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/bugzilla-searchresults.png Binary files differdeleted file mode 100644 index fbb118138..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/bugzilla-searchresults.png +++ /dev/null diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/existing-bug-editor.png b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/existing-bug-editor.png Binary files differdeleted file mode 100644 index 10c72e2c9..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/existing-bug-editor.png +++ /dev/null diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/new-bug-wizard-attributes.png b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/new-bug-wizard-attributes.png Binary files differdeleted file mode 100644 index 4cbcd7297..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/new-bug-wizard-attributes.png +++ /dev/null diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/new-bug-wizard-products.png b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/new-bug-wizard-products.png Binary files differdeleted file mode 100644 index 6fe751b3e..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/new-bug-wizard-products.png +++ /dev/null diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/new-bug-wizard.png b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/new-bug-wizard.png Binary files differdeleted file mode 100644 index b79562d44..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/new-bug-wizard.png +++ /dev/null diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/offline-reports.png b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/offline-reports.png Binary files differdeleted file mode 100644 index 8431de2c2..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/offline-reports.png +++ /dev/null diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/prefs.png b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/prefs.png Binary files differdeleted file mode 100644 index 1f4dd866d..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/prefs.png +++ /dev/null diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/previous-searches.png b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/previous-searches.png Binary files differdeleted file mode 100644 index d36812640..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/previous-searches.png +++ /dev/null diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/remember-query-overwrite.png b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/remember-query-overwrite.png Binary files differdeleted file mode 100644 index e16bbb8ca..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/remember-query-overwrite.png +++ /dev/null diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/remember-query.png b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/remember-query.png Binary files differdeleted file mode 100644 index 4d8ac7e1a..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/remember-query.png +++ /dev/null diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/saved-query-list.png b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/saved-query-list.png Binary files differdeleted file mode 100644 index c7681ee9a..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/saved-query-list.png +++ /dev/null diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/update-search-dialog.png b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/update-search-dialog.png Binary files differdeleted file mode 100644 index d00221612..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/images/update-search-dialog.png +++ /dev/null diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/limitations.html b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/limitations.html deleted file mode 100644 index 606071a94..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/limitations.html +++ /dev/null @@ -1,35 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> - <head> -<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." > - <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css"> - <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> - <meta http-equiv="Content-Style-Type" content="text/css"> - <title> - Preparing Eclipse - </title> - </head> - <body> - <h1> - Known Limitations</h1> - <p><b>Supported platforms</b></p> - <ul> - <li>Eclipse 3.1 final or later</li> - <li>Java 5 VM or later</li> - </ul> - <p><b>Bugzilla</b></p> - <p>This plug-in only works with Bugzilla 2.16 and 2.18 installations that - are not highly customized since it relies on parsing the html from the - Bugzilla server.</p> - <p>You can only set one bug repository per workspace. Proxy servers - are not yet supported.</p> - - <p>There is currently no support for attachments in the integrated bug - editor.</p> - <p>The Bugzilla Search Dialog shows all attributes for any Product, not just - the currently selected one.</p> - <p> </p> - - </body> -</html> - diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/offlineReports.html b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/offlineReports.html deleted file mode 100644 index 8c4f10fc5..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/offlineReports.html +++ /dev/null @@ -1,37 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> - -<html> - -<head> - <title>Getting Started</title> -</head> - -<body> - <font face="arial, lucida console"> - - <h3>Offline Reports</h3> - <br> - - <p>Bugzilla has the ability to save bugs offline on your hard-drive from both the bug editor and the - New Bug Wizard. The Offline Reports View is where the saved bug reports can be accessed. To show the - offline reports menu without saving a new bug, go to Window --> Show View --> Other... --> Bugzilla - and click on Bugzilla Offline Reports. To open an offline bug, simply double-click it. - </p> - - <img src="./images/offline-reports.png"><br> - - <br> - <br> - <br> - <br> - <br> - <br> - <br> - <br> - <br> - <br> - - </font> - -</body> -</html>
\ No newline at end of file diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/saveQuery.html b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/saveQuery.html deleted file mode 100644 index 5c9066bb2..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/saveQuery.html +++ /dev/null @@ -1,50 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> - -<head> - <title>Getting Started</title> -</head> - -<body> - <font face="arial, lucida console"> - - <h3>Saving Queries</h3> - <br> - - <p> - There is a pair of buttons in the middle of the search dialog that allow you - to save frequently used queries and run these saved queries. The "Remember..." button - will save the current query, and the "Saved Queries..." button will display - a list of saved queries that you can choose from. - </p> - - <img src="./images/bugzilla-search-dialog.png"><br> - - <p> - When the "Remember..." button is clicked, a dialog will be displayed asking - you to name the query. Once "OK" is clicked, the query will be saved locally. - </p> - - <img src="./images/remember-query.png"><br> - - <p> - If you try to name a new query with an name that already exists, you will be prompted - asking whether to overwrite the currently saved query with the new one. - </p> - - <img src="./images/remember-query-overwrite.png"><br> - - <p> - When the "Saved Queries..." button is clicked on, another dialog will be displayed - containing a list of all of the queries that are currently saved on your computer. Select - the query that you wish to run and click "run" to execute it. - </p> - - <img src="./images/saved-query-list.png"><br> - - <br> - - </font> -</body> - -</html> diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/setup.html b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/setup.html deleted file mode 100644 index 7501739c3..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/setup.html +++ /dev/null @@ -1,54 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> - -<html> - -<head> - <title>Server Configuration</title> -</head> - -<body> - <font face="arial, lucida console"> - - <h3>Server Configuration</h3> - <br> - - <p>Although default settings are provided, the bugzilla server can be changed. To change the configuration, go to Preferences (in the Window menu) and open the Bugzilla tab. - </p> - - <p>Here, the following parameters can be set: - - <ol> - <li>URL of the Bugzilla server (set by default to the Eclipse Bugzilla server). This is used by the bug report - viewer to view Bugzilla items within Eclipse.</li> - - <li>Your login name for the Bugzilla server (optional).</li> - <li>Your password for the Bugzilla server (optional).</li> - <li>Whether the version of the Bugzilla server to be accessed is 2.18 or - 2.16 (Note: The Eclipse.org server is 2.18)</li> - - </ol> - <br> - Your Bugzilla login name and password are only required if you wish to create or modify bugs - using this Bugzilla plugin. Viewing bugs using this plugin does not require that a user name - and password be specified unless it is required by the server.<p> </p> - </p> - - <img src="./images/prefs.png"> - <br> - <br> - - <br> - <br> - <br> - <br> - <br> - <br> - <br> - <br> - <br> - <br> - - </font> - -</body> -</html>
\ No newline at end of file diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/use.html b/org.eclipse.mylyn.bugzilla.ui/doc/html/start/use.html deleted file mode 100644 index e1c0599f4..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/html/start/use.html +++ /dev/null @@ -1,19 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> - -<head> - <title>Getting Started</title> -</head> - -<body> - <font face="arial, lucida console"> - - <h3>Using Bugzilla</h3> - <br> - - <p>How to use the various functions of bugzilla, and interpret their results. - - </font> -</body> - -</html> diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/toc.xml b/org.eclipse.mylyn.bugzilla.ui/doc/toc.xml deleted file mode 100644 index 19fcdd485..000000000 --- a/org.eclipse.mylyn.bugzilla.ui/doc/toc.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?NLS TYPE="org.eclipse.help.toc"?> - -<toc link_to="../org.eclipse.mylar.doc/doc/toc.xml#bugzilla" label="Bugzilla Client"> -<!-- - <topic label="Bugzilla Client" href="doc/html/book.html"> - <topic label="Server Configuration" href="doc/html/start/setup.html"/> - <topic label="New Bug Wizard" href="doc/html/start/bugWizard.html"/> - <topic label="Searching Reports" href="doc/html/start/bugzillaSearch.html"/> - <topic label="Saving Favorites" href="doc/html/start/bugzillaFavorites.html"/> - <topic label="Saving Queries" href="doc/html/start/saveQuery.html"/> - <topic label="Offline Reports" href="doc/html/start/offlineReports.html"/> - <topic label="Known Limitations" href="doc/html/start/limitations.html"/> - <topic label="Editing Reports" href="doc/html/start/bugEditor.html"/> - </topic> - --> -</toc>
\ No newline at end of file diff --git a/org.eclipse.mylyn.bugzilla.ui/plugin.xml b/org.eclipse.mylyn.bugzilla.ui/plugin.xml index 621f24582..08a473a56 100644 --- a/org.eclipse.mylyn.bugzilla.ui/plugin.xml +++ b/org.eclipse.mylyn.bugzilla.ui/plugin.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.0"?> -<?eclipse version="3.0"?> <plugin> <extension @@ -54,60 +53,4 @@ </description> </decorator> </extension> - - <extension - id="org.eclipse.mylar.bugzilla.help.context" - name="Bugzilla Context-sensitive Help" - point="org.eclipse.help.contexts"> - <contexts - file="bugzilla-help.xml"> - </contexts> - </extension> -<!-- <extension - point="org.eclipse.search.searchPages" - id="org.eclipse.mylar.bugzilla.core.search.searchPage" - name="Bugzilla Search Page"> - <page - class="org.eclipse.mylar.internal.bugzilla.ui.search.BugzillaSearchPage" - enabled="true" - icon="icons/elcl16/bug-search.gif" - id="org.eclipse.mylar.bugzilla.core.search.bugzillaSearchPage" - label="Bugzilla Search" - tabPosition="999"/> - </extension> - <extension - id="BugzillaSearchPage" - point="org.eclipse.search.searchResultViewPages"> - <viewPage - class="org.eclipse.mylar.internal.tasks.ui.search.RepositorySearchResultView" - searchResultClass="org.eclipse.mylar.internal.bugzilla.ui.search.BugzillaSearchResult" - id="org.eclipse.mylar.bugzilla.BugzillaSearchResultPage"/> - </extension>--> -<!-- <extension - point="org.eclipse.mylar.tasks.ui.templates"> - <repository - addAutomatically="true" - label="Eclipse.org" - repositoryKind="bugzilla" - urlRepository="https://bugs.eclipse.org/bugs" - version="2.20"/> - </extension>--> -<!-- <extension - id="org.eclipse.mylar.bugzilla.core.search.repositorySearchPage" - name="Repository Search Page" - point="org.eclipse.search.searchPages"> - <page - class="org.eclipse.mylar.internal.tasks.ui.TaskSearchPage" - enabled="true" - icon="icons/elcl16/bug-search.gif" - id="org.eclipse.mylar.bugzilla.core.search.repositorySearchPage" - label="Repository Search" - tabPosition="999"/> - </extension>--> -<!-- <extension - point="org.eclipse.mylar.tasklist.editors"> - <hyperlinkListener - class="org.eclipse.mylar.internal.bugzilla.ui.BugzillaTaskHyperlinkDetector" - type="org.eclipse.mylar.bugzilla.ui.hyperlinkListener1"/> - </extension>--> </plugin> diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaHyperLink.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaHyperLink.java index bf28e01ce..d7787cfdb 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaHyperLink.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaHyperLink.java @@ -21,7 +21,7 @@ import org.eclipse.mylar.tasks.ui.TasksUiUtil; */ public class BugzillaHyperLink implements IHyperlink { - private static final String SHOW_BUG_CGI = "/show_bug.cgi?id="; + private static final String SHOW_BUG_CGI = "/show_bug.cgi?taskId="; private IRegion region; @@ -57,7 +57,7 @@ public class BugzillaHyperLink implements IHyperlink { TasksUiUtil.openRepositoryTask(repositoryUrl, id, repositoryUrl + IBugzillaConstants.URL_GET_SHOW_BUG + id); // OpenBugzillaReportJob job = new - // OpenBugzillaReportJob(repository.getUrl(), id); + // OpenBugzillaReportJob(repository.getUrl(), taskId); // IProgressService service = // PlatformUI.getWorkbench().getProgressService(); // try { diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaUiPlugin.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaUiPlugin.java index afd8b06b1..90fd68688 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaUiPlugin.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaUiPlugin.java @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.mylar.context.core.MylarStatusHandler; +import org.eclipse.mylar.core.MylarStatusHandler; import org.eclipse.mylar.internal.bugzilla.core.BugzillaCorePlugin; import org.eclipse.mylar.internal.bugzilla.core.BugzillaRepositoryConnector; import org.eclipse.mylar.internal.bugzilla.core.IBugzillaConstants; @@ -48,13 +48,13 @@ public class BugzillaUiPlugin extends AbstractUIPlugin { public static final String EDITOR_PAGE_CONTEXT = BugzillaUiPlugin.PLUGIN_ID + ".bugzillaEditorContext"; // The is's for hit markers used in the label provider and sorters - public static final String HIT_MARKER_ATTR_ID = "id"; + public static final String HIT_MARKER_ATTR_ID = "taskId"; public static final String HIT_MARKER_ATTR_REPOSITORY = "repository"; public static final String HIT_MARKER_ATTR_HREF = "href"; - public static final String HIT_MARKER_ATTR_DESC = "description"; + public static final String HIT_MARKER_ATTR_DESC = "summary"; public static final String HIT_MARKER_ATTR_LABEL = "label"; @@ -112,8 +112,6 @@ public class BugzillaUiPlugin extends AbstractUIPlugin { .getRepositoryManager().getRepositoryConnector(BugzillaCorePlugin.REPOSITORY_KIND); TasksUiPlugin.getRepositoryManager().addListener(bugzillaConnector.getClientManager()); - - // migrateOldAuthenticationData(); } /** @@ -316,103 +314,3 @@ public class BugzillaUiPlugin extends AbstractUIPlugin { } } } - -// @SuppressWarnings("unchecked") -// private void migrateOldAuthenticationData() { -// String OLD_PREF_SERVER = "BUGZILLA_SERVER"; -// String serverUrl = -// BugzillaPlugin.getDefault().getPreferenceStore().getString(OLD_PREF_SERVER); -// if (serverUrl != null && serverUrl.trim() != "") { -// URL oldFakeUrl = null; -// try { -// oldFakeUrl = new URL("http://org.eclipse.mylar.bugzilla"); -// } catch (MalformedURLException e) { -// BugzillaPlugin.log(new Status(IStatus.WARNING, BugzillaPlugin.PLUGIN_ID, -// IStatus.OK, -// "Bad temp server url: BugzillaPreferencePage", e)); -// } -// -// String user = ""; -// String password = ""; -// Map<String, String> map = Platform.getAuthorizationInfo(oldFakeUrl, -// "Bugzilla", -// BugzillaPreferencePage.AUTH_SCHEME); -// -// // get the information from the map and save it -// if (map != null && !map.isEmpty()) { -// String username = map.get(BugzillaPreferencePage.INFO_USERNAME); -// if (username != null) -// user = username; -// -// String pwd = map.get(BugzillaPreferencePage.INFO_PASSWORD); -// if (pwd != null) -// password = pwd; -// } -// TaskRepository repository; -// // try { -// repository = new TaskRepository(BugzillaPlugin.REPOSITORY_KIND, serverUrl); -// repository.setAuthenticationCredentials(user, password); -// MylarTaskListPlugin.getRepositoryManager().addRepository(repository); -// BugzillaPlugin.getDefault().getPreferenceStore().setValue(OLD_PREF_SERVER, -// ""); -// // } catch (MalformedURLException e) { -// // MylarStatusHandler.fail(e, "could not create default repository", -// // true); -// // } -// try { -// // reset the authorization -// Platform.addAuthorizationInfo(oldFakeUrl, "Bugzilla", -// BugzillaPreferencePage.AUTH_SCHEME, new HashMap<String, String>()); -// } catch (CoreException e) { -// // ignore -// } -// } -// } - -// private void readOfflineReportsFile() { -// IPath offlineReportsPath = getOfflineReportsFilePath(); -// -// try { -// offlineReportsFile = new OfflineTaskManager(offlineReportsPath.toFile(), -// true); -// } catch (Exception e) { -// MylarStatusHandler.log(e, -// "Could not restore offline Bugzilla reports file, creating new one -// (possible version incompatibility)"); -// offlineReportsPath.toFile().delete(); -// // if (offlineReportsPath.toFile().delete()) { -// try { -// offlineReportsFile = new OfflineTaskManager(offlineReportsPath.toFile(), -// false); -// } catch (Exception e1) { -// MylarStatusHandler.fail(e, "could not reset offline Bugzilla reports -// file", true); -// } -// // } else { -// // MylarStatusHandler.fail(null, "reset of Bugzilla offline reports file -// failed", true); -// // } -// } -// } -// -// /** -// * Returns the path to the file cacheing the offline bug reports. -// */ -// private IPath getOfflineReportsFilePath() { -// IPath stateLocation = -// Platform.getStateLocation(BugzillaPlugin.getDefault().getBundle()); -// IPath configFile = stateLocation.append("offlineReports"); -// return configFile; -// } -// -// public OfflineTaskManager getOfflineReportsFile() { -// if (offlineReportsFile == null) { -// MylarStatusHandler.fail(null, "Offline reports file not created, try -// restarting.", true); -// } -// return offlineReportsFile; -// } - -// public List<BugzillaReport> getSavedBugReports() { -// return offlineReportsFile.elements(); -// } diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/OfflineView.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/OfflineView.java index a4c0b0244..4ecd5c60e 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/OfflineView.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/OfflineView.java @@ -354,8 +354,8 @@ // if (descriptors.length > 0) { // int[] objList = new int[descriptors.length]; // for (int nX = 0; nX < descriptors.length; nX++) { -// String id = descriptors[nX].getID(); -// objList[nX] = BugzillaPlugin.getDefault().getOfflineReports().find(Integer.valueOf(id).intValue()); +// String taskId = descriptors[nX].getID(); +// objList[nX] = BugzillaPlugin.getDefault().getOfflineReports().find(Integer.valueOf(taskId).intValue()); // } // table.setSelection(objList); // } @@ -382,9 +382,9 @@ // Object o = itr.next(); // if (o instanceof IBugzillaBug) { // IBugzillaBug entry = (IBugzillaBug) o; -// Integer id = entry.getId(); +// Integer taskId = entry.getId(); // if (!entry.isLocallyCreated()) { -// Ids.add(id); +// Ids.add(taskId); // } // } // } @@ -490,14 +490,14 @@ // // If this bug has not been saved offline before, add it to the // // file. // else { -// // If there is already an offline report with the same id, +// // If there is already an offline report with the same taskId, // // don't save this report. // // int index = -1; // // if ((index = file.find(bug.getId())) >= 0) { // // removeReport(getOfflineBugs().get(index)); // // MessageDialog.openInformation(null, "Bug's Id is already // // used.", "There is already a bug saved offline with an -// // identical id."); +// // identical taskId."); // // return; // // } // try { diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java index e03e03f20..08221aa38 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java @@ -26,7 +26,6 @@ import org.eclipse.mylar.internal.bugzilla.core.BugzillaCorePlugin; import org.eclipse.mylar.internal.bugzilla.core.BugzillaReportElement; import org.eclipse.mylar.internal.bugzilla.core.IBugzillaConstants; import org.eclipse.mylar.internal.tasks.ui.TaskListColorsAndFonts; -import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.core.RepositoryTaskAttribute; import org.eclipse.mylar.tasks.core.TaskComment; @@ -39,12 +38,14 @@ import org.eclipse.mylar.tasks.ui.editors.TaskEditor; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.layout.RowLayout; +import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Label; @@ -112,96 +113,56 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor { // compareInput = new BugzillaCompareInput(config); } -// @Override -// public void init(IEditorSite site, IEditorInput input) { -// super.init(site, input); -// -// if (!(input instanceof RepositoryTaskEditorInput)) { -// return; -// } -// super.init(site, input); -// -// editorInput = (AbstractTaskEditorInput) input; -// taskData = editorInput.getTaskData(); -// repository = editorInput.getRepository(); -// connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(repository.getKind()); -// -// setSite(site); -// setInput(input); -// -// taskOutlineModel = RepositoryTaskOutlineNode.parseBugReport(editorInput.getTaskData()); -// -// // restoreBug(); -// isDirty = false; -// updateEditorTitle(); -// } - @Override protected void createCustomAttributeLayout(Composite composite) { - FormToolkit toolkit = getManagedForm().getToolkit(); + // FormToolkit toolkit = getManagedForm().getToolkit(); + + RepositoryTaskAttribute attribute = this.taskData.getAttribute(BugzillaReportElement.DEPENDSON.getKeyString()); + if (attribute != null && !attribute.isReadOnly()) { + Label label; + if (hasOutgoingChange(attribute)) { + label = toolkit.createLabel(composite, "*" + BugzillaReportElement.DEPENDSON.toString()); + } else { + label = toolkit.createLabel(composite, BugzillaReportElement.DEPENDSON.toString()); + } + + GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.CENTER).applyTo(label); + Composite textFieldComposite = toolkit.createComposite(composite); + GridLayout textLayout = new GridLayout(); + textLayout.marginWidth = 1; + textLayout.marginHeight = 3; + textLayout.verticalSpacing = 3; + textFieldComposite.setLayout(textLayout); + GridData textData = new GridData(GridData.HORIZONTAL_ALIGN_FILL); + textData.horizontalSpan = 1; + textData.widthHint = 135; - Label label = toolkit.createLabel(composite, BugzillaReportElement.DEPENDSON.toString()); - GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.CENTER).applyTo(label); - Composite textFieldComposite = toolkit.createComposite(composite); - GridLayout textLayout = new GridLayout(); - textLayout.marginWidth = 1; - textLayout.marginHeight = 3; - textLayout.verticalSpacing = 3; - textFieldComposite.setLayout(textLayout); - GridData textData = new GridData(GridData.HORIZONTAL_ALIGN_FILL); - textData.horizontalSpan = 1; - textData.widthHint = 135; - RepositoryTaskAttribute attribute = this.taskData.getAttribute( - BugzillaReportElement.DEPENDSON.getKeyString()); - if (!attribute.isReadOnly()) { final Text text = createTextField(textFieldComposite, attribute, SWT.FLAT); text.setLayoutData(textData); toolkit.paintBordersFor(textFieldComposite); - text.setData(attribute); - text.addListener(SWT.KeyUp, new Listener() { - public void handleEvent(Event event) { - String sel = text.getText(); - RepositoryTaskAttribute a = (RepositoryTaskAttribute) text.getData(); - if (!(a.getValue().equals(sel))) { - a.setValue(sel); - markDirty(true); - } - } - }); - text.addListener(SWT.FocusIn, new GenericListener()); } - label = toolkit.createLabel(composite, BugzillaReportElement.BLOCKED.toString()); - GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.CENTER).applyTo(label); - textFieldComposite = toolkit.createComposite(composite); - textLayout = new GridLayout(); - textLayout.marginWidth = 1; - textLayout.marginHeight = 3; - textLayout.verticalSpacing = 3; - textFieldComposite.setLayout(textLayout); - textData = new GridData(GridData.HORIZONTAL_ALIGN_FILL); - textData.horizontalSpan = 1; - textData.widthHint = 135; attribute = this.taskData.getAttribute(BugzillaReportElement.BLOCKED.getKeyString()); - if (!attribute.isReadOnly()) { - final Text text = toolkit.createText(textFieldComposite, attribute.getValue(), SWT.FLAT); - // if(attribute.hasChanged()) { - // text.setBackground(TaskListColorsAndFonts.COLOR_ATTRIBUTE_CHANGED); - // } + if (attribute != null && !attribute.isReadOnly()) { + Label label; + if (hasOutgoingChange(attribute)) { + label = toolkit.createLabel(composite, "*" + BugzillaReportElement.BLOCKED.toString()); + } else { + label = toolkit.createLabel(composite, BugzillaReportElement.BLOCKED.toString()); + } + GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.CENTER).applyTo(label); + Composite textFieldComposite = toolkit.createComposite(composite); + GridLayout textLayout = new GridLayout(); + textLayout.marginWidth = 1; + textLayout.marginHeight = 3; + textLayout.verticalSpacing = 3; + textFieldComposite.setLayout(textLayout); + GridData textData = new GridData(GridData.HORIZONTAL_ALIGN_FILL); + textData.horizontalSpan = 1; + textData.widthHint = 135; + final Text text = createTextField(textFieldComposite, attribute, SWT.FLAT); text.setLayoutData(textData); toolkit.paintBordersFor(textFieldComposite); - text.setData(attribute); - text.addListener(SWT.KeyUp, new Listener() { - public void handleEvent(Event event) { - String sel = text.getText(); - RepositoryTaskAttribute a = (RepositoryTaskAttribute) text.getData(); - if (!(a.getValue().equals(sel))) { - a.setValue(sel); - markDirty(true); - } - } - }); - text.addListener(SWT.FocusIn, new GenericListener()); } String dependson = taskData.getAttributeValue(BugzillaReportElement.DEPENDSON.getKeyString()); @@ -251,133 +212,60 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor { addKeywordsList(composite); } catch (IOException e) { MessageDialog.openInformation(null, "Attribute Display Error", - "Could not retrieve keyword list, ensure proper configuration in " + TasksUiPlugin.LABEL_VIEW_REPOSITORIES - + "\n\nError reported: " + e.getMessage()); + "Could not retrieve keyword list, ensure proper configuration in " + + TasksUiPlugin.LABEL_VIEW_REPOSITORIES + "\n\nError reported: " + e.getMessage()); } - label = toolkit.createLabel(composite, BugzillaReportElement.BUG_FILE_LOC.toString()); - GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.CENTER).applyTo(label); attribute = this.taskData.getAttribute(BugzillaReportElement.BUG_FILE_LOC.getKeyString()); - Text urlField = createTextField(composite, attribute, SWT.FLAT); - GridDataFactory.fillDefaults().hint(135, SWT.DEFAULT).applyTo(urlField); -// TextViewer viewer = addTextEditor(repository, composite, attribute.getValue(), false, SWT.SINGLE); -// viewer.setEditable(true); -// GridDataFactory.fillDefaults().hint(DESCRIPTION_WIDTH, SWT.DEFAULT).applyTo(viewer.getTextWidget()); - + if (attribute != null && !attribute.isReadOnly()) { + Label label; + if (hasOutgoingChange(attribute)) { + label = toolkit.createLabel(composite, "*" + BugzillaReportElement.BUG_FILE_LOC.toString()); + } else { + label = toolkit.createLabel(composite, BugzillaReportElement.BUG_FILE_LOC.toString()); + } + GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.CENTER).applyTo(label); + Text urlField = createTextField(composite, attribute, SWT.FLAT); + GridDataFactory.fillDefaults().hint(135, SWT.DEFAULT).applyTo(urlField); + } addVoting(composite); - label = toolkit.createLabel(composite, ""); - Hyperlink viewActivity = toolkit.createHyperlink(composite, "Show Bug Activity", SWT.NONE); - viewActivity.addHyperlinkListener(new HyperlinkAdapter() { - @Override - public void linkActivated(HyperlinkEvent e) { - if (BugzillaTaskEditor.this.getEditor() instanceof TaskEditor) { - TaskEditor mylarTaskEditor = (TaskEditor) BugzillaTaskEditor.this.getEditor(); - mylarTaskEditor.displayInBrowser(repository.getUrl() + IBugzillaConstants.URL_BUG_ACTIVITY - + taskData.getId()); - } - } - }); + // If groups is available add roles + if (taskData.getAttribute(BugzillaReportElement.GROUP.getKeyString()) != null) { + addRoles(composite); + } if (taskData.getAttribute(BugzillaReportElement.ESTIMATED_TIME.getKeyString()) != null) addBugzillaTimeTracker(toolkit, composite); } - // protected void createDependencyLayout(Composite composite) { - // FormToolkit toolkit = getManagedForm().getToolkit(); - // final Section section = createSection(composite, "Dependencies"); - // boolean expand = false; - // final Composite sectionComposite = toolkit.createComposite(section); - // section.setClient(sectionComposite); - // GridLayout sectionLayout = new GridLayout(7, false); - // sectionComposite.setLayout(sectionLayout); - // - // toolkit.createLabel(sectionComposite, - // BugzillaReportElement.DEPENDSON.toString()); - // Composite textFieldComposite = toolkit.createComposite(sectionComposite); - // GridLayout textLayout = new GridLayout(); - // textLayout.marginWidth = 1; - // textLayout.marginHeight = 3; - // textLayout.verticalSpacing = 3; - // textFieldComposite.setLayout(textLayout); - // GridData textData = new GridData(GridData.HORIZONTAL_ALIGN_FILL); - // textData.horizontalSpan = 1; - // textData.widthHint = 135; - // RepositoryTaskAttribute attribute = - // this.taskData.getAttribute( - // BugzillaReportElement.DEPENDSON.getKeyString()); - // expand = attribute.getValue() != null && attribute.getValue().length() > - // 0; - // if (!attribute.isReadOnly()) { - // final Text text = toolkit.createText(textFieldComposite, - // attribute.getValue(), SWT.FLAT); - // text.setLayoutData(textData); - // toolkit.paintBordersFor(textFieldComposite); - // text.setData(attribute); - // text.addListener(SWT.KeyUp, new Listener() { - // public void handleEvent(Event event) { - // String sel = text.getText(); - // RepositoryTaskAttribute a = (RepositoryTaskAttribute) text.getData(); - // if (!(a.getValue().equals(sel))) { - // a.setValue(sel); - // markDirty(true); - // } - // } - // }); - // text.addListener(SWT.FocusIn, new GenericListener()); - // } - // - // addBugHyperlinks(sectionComposite, - // BugzillaReportElement.DEPENDSON.getKeyString()); - // - // // spacer - // GridDataFactory.fillDefaults().hint(20, - // SWT.DEFAULT).applyTo(toolkit.createLabel(sectionComposite, "")); - // - // toolkit.createLabel(sectionComposite, - // BugzillaReportElement.BLOCKED.toString()); - // textFieldComposite = toolkit.createComposite(sectionComposite); - // textLayout = new GridLayout(); - // textLayout.marginWidth = 1; - // textLayout.marginHeight = 3; - // textLayout.verticalSpacing = 3; - // textFieldComposite.setLayout(textLayout); - // textData = new GridData(GridData.HORIZONTAL_ALIGN_FILL); - // textData.horizontalSpan = 1; - // textData.widthHint = 135; - // attribute = - // this.taskData.getAttribute(BugzillaReportElement.BLOCKED.getKeyString()); - // if (!expand) { - // expand = attribute.getValue() != null && attribute.getValue().length() > - // 0; - // } - // if (!attribute.isReadOnly()) { - // final Text text = toolkit.createText(textFieldComposite, - // attribute.getValue(), SWT.FLAT); - // text.setLayoutData(textData); - // toolkit.paintBordersFor(textFieldComposite); - // text.setData(attribute); - // text.addListener(SWT.KeyUp, new Listener() { - // public void handleEvent(Event event) { - // String sel = text.getText(); - // RepositoryTaskAttribute a = (RepositoryTaskAttribute) text.getData(); - // if (!(a.getValue().equals(sel))) { - // a.setValue(sel); - // markDirty(true); - // } - // } - // }); - // text.addListener(SWT.FocusIn, new GenericListener()); - // } - // - // addBugHyperlinks(sectionComposite, - // BugzillaReportElement.BLOCKED.getKeyString()); - // - // section.setExpanded(expand); - // - // } + private boolean hasCustomAttributeChanges() { + if (taskData == null) + return false; + String customAttributeKeys[] = { BugzillaReportElement.BUG_FILE_LOC.getKeyString(), + BugzillaReportElement.DEPENDSON.getKeyString(), BugzillaReportElement.BLOCKED.getKeyString(), + BugzillaReportElement.KEYWORDS.getKeyString(), BugzillaReportElement.VOTES.getKeyString(), + BugzillaReportElement.REPORTER_ACCESSIBLE.getKeyString(), + BugzillaReportElement.CCLIST_ACCESSIBLE.getKeyString(), + BugzillaReportElement.ESTIMATED_TIME.getKeyString(), + BugzillaReportElement.REMAINING_TIME.getKeyString(), BugzillaReportElement.ACTUAL_TIME.getKeyString(), + BugzillaReportElement.DEADLINE.getKeyString() }; + for (String key : customAttributeKeys) { + RepositoryTaskAttribute attribute = taskData.getAttribute(key); + if (hasChanged(attribute)) { + return true; + } + } + return false; + } + + @Override + protected boolean hasVisibleAttributeChanges() { + return super.hasVisibleAttributeChanges() || this.hasCustomAttributeChanges(); + + } private void addBugHyperlinks(Composite composite, String key) { FormToolkit toolkit = getManagedForm().getToolkit(); @@ -395,8 +283,7 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor { for (String bugNumber : values.split(",")) { final String bugId = bugNumber.trim(); Hyperlink hyperlink = toolkit.createHyperlink(hyperlinksComposite, bugId, SWT.NONE); - final ITask task = TasksUiPlugin.getTaskListManager().getTaskList().getTask( - AbstractRepositoryTask.getHandle(repository.getUrl(), bugId)); + final ITask task = TasksUiPlugin.getTaskListManager().getTaskList().getTask(repository.getUrl(), bugId); if (task != null) { hyperlink.setToolTipText(task.getSummary()); } @@ -415,12 +302,89 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor { } } + protected void addRoles(Composite parent) { + Section rolesSection = toolkit.createSection(parent, ExpandableComposite.SHORT_TITLE_BAR); + rolesSection.setText("Users in the roles selected below can always view this bug"); + rolesSection + .setDescription("(The assignee can always see a bug, and this section does not take effect unless the bug is restricted to at least one group.)"); + GridLayout gl = new GridLayout(); + GridData gd = new GridData(SWT.FILL, SWT.NONE, false, false); + gd.horizontalSpan = 4; + rolesSection.setLayout(gl); + rolesSection.setLayoutData(gd); + + Composite rolesComposite = toolkit.createComposite(rolesSection); + GridLayout attributesLayout = new GridLayout(); + attributesLayout.numColumns = 4; + attributesLayout.horizontalSpacing = 5; + attributesLayout.verticalSpacing = 4; + rolesComposite.setLayout(attributesLayout); + GridData attributesData = new GridData(GridData.FILL_BOTH); + attributesData.horizontalSpan = 1; + attributesData.grabExcessVerticalSpace = false; + rolesComposite.setLayoutData(attributesData); + rolesSection.setClient(rolesComposite); + + RepositoryTaskAttribute attribute = taskData.getAttribute(BugzillaReportElement.REPORTER_ACCESSIBLE + .getKeyString()); + if (attribute == null) { + taskData.setAttributeValue(BugzillaReportElement.REPORTER_ACCESSIBLE.getKeyString(), "0"); + attribute = taskData.getAttribute(BugzillaReportElement.REPORTER_ACCESSIBLE.getKeyString()); + } + Button button = addButtonField(rolesComposite, attribute, SWT.CHECK); + if (hasChanged(attribute)) { + button.setBackground(backgroundIncoming); + } + + attribute = null; + attribute = taskData.getAttribute(BugzillaReportElement.CCLIST_ACCESSIBLE.getKeyString()); + if (attribute == null) { + taskData.setAttributeValue(BugzillaReportElement.CCLIST_ACCESSIBLE.getKeyString(), "0"); + attribute = taskData.getAttribute(BugzillaReportElement.CCLIST_ACCESSIBLE.getKeyString()); + } + button = addButtonField(rolesComposite, attribute, SWT.CHECK); + if (hasChanged(attribute)) { + button.setBackground(backgroundIncoming); + } + } + + private Button addButtonField(Composite rolesComposite, RepositoryTaskAttribute attribute, int style) { + if (attribute == null) { + return null; + } + String name = attribute.getName(); + if (hasOutgoingChange(attribute)) { + name += "*"; + } + + final Button button = toolkit.createButton(rolesComposite, name, style); + if (!attribute.isReadOnly()) { + button.setData(attribute); + button.setSelection(attribute.getValue().equals("1")); + button.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL)); + button.addSelectionListener(new SelectionAdapter() { + + @Override + public void widgetSelected(SelectionEvent e) { + String sel = "1"; + if (!button.getSelection()) { + sel = "0"; + } + RepositoryTaskAttribute a = (RepositoryTaskAttribute) button.getData(); + a.setValue(sel); + attributeChanged(a); + } + }); + } + return button; + } + protected void addBugzillaTimeTracker(FormToolkit toolkit, Composite parent) { - Section timeSection = toolkit.createSection(parent, ExpandableComposite.TREE_NODE); + Section timeSection = toolkit.createSection(parent, ExpandableComposite.SHORT_TITLE_BAR); timeSection.setText(LABEL_TIME_TRACKING); GridLayout gl = new GridLayout(); - GridData gd = new GridData(SWT.FILL, SWT.NONE, true, false); + GridData gd = new GridData(SWT.FILL, SWT.NONE, false, false); gd.horizontalSpan = 4; timeSection.setLayout(gl); timeSection.setLayoutData(gd); @@ -432,84 +396,90 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor { gd.horizontalSpan = 5; timeComposite.setLayoutData(gd); - toolkit.createLabel(timeComposite, BugzillaReportElement.ESTIMATED_TIME.toString()); - estimateText = toolkit.createText(timeComposite, taskData.getAttributeValue(BugzillaReportElement.ESTIMATED_TIME - .getKeyString()), SWT.BORDER); - estimateText.setFont(TEXT_FONT); - estimateText.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL)); - estimateText.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - markDirty(true); - taskData.setAttributeValue(BugzillaReportElement.ESTIMATED_TIME.getKeyString(), estimateText.getText()); - } - }); + RepositoryTaskAttribute attribute = this.taskData.getAttribute(BugzillaReportElement.ESTIMATED_TIME + .getKeyString()); + if (attribute != null && !attribute.isReadOnly()) { + createLabel(timeComposite, attribute); + estimateText = createTextField(timeComposite, attribute, SWT.FLAT); + estimateText.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL)); + } toolkit.createLabel(timeComposite, "Current Estimate:"); - Text currentEstimate = toolkit.createText(timeComposite, "" - + (Float.parseFloat(taskData.getAttributeValue(BugzillaReportElement.ACTUAL_TIME.getKeyString())) + Float - .parseFloat(taskData.getAttributeValue(BugzillaReportElement.REMAINING_TIME.getKeyString())))); + Text currentEstimate = toolkit.createText(timeComposite, + "" + + (Float.parseFloat(taskData + .getAttributeValue(BugzillaReportElement.ACTUAL_TIME.getKeyString())) + Float + .parseFloat(taskData.getAttributeValue(BugzillaReportElement.REMAINING_TIME + .getKeyString())))); currentEstimate.setFont(TEXT_FONT); currentEstimate.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL)); currentEstimate.setEditable(false); - toolkit.createLabel(timeComposite, BugzillaReportElement.ACTUAL_TIME.toString()); - actualText = toolkit.createText(timeComposite, taskData.getAttributeValue(BugzillaReportElement.ACTUAL_TIME - .getKeyString())); - actualText.setFont(TEXT_FONT); - actualText.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL)); - actualText.setEditable(false); + attribute = this.taskData.getAttribute(BugzillaReportElement.ACTUAL_TIME.getKeyString()); + if (attribute != null) { - taskData.setAttributeValue(BugzillaReportElement.WORK_TIME.getKeyString(), "0"); - toolkit.createLabel(timeComposite, BugzillaReportElement.WORK_TIME.toString()); - addTimeText = toolkit.createText(timeComposite, taskData.getAttributeValue(BugzillaReportElement.WORK_TIME - .getKeyString()), SWT.BORDER); - addTimeText.setFont(TEXT_FONT); - addTimeText.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL)); - addTimeText.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - markDirty(true); - taskData.setAttributeValue(BugzillaReportElement.WORK_TIME.getKeyString(), addTimeText.getText()); - } - }); - - toolkit.createLabel(timeComposite, BugzillaReportElement.REMAINING_TIME.toString()); - remainingText = toolkit.createText(timeComposite, taskData.getAttributeValue(BugzillaReportElement.REMAINING_TIME - .getKeyString()), SWT.BORDER); - remainingText.setFont(TEXT_FONT); - remainingText.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL)); - remainingText.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - markDirty(true); - taskData - .setAttributeValue(BugzillaReportElement.REMAINING_TIME.getKeyString(), remainingText.getText()); - } - }); + createLabel(timeComposite, attribute); + Text actualText = createTextField(timeComposite, attribute, SWT.FLAT); + actualText.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL)); + actualText.setEditable(false); + } - toolkit.createLabel(timeComposite, BugzillaReportElement.DEADLINE.toString()); + // Add Time + taskData.setAttributeValue(BugzillaReportElement.WORK_TIME.getKeyString(), "0"); + final RepositoryTaskAttribute addTimeAttribute = this.taskData.getAttribute(BugzillaReportElement.WORK_TIME + .getKeyString()); + if (addTimeAttribute != null) { + + createLabel(timeComposite, addTimeAttribute); + addTimeText = toolkit.createText(timeComposite, taskData.getAttributeValue(BugzillaReportElement.WORK_TIME + .getKeyString()), SWT.BORDER); + addTimeText.setFont(TEXT_FONT); + addTimeText.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL)); + addTimeText.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent e) { + addTimeAttribute.setValue(addTimeText.getText()); + attributeChanged(addTimeAttribute); + } + }); + } + attribute = this.taskData.getAttribute(BugzillaReportElement.REMAINING_TIME.getKeyString()); + if (attribute != null) { + createLabel(timeComposite, attribute); + createTextField(timeComposite, attribute, SWT.FLAT); + } - deadlinePicker = new DatePicker(timeComposite, /* SWT.NONE */SWT.BORDER, taskData - .getAttributeValue(BugzillaReportElement.DEADLINE.getKeyString())); - deadlinePicker.setFont(TEXT_FONT); - deadlinePicker.setDatePattern("yyyy-MM-dd"); - deadlinePicker.addPickerSelectionListener(new SelectionListener() { + attribute = this.taskData.getAttribute(BugzillaReportElement.DEADLINE.getKeyString()); + if (attribute != null) { + createLabel(timeComposite, attribute); - public void widgetDefaultSelected(SelectionEvent e) { - // ignore + deadlinePicker = new DatePicker(timeComposite, /* SWT.NONE */SWT.BORDER, taskData + .getAttributeValue(BugzillaReportElement.DEADLINE.getKeyString())); + deadlinePicker.setFont(TEXT_FONT); + deadlinePicker.setDatePattern("yyyy-MM-dd"); + if (hasChanged(attribute)) { + deadlinePicker.setBackground(backgroundIncoming); } + deadlinePicker.addPickerSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { - Calendar cal = deadlinePicker.getDate(); - if (cal != null) { - Date d = cal.getTime(); - SimpleDateFormat f = (SimpleDateFormat) SimpleDateFormat.getDateInstance(); - f.applyPattern("yyyy-MM-dd"); + public void widgetDefaultSelected(SelectionEvent e) { + // ignore + } - taskData.setAttributeValue(BugzillaReportElement.DEADLINE.getKeyString(), f.format(d)); - markDirty(true); // TODO goes dirty even if user - // presses cancel + public void widgetSelected(SelectionEvent e) { + Calendar cal = deadlinePicker.getDate(); + if (cal != null) { + Date d = cal.getTime(); + SimpleDateFormat f = (SimpleDateFormat) SimpleDateFormat.getDateInstance(); + f.applyPattern("yyyy-MM-dd"); + + taskData.setAttributeValue(BugzillaReportElement.DEADLINE.getKeyString(), f.format(d)); + attributeChanged(taskData.getAttribute(BugzillaReportElement.DEADLINE.getKeyString())); + // TODO goes dirty even if user presses cancel + // markDirty(true); + } } - } - }); + }); + } timeSection.setClient(timeComposite); } @@ -525,7 +495,7 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor { GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.CENTER).applyTo(label); // toolkit.createText(attributesComposite, keywords) - keywordsText = createTextField(attributesComposite, attribute, SWT.NONE); + keywordsText = createTextField(attributesComposite, attribute, SWT.FLAT); keywordsText.setFont(TEXT_FONT); keywordsText.setEditable(false); // keywordsText.setForeground(foreground); @@ -535,7 +505,6 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor { keywordsData.widthHint = 200; keywordsText.setLayoutData(keywordsData); // keywordsText.setText(keywords); - keywordsText.addListener(SWT.FocusIn, new GenericListener()); keyWordsList = new List(attributesComposite, SWT.MULTI | SWT.V_SCROLL); keyWordsList.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER); keyWordsList.setFont(TEXT_FONT); @@ -580,7 +549,6 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor { } keyWordsList.addSelectionListener(new KeywordListener()); - keyWordsList.addListener(SWT.FocusIn, new GenericListener()); } protected void addVoting(Composite attributesComposite) { @@ -594,8 +562,9 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor { votingComposite.setLayout(layout); // GridDataFactory.fillDefaults().span(2, 1).applyTo(votingComposite); RepositoryTaskAttribute votesAttribute = taskData.getAttribute(BugzillaReportElement.VOTES.getKeyString()); - String voteValue = votesAttribute != null ? votesAttribute.getValue() : "0"; - votesText = toolkit.createText(votingComposite, voteValue); + // String voteValue = votesAttribute != null ? votesAttribute.getValue() + // : "0"; + votesText = createTextField(votingComposite, votesAttribute, SWT.FLAT); votesText.setFont(TEXT_FONT); if (votesAttribute != null && hasChanged(votesAttribute)) { @@ -631,77 +600,6 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor { }); } - - // @Override - // protected void restoreBug() { - // - // if (taskData == null) - // return; - // - // // go through all of the attributes and restore the new values to the - // // main ones - // // for (Iterator<RepositoryTaskAttribute> it = - // // bug.getAttributes().iterator(); it.hasNext();) { - // // RepositoryTaskAttribute a = it.next(); - // // a.setNewValue(a.getValue()); - // // } - // - // // Restore some other fields as well. - // // bug.setNewNewComment(bug.getNewComment()); - // } - - /** - * This job opens a compare editor to compare the current state of the bug - * in the editor with the bug on the server. - */ - // protected class OpenCompareEditorJob extends Job { - // - // public OpenCompareEditorJob(String name) { - // super(name); - // } - // - // @Override - // protected IStatus run(IProgressMonitor monitor) { - // final RepositoryTaskData serverBug; - // try { - // TaskRepository repository = - // TasksUiPlugin.getRepositoryManager().getRepository( - // BugzillaPlugin.REPOSITORY_KIND, taskData.getRepositoryUrl()); - // serverBug = BugzillaServerFacade.getBug(repository.getUrl(), - // repository.getUserName(), repository - // .getPassword(), editorInput.getProxySettings(), - // repository.getCharacterEncoding(), Integer - // .parseInt(taskData.getId())); - // // If no bug was found on the server, throw an exception so that - // // the - // // user gets the same message that appears when there is a - // // problem reading the server. - // if (serverBug == null) - // throw new Exception(); - // } catch (Exception e) { - // PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { - // public void run() { - // MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), - // "Could not open bug.", "Bug #" + taskData.getId() - // + " could not be read from the server."); - // } - // }); - // return new Status(IStatus.OK, BugzillaUiPlugin.PLUGIN_ID, IStatus.OK, - // "Could not get the bug report from the server.", null); - // } - // PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { - // public void run() { - // compareInput.setTitle("Bug #" + taskData.getId()); - // compareInput.setLeft(taskData); - // compareInput.setRight(serverBug); - // CompareUI.openCompareEditor(compareInput); - // } - // }); - // return new Status(IStatus.OK, BugzillaUiPlugin.PLUGIN_ID, IStatus.OK, "", - // null); - // } - // - // } /** * Class to handle the selection change of the keywords. */ @@ -721,8 +619,7 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor { if (keyWordsList.getSelectionCount() == 1) { int index = keyWordsList.getSelectionIndex(); String keyword = keyWordsList.getItem(index); - if (taskData.getAttributeValue(BugzillaReportElement.KEYWORDS.getKeyString()).equals( - keyword)) + if (taskData.getAttributeValue(BugzillaReportElement.KEYWORDS.getKeyString()).equals(keyword)) keyWordsList.deselectAll(); } @@ -775,16 +672,7 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor { @Override protected void validateInput() { - // RepositoryOperation o = taskData.getSelectedOperation(); - // if (o != null && o.getKnobName().compareTo("resolve") == 0 - // && (addCommentsTextBox.getText() == null || - // addCommentsTextBox.getText().equals(""))) { - // // TODO: Highlight (change to light red?) New Comment area to - // // indicate need for message - // submitButton.setEnabled(false); - // } else { - // submitButton.setEnabled(true); - // } + } /** @@ -808,87 +696,17 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor { urlText.addListener(SWT.KeyUp, new Listener() { public void handleEvent(Event event) { String sel = urlText.getText(); - RepositoryTaskAttribute a = taskData.getAttribute( - BugzillaReportElement.BUG_FILE_LOC.getKeyString()); + RepositoryTaskAttribute a = taskData.getAttribute(BugzillaReportElement.BUG_FILE_LOC.getKeyString()); if (!(a.getValue().equals(sel))) { a.setValue(sel); markDirty(true); } } }); - urlText.addListener(SWT.FocusIn, new GenericListener()); } + protected String getActivityUrl() { + return repository.getUrl() + IBugzillaConstants.URL_BUG_ACTIVITY + taskData.getId(); + } - // protected void createDescriptionLayout(Composite composite) { - // // This is migration code from 0.6.1 -> 0.6.2 - // // Changes to the abstract editor causes the description - // // field of the bugzilla editor to be editable if the offline - // // task data hasn't been saved yet. Upon being saved it works fine but - // // the initial load of the page would have an editable description - // // area if this was not present. TODO: Remove post 0.6.1. - // super.createDescriptionLayout(composite); - // descriptionTextViewer.setEditable(false); - // } - - // TODO used for spell checking. Add back when we want to support this - // protected Button checkSpellingButton; - // - // private void checkSpelling() { - // SpellingContext context= new SpellingContext(); - // context.setContentType(Platform.getContentTypeManager().getContentType(IContentTypeManager.CT_TEXT)); - // IDocument document = new Document(addCommentsTextBox.getText()); - // ISpellingProblemCollector collector= new - // SpellingProblemCollector(document); - // EditorsUI.getSpellingService().check(document, context, collector, new - // NullProgressMonitor()); - // } - // - // private class SpellingProblemCollector implements - // ISpellingProblemCollector { - // - // private IDocument document; - // - // private SpellingDialog spellingDialog; - // - // public SpellingProblemCollector(IDocument document){ - // this.document = document; - // spellingDialog = new - // SpellingDialog(Display.getCurrent().getActiveShell(), "Spell Checking", - // document); - // } - // - // /* - // * @see - // org.eclipse.ui.texteditor.spelling.ISpellingProblemCollector#accept(org.eclipse.ui.texteditor.spelling.SpellingProblem) - // */ - // public void accept(SpellingProblem problem) { - // try { - // int line= document.getLineOfOffset(problem.getOffset()) + 1; - // String word= document.get(problem.getOffset(), problem.getLength()); - // - // spellingDialog.open(word, problem.getProposals()); - // - // } catch (BadLocationException x) { - // // drop this SpellingProblem - // } - // } - // - // /* - // * @see - // org.eclipse.ui.texteditor.spelling.ISpellingProblemCollector#beginCollecting() - // */ - // public void beginCollecting() { - // - // } - // - // /* - // * @see - // org.eclipse.ui.texteditor.spelling.ISpellingProblemCollector#endCollecting() - // */ - // public void endCollecting() { - // MessageDialog.openInformation(Display.getCurrent().getActiveShell(), - // "Spell Checking Finished", "The spell check has finished"); - // } - // } }
\ No newline at end of file diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/NewBugzillaTaskEditor.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/NewBugzillaTaskEditor.java index a3285d143..7c5451698 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/NewBugzillaTaskEditor.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/NewBugzillaTaskEditor.java @@ -13,8 +13,9 @@ package org.eclipse.mylar.internal.bugzilla.ui.editor; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.layout.GridDataFactory; -import org.eclipse.mylar.context.core.MylarStatusHandler; +import org.eclipse.mylar.core.MylarStatusHandler; import org.eclipse.mylar.internal.bugzilla.core.BugzillaRepositoryQuery; import org.eclipse.mylar.tasks.core.RepositoryTaskAttribute; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; @@ -33,7 +34,7 @@ import org.eclipse.ui.forms.widgets.Section; /** * An editor used to view a locally created bug that does not yet exist on a - * server. + * repository. * * @author Rob Elves */ @@ -64,7 +65,7 @@ public class NewBugzillaTaskEditor extends AbstractNewRepositoryTaskEditor { @Override protected void createPeopleLayout(Composite composite) { FormToolkit toolkit = getManagedForm().getToolkit(); - Section peopleSection = createSection(composite, SECTION_TITLE_PEOPLE); + Section peopleSection = createSection(composite, getSectionLabel(SECTION_NAME.PEOPLE_SECTION)); GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(peopleSection); Composite peopleComposite = toolkit.createComposite(peopleSection); GridLayout layout = new GridLayout(2, false); @@ -73,131 +74,22 @@ public class NewBugzillaTaskEditor extends AbstractNewRepositoryTaskEditor { GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(peopleComposite); Label label = toolkit.createLabel(peopleComposite, "Assign to:"); - GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.DEFAULT).applyTo(label); + GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.CENTER).applyTo(label); Composite textFieldComposite = toolkit.createComposite(peopleComposite); GridLayout textLayout = new GridLayout(); - textLayout.marginWidth = 1; - textLayout.verticalSpacing = 0; - textLayout.marginHeight = 0; - textLayout.marginRight = 5; +// textLayout.marginWidth = 1; +// textLayout.verticalSpacing = 0; +// textLayout.marginHeight = 0; +// textLayout.marginRight = 5; textFieldComposite.setLayout(textLayout); Text textField = createTextField(textFieldComposite, taskData .getAttribute(RepositoryTaskAttribute.USER_ASSIGNED), SWT.FLAT); - + toolkit.paintBordersFor(textFieldComposite); GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).applyTo(textField); peopleSection.setClient(peopleComposite); + toolkit.paintBordersFor(peopleComposite); } - // @Override - // protected void createCustomAttributeLayout(Composite composite) { - // FormToolkit toolkit = getManagedForm().getToolkit(); - // Label label = toolkit.createLabel(composite, - // BugzillaReportElement.ASSIGNED_TO.toString()); - // - // GridDataFactory.fillDefaults().align(SWT.RIGHT, - // SWT.CENTER).applyTo(label); - // Composite textFieldComposite = toolkit.createComposite(composite); - // GridLayout textLayout = new GridLayout(); - // textLayout.marginWidth = 1; - // textLayout.marginHeight = 2; - // textFieldComposite.setLayout(textLayout); - // GridData textData = new GridData(GridData.HORIZONTAL_ALIGN_FILL); - // textData.horizontalSpan = 1; - // textData.widthHint = 135; - // RepositoryTaskAttribute attribute = - // taskData.getAttribute(RepositoryTaskAttribute.USER_ASSIGNED); - // final Text text = createTextField(textFieldComposite, attribute, - // SWT.FLAT); - // // text.setFont(COMMENT_FONT); - // text.setLayoutData(textData); - // toolkit.paintBordersFor(textFieldComposite); - // text.setData(attribute); - // text.addListener(SWT.KeyUp, new Listener() { - // public void handleEvent(Event event) { - // String sel = text.getText(); - // RepositoryTaskAttribute a = (RepositoryTaskAttribute) text.getData(); - // if (!(a.getValue().equals(sel))) { - // a.setValue(sel); - // markDirty(true); - // } - // } - // }); - // text.addListener(SWT.FocusIn, new GenericListener()); - // } - - // @Override - // protected void submitToRepository() { - // if (!prepareSubmit()) { - // return; - // } - // updateTask(); - // boolean wrap = - // IBugzillaConstants.BugzillaServerVersion.SERVER_218.equals(repository.getVersion()); - // - // try { - // final BugzillaReportSubmitForm bugzillaReportSubmitForm = - // BugzillaReportSubmitForm.makeNewBugPost( - // repository.getUrl(), repository.getUserName(), repository.getPassword(), - // repository - // .getCharacterEncoding(), taskData, wrap); - // - // submissionHandler.submitBugReport(bugzillaReportSubmitForm, - // submitJobListener, false, getCategory()); - // - // } catch (UnsupportedEncodingException e) { - // MessageDialog.openError(null, "Posting Error", "Ensure proper encoding - // selected in " - // + TaskRepositoriesView.NAME + "."); - // return; - // } catch (Exception e) { - // MylarStatusHandler.fail(e, "Posting Error. Ensure proper configuration in - // " + TaskRepositoriesView.NAME - // + ".", true); - // return; - // } - // - // } - // protected void handleNewBugPost(String postResult) throws CoreException { - // int bugId = -1; - // try { - // bugId = Integer.parseInt(postResult); - // } catch (NumberFormatException e) { - // throw new CoreException(new Status(Status.ERROR, - // BugzillaUiPlugin.PLUGIN_ID, - // "Invalid id returned by repository: " + postResult)); - // } - // - // BugzillaTask newTask = new - // BugzillaTask(AbstractRepositoryTask.getHandle(repository.getUrl(), - // bugId), - // "<bugzilla info>", true); - // - // if (getCategory() != null) { - // TasksUiPlugin.getTaskListManager().getTaskList().moveToContainer(getCategory(), - // newTask); - // } - // TasksUiPlugin.getSynchronizationScheduler().synchNow(0, - // Collections.singletonList(repository)); - // - // } - - // protected void addActionButtons(Composite buttonComposite) { - // - // FormToolkit toolkit = new FormToolkit(buttonComposite.getDisplay()); - // searchDuplicatesButton = toolkit.createButton(buttonComposite, - // LABEL_SEARCH_DUPS, SWT.NONE); - // GridData searchDuplicatesButtonData = new - // GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); - // searchDuplicatesButton.setLayoutData(searchDuplicatesButtonData); - // searchDuplicatesButton.addListener(SWT.Selection, new Listener() { - // public void handleEvent(Event e) { - // searchForDuplicates(); - // } - // }); - // - // super.addActionButtons(buttonComposite); - // } - @Override public SearchHitCollector getDuplicateSearchCollector(String searchString) { String queryUrl = ""; @@ -219,25 +111,20 @@ public class NewBugzillaTaskEditor extends AbstractNewRepositoryTaskEditor { return collector; } - // @Override - // protected String getPluginId() { - // return BugzillaUiPlugin.PLUGIN_ID; - // } - - // @Override - // protected void handleErrorStatus(IJobChangeEvent event) { - // if (event.getJob().getResult().getCode() == Status.INFO) { - // WebBrowserDialog.openAcceptAgreement(NewBugzillaTaskEditor.this.getSite().getShell(), - // IBugzillaConstants.REPORT_SUBMIT_ERROR, - // event.getJob().getResult().getMessage(), event.getJob() - // .getResult().getException().getMessage()); - // } else if (event.getJob().getResult().getCode() == Status.ERROR) { - // MessageDialog.openError(NewBugzillaTaskEditor.this.getSite().getShell(), - // IBugzillaConstants.REPORT_SUBMIT_ERROR, event.getResult().getMessage()); - // } - // super.handleErrorStatus(event); - // } - + @Override + public void submitToRepository() { + if (summaryText.getText().equals("")) { + MessageDialog.openInformation(this.getSite().getShell(), "Submit Error", "Please provide a brief summary with new reports."); + summaryText.setFocus(); + return; + } else if (descriptionTextViewer.getTextWidget().getText().equals("")) { + MessageDialog.openInformation(this.getSite().getShell(), "Submit Error", "Please proved a detailed summary with new reports"); + descriptionTextViewer.getTextWidget().setFocus(); + return; + } + super.submitToRepository(); + } + /** * Break text up into lines so that it is displayed properly in bugzilla */ @@ -277,5 +164,4 @@ public class NewBugzillaTaskEditor extends AbstractNewRepositoryTaskEditor { return newText; } } - } diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java index 08dae9aa0..1009e0072 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java @@ -25,7 +25,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.mylar.context.core.MylarStatusHandler; +import org.eclipse.mylar.core.MylarStatusHandler; import org.eclipse.mylar.internal.bugzilla.core.BugzillaCorePlugin; import org.eclipse.mylar.internal.bugzilla.core.BugzillaRepositoryQuery; import org.eclipse.mylar.internal.bugzilla.core.IBugzillaConstants; @@ -262,7 +262,7 @@ public class BugzillaSearchPage extends AbstractRepositoryQueryPage implements L // Info text label = new Label(group, SWT.LEFT); - label.setText("Summary/id contains: "); + label.setText("Summary/taskId contains: "); gd = new GridData(GridData.BEGINNING); gd.horizontalSpan = 1; label.setLayoutData(gd); @@ -1242,7 +1242,7 @@ public class BugzillaSearchPage extends AbstractRepositoryQueryPage implements L // --------------- Configuration handling -------------- - // Dialog store id constants + // Dialog store taskId constants protected final static String PAGE_NAME = "BugzillaSearchPage"; //$NON-NLS-1$ private static final String STORE_PRODUCT_ID = PAGE_NAME + ".PRODUCT"; 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 706e40fed..fb4b9bd12 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 @@ -22,9 +22,9 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; -import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.mylar.context.core.MylarStatusHandler; +import org.eclipse.mylar.core.MylarStatusHandler; +import org.eclipse.mylar.core.net.WebClientUtil; import org.eclipse.mylar.internal.bugzilla.core.BugzillaClient; import org.eclipse.mylar.internal.bugzilla.core.BugzillaClientFactory; import org.eclipse.mylar.internal.bugzilla.core.BugzillaCorePlugin; @@ -33,9 +33,8 @@ import org.eclipse.mylar.internal.bugzilla.core.RepositoryConfiguration; import org.eclipse.mylar.tasks.core.IMylarStatusConstants; import org.eclipse.mylar.tasks.core.MylarStatus; import org.eclipse.mylar.tasks.core.RepositoryTemplate; -import org.eclipse.mylar.tasks.core.web.WebClientUtil; +import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi; -import org.eclipse.mylar.tasks.ui.TasksUiUtil; import org.eclipse.mylar.tasks.ui.wizards.AbstractRepositorySettingsPage; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -44,7 +43,6 @@ import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; -import org.eclipse.ui.PlatformUI; /** * @author Mik Kersten @@ -60,8 +58,6 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa protected Combo repositoryVersionCombo; - private boolean testing = false; - public BugzillaRepositorySettingsPage(AbstractRepositoryConnectorUi repositoryUi) { super(TITLE, DESCRIPTION, repositoryUi); setNeedsAnonymousLogin(true); @@ -184,8 +180,10 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa final String httpAuthPass = getHttpAuthPassword(); final Proxy tempProxy; try { + setMessage("Validating server settings..."); + setErrorMessage(null); if (getUseDefaultProxy()) { - tempProxy = WebClientUtil.getSystemProxy(); + tempProxy = TaskRepository.getSystemProxy(); } else { tempProxy = WebClientUtil.getProxy(getProxyHostname(), getProxyPort(), getProxyUsername(), getProxyPassword()); @@ -200,7 +198,11 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa try { monitor.beginTask("Validating server settings", IProgressMonitor.UNKNOWN); BugzillaClient client = null; - if (!isAnonymous && version != null) { + if (isAnonymous) { + client = BugzillaClientFactory.createClient(serverUrl, newUserId, newPassword, + httpAuthUser, httpAuthPass, tempProxy, newEncoding); + client.logout(); + } else if (version != null) { client = BugzillaClientFactory.createClient(serverUrl, newUserId, newPassword, httpAuthUser, httpAuthPass, tempProxy, newEncoding); client.validate(); @@ -211,13 +213,10 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa version[0] = config.getInstallVersion(); } } - } catch (final Exception e) { - PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { - public void run() { - displayError(serverUrl, e); - } - }); - throw new InvocationTargetException(e); + + } catch (Exception ex) { + throw new InvocationTargetException(ex); + } finally { monitor.done(); } @@ -228,59 +227,34 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa setBugzillaVersion(version[0]); } - if (!testing) { - MessageDialog.openInformation(null, IBugzillaConstants.TITLE_MESSAGE_DIALOG, - "Authentication credentials are valid."); + if (!isAnonymous) { + setMessage("Valid Bugzilla server found and your login was accepted"); + } else { + setMessage("Valid Bugzilla server found"); } - } catch (InvocationTargetException e) { - // ignore + } catch (InvocationTargetException e) { + setMessage(null); + displayError(serverUrl, e.getTargetException()); + } catch (InterruptedException e) { - MessageDialog.openWarning(null, IBugzillaConstants.TITLE_MESSAGE_DIALOG, "Validation cancelled"); + setErrorMessage("Could not connect to Bugzilla server or authentication failed"); } - - super.getWizard().getContainer().updateButtons(); } - private void displayError(final String serverUrl, Exception e) { + private void displayError(final String serverUrl, Throwable e) { IStatus status; if (e instanceof MalformedURLException) { - status = new MylarStatus(Status.WARNING, BugzillaCorePlugin.PLUGIN_ID, - IMylarStatusConstants.NETWORK_ERROR, "Server URL is invalid."); + status = new MylarStatus(Status.WARNING, BugzillaCorePlugin.PLUGIN_ID, IMylarStatusConstants.NETWORK_ERROR, + "Server URL is invalid."); } else if (e instanceof CoreException) { status = ((CoreException) e).getStatus(); } else if (e instanceof IOException) { - status = new MylarStatus(Status.WARNING, BugzillaCorePlugin.PLUGIN_ID, - IMylarStatusConstants.IO_ERROR, serverUrl, e); + status = new MylarStatus(Status.WARNING, BugzillaCorePlugin.PLUGIN_ID, IMylarStatusConstants.IO_ERROR, + serverUrl, e.getMessage()); } else { - status = new MylarStatus(Status.WARNING, BugzillaCorePlugin.PLUGIN_ID, - IMylarStatusConstants.NETWORK_ERROR, serverUrl, e.getMessage()); + status = new MylarStatus(Status.WARNING, BugzillaCorePlugin.PLUGIN_ID, IMylarStatusConstants.NETWORK_ERROR, + serverUrl, e.getMessage()); } - TasksUiUtil.displayStatus("Validation failed", status, BugzillaRepositorySettingsPage.this.getShell()); - } - - // private void displayError(final String serverUrl, Exception e) { - // CoreException coreException; - // if (e.getCause() instanceof MalformedURLException) { - // coreException = new CoreException(new MylarStatus(Status.WARNING, - // BugzillaCorePlugin.PLUGIN_ID, - // IMylarStatusConstants.NETWORK_ERROR, "Server URL is invalid.")); - // } else if (e.getCause() instanceof CoreException) { - // coreException = (CoreException) e.getCause(); - // } else if (e.getCause() instanceof IOException) { - // coreException = new CoreException(new MylarStatus(Status.WARNING, - // BugzillaCorePlugin.PLUGIN_ID, - // IMylarStatusConstants.IO_ERROR, serverUrl, e.getCause())); - // } else { - // coreException = new CoreException(new MylarStatus(Status.WARNING, - // BugzillaCorePlugin.PLUGIN_ID, - // IMylarStatusConstants.NETWORK_ERROR, e.getCause().getMessage())); - // } - // TasksUiUtil.displayDialog("Validation failed", coreException, - // BugzillaRepositorySettingsPage.this.getShell()); - // } - - public void setTesting(boolean testing) { - this.testing = testing; + MylarStatusHandler.displayStatus("Validation failed", status); } - }
\ No newline at end of file diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryUi.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryUi.java index 1b78af4ac..a11577c02 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryUi.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryUi.java @@ -14,21 +14,18 @@ package org.eclipse.mylar.internal.bugzilla.ui.tasklist; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.IWizard; import org.eclipse.mylar.internal.bugzilla.core.BugzillaCorePlugin; -import org.eclipse.mylar.internal.bugzilla.core.BugzillaClient; import org.eclipse.mylar.internal.bugzilla.core.BugzillaRepositoryQuery; import org.eclipse.mylar.internal.bugzilla.ui.search.BugzillaSearchPage; import org.eclipse.mylar.internal.bugzilla.ui.wizard.NewBugzillaTaskWizard; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi; -import org.eclipse.mylar.tasks.ui.OpenRepositoryTaskJob; import org.eclipse.mylar.tasks.ui.search.AbstractRepositoryQueryPage; import org.eclipse.mylar.tasks.ui.wizards.AbstractRepositorySettingsPage; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.PlatformUI; /** * @author Mik Kersten + * @author Eugene Kuleshov */ public class BugzillaRepositoryUi extends AbstractRepositoryConnectorUi { @@ -71,20 +68,4 @@ public class BugzillaRepositoryUi extends AbstractRepositoryConnectorUi { return BugzillaCorePlugin.REPOSITORY_KIND; } - @Override - public boolean openRemoteTask(String repositoryUrl, String idString) { - int id = -1; - try { - id = Integer.parseInt(idString); - } catch (NumberFormatException e) { - return false; - } - String bugUrl = BugzillaClient.getBugUrlWithoutLogin(repositoryUrl, id); - IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); - OpenRepositoryTaskJob job = new OpenRepositoryTaskJob(BugzillaCorePlugin.REPOSITORY_KIND, repositoryUrl, idString, - bugUrl, page); - job.schedule(); - return true; - } - } diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditorFactory.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditorFactory.java index 8e91299f5..28dcc3529 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditorFactory.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditorFactory.java @@ -56,7 +56,6 @@ public class BugzillaTaskEditorFactory implements ITaskEditorFactory { BugzillaCorePlugin.REPOSITORY_KIND, bugzillaTask.getRepositoryUrl()); BugzillaTaskEditorInput input = new BugzillaTaskEditorInput(repository, bugzillaTask, true); return input; - } return null; } diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditorInput.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditorInput.java index 4e27f5678..832b710f8 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditorInput.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditorInput.java @@ -17,7 +17,6 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.mylar.internal.bugzilla.core.BugzillaCorePlugin; import org.eclipse.mylar.internal.bugzilla.core.BugzillaRepositoryConnector; import org.eclipse.mylar.internal.bugzilla.core.BugzillaTask; -import org.eclipse.mylar.tasks.core.RepositoryTaskAttribute; import org.eclipse.mylar.tasks.core.RepositoryTaskData; import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; @@ -35,11 +34,9 @@ public class BugzillaTaskEditorInput extends RepositoryTaskEditorInput { private BugzillaTask bugTask; - public BugzillaTaskEditorInput(TaskRepository repository, BugzillaTask bugTask, boolean offline) { - super(repository, bugTask.getHandleIdentifier(), bugTask.getUrl()); - this.bugTask = bugTask; - migrateDescToReadOnly(getTaskData()); - migrateDescToReadOnly(getOldTaskData()); + public BugzillaTaskEditorInput(TaskRepository repository, BugzillaTask bugzillaTask, boolean offline) { + super(repository, bugzillaTask.getHandleIdentifier(), bugzillaTask.getTaskUrl(), bugzillaTask.getTaskId()); + this.bugTask = bugzillaTask; updateOptions(getTaskData()); updateOptions(getOldTaskData()); } @@ -59,11 +56,6 @@ public class BugzillaTaskEditorInput extends RepositoryTaskEditorInput { return null; } - // @Override - // public String getName() { - // return bugTask.getDescription(); - // } - @Override public IPersistableElement getPersistable() { return null; @@ -87,16 +79,6 @@ public class BugzillaTaskEditorInput extends RepositoryTaskEditorInput { return bugTask; } - // TODO: migration code 0.6.1 -> 0.6.2 - private void migrateDescToReadOnly(RepositoryTaskData taskData) { - if (taskData != null) { - RepositoryTaskAttribute attrib = taskData.getDescriptionAttribute(); - if (attrib != null) { - attrib.setReadOnly(true); - } - } - } - // TODO: repository configuration update (remove at some point) private void updateOptions(RepositoryTaskData taskData) { try { diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskExternalizer.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskExternalizer.java index 2b0c076c3..399361669 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskExternalizer.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskExternalizer.java @@ -11,14 +11,11 @@ package org.eclipse.mylar.internal.bugzilla.ui.tasklist; -import java.text.SimpleDateFormat; -import java.util.Date; - import org.eclipse.mylar.internal.bugzilla.core.BugzillaQueryHit; import org.eclipse.mylar.internal.bugzilla.core.BugzillaRepositoryQuery; import org.eclipse.mylar.internal.bugzilla.core.BugzillaTask; +import org.eclipse.mylar.tasks.core.AbstractQueryHit; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; -import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.AbstractTaskContainer; import org.eclipse.mylar.tasks.core.DelegatingTaskExternalizer; import org.eclipse.mylar.tasks.core.ITask; @@ -26,7 +23,6 @@ import org.eclipse.mylar.tasks.core.TaskExternalizationException; import org.eclipse.mylar.tasks.core.TaskList; import org.w3c.dom.Element; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; /** * @author Mik Kersten @@ -37,11 +33,11 @@ public class BugzillaTaskExternalizer extends DelegatingTaskExternalizer { private static final String STATUS_NEW = "NEW"; - private static final String KEY_OLD_LAST_DATE = "LastDate"; - - private static final String TAG_BUGZILLA_QUERY_HIT = "Bugzilla" + KEY_QUERY_HIT; + private static final String TAG_BUGZILLA = "Bugzilla"; + + private static final String TAG_BUGZILLA_QUERY_HIT = TAG_BUGZILLA + KEY_QUERY_HIT; - private static final String TAG_BUGZILLA_QUERY = "Bugzilla" + KEY_QUERY; + private static final String TAG_BUGZILLA_QUERY = TAG_BUGZILLA + KEY_QUERY; private static final String TAG_BUGZILLA_CUSTOM_QUERY = "BugzillaCustom" + KEY_QUERY; @@ -66,7 +62,6 @@ public class BugzillaTaskExternalizer extends DelegatingTaskExternalizer { @Override public AbstractRepositoryQuery readQuery(Node node, TaskList taskList) throws TaskExternalizationException { - boolean hasCaughtException = false; Element element = (Element) node; BugzillaRepositoryQuery query = new BugzillaRepositoryQuery(element.getAttribute(KEY_REPOSITORY_URL), element .getAttribute(KEY_QUERY_STRING), element.getAttribute(KEY_NAME), element @@ -77,21 +72,7 @@ public class BugzillaTaskExternalizer extends DelegatingTaskExternalizer { if (element.getAttribute(KEY_LAST_REFRESH) != null && !element.getAttribute(KEY_LAST_REFRESH).equals("")) { query.setLastRefreshTimeStamp(element.getAttribute(KEY_LAST_REFRESH)); } - - NodeList list = node.getChildNodes(); - for (int i = 0; i < list.getLength(); i++) { - Node child = list.item(i); - try { - readQueryHit(child, taskList, query); - } catch (TaskExternalizationException e) { - hasCaughtException = true; - } - } - if (hasCaughtException) { - throw new TaskExternalizationException("Failed to load all tasks"); - } else { - return query; - } + return query; } @Override @@ -110,49 +91,9 @@ public class BugzillaTaskExternalizer extends DelegatingTaskExternalizer { } @Override - public ITask readTask(Node node, TaskList taskList, AbstractTaskContainer category, ITask parent) + public ITask createTask(String repositoryUrl, String taskId, String summary, Element element, TaskList taskList, AbstractTaskContainer category, ITask parent) throws TaskExternalizationException { - Element element = (Element) node; - String handle; - String label; - if (element.hasAttribute(KEY_HANDLE)) { - handle = element.getAttribute(KEY_HANDLE); - } else { - throw new TaskExternalizationException("Handle not stored for bug report"); - } - if (element.hasAttribute(KEY_LABEL)) { - label = element.getAttribute(KEY_LABEL); - } else { - throw new TaskExternalizationException("Description not stored for bug report"); - } - BugzillaTask task = new BugzillaTask(handle, label, false); - super.readTaskInfo(task, taskList, element, parent, category); - - if (!element.hasAttribute(KEY_LAST_MOD_DATE) || element.getAttribute(KEY_LAST_MOD_DATE).equals("")) { - // migrate to new time stamp 0.5.3 -> 0.6.0 - try { - if (element.hasAttribute(KEY_OLD_LAST_DATE)) { - String DATE_FORMAT_2 = "yyyy-MM-dd HH:mm:ss"; - SimpleDateFormat delta_ts_format = new SimpleDateFormat(DATE_FORMAT_2); - String oldDateStamp = ""; - try { - oldDateStamp = delta_ts_format.format(new Date( - new Long(element.getAttribute(KEY_OLD_LAST_DATE)).longValue())); - task.setLastSyncDateStamp(oldDateStamp); - } catch (NumberFormatException e) { - // For those who may have been working from head... - Date parsedDate = delta_ts_format.parse(element.getAttribute(KEY_OLD_LAST_DATE)); - if (parsedDate != null) { - oldDateStamp = element.getAttribute(KEY_OLD_LAST_DATE); - task.setLastSyncDateStamp(oldDateStamp); - } - } - } - } catch (Exception e) { - // invalid date format/parse - } - } - + BugzillaTask task = new BugzillaTask(repositoryUrl, taskId, summary, false); return task; } @@ -162,27 +103,17 @@ public class BugzillaTaskExternalizer extends DelegatingTaskExternalizer { } @Override - public void readQueryHit(Node node, TaskList taskList, AbstractRepositoryQuery query) + public AbstractQueryHit createQueryHit(String repositoryUrl, String taskId, String summary, Element element, TaskList taskList, AbstractRepositoryQuery query) throws TaskExternalizationException { - Element element = (Element) node; - String handle; - String status; - if (element.hasAttribute(KEY_HANDLE)) { - handle = element.getAttribute(KEY_HANDLE); - } else { - throw new TaskExternalizationException("Handle not stored for bug report"); - } - - status = STATUS_NEW; + String status = STATUS_NEW; if (element.hasAttribute(KEY_COMPLETE)) { status = element.getAttribute(KEY_COMPLETE); if (status.equals(VAL_TRUE)) { status = STATUS_RESO; } } - BugzillaQueryHit hit = new BugzillaQueryHit(taskList, "", "", query.getRepositoryUrl(), AbstractRepositoryTask - .getTaskId(handle), null, status); - readQueryHitInfo(hit, taskList, query, element); + BugzillaQueryHit hit = new BugzillaQueryHit(taskList, summary, "", repositoryUrl, taskId, null, status); + return hit; } @Override diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/NewBugzillaQueryWizard.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/NewBugzillaQueryWizard.java index 8df6988cc..84ec20e6b 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/NewBugzillaQueryWizard.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/NewBugzillaQueryWizard.java @@ -14,7 +14,7 @@ package org.eclipse.mylar.internal.bugzilla.ui.tasklist; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.mylar.context.core.MylarStatusHandler; +import org.eclipse.mylar.core.MylarStatusHandler; import org.eclipse.mylar.internal.bugzilla.core.BugzillaCorePlugin; import org.eclipse.mylar.internal.bugzilla.core.BugzillaRepositoryQuery; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/StackTrace.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/StackTrace.java index d70e4f06c..eff36714e 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/StackTrace.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/StackTrace.java @@ -86,7 +86,7 @@ public class StackTrace { * Get the Comment that this stack trace came from * * @return Returns the Comment if it was a comment else a String if it was - * the description + * the summary */ public Object getComment() { return comment; diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaProductPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaProductPage.java index cff92396d..f2c5aaba7 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaProductPage.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaProductPage.java @@ -41,7 +41,7 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.mylar.context.core.MylarStatusHandler; +import org.eclipse.mylar.core.MylarStatusHandler; import org.eclipse.mylar.internal.bugzilla.core.BugzillaCorePlugin; import org.eclipse.mylar.internal.bugzilla.core.BugzillaQueryHit; import org.eclipse.mylar.internal.bugzilla.core.BugzillaReportElement; diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/NewBugzillaTaskWizard.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/NewBugzillaTaskWizard.java index 46c836bcd..6d2eb04a9 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/NewBugzillaTaskWizard.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/NewBugzillaTaskWizard.java @@ -130,13 +130,13 @@ public class NewBugzillaTaskWizard extends Wizard implements INewWizard { // } // } catch (NumberFormatException nfe) { // MessageDialog.openError(null, IBugzillaConstants.TITLE_MESSAGE_DIALOG, -// "Could not create bug id, no valid id"); +// "Could not create bug taskId, no valid taskId"); // return false; // } // // if (!validId) { // // MessageDialog.openError(null, // // IBugzillaConstants.TITLE_MESSAGE_DIALOG, -// // "Could not create bug id, no valid id"); +// // "Could not create bug taskId, no valid taskId"); // // return false; // // } // diff --git a/org.eclipse.mylyn.trac-feature/feature.xml b/org.eclipse.mylyn.trac-feature/feature.xml index 65f18cfec..e3908a100 100644 --- a/org.eclipse.mylyn.trac-feature/feature.xml +++ b/org.eclipse.mylyn.trac-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.mylar.trac_feature" label="Mylar Connector: Trac" - version="1.0.1.v20070214-0830" + version="1.0.1.v20070216-0900" provider-name="Eclipse.org" plugin="org.eclipse.mylar"> @@ -234,14 +234,14 @@ litigation. id="org.eclipse.mylar.trac.ui" download-size="0" install-size="0" - version="1.0.1.v20070214-0830" + version="1.0.1.v20070216-0900" unpack="false"/> <plugin id="org.eclipse.mylar.trac.core" download-size="0" install-size="0" - version="1.0.1.v20070214-0830" + version="1.0.1.v20070216-0900" unpack="false"/> </feature> |
