diff options
-rw-r--r-- | org.eclipse.mylyn.bugzilla-feature/about.html | 22 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla-feature/feature.xml | 3 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF | 17 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.core/plugin.xml | 93 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugReport.java | 18 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaPlugin.java | 27 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaRepository.java | 1 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaTools.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaTools.java) | 3 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/IBugzillaBug.java | 9 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/IBugzillaReportSelection.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/IBugzillaReportSelection.java) | 3 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/NewBugModel.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/NewBugModel.java) | 22 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/favorites/Favorite.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/Favorite.java) | 2 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/favorites/FavoritesFile.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/FavoritesFile.java) | 2 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/NewBugParser.java | 2 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/offline/OfflineReportsFile.java | 43 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchHit.java | 183 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchResult.java | 44 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/IBugzillaResultEditorMatchAdapter.java | 16 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF | 3 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestCDT.java | 2 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestEquinox.java | 2 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestGMT.java | 2 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestPlatform.java | 2 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestVE.java | 2 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/.classpath | 6 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF | 20 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/about.html | 22 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/bugzilla_contexts.xml (renamed from org.eclipse.mylyn.bugzilla.core/bugzilla_contexts.xml) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/build.properties | 19 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/Bugzilla.gif (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/Bugzilla.gif) | bin | 1662 -> 1662 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/book.html (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/book.html) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start.html (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start.html) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/bugEditor.html (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/bugEditor.html) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/bugWizard.html (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/bugWizard.html) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/bugzillaFavorites.html (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/bugzillaFavorites.html) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/bugzillaSearch.html (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/bugzillaSearch.html) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/bugzillaUpdate.html (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/bugzillaUpdate.html) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/Icons/remove-all.gif (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/images/Icons/remove-all.gif) | bin | 117 -> 117 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/Icons/remove.gif (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/images/Icons/remove.gif) | bin | 97 -> 97 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/bugzilla-bug-editor.png (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/images/bugzilla-bug-editor.png) | bin | 13188 -> 13188 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/bugzilla-favorites-window.png (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/images/bugzilla-favorites-window.png) | bin | 7191 -> 7191 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/bugzilla-search-context.png (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/images/bugzilla-search-context.png) | bin | 25071 -> 25071 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/bugzilla-search-dialog.png (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/images/bugzilla-search-dialog.png) | bin | 23762 -> 23762 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/bugzilla-search-sorting.png (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/images/bugzilla-search-sorting.png) | bin | 14970 -> 14970 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/bugzilla-searchresults.png (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/images/bugzilla-searchresults.png) | bin | 12779 -> 12779 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/existing-bug-editor.png (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/images/existing-bug-editor.png) | bin | 24719 -> 24719 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/new-bug-wizard-attributes.png (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/images/new-bug-wizard-attributes.png) | bin | 10595 -> 10595 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/new-bug-wizard-products.png (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/images/new-bug-wizard-products.png) | bin | 11036 -> 11036 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/new-bug-wizard.png (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/images/new-bug-wizard.png) | bin | 14750 -> 14750 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/offline-reports.png (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/images/offline-reports.png) | bin | 7126 -> 7126 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/prefs.png (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/images/prefs.png) | bin | 17837 -> 17837 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/previous-searches.png (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/images/previous-searches.png) | bin | 12742 -> 12742 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/remember-query-overwrite.png (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/images/remember-query-overwrite.png) | bin | 6687 -> 6687 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/remember-query.png (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/images/remember-query.png) | bin | 4326 -> 4326 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/saved-query-list.png (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/images/saved-query-list.png) | bin | 5074 -> 5074 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/update-search-dialog.png (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/images/update-search-dialog.png) | bin | 23503 -> 23503 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/offlineReports.html (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/offlineReports.html) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/saveQuery.html (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/saveQuery.html) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/setup.html (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/setup.html) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/docs/html/start/use.html (renamed from org.eclipse.mylyn.bugzilla.core/docs/html/start/use.html) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/icons/elcl16/bug-comment.gif (renamed from org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-comment.gif) | bin | 343 -> 343 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/icons/elcl16/bug-dirty.gif (renamed from org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-dirty.gif) | bin | 237 -> 237 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/icons/elcl16/bug-favorite.gif (renamed from org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-favorite.gif) | bin | 358 -> 358 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/icons/elcl16/bug-new.gif (renamed from org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-new.gif) | bin | 233 -> 233 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/icons/elcl16/bug-search-new.gif (renamed from org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-search-new.gif) | bin | 596 -> 596 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/icons/elcl16/bug-search.gif (renamed from org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-search.gif) | bin | 583 -> 583 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/icons/elcl16/bug.gif (renamed from org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug.gif) | bin | 159 -> 159 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/icons/openresult.gif (renamed from org.eclipse.mylyn.bugzilla.core/icons/openresult.gif) | bin | 157 -> 157 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/icons/remove-all.gif (renamed from org.eclipse.mylyn.bugzilla.core/icons/remove-all.gif) | bin | 117 -> 117 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/icons/remove.gif (renamed from org.eclipse.mylyn.bugzilla.core/icons/remove.gif) | bin | 97 -> 97 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/icons/selectAll.gif (renamed from org.eclipse.mylyn.bugzilla.core/icons/selectAll.gif) | bin | 149 -> 149 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/icons/wizban/bug-wizard.gif (renamed from org.eclipse.mylyn.bugzilla.core/icons/wizban/bug-wizard.gif) | bin | 3895 -> 3895 bytes | |||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/plugin.xml | 100 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaOpenStructure.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/BugzillaOpenStructure.java) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaResultMatchAdapter.java | 53 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaTableContentProvider.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaTableContentProvider.java) | 5 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaUITools.java | 214 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaUiPlugin.java | 4 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/FavoritesView.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/FavoritesView.java) | 7 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/OfflineView.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/OfflineView.java) | 52 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/ViewBugzillaAction.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/ViewBugzillaAction.java) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/BugzillaSortAction.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSortAction.java) | 3 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/DeleteOfflineReportAction.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/offline/DeleteOfflineReportAction.java) | 3 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/OpenBugsAction.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/OpenBugsAction.java) | 6 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/ViewOfflineReportAction.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/offline/ViewOfflineReportAction.java) | 5 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/AbstractBugEditor.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/AbstractBugEditor.java) | 4 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/AbstractBugEditorInput.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/AbstractBugEditorInput.java) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/BugzillaEditorCopyAction.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/BugzillaEditorCopyAction.java) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditor.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditor.java) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditorInput.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditorInput.java) | 1 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditor.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditor.java) | 2 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditorInput.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditorInput.java) | 2 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/AbstractFavoritesAction.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/AbstractFavoritesAction.java) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/AddFavoriteAction.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/AddFavoriteAction.java) | 5 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/AddToFavoritesAction.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/AddToFavoritesAction.java) | 2 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/DeleteFavoriteAction.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/DeleteFavoriteAction.java) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/ViewFavoriteAction.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/ViewFavoriteAction.java) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlineComparer.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlineComparer.java) | 2 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlineNode.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlineNode.java) | 3 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlinePage.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlinePage.java) | 2 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaReportSelection.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaReportSelection.java) | 1 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/query/GetQueryDialog.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/query/GetQueryDialog.java) | 2 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/query/SaveQueryDialog.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/query/SaveQueryDialog.java) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/query/SavedQueryFile.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/query/SavedQueryFile.java) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/search/BugzillaSearchPage.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchPage.java) | 10 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/search/BugzillaSearchResultView.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchResultView.java) | 14 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractBugWizard.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractBugWizard.java) | 1 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractWizardDataPage.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractWizardDataPage.java) | 1 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractWizardListPage.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractWizardListPage.java) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/NewBugWizard.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/NewBugWizard.java) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/WizardAttributesPage.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/WizardAttributesPage.java) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/WizardProductPage.java (renamed from org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/WizardProductPage.java) | 1 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/toc.xml (renamed from org.eclipse.mylyn.bugzilla.core/toc.xml) | 0 | ||||
-rw-r--r-- | org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF | 3 | ||||
-rw-r--r-- | org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/BugzillaStructureBridge.java | 2 | ||||
-rw-r--r-- | org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/views/BugzillaQueryDialog.java | 2 |
116 files changed, 648 insertions, 454 deletions
diff --git a/org.eclipse.mylyn.bugzilla-feature/about.html b/org.eclipse.mylyn.bugzilla-feature/about.html new file mode 100644 index 000000000..60ca57b4b --- /dev/null +++ b/org.eclipse.mylyn.bugzilla-feature/about.html @@ -0,0 +1,22 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd"> +<!-- saved from url=(0043)http://www.eclipse.org/legal/epl/about.html --> +<HTML><HEAD><TITLE>About</TITLE> +<META http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> +<META content="MSHTML 6.00.2900.2627" name=GENERATOR></HEAD> +<BODY lang=EN-US> +<H2>About This Content</H2> +<P>February 24, 2005</P> +<H3>License</H3> +<P>The Eclipse Foundation makes available all content in this plug-in +("Content"). Unless otherwise indicated below, the Content is provided to you +under the terms and conditions of the Eclipse Public License Version 1.0 +("EPL"). A copy of the EPL is available at <A +href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. +For purposes of the EPL, "Program" will mean the Content.</P> +<P>If you did not receive this Content directly from the Eclipse Foundation, the +Content is being redistributed by another party ("Redistributor") and different +terms and conditions may apply to your use of any object code in the Content. +Check the Redistributor's license that was provided with the Content. If no such +license exists, contact the Redistributor. Unless otherwise indicated below, the +terms and conditions of the EPL still apply to any source code in the +Content.</P></BODY></HTML> diff --git a/org.eclipse.mylyn.bugzilla-feature/feature.xml b/org.eclipse.mylyn.bugzilla-feature/feature.xml index a3c009d0b..6ee96664a 100644 --- a/org.eclipse.mylyn.bugzilla-feature/feature.xml +++ b/org.eclipse.mylyn.bugzilla-feature/feature.xml @@ -3,7 +3,8 @@ id="org.eclipse.mylar.bugzilla_feature" label="org.eclipse.mylar.bugzilla-feature" version="0.3.1" - provider-name="University of British Columbia"> + provider-name="University of British Columbia" + plugin="org.eclipse.mylar.bugzilla.core"> <description> Bugzilla Client Plugin diff --git a/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF index d05c33561..8e4959f8a 100644 --- a/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF @@ -10,14 +10,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.resources, org.eclipse.compare, org.eclipse.search, - org.eclipse.ui.views, org.eclipse.ui.ide, - org.eclipse.help, - org.eclipse.help.ui, - org.eclipse.jface.text, - org.eclipse.ui.workbench.texteditor, - org.eclipse.ui.editors, - org.eclipse.pde.ui, org.eclipse.update.core, org.eclipse.update.ui Eclipse-AutoStart: true @@ -25,13 +18,7 @@ Bundle-Vendor: University of British Columbia Bundle-ClassPath: bugzilla-core.jar Export-Package: org.eclipse.mylar.bugzilla.core, org.eclipse.mylar.bugzilla.core.compare, + org.eclipse.mylar.bugzilla.core.favorites, org.eclipse.mylar.bugzilla.core.internal, org.eclipse.mylar.bugzilla.core.offline, - org.eclipse.mylar.bugzilla.core.search, - org.eclipse.mylar.bugzilla.ui, - org.eclipse.mylar.bugzilla.ui.editor, - org.eclipse.mylar.bugzilla.ui.favorites, - org.eclipse.mylar.bugzilla.ui.favorites.actions, - org.eclipse.mylar.bugzilla.ui.outline, - org.eclipse.mylar.bugzilla.ui.query, - org.eclipse.mylar.bugzilla.ui.wizard + org.eclipse.mylar.bugzilla.core.search diff --git a/org.eclipse.mylyn.bugzilla.core/plugin.xml b/org.eclipse.mylyn.bugzilla.core/plugin.xml index fbf4bc9a8..e8440d1d9 100644 --- a/org.eclipse.mylyn.bugzilla.core/plugin.xml +++ b/org.eclipse.mylyn.bugzilla.core/plugin.xml @@ -4,82 +4,6 @@ <plugin> <extension - id="org.eclipse.mylar.bugzilla.wizards" - name="Bug Wizard" - point="org.eclipse.ui.newWizards"> - <category - name="Bugzilla Client" - id="org.eclipse.mylar.bugzilla.wizard.category"> - </category> - <wizard - category="org.eclipse.mylar.bugzilla.wizard.category" - class="org.eclipse.mylar.bugzilla.ui.wizard.NewBugWizard" - icon="icons/elcl16/bug-new.gif" - id="org.eclipse.mylar.bugzilla.bugWizard" - name="New Bug Report"> - <description> - Create a new bug report - </description> - </wizard> -</extension> - - <extension - id="org.eclipse.mylar.bugzilla.help.browser" - name="Bugzilla Help" - point="org.eclipse.help.toc"> - <toc - file="toc.xml" - primary="true"> - </toc> - </extension> - <extension - id="org.eclipse.mylar.bugzilla.ui" - name="Bugzilla Client Views" - point="org.eclipse.ui.views"> - <category - name="Bugzilla" - id="org.eclipse.mylar.bugzilla.category"/> - <view - name="Bugzilla Offline Reports" - icon="icons/elcl16/bug-dirty.gif" - category="org.eclipse.mylar.bugzilla.category" - class="org.eclipse.mylar.bugzilla.ui.OfflineView" - id="org.eclipse.mylar.bugzilla.ui.offlineReportsView"/> - <view - name="Bugzilla Favorites" - icon="icons/elcl16/bug-favorite.gif" - category="org.eclipse.mylar.bugzilla.category" - class="org.eclipse.mylar.bugzilla.ui.FavoritesView" - id="org.eclipse.mylar.bugzilla.ui.favoritesView"/> - </extension> - <extension - point="org.eclipse.search.searchPages" - id="org.eclipse.mylar.bugzilla.core.search.searchPage" - name="Bugzilla Search Page"> - <page - class="org.eclipse.mylar.bugzilla.core.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 - point="org.eclipse.ui.editors"> - <editor - name="Bugzilla viewer" - icon="icons/elcl16/bug.gif" - class="org.eclipse.mylar.bugzilla.ui.editor.ExistingBugEditor" - id="org.eclipse.mylar.bugzilla.ui.existingBugEditor"> - </editor> - <editor - name="Bugzilla viewer" - icon="icons/elcl16/bug.gif" - class="org.eclipse.mylar.bugzilla.ui.editor.NewBugEditor" - id="org.eclipse.mylar.bugzilla.ui.newBugEditor"> - </editor> - </extension> - <extension id="searchHit" name="Bugzilla Search Match" point="org.eclipse.core.resources.markers"> @@ -103,22 +27,5 @@ class="org.eclipse.mylar.bugzilla.core.BugzillaPreferences" id="org.eclipse.mylar.bugzilla.bugzillaPreferences"/> </extension> - <extension - id="org.eclipse.mylar.bugzilla.help.context" - name="Bugzilla Context-sensitive Help" - point="org.eclipse.help.contexts"> - <contexts - file="bugzilla_contexts.xml"> - </contexts> - </extension> - <extension - id="BugzillaSearchPage" - point="org.eclipse.search.searchResultViewPages"> - <viewPage - class="org.eclipse.mylar.bugzilla.core.search.BugzillaSearchResultView" - searchResultClass="org.eclipse.mylar.bugzilla.core.search.BugzillaSearchResult" - id="org.eclipse.mylar.bugzilla.BugzillaSearchResultPage"/> - </extension> - </plugin> diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugReport.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugReport.java index f5096d65c..152cde860 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugReport.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugReport.java @@ -21,11 +21,6 @@ import java.util.Set; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.mylar.bugzilla.ui.editor.ExistingBugEditor; -import org.eclipse.mylar.bugzilla.ui.editor.ExistingBugEditorInput; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IWorkbenchPage; /** @@ -395,17 +390,4 @@ public class BugReport implements Serializable, IBugzillaBug { public void setOfflineState(boolean newOfflineState) { savedOffline = newOfflineState; } - - public void closeEditor(IWorkbenchPage page) { - IEditorInput input = new ExistingBugEditorInput(this); - IEditorPart bugEditor = page.findEditor(input); - if (bugEditor != null) { - page.closeEditor(bugEditor, false); - IEditorPart compareEditor = page.findEditor(((ExistingBugEditor)bugEditor).getCompareInput()); - if (compareEditor != null) { - page.closeEditor(compareEditor, false); - } - } - } - } diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaPlugin.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaPlugin.java index 4a9b70276..16e0855e8 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaPlugin.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaPlugin.java @@ -32,10 +32,11 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.mylar.bugzilla.core.favorites.FavoritesFile; import org.eclipse.mylar.bugzilla.core.internal.ProductConfiguration; import org.eclipse.mylar.bugzilla.core.internal.ProductConfigurationFactory; import org.eclipse.mylar.bugzilla.core.offline.OfflineReportsFile; -import org.eclipse.mylar.bugzilla.ui.favorites.FavoritesFile; +import org.eclipse.mylar.bugzilla.core.search.IBugzillaResultEditorMatchAdapter; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.eclipse.update.internal.core.UpdateCore; import org.eclipse.update.internal.ui.UpdateUI; @@ -129,6 +130,12 @@ public class BugzillaPlugin extends AbstractUIPlugin { return offlineReportsFile; } + @Override + protected void initializeDefaultPreferences(IPreferenceStore store) + { + BugzillaPreferences.initDefaults(store); + } + /** * Get the name of the bugzilla server * @@ -240,12 +247,6 @@ public class BugzillaPlugin extends AbstractUIPlugin { IPath configFile = stateLocation.append("productConfig"); return configFile; } - - @Override - protected void initializeDefaultPreferences(IPreferenceStore store) - { - BugzillaPreferences.initDefaults(store); - } /** * Convenience method for logging statuses to the plugin log @@ -324,4 +325,16 @@ public class BugzillaPlugin extends AbstractUIPlugin { URLConnection cntx = url.openConnection(p); return cntx; } + + private static IBugzillaResultEditorMatchAdapter resultEditorMatchAdapter = null; + + public static IBugzillaResultEditorMatchAdapter getResultEditorMatchAdapter() { + return resultEditorMatchAdapter; + } + + public static void setResultEditorMatchAdapter(IBugzillaResultEditorMatchAdapter resultEditorMatchAdapter) { + BugzillaPlugin.resultEditorMatchAdapter = resultEditorMatchAdapter; + } + + } diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaRepository.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaRepository.java index e70f18f4c..6b5c4c988 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaRepository.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaRepository.java @@ -34,7 +34,6 @@ import org.eclipse.mylar.bugzilla.core.internal.BugParser; import org.eclipse.mylar.bugzilla.core.internal.NewBugParser; import org.eclipse.mylar.bugzilla.core.internal.ProductParser; import org.eclipse.mylar.bugzilla.core.offline.OfflineReportsFile; -import org.eclipse.mylar.bugzilla.ui.wizard.NewBugModel; /** diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaTools.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaTools.java index 0216b88b2..2682d703b 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaTools.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaTools.java @@ -8,9 +8,8 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.ui.outline; +package org.eclipse.mylar.bugzilla.core; -import org.eclipse.mylar.bugzilla.core.IBugzillaBug; /** diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/IBugzillaBug.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/IBugzillaBug.java index 945dc49b4..3af1c1975 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/IBugzillaBug.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/IBugzillaBug.java @@ -13,8 +13,6 @@ package org.eclipse.mylar.bugzilla.core; import java.io.Serializable; import java.util.List; -import org.eclipse.ui.IWorkbenchPage; - /** * Interface representing a Bugzilla bug report. @@ -85,11 +83,4 @@ public interface IBugzillaBug extends Serializable { * @param newOfflineState <code>true</code> if this bug is saved offline */ public void setOfflineState(boolean newOfflineState); - - /** - * Closes any open editors for this bug. - * @param page The workbench page. This cannot be <code>null</code>. - */ - public void closeEditor(IWorkbenchPage page); - } diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/IBugzillaReportSelection.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/IBugzillaReportSelection.java index 98d88af55..494a38bb1 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/IBugzillaReportSelection.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/IBugzillaReportSelection.java @@ -8,10 +8,9 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.ui.outline; +package org.eclipse.mylar.bugzilla.core; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.mylar.bugzilla.core.Comment; /** diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/NewBugModel.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/NewBugModel.java index df9bfa3ae..3715bc0bf 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/NewBugModel.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/NewBugModel.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.ui.wizard; +package org.eclipse.mylar.bugzilla.core; import java.io.Serializable; import java.util.ArrayList; @@ -16,15 +16,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; -import org.eclipse.mylar.bugzilla.core.Attribute; -import org.eclipse.mylar.bugzilla.core.IBugzillaBug; -import org.eclipse.mylar.bugzilla.ui.OfflineView; -import org.eclipse.mylar.bugzilla.ui.editor.NewBugEditorInput; -import org.eclipse.mylar.bugzilla.ui.outline.BugzillaTools; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IWorkbenchPage; - /** * This class is used to store data about the new bug that is being created while the wizard is being used @@ -72,7 +63,7 @@ public class NewBugModel implements Serializable, IBugzillaBug { */ public NewBugModel() { super(); - id = OfflineView.getNextOfflineBugId(); + id = BugzillaPlugin.getDefault().getOfflineReports().getNextOfflineBugId(); } public Attribute getAttribute(String key) { @@ -202,13 +193,4 @@ public class NewBugModel implements Serializable, IBugzillaBug { public void setOfflineState(boolean newOfflineState) { savedOffline = newOfflineState; } - - public void closeEditor(IWorkbenchPage page) { - IEditorInput input = new NewBugEditorInput(this); - IEditorPart bugEditor = page.findEditor(input); - if (bugEditor != null) { - page.closeEditor(bugEditor, false); - } - } - } diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/Favorite.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/favorites/Favorite.java index 9eb9b348a..b786f8dae 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/Favorite.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/favorites/Favorite.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.ui.favorites; +package org.eclipse.mylar.bugzilla.core.favorites; import java.io.Serializable; import java.util.Date; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/FavoritesFile.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/favorites/FavoritesFile.java index 7eecfc372..869d43a8c 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/FavoritesFile.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/favorites/FavoritesFile.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.ui.favorites; +package org.eclipse.mylar.bugzilla.core.favorites; import java.io.File; import java.io.FileInputStream; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/NewBugParser.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/NewBugParser.java index cc7327e90..242ff4f82 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/NewBugParser.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/NewBugParser.java @@ -17,8 +17,8 @@ import java.text.ParseException; import javax.security.auth.login.LoginException; import org.eclipse.mylar.bugzilla.core.Attribute; +import org.eclipse.mylar.bugzilla.core.NewBugModel; import org.eclipse.mylar.bugzilla.core.internal.HtmlStreamTokenizer.Token; -import org.eclipse.mylar.bugzilla.ui.wizard.NewBugModel; /** diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/offline/OfflineReportsFile.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/offline/OfflineReportsFile.java index 0fb707bf0..734295ae0 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/offline/OfflineReportsFile.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/offline/OfflineReportsFile.java @@ -275,4 +275,47 @@ public class OfflineReportsFile return 0; } } + + /** + * Saves the given report to the offlineReportsFile, or, if it already + * exists in the file, updates it. + * + * @param bug + * The bug to add/update. + */ + public static void saveOffline(IBugzillaBug bug) { + OfflineReportsFile file = BugzillaPlugin.getDefault().getOfflineReports(); + // If there is already an offline report for this bug, update the file. + if (bug.isSavedOffline()) { + file.update(); + } + // 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, don't save this report. + if (file.find(bug.getId()) >= 0) { + MessageDialog.openInformation(null, "Bug's Id is already used.", "There is already a bug saved offline with an identical id."); + return; + } + file.add(bug); + bug.setOfflineState(true); + file.sort(OfflineReportsFile.lastSel); + } + } + + public static List<IBugzillaBug> getOfflineBugs(){ + OfflineReportsFile file = BugzillaPlugin.getDefault().getOfflineReports(); + return file.elements(); + } + + /** + * Removes the given report from the offlineReportsFile. + * + * @param bug + * The report to remove. + */ + public static void removeReport(IBugzillaBug bug) { + ArrayList<IBugzillaBug> bugList = new ArrayList<IBugzillaBug>(); + bugList.add(bug); + BugzillaPlugin.getDefault().getOfflineReports().remove(bugList); + } } diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchHit.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchHit.java index 157d985b3..9f35d5c0d 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchHit.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchHit.java @@ -10,26 +10,6 @@ *******************************************************************************/ package org.eclipse.mylar.bugzilla.core.search; -import java.io.IOException; - -import javax.security.auth.login.LoginException; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.MultiStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.dialogs.ErrorDialog; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; -import org.eclipse.mylar.bugzilla.ui.editor.ExistingBugEditorInput; -import org.eclipse.search.internal.ui.SearchMessages; -import org.eclipse.search.internal.ui.SearchPlugin; -import org.eclipse.search.internal.ui.util.ExceptionHandler; -import org.eclipse.search.ui.NewSearchUI; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.PartInitException; /** @@ -66,9 +46,6 @@ public class BugzillaSearchHit /** The query that the bug was a result of */ private String query; - - /** The editor to use when a bug is opened */ - private static IEditorPart fEditor; /** * Constructor @@ -191,164 +168,4 @@ public class BugzillaSearchHit { return id + " " + description + "\n"; } - - - /** - * Convenience method for opening a bug in an editor. - * @param id The bug id of the bug to open in the editor - */ - public static boolean show(int id) - { - // determine if the editor is to be reused or not and call the appropriate - // function to show the bug - if (NewSearchUI.reuseEditor()) - return showWithReuse(id); - else - return showWithoutReuse(id); - } - - /** - * Show the bug in the same editor window - * @param id The id of the bug to show - */ - private static boolean showWithReuse(int id) - { - // get the active page so that we can reuse it - IWorkbenchPage page = SearchPlugin.getActivePage(); - try - { - // if we couldn't get a page, get out - if (page == null) - return true; - - IEditorInput input = null; - - // try to get an editor input on the bug - input = new ExistingBugEditorInput(id); - - // check if we found a valid bug - if(((ExistingBugEditorInput)input).getBug() == null) - { - MessageDialog.openError(null, "No such bug", "No bug exists with this id"); - return false; - } - - // get the editor for the page - IEditorPart editor = page.findEditor(input); - - if (editor == null) - { - // close the current editor if it is clean and open - if (fEditor != null && !fEditor.isDirty()) - page.closeEditor(fEditor, false); - - try - { - // try to open a new editor with the input bug, but don't activate it - editor= page.openEditor(input, IBugzillaConstants.EXISTING_BUG_EDITOR_ID, false); - } - catch (PartInitException ex) - { - // if there was a problem, handle it and log it, then get out of here - ExceptionHandler.handle(ex, SearchMessages.Search_Error_search_title, SearchMessages.Search_Error_search_message); //$NON-NLS-2$ //$NON-NLS-1$ - BugzillaPlugin.log(ex.getStatus()); - return false; - } - - } - else - { - // if a editor is openon that bug, just bring it to the top - // of the editors - page.bringToTop(editor); - } - - if (editor != null) - { - // if we have an editor, save it for later use - fEditor= editor; - } - } - catch(LoginException e) - { - MessageDialog.openError(null, "Login Error", "Bugzilla could not log you in to get the information you requested since login name or password is incorrect.\nPlease check your settings in the bugzilla preferences. "); - BugzillaPlugin.log(e); - } - catch(IOException e){ - IStatus status = new MultiStatus( IBugzillaConstants.PLUGIN_ID, IStatus.ERROR, e.getClass().toString() + " occurred while opening the bug report. \n\nClick Details or see log for more information.", e); - IStatus s = new Status(IStatus.ERROR, IBugzillaConstants.PLUGIN_ID, IStatus.ERROR, e.getClass().toString() + ": ", e); - ((MultiStatus)status).add(s); - s = new Status (IStatus.ERROR, IBugzillaConstants.PLUGIN_ID, IStatus.ERROR, e.getMessage(), e); - ((MultiStatus)status).add(s); - - //write error to log - BugzillaPlugin.log(status); - - ErrorDialog.openError(null, "Bugzilla Error", null, status); - return false; - } - - return true; - } - - /** - * Show the bug in a new editor window - * @param id The id of the bug to show - */ - private static boolean showWithoutReuse(int id) - { - // get the active workbench page - IWorkbenchPage page = SearchPlugin.getActivePage(); - try - { - // if we couldn't get the page, get out of here - if (page == null) - return true; - - IEditorInput input = null; - String editorId = IBugzillaConstants.EXISTING_BUG_EDITOR_ID; - - // get a new editor input on the bug that we want to open - input = new ExistingBugEditorInput(id); - - // check if we found a valid bug - if(((ExistingBugEditorInput)input).getBug() == null) - { - MessageDialog.openError(null, "No such bug", "No bug exists with this id"); - return false; - } - - try - { - // try to open an editor on the input bug - page.openEditor(input, editorId); - } - catch (PartInitException ex) - { - // if we have a problem, handle it, log it, and get out of here - ExceptionHandler.handle(ex, SearchMessages.Search_Error_search_title, SearchMessages.Search_Error_search_message); //$NON-NLS-2$ //$NON-NLS-1$ - BugzillaPlugin.log(ex.getStatus()); - return false; - } - } - catch(LoginException e) - { - MessageDialog.openError(null, "Login Error", "Bugzilla could not log you in to get the information you requested since login name or password is incorrect.\nPlease check your settings in the bugzilla preferences. "); - BugzillaPlugin.log(e); - } - catch(IOException e){ - IStatus status = new MultiStatus( IBugzillaConstants.PLUGIN_ID, IStatus.ERROR, e.getClass().toString() + " occurred while opening the bug report. \n\nClick Details or see log for more information.", e); - IStatus s = new Status(IStatus.ERROR, IBugzillaConstants.PLUGIN_ID, IStatus.ERROR, e.getClass().toString() + ": ", e); - ((MultiStatus)status).add(s); - s = new Status (IStatus.ERROR, IBugzillaConstants.PLUGIN_ID, IStatus.ERROR, e.getMessage(), e); - ((MultiStatus)status).add(s); - - //write error to log - BugzillaPlugin.log(status); - - ErrorDialog.openError(null, "Bugzilla Error", null, status); - return false; - } - return true; - } } diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchResult.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchResult.java index e273df605..df13f51db 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchResult.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchResult.java @@ -11,15 +11,12 @@ package org.eclipse.mylar.bugzilla.core.search; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.mylar.bugzilla.ui.editor.ExistingBugEditorInput; +import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; import org.eclipse.search.internal.ui.SearchPluginImages; import org.eclipse.search.ui.ISearchQuery; import org.eclipse.search.ui.text.AbstractTextSearchResult; import org.eclipse.search.ui.text.IEditorMatchAdapter; import org.eclipse.search.ui.text.IFileMatchAdapter; -import org.eclipse.search.ui.text.Match; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; @@ -27,16 +24,13 @@ import org.eclipse.ui.IEditorPart; * The collection of all the bugzilla matches. * @see org.eclipse.search.ui.text.AbstractTextSearchResult */ -public class BugzillaSearchResult extends AbstractTextSearchResult implements IEditorMatchAdapter { +public class BugzillaSearchResult extends AbstractTextSearchResult{ - /** An empty array of matches */ - private final Match[] EMPTY_ARR= new Match[0]; - /** * The query producing this result. */ private BugzillaSearchQuery bugQuery; - + /** * Constructor for <code>BugzillaSearchResult</code> class. * @@ -49,9 +43,15 @@ public class BugzillaSearchResult extends AbstractTextSearchResult implements IE @Override public IEditorMatchAdapter getEditorMatchAdapter() { - return this; + IBugzillaResultEditorMatchAdapter adapter = BugzillaPlugin.getResultEditorMatchAdapter(); + if(adapter == null){ + return null; + } else { + adapter.setResult(this); + return adapter; + } } - + /** * This function always returns <code>null</code>, as the matches for this implementation of <code>AbstractTextSearchResult</code> never contain files. * @see org.eclipse.search.ui.text.AbstractTextSearchResult#getFileMatchAdapter() @@ -61,29 +61,7 @@ public class BugzillaSearchResult extends AbstractTextSearchResult implements IE return null; } - /* (non-Javadoc) - * @see org.eclipse.search.ui.text.IEditorMatchAdapter#isShownInEditor(org.eclipse.search.ui.text.Match, org.eclipse.ui.IEditorPart) - */ - public boolean isShownInEditor(Match match, IEditorPart editor) { - IEditorInput ei= editor.getEditorInput(); - if (ei instanceof ExistingBugEditorInput) { - ExistingBugEditorInput bi= (ExistingBugEditorInput) ei; - return match.getElement().equals(bi.getBug()); - } - return false; - } - /* (non-Javadoc) - * @see org.eclipse.search.ui.text.IEditorMatchAdapter#computeContainedMatches(org.eclipse.search.ui.text.AbstractTextSearchResult, org.eclipse.ui.IEditorPart) - */ - public Match[] computeContainedMatches(AbstractTextSearchResult result, IEditorPart editor) { - IEditorInput ei= editor.getEditorInput(); - if (ei instanceof ExistingBugEditorInput) { - ExistingBugEditorInput bi= (ExistingBugEditorInput) ei; - return getMatches(bi.getBug()); - } - return EMPTY_ARR; - } /* (non-Javadoc) * @see org.eclipse.search.ui.ISearchResult#getLabel() diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/IBugzillaResultEditorMatchAdapter.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/IBugzillaResultEditorMatchAdapter.java new file mode 100644 index 000000000..f6d8c259e --- /dev/null +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/IBugzillaResultEditorMatchAdapter.java @@ -0,0 +1,16 @@ +package org.eclipse.mylar.bugzilla.core.search; + +import org.eclipse.search.ui.text.AbstractTextSearchResult; +import org.eclipse.search.ui.text.IEditorMatchAdapter; +import org.eclipse.search.ui.text.Match; +import org.eclipse.ui.IEditorPart; + +public interface IBugzillaResultEditorMatchAdapter extends IEditorMatchAdapter { + + public boolean isShownInEditor(Match match, IEditorPart editor); + + public Match[] computeContainedMatches(AbstractTextSearchResult result, + IEditorPart editor); + + public void setResult(BugzillaSearchResult result); +} diff --git a/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF index 31d159c0f..26d77be53 100644 --- a/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF @@ -12,7 +12,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.ui.views, org.eclipse.ui.editors, org.eclipse.ui.workbench.texteditor, - org.eclipse.mylar.bugzilla.core + org.eclipse.mylar.bugzilla.core, + org.eclipse.mylar.bugzilla.ui Eclipse-AutoStart: true Bundle-Vendor: University of British Columbia Export-Package: org.eclipse.mylar.bugzilla.test diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestCDT.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestCDT.java index f6d241feb..5b3cc9fee 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestCDT.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestCDT.java @@ -21,8 +21,8 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.Path; import org.eclipse.mylar.bugzilla.core.Attribute; +import org.eclipse.mylar.bugzilla.core.NewBugModel; import org.eclipse.mylar.bugzilla.core.internal.NewBugParser; -import org.eclipse.mylar.bugzilla.ui.wizard.NewBugModel; /** diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestEquinox.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestEquinox.java index 602483300..19242b085 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestEquinox.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestEquinox.java @@ -21,8 +21,8 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.Path; import org.eclipse.mylar.bugzilla.core.Attribute; +import org.eclipse.mylar.bugzilla.core.NewBugModel; import org.eclipse.mylar.bugzilla.core.internal.NewBugParser; -import org.eclipse.mylar.bugzilla.ui.wizard.NewBugModel; /** diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestGMT.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestGMT.java index 4edced4df..493787200 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestGMT.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestGMT.java @@ -21,8 +21,8 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.Path; import org.eclipse.mylar.bugzilla.core.Attribute; +import org.eclipse.mylar.bugzilla.core.NewBugModel; import org.eclipse.mylar.bugzilla.core.internal.NewBugParser; -import org.eclipse.mylar.bugzilla.ui.wizard.NewBugModel; /** diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestPlatform.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestPlatform.java index 941814b84..0454b2878 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestPlatform.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestPlatform.java @@ -21,8 +21,8 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.Path; import org.eclipse.mylar.bugzilla.core.Attribute; +import org.eclipse.mylar.bugzilla.core.NewBugModel; import org.eclipse.mylar.bugzilla.core.internal.NewBugParser; -import org.eclipse.mylar.bugzilla.ui.wizard.NewBugModel; /** diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestVE.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestVE.java index 9fafda828..2a01605a3 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestVE.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/test/BugzillaNewBugParserTestVE.java @@ -21,8 +21,8 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.Path; import org.eclipse.mylar.bugzilla.core.Attribute; +import org.eclipse.mylar.bugzilla.core.NewBugModel; import org.eclipse.mylar.bugzilla.core.internal.NewBugParser; -import org.eclipse.mylar.bugzilla.ui.wizard.NewBugModel; /** diff --git a/org.eclipse.mylyn.bugzilla.ui/.classpath b/org.eclipse.mylyn.bugzilla.ui/.classpath index 751c8f2e5..cc69b552e 100644 --- a/org.eclipse.mylyn.bugzilla.ui/.classpath +++ b/org.eclipse.mylyn.bugzilla.ui/.classpath @@ -2,6 +2,10 @@ <classpath> <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"> + <accessrules> + <accessrule kind="accessible" pattern="**/internal/**"/> + </accessrules> + </classpathentry> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF index 2633aa0ce..b7431aebd 100644 --- a/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF @@ -1,11 +1,27 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Ui Plug-in -Bundle-SymbolicName: org.eclipse.mylar.bugzilla.ui +Bundle-SymbolicName: org.eclipse.mylar.bugzilla.ui; singleton:=true Bundle-Version: 0.3.1 Bundle-Activator: org.eclipse.mylar.bugzilla.ui.BugzillaUiPlugin Bundle-Vendor: University of British Columbia Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime + org.eclipse.core.runtime, + org.eclipse.core.resources, + org.eclipse.compare, + org.eclipse.search, + org.eclipse.ui.views, + org.eclipse.ui.ide, + org.eclipse.mylar.bugzilla.core Eclipse-AutoStart: true +Export-Package: org.eclipse.mylar.bugzilla.ui, + org.eclipse.mylar.bugzilla.ui.actions, + org.eclipse.mylar.bugzilla.ui.editor, + org.eclipse.mylar.bugzilla.ui.favorites, + org.eclipse.mylar.bugzilla.ui.favorites.actions, + org.eclipse.mylar.bugzilla.ui.outline, + org.eclipse.mylar.bugzilla.ui.query, + org.eclipse.mylar.bugzilla.ui.search, + org.eclipse.mylar.bugzilla.ui.wizard +Bundle-ClassPath: bugzilla-ui.jar diff --git a/org.eclipse.mylyn.bugzilla.ui/about.html b/org.eclipse.mylyn.bugzilla.ui/about.html new file mode 100644 index 000000000..60ca57b4b --- /dev/null +++ b/org.eclipse.mylyn.bugzilla.ui/about.html @@ -0,0 +1,22 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd"> +<!-- saved from url=(0043)http://www.eclipse.org/legal/epl/about.html --> +<HTML><HEAD><TITLE>About</TITLE> +<META http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> +<META content="MSHTML 6.00.2900.2627" name=GENERATOR></HEAD> +<BODY lang=EN-US> +<H2>About This Content</H2> +<P>February 24, 2005</P> +<H3>License</H3> +<P>The Eclipse Foundation makes available all content in this plug-in +("Content"). Unless otherwise indicated below, the Content is provided to you +under the terms and conditions of the Eclipse Public License Version 1.0 +("EPL"). A copy of the EPL is available at <A +href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. +For purposes of the EPL, "Program" will mean the Content.</P> +<P>If you did not receive this Content directly from the Eclipse Foundation, the +Content is being redistributed by another party ("Redistributor") and different +terms and conditions may apply to your use of any object code in the Content. +Check the Redistributor's license that was provided with the Content. If no such +license exists, contact the Redistributor. Unless otherwise indicated below, the +terms and conditions of the EPL still apply to any source code in the +Content.</P></BODY></HTML> diff --git a/org.eclipse.mylyn.bugzilla.core/bugzilla_contexts.xml b/org.eclipse.mylyn.bugzilla.ui/bugzilla_contexts.xml index 78b55ca14..78b55ca14 100644 --- a/org.eclipse.mylyn.bugzilla.core/bugzilla_contexts.xml +++ b/org.eclipse.mylyn.bugzilla.ui/bugzilla_contexts.xml diff --git a/org.eclipse.mylyn.bugzilla.ui/build.properties b/org.eclipse.mylyn.bugzilla.ui/build.properties index 34d2e4d2d..40658c0e1 100644 --- a/org.eclipse.mylyn.bugzilla.ui/build.properties +++ b/org.eclipse.mylyn.bugzilla.ui/build.properties @@ -1,4 +1,17 @@ -source.. = src/ -output.. = bin/ bin.includes = META-INF/,\ - . + bugzilla-ui.jar,\ + plugin.xml,\ + icons/,\ + docs/,\ + about.html,\ + toc.xml +jars.compile.order = bugzilla-ui.jar +source.bugzilla-ui.jar = src/ +output.bugzilla-ui.jar = bin/ +src.includes = src/,\ + plugin.xml,\ + META-INF/,\ + about.html,\ + docs/,\ + icons/,\ + toc.xml diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/Bugzilla.gif b/org.eclipse.mylyn.bugzilla.ui/docs/html/Bugzilla.gif Binary files differindex 4d0c53d05..4d0c53d05 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/Bugzilla.gif +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/Bugzilla.gif diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/book.html b/org.eclipse.mylyn.bugzilla.ui/docs/html/book.html index 10ffb6918..10ffb6918 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/book.html +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/book.html diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start.html b/org.eclipse.mylyn.bugzilla.ui/docs/html/start.html index e59973752..e59973752 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start.html +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start.html diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/bugEditor.html b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/bugEditor.html index d18582899..d18582899 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/bugEditor.html +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/bugEditor.html diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/bugWizard.html b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/bugWizard.html index df9abf109..df9abf109 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/bugWizard.html +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/bugWizard.html diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/bugzillaFavorites.html b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/bugzillaFavorites.html index d5ab217e7..d5ab217e7 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/bugzillaFavorites.html +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/bugzillaFavorites.html diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/bugzillaSearch.html b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/bugzillaSearch.html index 412906e5b..412906e5b 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/bugzillaSearch.html +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/bugzillaSearch.html diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/bugzillaUpdate.html b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/bugzillaUpdate.html index 5b0dc1341..5b0dc1341 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/bugzillaUpdate.html +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/bugzillaUpdate.html diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/Icons/remove-all.gif b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/Icons/remove-all.gif Binary files differindex 2c069ab3f..2c069ab3f 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/Icons/remove-all.gif +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/Icons/remove-all.gif diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/Icons/remove.gif b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/Icons/remove.gif Binary files differindex 12a9167c5..12a9167c5 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/Icons/remove.gif +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/Icons/remove.gif diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/bugzilla-bug-editor.png b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/bugzilla-bug-editor.png Binary files differindex 192110478..192110478 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/bugzilla-bug-editor.png +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/bugzilla-bug-editor.png diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/bugzilla-favorites-window.png b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/bugzilla-favorites-window.png Binary files differindex 01f46ae83..01f46ae83 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/bugzilla-favorites-window.png +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/bugzilla-favorites-window.png diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/bugzilla-search-context.png b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/bugzilla-search-context.png Binary files differindex 4c883b54d..4c883b54d 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/bugzilla-search-context.png +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/bugzilla-search-context.png diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/bugzilla-search-dialog.png b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/bugzilla-search-dialog.png Binary files differindex 93098c8ea..93098c8ea 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/bugzilla-search-dialog.png +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/bugzilla-search-dialog.png diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/bugzilla-search-sorting.png b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/bugzilla-search-sorting.png Binary files differindex 9ceb8f0e1..9ceb8f0e1 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/bugzilla-search-sorting.png +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/bugzilla-search-sorting.png diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/bugzilla-searchresults.png b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/bugzilla-searchresults.png Binary files differindex 5f538de0c..5f538de0c 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/bugzilla-searchresults.png +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/bugzilla-searchresults.png diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/existing-bug-editor.png b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/existing-bug-editor.png Binary files differindex 82ced89e4..82ced89e4 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/existing-bug-editor.png +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/existing-bug-editor.png diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/new-bug-wizard-attributes.png b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/new-bug-wizard-attributes.png Binary files differindex 027fea913..027fea913 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/new-bug-wizard-attributes.png +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/new-bug-wizard-attributes.png diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/new-bug-wizard-products.png b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/new-bug-wizard-products.png Binary files differindex 859533dba..859533dba 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/new-bug-wizard-products.png +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/new-bug-wizard-products.png diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/new-bug-wizard.png b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/new-bug-wizard.png Binary files differindex d0e05339a..d0e05339a 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/new-bug-wizard.png +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/new-bug-wizard.png diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/offline-reports.png b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/offline-reports.png Binary files differindex 966384dcf..966384dcf 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/offline-reports.png +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/offline-reports.png diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/prefs.png b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/prefs.png Binary files differindex c608502d1..c608502d1 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/prefs.png +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/prefs.png diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/previous-searches.png b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/previous-searches.png Binary files differindex 8bcb49d1b..8bcb49d1b 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/previous-searches.png +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/previous-searches.png diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/remember-query-overwrite.png b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/remember-query-overwrite.png Binary files differindex e16bbb8ca..e16bbb8ca 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/remember-query-overwrite.png +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/remember-query-overwrite.png diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/remember-query.png b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/remember-query.png Binary files differindex 4d8ac7e1a..4d8ac7e1a 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/remember-query.png +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/remember-query.png diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/saved-query-list.png b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/saved-query-list.png Binary files differindex c7681ee9a..c7681ee9a 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/saved-query-list.png +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/saved-query-list.png diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/update-search-dialog.png b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/update-search-dialog.png Binary files differindex c28f642c6..c28f642c6 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/images/update-search-dialog.png +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/images/update-search-dialog.png diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/offlineReports.html b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/offlineReports.html index 8c4f10fc5..8c4f10fc5 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/offlineReports.html +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/offlineReports.html diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/saveQuery.html b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/saveQuery.html index d80fa6f6d..d80fa6f6d 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/saveQuery.html +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/saveQuery.html diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/setup.html b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/setup.html index 9f7c5a83f..9f7c5a83f 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/setup.html +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/setup.html diff --git a/org.eclipse.mylyn.bugzilla.core/docs/html/start/use.html b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/use.html index e1c0599f4..e1c0599f4 100644 --- a/org.eclipse.mylyn.bugzilla.core/docs/html/start/use.html +++ b/org.eclipse.mylyn.bugzilla.ui/docs/html/start/use.html diff --git a/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-comment.gif b/org.eclipse.mylyn.bugzilla.ui/icons/elcl16/bug-comment.gif Binary files differindex 97bbdf7dd..97bbdf7dd 100644 --- a/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-comment.gif +++ b/org.eclipse.mylyn.bugzilla.ui/icons/elcl16/bug-comment.gif diff --git a/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-dirty.gif b/org.eclipse.mylyn.bugzilla.ui/icons/elcl16/bug-dirty.gif Binary files differindex 8628881c7..8628881c7 100644 --- a/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-dirty.gif +++ b/org.eclipse.mylyn.bugzilla.ui/icons/elcl16/bug-dirty.gif diff --git a/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-favorite.gif b/org.eclipse.mylyn.bugzilla.ui/icons/elcl16/bug-favorite.gif Binary files differindex 6830e3348..6830e3348 100644 --- a/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-favorite.gif +++ b/org.eclipse.mylyn.bugzilla.ui/icons/elcl16/bug-favorite.gif diff --git a/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-new.gif b/org.eclipse.mylyn.bugzilla.ui/icons/elcl16/bug-new.gif Binary files differindex 312ca8f9d..312ca8f9d 100644 --- a/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-new.gif +++ b/org.eclipse.mylyn.bugzilla.ui/icons/elcl16/bug-new.gif diff --git a/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-search-new.gif b/org.eclipse.mylyn.bugzilla.ui/icons/elcl16/bug-search-new.gif Binary files differindex 8ac5e5706..8ac5e5706 100644 --- a/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-search-new.gif +++ b/org.eclipse.mylyn.bugzilla.ui/icons/elcl16/bug-search-new.gif diff --git a/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-search.gif b/org.eclipse.mylyn.bugzilla.ui/icons/elcl16/bug-search.gif Binary files differindex b70606376..b70606376 100644 --- a/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-search.gif +++ b/org.eclipse.mylyn.bugzilla.ui/icons/elcl16/bug-search.gif diff --git a/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug.gif b/org.eclipse.mylyn.bugzilla.ui/icons/elcl16/bug.gif Binary files differindex 54525a775..54525a775 100644 --- a/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug.gif +++ b/org.eclipse.mylyn.bugzilla.ui/icons/elcl16/bug.gif diff --git a/org.eclipse.mylyn.bugzilla.core/icons/openresult.gif b/org.eclipse.mylyn.bugzilla.ui/icons/openresult.gif Binary files differindex 2b645a88f..2b645a88f 100644 --- a/org.eclipse.mylyn.bugzilla.core/icons/openresult.gif +++ b/org.eclipse.mylyn.bugzilla.ui/icons/openresult.gif diff --git a/org.eclipse.mylyn.bugzilla.core/icons/remove-all.gif b/org.eclipse.mylyn.bugzilla.ui/icons/remove-all.gif Binary files differindex 2c069ab3f..2c069ab3f 100644 --- a/org.eclipse.mylyn.bugzilla.core/icons/remove-all.gif +++ b/org.eclipse.mylyn.bugzilla.ui/icons/remove-all.gif diff --git a/org.eclipse.mylyn.bugzilla.core/icons/remove.gif b/org.eclipse.mylyn.bugzilla.ui/icons/remove.gif Binary files differindex 12a9167c5..12a9167c5 100644 --- a/org.eclipse.mylyn.bugzilla.core/icons/remove.gif +++ b/org.eclipse.mylyn.bugzilla.ui/icons/remove.gif diff --git a/org.eclipse.mylyn.bugzilla.core/icons/selectAll.gif b/org.eclipse.mylyn.bugzilla.ui/icons/selectAll.gif Binary files differindex e159862e3..e159862e3 100644 --- a/org.eclipse.mylyn.bugzilla.core/icons/selectAll.gif +++ b/org.eclipse.mylyn.bugzilla.ui/icons/selectAll.gif diff --git a/org.eclipse.mylyn.bugzilla.core/icons/wizban/bug-wizard.gif b/org.eclipse.mylyn.bugzilla.ui/icons/wizban/bug-wizard.gif Binary files differindex ec6d66ce3..ec6d66ce3 100644 --- a/org.eclipse.mylyn.bugzilla.core/icons/wizban/bug-wizard.gif +++ b/org.eclipse.mylyn.bugzilla.ui/icons/wizban/bug-wizard.gif diff --git a/org.eclipse.mylyn.bugzilla.ui/plugin.xml b/org.eclipse.mylyn.bugzilla.ui/plugin.xml new file mode 100644 index 000000000..2aee1614d --- /dev/null +++ b/org.eclipse.mylyn.bugzilla.ui/plugin.xml @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> +<?eclipse version="3.0"?> +<plugin> + + <extension + id="org.eclipse.mylar.bugzilla.wizards" + name="Bug Wizard" + point="org.eclipse.ui.newWizards"> + <category + name="Bugzilla Client" + id="org.eclipse.mylar.bugzilla.wizard.category"> + </category> + <wizard + category="org.eclipse.mylar.bugzilla.wizard.category" + class="org.eclipse.mylar.bugzilla.ui.wizard.NewBugWizard" + icon="icons/elcl16/bug-new.gif" + id="org.eclipse.mylar.bugzilla.bugWizard" + name="New Bug Report"> + <description> + Create a new bug report + </description> + </wizard> +</extension> + + <extension + id="org.eclipse.mylar.bugzilla.help.browser" + name="Bugzilla Help" + point="org.eclipse.help.toc"> + <toc + file="toc.xml" + primary="true"> + </toc> + </extension> + <extension + id="org.eclipse.mylar.bugzilla.ui" + name="Bugzilla Client Views" + point="org.eclipse.ui.views"> + <category + name="Bugzilla" + id="org.eclipse.mylar.bugzilla.category"/> + <view + name="Bugzilla Offline Reports" + icon="icons/elcl16/bug-dirty.gif" + category="org.eclipse.mylar.bugzilla.category" + class="org.eclipse.mylar.bugzilla.ui.OfflineView" + id="org.eclipse.mylar.bugzilla.ui.offlineReportsView"/> + <view + name="Bugzilla Favorites" + icon="icons/elcl16/bug-favorite.gif" + category="org.eclipse.mylar.bugzilla.category" + class="org.eclipse.mylar.bugzilla.ui.FavoritesView" + id="org.eclipse.mylar.bugzilla.ui.favoritesView"/> + </extension> + <extension + point="org.eclipse.search.searchPages" + id="org.eclipse.mylar.bugzilla.core.search.searchPage" + name="Bugzilla Search Page"> + <page + class="org.eclipse.mylar.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 + point="org.eclipse.ui.editors"> + <editor + name="Bugzilla viewer" + icon="icons/elcl16/bug.gif" + class="org.eclipse.mylar.bugzilla.ui.editor.ExistingBugEditor" + id="org.eclipse.mylar.bugzilla.ui.existingBugEditor"> + </editor> + <editor + name="Bugzilla viewer" + icon="icons/elcl16/bug.gif" + class="org.eclipse.mylar.bugzilla.ui.editor.NewBugEditor" + id="org.eclipse.mylar.bugzilla.ui.newBugEditor"> + </editor> + </extension> + <extension + id="org.eclipse.mylar.bugzilla.help.context" + name="Bugzilla Context-sensitive Help" + point="org.eclipse.help.contexts"> + <contexts + file="bugzilla_contexts.xml"> + </contexts> + </extension> + <extension + id="BugzillaSearchPage" + point="org.eclipse.search.searchResultViewPages"> + <viewPage + class="org.eclipse.mylar.bugzilla.ui.search.BugzillaSearchResultView" + searchResultClass="org.eclipse.mylar.bugzilla.core.search.BugzillaSearchResult" + id="org.eclipse.mylar.bugzilla.BugzillaSearchResultPage"/> + </extension> + +</plugin> + diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/BugzillaOpenStructure.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaOpenStructure.java index c902d5dd7..c902d5dd7 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/BugzillaOpenStructure.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaOpenStructure.java diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaResultMatchAdapter.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaResultMatchAdapter.java new file mode 100644 index 000000000..233409273 --- /dev/null +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaResultMatchAdapter.java @@ -0,0 +1,53 @@ +package org.eclipse.mylar.bugzilla.ui; + +import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchResult; +import org.eclipse.mylar.bugzilla.core.search.IBugzillaResultEditorMatchAdapter; +import org.eclipse.mylar.bugzilla.ui.editor.ExistingBugEditorInput; +import org.eclipse.search.ui.text.AbstractTextSearchResult; +import org.eclipse.search.ui.text.Match; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; + +public class BugzillaResultMatchAdapter implements + IBugzillaResultEditorMatchAdapter { + + + /** An empty array of matches */ + private final Match[] EMPTY_ARR= new Match[0]; + + + private BugzillaSearchResult result; + + /* (non-Javadoc) + * @see org.eclipse.search.ui.text.IEditorMatchAdapter#isShownInEditor(org.eclipse.search.ui.text.Match, org.eclipse.ui.IEditorPart) + */ + public boolean isShownInEditor(Match match, IEditorPart editor) { + if(result == null) + return false; + IEditorInput ei= editor.getEditorInput(); + if (ei instanceof ExistingBugEditorInput) { + ExistingBugEditorInput bi= (ExistingBugEditorInput) ei; + return match.getElement().equals(bi.getBug()); + } + return false; + } + + /* (non-Javadoc) + * @see org.eclipse.search.ui.text.IEditorMatchAdapter#computeContainedMatches(org.eclipse.search.ui.text.AbstractTextSearchResult, org.eclipse.ui.IEditorPart) + */ + public Match[] computeContainedMatches(AbstractTextSearchResult result, IEditorPart editor) { + if(result == null) + return EMPTY_ARR; + IEditorInput ei= editor.getEditorInput(); + if (ei instanceof ExistingBugEditorInput) { + ExistingBugEditorInput bi= (ExistingBugEditorInput) ei; + return result.getMatches(bi.getBug()); + } + return EMPTY_ARR; + } + + public void setResult(BugzillaSearchResult result) { + this.result = result; + } + +} diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaTableContentProvider.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaTableContentProvider.java index 75e6c61ca..bbc4609a7 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaTableContentProvider.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaTableContentProvider.java @@ -8,11 +8,14 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.core.search; +package org.eclipse.mylar.bugzilla.ui; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.mylar.bugzilla.core.search.BugzillaContentProvider; +import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchResult; +import org.eclipse.mylar.bugzilla.ui.search.BugzillaSearchResultView; import org.eclipse.search.internal.ui.SearchPreferencePage; /** diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaUITools.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaUITools.java new file mode 100644 index 000000000..88e4a184e --- /dev/null +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaUITools.java @@ -0,0 +1,214 @@ +package org.eclipse.mylar.bugzilla.ui; + +import java.io.IOException; + +import javax.security.auth.login.LoginException; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.MultiStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.dialogs.ErrorDialog; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.mylar.bugzilla.core.BugReport; +import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; +import org.eclipse.mylar.bugzilla.core.IBugzillaBug; +import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; +import org.eclipse.mylar.bugzilla.core.NewBugModel; +import org.eclipse.mylar.bugzilla.ui.editor.ExistingBugEditor; +import org.eclipse.mylar.bugzilla.ui.editor.ExistingBugEditorInput; +import org.eclipse.mylar.bugzilla.ui.editor.NewBugEditorInput; +import org.eclipse.search.internal.ui.SearchMessages; +import org.eclipse.search.internal.ui.SearchPlugin; +import org.eclipse.search.internal.ui.util.ExceptionHandler; +import org.eclipse.search.ui.NewSearchUI; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.PartInitException; + +public class BugzillaUITools { + + /** The editor to use when a bug is opened */ + private static IEditorPart fEditor; + + /** + * Convenience method for opening a bug in an editor. + * @param id The bug id of the bug to open in the editor + */ + public static boolean show(int id) + { + // determine if the editor is to be reused or not and call the appropriate + // function to show the bug + if (NewSearchUI.reuseEditor()) + return showWithReuse(id); + else + return showWithoutReuse(id); + } + + /** + * Show the bug in the same editor window + * @param id The id of the bug to show + */ + private static boolean showWithReuse(int id) + { + // get the active page so that we can reuse it + IWorkbenchPage page = SearchPlugin.getActivePage(); + try + { + // if we couldn't get a page, get out + if (page == null) + return true; + + IEditorInput input = null; + + // try to get an editor input on the bug + input = new ExistingBugEditorInput(id); + + // check if we found a valid bug + if(((ExistingBugEditorInput)input).getBug() == null) + { + MessageDialog.openError(null, "No such bug", "No bug exists with this id"); + return false; + } + + // get the editor for the page + IEditorPart editor = page.findEditor(input); + + if (editor == null) + { + // close the current editor if it is clean and open + if (fEditor != null && !fEditor.isDirty()) + page.closeEditor(fEditor, false); + + try + { + // try to open a new editor with the input bug, but don't activate it + editor= page.openEditor(input, IBugzillaConstants.EXISTING_BUG_EDITOR_ID, false); + } + catch (PartInitException ex) + { + // if there was a problem, handle it and log it, then get out of here + ExceptionHandler.handle(ex, SearchMessages.Search_Error_search_title, SearchMessages.Search_Error_search_message); //$NON-NLS-2$ //$NON-NLS-1$ + BugzillaPlugin.log(ex.getStatus()); + return false; + } + + } + else + { + // if a editor is openon that bug, just bring it to the top + // of the editors + page.bringToTop(editor); + } + + if (editor != null) + { + // if we have an editor, save it for later use + fEditor= editor; + } + } + catch(LoginException e) + { + MessageDialog.openError(null, "Login Error", "Bugzilla could not log you in to get the information you requested since login name or password is incorrect.\nPlease check your settings in the bugzilla preferences. "); + BugzillaPlugin.log(e); + } + catch(IOException e){ + IStatus status = new MultiStatus( IBugzillaConstants.PLUGIN_ID, IStatus.ERROR, e.getClass().toString() + " occurred while opening the bug report. \n\nClick Details or see log for more information.", e); + IStatus s = new Status(IStatus.ERROR, IBugzillaConstants.PLUGIN_ID, IStatus.ERROR, e.getClass().toString() + ": ", e); + ((MultiStatus)status).add(s); + s = new Status (IStatus.ERROR, IBugzillaConstants.PLUGIN_ID, IStatus.ERROR, e.getMessage(), e); + ((MultiStatus)status).add(s); + + //write error to log + BugzillaPlugin.log(status); + + ErrorDialog.openError(null, "Bugzilla Error", null, status); + return false; + } + + return true; + } + + /** + * Show the bug in a new editor window + * @param id The id of the bug to show + */ + private static boolean showWithoutReuse(int id) + { + // get the active workbench page + IWorkbenchPage page = SearchPlugin.getActivePage(); + try + { + // if we couldn't get the page, get out of here + if (page == null) + return true; + + IEditorInput input = null; + String editorId = IBugzillaConstants.EXISTING_BUG_EDITOR_ID; + + // get a new editor input on the bug that we want to open + input = new ExistingBugEditorInput(id); + + // check if we found a valid bug + if(((ExistingBugEditorInput)input).getBug() == null) + { + MessageDialog.openError(null, "No such bug", "No bug exists with this id"); + return false; + } + + try + { + // try to open an editor on the input bug + page.openEditor(input, editorId); + } + catch (PartInitException ex) + { + // if we have a problem, handle it, log it, and get out of here + ExceptionHandler.handle(ex, SearchMessages.Search_Error_search_title, SearchMessages.Search_Error_search_message); //$NON-NLS-2$ //$NON-NLS-1$ + BugzillaPlugin.log(ex.getStatus()); + return false; + } + } + catch(LoginException e) + { + MessageDialog.openError(null, "Login Error", "Bugzilla could not log you in to get the information you requested since login name or password is incorrect.\nPlease check your settings in the bugzilla preferences. "); + BugzillaPlugin.log(e); + } + catch(IOException e){ + IStatus status = new MultiStatus( IBugzillaConstants.PLUGIN_ID, IStatus.ERROR, e.getClass().toString() + " occurred while opening the bug report. \n\nClick Details or see log for more information.", e); + IStatus s = new Status(IStatus.ERROR, IBugzillaConstants.PLUGIN_ID, IStatus.ERROR, e.getClass().toString() + ": ", e); + ((MultiStatus)status).add(s); + s = new Status (IStatus.ERROR, IBugzillaConstants.PLUGIN_ID, IStatus.ERROR, e.getMessage(), e); + ((MultiStatus)status).add(s); + + //write error to log + BugzillaPlugin.log(status); + + ErrorDialog.openError(null, "Bugzilla Error", null, status); + return false; + } + return true; + } + + public static void closeEditor(IWorkbenchPage page, IBugzillaBug bug) { + if(bug instanceof NewBugModel){ + IEditorInput input = new NewBugEditorInput((NewBugModel)bug); + IEditorPart bugEditor = page.findEditor(input); + if (bugEditor != null) { + page.closeEditor(bugEditor, false); + } + } else if(bug instanceof BugReport){ + IEditorInput input = new ExistingBugEditorInput((BugReport)bug); + IEditorPart bugEditor = page.findEditor(input); + if (bugEditor != null) { + page.closeEditor(bugEditor, false); + IEditorPart compareEditor = page.findEditor(((ExistingBugEditor)bugEditor).getCompareInput()); + if (compareEditor != null) { + page.closeEditor(compareEditor, false); + } + } + } + + } + +} diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaUiPlugin.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaUiPlugin.java index ff1c1f843..37b2b640b 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaUiPlugin.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaUiPlugin.java @@ -1,7 +1,8 @@ package org.eclipse.mylar.bugzilla.ui; -import org.eclipse.ui.plugin.*; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; +import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; /** @@ -24,6 +25,7 @@ public class BugzillaUiPlugin extends AbstractUIPlugin { */ public void start(BundleContext context) throws Exception { super.start(context); + BugzillaPlugin.setResultEditorMatchAdapter(new BugzillaResultMatchAdapter()); } /** diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/FavoritesView.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/FavoritesView.java index 4a66d316c..b36ce2b1b 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/FavoritesView.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/FavoritesView.java @@ -24,6 +24,7 @@ import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; import org.eclipse.jface.viewers.ColumnLayoutData; import org.eclipse.jface.viewers.ColumnWeightData; +import org.eclipse.jface.viewers.IContentProvider; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.IStructuredSelection; @@ -35,8 +36,8 @@ import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; -import org.eclipse.mylar.bugzilla.ui.favorites.Favorite; -import org.eclipse.mylar.bugzilla.ui.favorites.FavoritesFile; +import org.eclipse.mylar.bugzilla.core.favorites.Favorite; +import org.eclipse.mylar.bugzilla.core.favorites.FavoritesFile; import org.eclipse.mylar.bugzilla.ui.favorites.actions.AbstractFavoritesAction; import org.eclipse.mylar.bugzilla.ui.favorites.actions.DeleteFavoriteAction; import org.eclipse.mylar.bugzilla.ui.favorites.actions.ViewFavoriteAction; @@ -45,6 +46,8 @@ import org.eclipse.swt.events.KeyAdapter; import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.events.MouseAdapter; import org.eclipse.swt.events.MouseEvent; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/OfflineView.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/OfflineView.java index 8f4a32104..49faa0438 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/OfflineView.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/OfflineView.java @@ -25,6 +25,7 @@ import org.eclipse.jface.action.Separator; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ColumnLayoutData; import org.eclipse.jface.viewers.ColumnWeightData; +import org.eclipse.jface.viewers.IContentProvider; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.IStructuredSelection; @@ -38,14 +39,16 @@ import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; import org.eclipse.mylar.bugzilla.core.IBugzillaBug; import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; import org.eclipse.mylar.bugzilla.core.offline.AbstractOfflineReportsAction; -import org.eclipse.mylar.bugzilla.core.offline.DeleteOfflineReportAction; import org.eclipse.mylar.bugzilla.core.offline.OfflineReportsFile; -import org.eclipse.mylar.bugzilla.core.offline.ViewOfflineReportAction; +import org.eclipse.mylar.bugzilla.ui.actions.DeleteOfflineReportAction; +import org.eclipse.mylar.bugzilla.ui.actions.ViewOfflineReportAction; import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyAdapter; import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.events.MouseAdapter; import org.eclipse.swt.events.MouseEvent; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; @@ -405,26 +408,6 @@ public class OfflineView extends ViewPart { } /** - * Calls remove function in OfflineReportsFile - */ - @SuppressWarnings("unchecked") - public void deleteSelectedOfflineReports() { - List<IBugzillaBug> selection = ((IStructuredSelection)viewer.getSelection()).toList(); - closeOfflineReports(selection); - BugzillaPlugin.getDefault().getOfflineReports().remove(selection); - viewer.setInput(viewer.getInput()); - } - - /** - * Removes all of the offline reports in the OfflineReportsFile. - */ - public void deleteAllOfflineReports() { - closeOfflineReports(BugzillaPlugin.getDefault().getOfflineReports().elements()); - BugzillaPlugin.getDefault().getOfflineReports().removeAll(); - viewer.setInput(viewer.getInput()); - } - - /** * Closes any open editors of the given offline reports. * @param reports The list of offline reports that need their editors closed. */ @@ -440,10 +423,9 @@ public class OfflineView extends ViewPart { for (Iterator<IBugzillaBug> iter = reports.iterator(); iter.hasNext();) { IBugzillaBug bug = iter.next(); - bug.closeEditor(page); + BugzillaUITools.closeEditor(page, bug); } } - /** * Refreshes the view. */ @@ -453,14 +435,26 @@ public class OfflineView extends ViewPart { } /** - * @return The id that a new offline bug should use. The value changes each - * time this method is called. + * Calls remove function in OfflineReportsFile */ - public static int getNextOfflineBugId() { - return BugzillaPlugin.getDefault().getOfflineReports().getNextOfflineBugId(); + @SuppressWarnings("unchecked") + public void deleteSelectedOfflineReports() { + List<IBugzillaBug> selection = ((IStructuredSelection)viewer.getSelection()).toList(); + closeOfflineReports(selection); + BugzillaPlugin.getDefault().getOfflineReports().remove(selection); + viewer.setInput(viewer.getInput()); } /** + * Removes all of the offline reports in the OfflineReportsFile. + */ + public void deleteAllOfflineReports() { + closeOfflineReports(BugzillaPlugin.getDefault().getOfflineReports().elements()); + BugzillaPlugin.getDefault().getOfflineReports().removeAll(); + viewer.setInput(viewer.getInput()); + } + + /** * Saves the given report to the offlineReportsFile, or, if it already * exists in the file, updates it. * @@ -506,7 +500,7 @@ public class OfflineView extends ViewPart { if(viewer != null) viewer.setInput(viewer.getInput()); } - + /** * @see SelectionListener#widgetSelected(SelectionEvent) */ diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/ViewBugzillaAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/ViewBugzillaAction.java index 1c6373829..1c6373829 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/ViewBugzillaAction.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/ViewBugzillaAction.java diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSortAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/BugzillaSortAction.java index a6ef80668..495dce05f 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSortAction.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/BugzillaSortAction.java @@ -8,9 +8,10 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.core.search; +package org.eclipse.mylar.bugzilla.ui.actions; import org.eclipse.jface.action.Action; +import org.eclipse.mylar.bugzilla.ui.search.BugzillaSearchResultView; /** * This class sorts Bugzilla search results by a supplied category. diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/offline/DeleteOfflineReportAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/DeleteOfflineReportAction.java index edfb3cf67..93be254d1 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/offline/DeleteOfflineReportAction.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/DeleteOfflineReportAction.java @@ -8,8 +8,9 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.core.offline; +package org.eclipse.mylar.bugzilla.ui.actions; +import org.eclipse.mylar.bugzilla.core.offline.AbstractOfflineReportsAction; import org.eclipse.mylar.bugzilla.ui.OfflineView; /** diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/OpenBugsAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/OpenBugsAction.java index 32406c23a..b427d413e 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/OpenBugsAction.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/OpenBugsAction.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.core.search; +package org.eclipse.mylar.bugzilla.ui.actions; import java.util.Iterator; @@ -19,6 +19,8 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; +import org.eclipse.mylar.bugzilla.ui.BugzillaUITools; +import org.eclipse.mylar.bugzilla.ui.search.BugzillaSearchResultView; import org.eclipse.search.internal.ui.SearchMessages; import org.eclipse.search.internal.ui.util.ExceptionHandler; @@ -58,7 +60,7 @@ public class OpenBugsAction extends Action { IMarker marker = it.next(); try { Integer id = (Integer) marker.getAttribute(IBugzillaConstants.HIT_MARKER_ATTR_ID); - BugzillaSearchHit.show(id.intValue()); + BugzillaUITools.show(id.intValue()); } catch (CoreException e) { // if an error occurs, handle and log it diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/offline/ViewOfflineReportAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/ViewOfflineReportAction.java index ea45ee9de..b4bb30c5d 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/offline/ViewOfflineReportAction.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/ViewOfflineReportAction.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.core.offline; +package org.eclipse.mylar.bugzilla.ui.actions; import java.util.Iterator; import java.util.List; @@ -17,10 +17,11 @@ import org.eclipse.mylar.bugzilla.core.BugReport; import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; import org.eclipse.mylar.bugzilla.core.IBugzillaBug; import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; +import org.eclipse.mylar.bugzilla.core.NewBugModel; +import org.eclipse.mylar.bugzilla.core.offline.AbstractOfflineReportsAction; import org.eclipse.mylar.bugzilla.ui.OfflineView; import org.eclipse.mylar.bugzilla.ui.editor.ExistingBugEditorInput; import org.eclipse.mylar.bugzilla.ui.editor.NewBugEditorInput; -import org.eclipse.mylar.bugzilla.ui.wizard.NewBugModel; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PartInitException; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/AbstractBugEditor.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/AbstractBugEditor.java index d865bcc71..e3107bc8d 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/AbstractBugEditor.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/AbstractBugEditor.java @@ -41,16 +41,16 @@ import org.eclipse.mylar.bugzilla.core.Attribute; import org.eclipse.mylar.bugzilla.core.BugPost; import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; import org.eclipse.mylar.bugzilla.core.BugzillaPreferences; +import org.eclipse.mylar.bugzilla.core.BugzillaTools; import org.eclipse.mylar.bugzilla.core.Comment; import org.eclipse.mylar.bugzilla.core.IBugzillaAttributeListener; import org.eclipse.mylar.bugzilla.core.IBugzillaBug; import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; +import org.eclipse.mylar.bugzilla.core.IBugzillaReportSelection; import org.eclipse.mylar.bugzilla.ui.OfflineView; import org.eclipse.mylar.bugzilla.ui.outline.BugzillaOutlineNode; import org.eclipse.mylar.bugzilla.ui.outline.BugzillaOutlinePage; import org.eclipse.mylar.bugzilla.ui.outline.BugzillaReportSelection; -import org.eclipse.mylar.bugzilla.ui.outline.BugzillaTools; -import org.eclipse.mylar.bugzilla.ui.outline.IBugzillaReportSelection; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CLabel; import org.eclipse.swt.custom.ScrolledComposite; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/AbstractBugEditorInput.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/AbstractBugEditorInput.java index 1cef2a0d0..1cef2a0d0 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/AbstractBugEditorInput.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/AbstractBugEditorInput.java diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/BugzillaEditorCopyAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/BugzillaEditorCopyAction.java index 38df0c8da..38df0c8da 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/BugzillaEditorCopyAction.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/BugzillaEditorCopyAction.java diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditor.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditor.java index 19f1dc193..19f1dc193 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditor.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditor.java diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditorInput.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditorInput.java index d187f2c63..02169c600 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditorInput.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditorInput.java @@ -11,6 +11,7 @@ package org.eclipse.mylar.bugzilla.ui.editor; import java.io.IOException; + import javax.security.auth.login.LoginException; import org.eclipse.mylar.bugzilla.core.BugReport; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditor.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditor.java index 10bb28ce4..375b840d7 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditor.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditor.java @@ -22,10 +22,10 @@ import org.eclipse.mylar.bugzilla.core.BugPost; import org.eclipse.mylar.bugzilla.core.BugzillaException; import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; import org.eclipse.mylar.bugzilla.core.IBugzillaBug; +import org.eclipse.mylar.bugzilla.core.NewBugModel; import org.eclipse.mylar.bugzilla.ui.OfflineView; import org.eclipse.mylar.bugzilla.ui.outline.BugzillaOutlineNode; import org.eclipse.mylar.bugzilla.ui.outline.BugzillaReportSelection; -import org.eclipse.mylar.bugzilla.ui.wizard.NewBugModel; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditorInput.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditorInput.java index 897098a82..92fd3dc92 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditorInput.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditorInput.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.mylar.bugzilla.ui.editor; -import org.eclipse.mylar.bugzilla.ui.wizard.NewBugModel; +import org.eclipse.mylar.bugzilla.core.NewBugModel; /** * The <code>IEditorInput</code> implementation for <code>NewBugEditor</code>. diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/AbstractFavoritesAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/AbstractFavoritesAction.java index 2caf881be..2caf881be 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/AbstractFavoritesAction.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/AbstractFavoritesAction.java diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/AddFavoriteAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/AddFavoriteAction.java index 68846e25a..3b88ccc93 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/AddFavoriteAction.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/AddFavoriteAction.java @@ -17,13 +17,14 @@ import java.util.List; import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; -import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchResultView; +import org.eclipse.mylar.bugzilla.core.favorites.Favorite; import org.eclipse.mylar.bugzilla.ui.FavoritesView; -import org.eclipse.mylar.bugzilla.ui.favorites.Favorite; +import org.eclipse.mylar.bugzilla.ui.search.BugzillaSearchResultView; /** diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/AddToFavoritesAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/AddToFavoritesAction.java index 263bdc4ca..524999d11 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/AddToFavoritesAction.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/AddToFavoritesAction.java @@ -13,9 +13,9 @@ package org.eclipse.mylar.bugzilla.ui.favorites.actions; import org.eclipse.jface.action.Action; import org.eclipse.mylar.bugzilla.core.BugzillaImages; import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; +import org.eclipse.mylar.bugzilla.core.favorites.Favorite; import org.eclipse.mylar.bugzilla.ui.FavoritesView; import org.eclipse.mylar.bugzilla.ui.editor.ExistingBugEditorInput; -import org.eclipse.mylar.bugzilla.ui.favorites.Favorite; import org.eclipse.ui.part.EditorPart; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/DeleteFavoriteAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/DeleteFavoriteAction.java index 49829d002..49829d002 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/DeleteFavoriteAction.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/DeleteFavoriteAction.java diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/ViewFavoriteAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/ViewFavoriteAction.java index f83e5bb4b..f83e5bb4b 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/ViewFavoriteAction.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/ViewFavoriteAction.java diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlineComparer.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlineComparer.java index 360df447a..80884eb7b 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlineComparer.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlineComparer.java @@ -11,6 +11,8 @@ package org.eclipse.mylar.bugzilla.ui.outline; import org.eclipse.jface.viewers.IElementComparer; +import org.eclipse.mylar.bugzilla.core.BugzillaTools; +import org.eclipse.mylar.bugzilla.core.IBugzillaReportSelection; /** * This class is used to compare two <code>IBugzillaReportSelection</code> diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlineNode.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlineNode.java index e5c8f1ba9..4336e4e82 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlineNode.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlineNode.java @@ -17,7 +17,8 @@ import org.eclipse.mylar.bugzilla.core.BugReport; import org.eclipse.mylar.bugzilla.core.BugzillaImages; import org.eclipse.mylar.bugzilla.core.Comment; import org.eclipse.mylar.bugzilla.core.IBugzillaBug; -import org.eclipse.mylar.bugzilla.ui.wizard.NewBugModel; +import org.eclipse.mylar.bugzilla.core.IBugzillaReportSelection; +import org.eclipse.mylar.bugzilla.core.NewBugModel; import org.eclipse.swt.graphics.Image; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlinePage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlinePage.java index 3bdc665c7..4a8048eef 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlinePage.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlinePage.java @@ -16,6 +16,8 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.mylar.bugzilla.core.BugzillaTools; +import org.eclipse.mylar.bugzilla.core.IBugzillaReportSelection; import org.eclipse.mylar.bugzilla.ui.editor.AbstractBugEditor; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaReportSelection.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaReportSelection.java index 8dd61ac02..fe18a93f4 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaReportSelection.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaReportSelection.java @@ -11,6 +11,7 @@ package org.eclipse.mylar.bugzilla.ui.outline; import org.eclipse.mylar.bugzilla.core.Comment; +import org.eclipse.mylar.bugzilla.core.IBugzillaReportSelection; /** * A selection of a Bugzilla element in a view. diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/query/GetQueryDialog.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/query/GetQueryDialog.java index 37a9ba2f4..70a2feac4 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/query/GetQueryDialog.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/query/GetQueryDialog.java @@ -18,7 +18,7 @@ import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchPage; +import org.eclipse.mylar.bugzilla.ui.search.BugzillaSearchPage; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseAdapter; import org.eclipse.swt.events.MouseEvent; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/query/SaveQueryDialog.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/query/SaveQueryDialog.java index e8788c59c..e8788c59c 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/query/SaveQueryDialog.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/query/SaveQueryDialog.java diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/query/SavedQueryFile.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/query/SavedQueryFile.java index 11da9d2df..11da9d2df 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/query/SavedQueryFile.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/query/SavedQueryFile.java diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/search/BugzillaSearchPage.java index 2420730a8..a586a662f 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchPage.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/search/BugzillaSearchPage.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.core.search; +package org.eclipse.mylar.bugzilla.ui.search; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -26,6 +26,12 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; import org.eclipse.mylar.bugzilla.core.BugzillaPreferences; import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; +import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchOperation; +import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchQuery; +import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchResultCollector; +import org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchOperation; +import org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchResultCollector; +import org.eclipse.mylar.bugzilla.ui.BugzillaUITools; import org.eclipse.mylar.bugzilla.ui.query.GetQueryDialog; import org.eclipse.mylar.bugzilla.ui.query.SaveQueryDialog; import org.eclipse.mylar.bugzilla.ui.query.SavedQueryFile; @@ -640,7 +646,7 @@ public class BugzillaSearchPage extends DialogPage implements ISearchPage { try { // if the summary contains a single bug id, open the bug directly int id = Integer.parseInt(summaryText); - return BugzillaSearchHit.show(id); + return BugzillaUITools.show(id); } catch (NumberFormatException ignored) { // ignore this since this means that the text is not a bug id } diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchResultView.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/search/BugzillaSearchResultView.java index 99bf06dd9..08429d5ca 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchResultView.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/search/BugzillaSearchResultView.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.core.search; +package org.eclipse.mylar.bugzilla.ui.search; import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.CoreException; @@ -23,6 +23,16 @@ import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; +import org.eclipse.mylar.bugzilla.core.search.BugzillaContentProvider; +import org.eclipse.mylar.bugzilla.core.search.BugzillaIdSearchSorter; +import org.eclipse.mylar.bugzilla.core.search.BugzillaLabelProvider; +import org.eclipse.mylar.bugzilla.core.search.BugzillaPrioritySearchSorter; +import org.eclipse.mylar.bugzilla.core.search.BugzillaSeveritySearchSorter; +import org.eclipse.mylar.bugzilla.core.search.BugzillaStateSearchSorter; +import org.eclipse.mylar.bugzilla.ui.BugzillaTableContentProvider; +import org.eclipse.mylar.bugzilla.ui.BugzillaUITools; +import org.eclipse.mylar.bugzilla.ui.actions.BugzillaSortAction; +import org.eclipse.mylar.bugzilla.ui.actions.OpenBugsAction; import org.eclipse.mylar.bugzilla.ui.favorites.actions.AddFavoriteAction; import org.eclipse.search.internal.ui.SearchMessages; import org.eclipse.search.internal.ui.SearchPlugin; @@ -184,7 +194,7 @@ public class BugzillaSearchResultView extends AbstractTextSearchViewPage impleme Object element = getCurrentMatch().getElement(); if (element instanceof IMarker) { Integer id = (Integer) ((IMarker)element).getAttribute(IBugzillaConstants.HIT_MARKER_ATTR_ID); - BugzillaSearchHit.show(id.intValue()); + BugzillaUITools.show(id.intValue()); } } catch (CoreException e) { diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractBugWizard.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractBugWizard.java index e52831098..76c07dffb 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractBugWizard.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractBugWizard.java @@ -25,6 +25,7 @@ import org.eclipse.mylar.bugzilla.core.BugzillaException; import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; import org.eclipse.mylar.bugzilla.core.BugzillaPreferences; import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; +import org.eclipse.mylar.bugzilla.core.NewBugModel; import org.eclipse.mylar.bugzilla.ui.editor.ExistingBugEditorInput; import org.eclipse.search.internal.ui.SearchMessages; import org.eclipse.search.internal.ui.util.ExceptionHandler; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractWizardDataPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractWizardDataPage.java index 6fdc72a6b..777231a25 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractWizardDataPage.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractWizardDataPage.java @@ -20,6 +20,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.mylar.bugzilla.core.Attribute; +import org.eclipse.mylar.bugzilla.core.NewBugModel; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.FontData; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractWizardListPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractWizardListPage.java index 47d4c3aa0..47d4c3aa0 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractWizardListPage.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractWizardListPage.java diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/NewBugWizard.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/NewBugWizard.java index 48e3393db..48e3393db 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/NewBugWizard.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/NewBugWizard.java diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/WizardAttributesPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/WizardAttributesPage.java index 10c31d5fc..10c31d5fc 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/WizardAttributesPage.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/WizardAttributesPage.java diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/WizardProductPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/WizardProductPage.java index 682cd66e6..956a28f77 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/WizardProductPage.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/WizardProductPage.java @@ -15,6 +15,7 @@ import java.util.Iterator; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; import org.eclipse.mylar.bugzilla.core.BugzillaRepository; +import org.eclipse.mylar.bugzilla.core.NewBugModel; import org.eclipse.swt.widgets.Event; import org.eclipse.ui.IWorkbench; diff --git a/org.eclipse.mylyn.bugzilla.core/toc.xml b/org.eclipse.mylyn.bugzilla.ui/toc.xml index 0e7d5de97..0e7d5de97 100644 --- a/org.eclipse.mylyn.bugzilla.core/toc.xml +++ b/org.eclipse.mylyn.bugzilla.ui/toc.xml diff --git a/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF index dc1a5c557..876d5c37d 100644 --- a/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF @@ -19,7 +19,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.mylar.core, org.eclipse.mylar.ui, org.eclipse.jdt.core, - org.eclipse.mylar.bugzilla.core + org.eclipse.mylar.bugzilla.core, + org.eclipse.mylar.bugzilla.ui Eclipse-AutoStart: true Bundle-Vendor: University of British Columbia Bundle-ClassPath: mylar-tasklist.jar diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/BugzillaStructureBridge.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/BugzillaStructureBridge.java index 812d455f5..9301c8135 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/BugzillaStructureBridge.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/BugzillaStructureBridge.java @@ -26,12 +26,12 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Platform; import org.eclipse.mylar.bugzilla.core.BugReport; import org.eclipse.mylar.bugzilla.core.BugzillaRepository; +import org.eclipse.mylar.bugzilla.core.BugzillaTools; import org.eclipse.mylar.bugzilla.core.IBugzillaBug; import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchHit; import org.eclipse.mylar.bugzilla.ui.editor.AbstractBugEditor; import org.eclipse.mylar.bugzilla.ui.outline.BugzillaOutlineNode; import org.eclipse.mylar.bugzilla.ui.outline.BugzillaReportSelection; -import org.eclipse.mylar.bugzilla.ui.outline.BugzillaTools; import org.eclipse.mylar.core.IMylarStructureBridge; import org.eclipse.mylar.core.MylarPlugin; import org.eclipse.mylar.tasks.MylarTasksPlugin; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/views/BugzillaQueryDialog.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/views/BugzillaQueryDialog.java index 3cc3e4762..54c56ca5c 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/views/BugzillaQueryDialog.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/views/BugzillaQueryDialog.java @@ -18,9 +18,9 @@ import org.eclipse.jface.dialogs.IInputValidator; import org.eclipse.jface.dialogs.InputDialog; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchPage; import org.eclipse.mylar.bugzilla.ui.query.GetQueryDialog; import org.eclipse.mylar.bugzilla.ui.query.SaveQueryDialog; +import org.eclipse.mylar.bugzilla.ui.search.BugzillaSearchPage; import org.eclipse.search.ui.ISearchPageContainer; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; |