diff options
87 files changed, 363 insertions, 348 deletions
diff --git a/org.eclipse.mylyn-feature/feature.xml b/org.eclipse.mylyn-feature/feature.xml index 4e335f11d..1d018794e 100644 --- a/org.eclipse.mylyn-feature/feature.xml +++ b/org.eclipse.mylyn-feature/feature.xml @@ -238,7 +238,7 @@ litigation. <import plugin="org.eclipse.ant.core" version="0.0.0" match="greaterOrEqual"/> <import plugin="org.eclipse.pde.core" version="0.0.0" match="greaterOrEqual"/> <import plugin="org.eclipse.mylar.core"/> - <import plugin="org.eclipse.mylar.bugzilla"/> + <import plugin="org.eclipse.mylar.bugzilla.core"/> </requires> <plugin diff --git a/org.eclipse.mylyn.bugzilla-feature/feature.xml b/org.eclipse.mylyn.bugzilla-feature/feature.xml index 17c6abe68..c9833931b 100644 --- a/org.eclipse.mylyn.bugzilla-feature/feature.xml +++ b/org.eclipse.mylyn.bugzilla-feature/feature.xml @@ -229,7 +229,7 @@ litigation. </requires> <plugin - id="org.eclipse.mylar.bugzilla" + id="org.eclipse.mylar.bugzilla.core" download-size="0" install-size="0" version="0.3.0" diff --git a/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF index cab010bf8..baac735bc 100644 --- a/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Bugzilla Plug-in -Bundle-SymbolicName: org.eclipse.mylar.bugzilla; singleton:=true +Bundle-SymbolicName: org.eclipse.mylar.bugzilla.core; singleton:=true Bundle-Version: 0.3.0 -Bundle-Activator: org.eclipse.mylar.bugzilla.BugzillaPlugin +Bundle-Activator: org.eclipse.mylar.bugzilla.core.BugzillaPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -20,17 +20,16 @@ Require-Bundle: org.eclipse.ui, org.eclipse.pde.ui Eclipse-AutoStart: true Bundle-Vendor: University of British Columbia -Bundle-ClassPath: bugzilla-eclipse.jar -Export-Package: org.eclipse.mylar.bugzilla, - org.eclipse.mylar.bugzilla.compare, - org.eclipse.mylar.bugzilla.core, +Bundle-ClassPath: bugzilla-core.jar +Export-Package: org.eclipse.mylar.bugzilla.core, + org.eclipse.mylar.bugzilla.core.compare, org.eclipse.mylar.bugzilla.core.internal, - org.eclipse.mylar.bugzilla.favorites, - org.eclipse.mylar.bugzilla.favorites.actions, - org.eclipse.mylar.bugzilla.offlineReports, - org.eclipse.mylar.bugzilla.saveQuery, - org.eclipse.mylar.bugzilla.search, + 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 diff --git a/org.eclipse.mylyn.bugzilla.core/build.properties b/org.eclipse.mylyn.bugzilla.core/build.properties index 0fe641e58..14337764d 100644 --- a/org.eclipse.mylyn.bugzilla.core/build.properties +++ b/org.eclipse.mylyn.bugzilla.core/build.properties @@ -12,15 +12,13 @@ bin.includes = plugin.xml,\ toc.xml,\ Icons/,\ doc.zip,\ - bugzilla-eclipse.jar,\ xercesImpl.jar,\ META-INF/,\ docs/,\ bugzilla_contexts.xml,\ about.html,\ - icons/ -source.bugzilla-eclipse.jar = src/ -output.bugzilla-eclipse.jar = bin/ + icons/,\ + bugzilla-core.jar src.includes = META-INF/,\ Icons/,\ docs/,\ @@ -31,3 +29,6 @@ src.includes = META-INF/,\ bugzilla_contexts.xml,\ about.html,\ icons/ +jars.compile.order = bugzilla-core.jar +source.bugzilla-core.jar = src/ +output.bugzilla-core.jar = bin/ diff --git a/org.eclipse.mylyn.bugzilla.core/plugin.xml b/org.eclipse.mylyn.bugzilla.core/plugin.xml index 8fef2b98a..835806575 100644 --- a/org.eclipse.mylyn.bugzilla.core/plugin.xml +++ b/org.eclipse.mylyn.bugzilla.core/plugin.xml @@ -54,14 +54,14 @@ </extension> <extension point="org.eclipse.search.searchPages" - id="org.eclipse.mylar.bugzilla.search.searchPage" + id="org.eclipse.mylar.bugzilla.core.search.searchPage" name="Bugzilla Search Page"> <page label="Bugzilla Search" enabled="true" icon="icons/elcl16/bug-search.gif" - class="org.eclipse.mylar.bugzilla.search.BugzillaSearchPage" - id="org.eclipse.mylar.bugzilla.search.bugzillaSearchPage"/> + class="org.eclipse.mylar.bugzilla.core.search.BugzillaSearchPage" + id="org.eclipse.mylar.bugzilla.core.search.bugzillaSearchPage"/> </extension> <extension point="org.eclipse.ui.editors"> @@ -99,7 +99,7 @@ point="org.eclipse.ui.preferencePages"> <page name="Bugzilla" - class="org.eclipse.mylar.bugzilla.BugzillaPreferences" + class="org.eclipse.mylar.bugzilla.core.BugzillaPreferences" id="org.eclipse.mylar.bugzilla.bugzillaPreferences"/> </extension> <extension @@ -114,8 +114,8 @@ id="BugzillaSearchPage" point="org.eclipse.search.searchResultViewPages"> <viewPage - class="org.eclipse.mylar.bugzilla.search.BugzillaSearchResultView" - searchResultClass="org.eclipse.mylar.bugzilla.search.BugzillaSearchResult" + class="org.eclipse.mylar.bugzilla.core.search.BugzillaSearchResultView" + searchResultClass="org.eclipse.mylar.bugzilla.core.search.BugzillaSearchResult" id="org.eclipse.mylar.bugzilla.BugzillaSearchResultPage"/> </extension> diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugPost.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugPost.java index d8d97b174..ab8acbd1c 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugPost.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugPost.java @@ -32,9 +32,6 @@ import javax.security.auth.login.LoginException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; -import org.eclipse.mylar.bugzilla.TrustAll; /** 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 223e15f04..f5096d65c 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,8 +21,6 @@ import java.util.Set; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; import org.eclipse.mylar.bugzilla.ui.editor.ExistingBugEditor; import org.eclipse.mylar.bugzilla.ui.editor.ExistingBugEditorInput; import org.eclipse.ui.IEditorInput; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/BugzillaImages.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaImages.java index fa5c9f043..0d3b22e92 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/BugzillaImages.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaImages.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla; +package org.eclipse.mylar.bugzilla.core; import java.net.MalformedURLException; import java.net.URL; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/BugzillaPlugin.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaPlugin.java index dcfeed58d..7b65fc999 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/BugzillaPlugin.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaPlugin.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla; +package org.eclipse.mylar.bugzilla.core; import java.io.IOException; import java.util.List; @@ -21,11 +21,10 @@ 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.IBugzillaBug; import org.eclipse.mylar.bugzilla.core.internal.ProductConfiguration; import org.eclipse.mylar.bugzilla.core.internal.ProductConfigurationFactory; -import org.eclipse.mylar.bugzilla.favorites.FavoritesFile; -import org.eclipse.mylar.bugzilla.offlineReports.OfflineReportsFile; +import org.eclipse.mylar.bugzilla.core.offline.OfflineReportsFile; +import org.eclipse.mylar.bugzilla.ui.favorites.FavoritesFile; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/BugzillaPreferences.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaPreferences.java index 928de7136..bd803f781 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/BugzillaPreferences.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/BugzillaPreferences.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla; +package org.eclipse.mylar.bugzilla.core; import java.io.IOException; import java.net.HttpURLConnection; @@ -33,10 +33,9 @@ import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.StringFieldEditor; -import org.eclipse.mylar.bugzilla.core.BugzillaException; import org.eclipse.mylar.bugzilla.core.internal.ProductConfiguration; import org.eclipse.mylar.bugzilla.core.internal.ProductConfigurationFactory; -import org.eclipse.mylar.bugzilla.search.BugzillaQueryPageParser; +import org.eclipse.mylar.bugzilla.core.search.BugzillaQueryPageParser; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.IWorkbench; 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 00c3a1e4e..9e8ee67ed 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 @@ -30,14 +30,10 @@ import javax.security.auth.login.LoginException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.BugzillaPreferences; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; -import org.eclipse.mylar.bugzilla.TrustAll; 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.offlineReports.OfflineReportsFile; +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/IBugzillaAttributeListener.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/IBugzillaAttributeListener.java index 36687da45..c9c4dcdca 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/IBugzillaAttributeListener.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/IBugzillaAttributeListener.java @@ -1,4 +1,4 @@ -package org.eclipse.mylar.bugzilla; +package org.eclipse.mylar.bugzilla.core; /** diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/IBugzillaConstants.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/IBugzillaConstants.java index 9414c3caf..61eb408f4 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/IBugzillaConstants.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/IBugzillaConstants.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla; +package org.eclipse.mylar.bugzilla.core; /** * @author kvesik diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/TrustAll.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/TrustAll.java index f131cd68f..836c6bc10 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/TrustAll.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/TrustAll.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla; +package org.eclipse.mylar.bugzilla.core; import javax.net.ssl.X509TrustManager; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/compare/BugzillaCompareInput.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/compare/BugzillaCompareInput.java index f81a6e272..799dee183 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/compare/BugzillaCompareInput.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/compare/BugzillaCompareInput.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.compare; +package org.eclipse.mylar.bugzilla.core.compare; import org.eclipse.compare.CompareConfiguration; import org.eclipse.compare.CompareEditorInput; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/compare/BugzillaCompareNode.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/compare/BugzillaCompareNode.java index f8ca4be04..27e05eeda 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/compare/BugzillaCompareNode.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/compare/BugzillaCompareNode.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.compare; +package org.eclipse.mylar.bugzilla.core.compare; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/compare/BugzillaStructureCreator.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/compare/BugzillaStructureCreator.java index 7c55181c8..b5c453e49 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/compare/BugzillaStructureCreator.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/compare/BugzillaStructureCreator.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.compare; +package org.eclipse.mylar.bugzilla.core.compare; import org.eclipse.compare.structuremergeviewer.IStructureComparator; import org.eclipse.compare.structuremergeviewer.IStructureCreator; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/BugParser.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/BugParser.java index ea82dc7f1..a0b5c6411 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/BugParser.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/BugParser.java @@ -26,12 +26,12 @@ import javax.security.auth.login.LoginException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; import org.eclipse.mylar.bugzilla.core.Attribute; import org.eclipse.mylar.bugzilla.core.BugReport; +import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; import org.eclipse.mylar.bugzilla.core.BugzillaRepository; import org.eclipse.mylar.bugzilla.core.Comment; +import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; import org.eclipse.mylar.bugzilla.core.Operation; import org.eclipse.mylar.bugzilla.core.internal.HtmlStreamTokenizer.Token; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/ProductConfigurationFactory.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/ProductConfigurationFactory.java index b7736df57..f773edff7 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/ProductConfigurationFactory.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/internal/ProductConfigurationFactory.java @@ -22,7 +22,7 @@ import java.net.URL; import java.net.URLConnection; import java.util.ArrayList; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; +import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; /** diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/offlineReports/AbstractOfflineReportsAction.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/offline/AbstractOfflineReportsAction.java index f50d0ece6..cb37f5dfe 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/offlineReports/AbstractOfflineReportsAction.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/offline/AbstractOfflineReportsAction.java @@ -8,14 +8,14 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.offlineReports; +package org.eclipse.mylar.bugzilla.core.offline; import java.net.MalformedURLException; import java.net.URL; import org.eclipse.jface.action.Action; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; +import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; import org.eclipse.swt.widgets.Shell; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/offlineReports/DeleteOfflineReportAction.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/offline/DeleteOfflineReportAction.java index fa223e190..edfb3cf67 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/offlineReports/DeleteOfflineReportAction.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/offline/DeleteOfflineReportAction.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.offlineReports; +package org.eclipse.mylar.bugzilla.core.offline; import org.eclipse.mylar.bugzilla.ui.OfflineView; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/offlineReports/OfflineReportsFile.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/offline/OfflineReportsFile.java index 8ab8fa48c..0fb707bf0 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/offlineReports/OfflineReportsFile.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/offline/OfflineReportsFile.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.offlineReports; +package org.eclipse.mylar.bugzilla.core.offline; import java.io.File; import java.io.FileInputStream; @@ -22,7 +22,7 @@ import java.util.Comparator; import java.util.List; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; +import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; import org.eclipse.mylar.bugzilla.core.IBugzillaBug; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/offlineReports/ViewOfflineReportAction.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/offline/ViewOfflineReportAction.java index 847d56f37..ea45ee9de 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/offlineReports/ViewOfflineReportAction.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/offline/ViewOfflineReportAction.java @@ -8,15 +8,15 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.offlineReports; +package org.eclipse.mylar.bugzilla.core.offline; import java.util.Iterator; import java.util.List; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; 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.ui.OfflineView; import org.eclipse.mylar.bugzilla.ui.editor.ExistingBugEditorInput; import org.eclipse.mylar.bugzilla.ui.editor.NewBugEditorInput; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaContentProvider.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaContentProvider.java index 89203c97d..0fb2ae641 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaContentProvider.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaContentProvider.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.search; +package org.eclipse.mylar.bugzilla.core.search; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.Viewer; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaIdSearchSorter.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaIdSearchSorter.java index 176e786ca..fcc3bb457 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaIdSearchSorter.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaIdSearchSorter.java @@ -8,12 +8,12 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.search; +package org.eclipse.mylar.bugzilla.core.search; import org.eclipse.core.resources.IMarker; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; +import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; /** diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaLabelProvider.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaLabelProvider.java index 4625c5c68..23fe8d0e8 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaLabelProvider.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaLabelProvider.java @@ -8,11 +8,11 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.search; +package org.eclipse.mylar.bugzilla.core.search; import org.eclipse.core.resources.IMarker; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; +import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; import org.eclipse.mylar.bugzilla.core.internal.HtmlStreamTokenizer; /** diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaPrioritySearchSorter.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaPrioritySearchSorter.java index 2f5d789e0..c0e899b1a 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaPrioritySearchSorter.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaPrioritySearchSorter.java @@ -8,12 +8,12 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.search; +package org.eclipse.mylar.bugzilla.core.search; import org.eclipse.core.resources.IMarker; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; +import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; /** diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaQueryPageParser.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaQueryPageParser.java index 32ab91576..cb3d14f3e 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaQueryPageParser.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaQueryPageParser.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.search; +package org.eclipse.mylar.bugzilla.core.search; import java.io.BufferedReader; import java.io.IOException; @@ -30,10 +30,10 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.BugzillaPreferences; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; -import org.eclipse.mylar.bugzilla.TrustAll; +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.TrustAll; import org.eclipse.mylar.bugzilla.core.internal.HtmlStreamTokenizer; import org.eclipse.mylar.bugzilla.core.internal.HtmlTag; import org.eclipse.mylar.bugzilla.core.internal.HtmlStreamTokenizer.Token; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaSearchEngine.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchEngine.java index 2a02735b3..69ac837c6 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaSearchEngine.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchEngine.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.search; +package org.eclipse.mylar.bugzilla.core.search; import java.io.BufferedReader; import java.io.IOException; @@ -28,11 +28,11 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.MultiStatus; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Status; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.BugzillaPreferences; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; -import org.eclipse.mylar.bugzilla.TrustAll; 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.TrustAll; import org.eclipse.search.ui.NewSearchUI; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaSearchHit.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchHit.java index 9ed4430e7..157d985b3 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaSearchHit.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchHit.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.search; +package org.eclipse.mylar.bugzilla.core.search; import java.io.IOException; @@ -19,8 +19,8 @@ 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.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; +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; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaSearchOperation.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchOperation.java index 4d39036a4..8fee1ebd2 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaSearchOperation.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchOperation.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.search; +package org.eclipse.mylar.bugzilla.core.search; import javax.security.auth.login.LoginException; @@ -65,14 +65,14 @@ public class BugzillaSearchOperation extends WorkspaceModifyOperation implements } /** - * @see org.eclipse.mylar.bugzilla.search.IBugzillaSearchOperation#getImageDescriptor() + * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchOperation#getImageDescriptor() */ public ImageDescriptor getImageDescriptor() { return null; } /** - * @see org.eclipse.mylar.bugzilla.search.IBugzillaSearchOperation#getStatus() + * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchOperation#getStatus() */ public IStatus getStatus() throws LoginException { // if a LoginException was thrown while trying to search, throw this @@ -83,14 +83,14 @@ public class BugzillaSearchOperation extends WorkspaceModifyOperation implements } /** - * @see org.eclipse.mylar.bugzilla.search.IBugzillaSearchOperation#getQuery() + * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchOperation#getQuery() */ public BugzillaSearchQuery getQuery() { return query; } /** - * @see org.eclipse.mylar.bugzilla.search.IBugzillaSearchOperation#setQuery(org.eclipse.mylar.bugzilla.search.BugzillaSearchQuery) + * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchOperation#setQuery(org.eclipse.mylar.bugzilla.core.search.BugzillaSearchQuery) */ public void setQuery(BugzillaSearchQuery newQuery) { this.query = newQuery; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaSearchPage.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchPage.java index 25500770b..2420730a8 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaSearchPage.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchPage.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.search; +package org.eclipse.mylar.bugzilla.core.search; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -23,12 +23,12 @@ import org.eclipse.jface.dialogs.InputDialog; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.BugzillaPreferences; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; -import org.eclipse.mylar.bugzilla.saveQuery.GetQueryDialog; -import org.eclipse.mylar.bugzilla.saveQuery.SaveQueryDialog; -import org.eclipse.mylar.bugzilla.saveQuery.SavedQueryFile; +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.ui.query.GetQueryDialog; +import org.eclipse.mylar.bugzilla.ui.query.SaveQueryDialog; +import org.eclipse.mylar.bugzilla.ui.query.SavedQueryFile; import org.eclipse.search.ui.ISearchPage; import org.eclipse.search.ui.ISearchPageContainer; import org.eclipse.search.ui.NewSearchUI; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaSearchQuery.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchQuery.java index 3c3d7c268..a332c4d41 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaSearchQuery.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchQuery.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.search; +package org.eclipse.mylar.bugzilla.core.search; import javax.security.auth.login.LoginException; @@ -18,8 +18,8 @@ import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; +import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; +import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; import org.eclipse.search.ui.ISearchQuery; import org.eclipse.search.ui.ISearchResult; import org.eclipse.search.ui.text.AbstractTextSearchResult; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaSearchResult.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchResult.java index 4dc00eee6..e273df605 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaSearchResult.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchResult.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.search; +package org.eclipse.mylar.bugzilla.core.search; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.mylar.bugzilla.ui.editor.ExistingBugEditorInput; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaSearchResultCollector.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchResultCollector.java index 6e7c61fa9..aa70a722b 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaSearchResultCollector.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchResultCollector.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.search; +package org.eclipse.mylar.bugzilla.core.search; import java.text.MessageFormat; import java.util.HashMap; @@ -19,8 +19,8 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; import org.eclipse.mylar.bugzilla.core.BugReport; +import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; import org.eclipse.search.ui.NewSearchUI; import org.eclipse.search.ui.text.Match; @@ -73,7 +73,7 @@ public class BugzillaSearchResultCollector implements IBugzillaSearchResultColle /** - * @see org.eclipse.mylar.bugzilla.search.IBugzillaSearchResultCollector#aboutToStart(int) + * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchResultCollector#aboutToStart(int) */ public void aboutToStart(int startMatchCount) throws CoreException { @@ -86,7 +86,7 @@ public class BugzillaSearchResultCollector implements IBugzillaSearchResultColle } /** - * @see org.eclipse.mylar.bugzilla.search.IBugzillaSearchResultCollector#accept(org.eclipse.mylar.bugzilla.search.BugzillaSearchHit) + * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchResultCollector#accept(org.eclipse.mylar.bugzilla.core.search.BugzillaSearchHit) */ public void accept(BugzillaSearchHit hit) throws CoreException { @@ -159,7 +159,7 @@ public class BugzillaSearchResultCollector implements IBugzillaSearchResultColle } /** - * @see org.eclipse.mylar.bugzilla.search.IBugzillaSearchResultCollector#done() + * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchResultCollector#done() */ public void done() { @@ -192,7 +192,7 @@ public class BugzillaSearchResultCollector implements IBugzillaSearchResultColle } /** - * @see org.eclipse.mylar.bugzilla.search.IBugzillaSearchResultCollector#getProgressMonitor() + * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchResultCollector#getProgressMonitor() */ public IProgressMonitor getProgressMonitor() { @@ -200,7 +200,7 @@ public class BugzillaSearchResultCollector implements IBugzillaSearchResultColle } /** - * @see org.eclipse.mylar.bugzilla.search.IBugzillaSearchResultCollector#setProgressMonitor(org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchResultCollector#setProgressMonitor(org.eclipse.core.runtime.IProgressMonitor) */ public void setProgressMonitor(IProgressMonitor monitor) { @@ -208,7 +208,7 @@ public class BugzillaSearchResultCollector implements IBugzillaSearchResultColle } /** - * @see org.eclipse.mylar.bugzilla.search.IBugzillaSearchResultCollector#getOperation() + * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchResultCollector#getOperation() */ public IBugzillaSearchOperation getOperation() { @@ -216,7 +216,7 @@ public class BugzillaSearchResultCollector implements IBugzillaSearchResultColle } /** - * @see org.eclipse.mylar.bugzilla.search.IBugzillaSearchResultCollector#setOperation(org.eclipse.mylar.bugzilla.search.IBugzillaSearchOperation) + * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchResultCollector#setOperation(org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchOperation) */ public void setOperation(IBugzillaSearchOperation operation) { diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaSearchResultView.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchResultView.java index 9d077dbb3..99bf06dd9 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaSearchResultView.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSearchResultView.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.search; +package org.eclipse.mylar.bugzilla.core.search; import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.CoreException; @@ -21,9 +21,9 @@ import org.eclipse.jface.viewers.DecoratingLabelProvider; import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; -import org.eclipse.mylar.bugzilla.favorites.actions.AddFavoriteAction; +import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; +import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; +import org.eclipse.mylar.bugzilla.ui.favorites.actions.AddFavoriteAction; import org.eclipse.search.internal.ui.SearchMessages; import org.eclipse.search.internal.ui.SearchPlugin; import org.eclipse.search.internal.ui.SearchPreferencePage; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaSeveritySearchSorter.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSeveritySearchSorter.java index 89765098c..f652e764c 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaSeveritySearchSorter.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSeveritySearchSorter.java @@ -8,12 +8,12 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.search; +package org.eclipse.mylar.bugzilla.core.search; import org.eclipse.core.resources.IMarker; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; +import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; /** diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaSortAction.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSortAction.java index 84d94f47a..a6ef80668 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaSortAction.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaSortAction.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.search; +package org.eclipse.mylar.bugzilla.core.search; import org.eclipse.jface.action.Action; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaStateSearchSorter.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaStateSearchSorter.java index 3c78eb8d5..d0cbe726c 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaStateSearchSorter.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaStateSearchSorter.java @@ -8,12 +8,12 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.search; +package org.eclipse.mylar.bugzilla.core.search; import org.eclipse.core.resources.IMarker; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; +import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; /** diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaTableContentProvider.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaTableContentProvider.java index 1e176d120..75e6c61ca 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/BugzillaTableContentProvider.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/BugzillaTableContentProvider.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.search; +package org.eclipse.mylar.bugzilla.core.search; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.TableViewer; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/IBugzillaSearchOperation.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/IBugzillaSearchOperation.java index a31bac079..d49607d01 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/IBugzillaSearchOperation.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/IBugzillaSearchOperation.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.search; +package org.eclipse.mylar.bugzilla.core.search; import javax.security.auth.login.LoginException; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/IBugzillaSearchResultCollector.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/IBugzillaSearchResultCollector.java index 30f6c766d..9411d88eb 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/IBugzillaSearchResultCollector.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/IBugzillaSearchResultCollector.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.search; +package org.eclipse.mylar.bugzilla.core.search; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/OpenBugsAction.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/OpenBugsAction.java index 609ad441d..32406c23a 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/search/OpenBugsAction.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/core/search/OpenBugsAction.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.search; +package org.eclipse.mylar.bugzilla.core.search; import java.util.Iterator; @@ -17,8 +17,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.action.Action; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; +import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; +import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; 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/FavoritesView.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/FavoritesView.java index 98a75c0c4..4a66d316c 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/FavoritesView.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/FavoritesView.java @@ -33,13 +33,13 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TableLayout; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; -import org.eclipse.mylar.bugzilla.favorites.Favorite; -import org.eclipse.mylar.bugzilla.favorites.FavoritesFile; -import org.eclipse.mylar.bugzilla.favorites.actions.AbstractFavoritesAction; -import org.eclipse.mylar.bugzilla.favorites.actions.DeleteFavoriteAction; -import org.eclipse.mylar.bugzilla.favorites.actions.ViewFavoriteAction; +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.ui.favorites.actions.AbstractFavoritesAction; +import org.eclipse.mylar.bugzilla.ui.favorites.actions.DeleteFavoriteAction; +import org.eclipse.mylar.bugzilla.ui.favorites.actions.ViewFavoriteAction; import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyAdapter; import org.eclipse.swt.events.KeyEvent; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/OfflineView.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/OfflineView.java index 91cfb0590..8f4a32104 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/OfflineView.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/OfflineView.java @@ -34,13 +34,13 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TableLayout; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; +import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; import org.eclipse.mylar.bugzilla.core.IBugzillaBug; -import org.eclipse.mylar.bugzilla.offlineReports.AbstractOfflineReportsAction; -import org.eclipse.mylar.bugzilla.offlineReports.DeleteOfflineReportAction; -import org.eclipse.mylar.bugzilla.offlineReports.OfflineReportsFile; -import org.eclipse.mylar.bugzilla.offlineReports.ViewOfflineReportAction; +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.swt.SWT; import org.eclipse.swt.events.KeyAdapter; import org.eclipse.swt.events.KeyEvent; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/ViewBugzillaAction.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/ViewBugzillaAction.java index 4d565e250..1c6373829 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/ViewBugzillaAction.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/ViewBugzillaAction.java @@ -20,8 +20,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; +import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; +import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; import org.eclipse.mylar.bugzilla.ui.editor.AbstractBugEditor; import org.eclipse.mylar.bugzilla.ui.editor.ExistingBugEditorInput; import org.eclipse.ui.IWorkbenchPage; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/AbstractBugEditor.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/AbstractBugEditor.java index b26eed1c8..d865bcc71 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/AbstractBugEditor.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/AbstractBugEditor.java @@ -37,14 +37,14 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.BugzillaPreferences; -import org.eclipse.mylar.bugzilla.IBugzillaAttributeListener; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; 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.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.ui.OfflineView; import org.eclipse.mylar.bugzilla.ui.outline.BugzillaOutlineNode; import org.eclipse.mylar.bugzilla.ui.outline.BugzillaOutlinePage; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditor.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditor.java index 887e56d41..826f95791 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditor.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditor.java @@ -33,19 +33,19 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.resource.JFaceColors; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; -import org.eclipse.mylar.bugzilla.compare.BugzillaCompareInput; import org.eclipse.mylar.bugzilla.core.Attribute; import org.eclipse.mylar.bugzilla.core.BugPost; import org.eclipse.mylar.bugzilla.core.BugReport; import org.eclipse.mylar.bugzilla.core.BugzillaException; +import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; import org.eclipse.mylar.bugzilla.core.BugzillaRepository; import org.eclipse.mylar.bugzilla.core.Comment; import org.eclipse.mylar.bugzilla.core.IBugzillaBug; +import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; import org.eclipse.mylar.bugzilla.core.Operation; -import org.eclipse.mylar.bugzilla.favorites.actions.AddToFavoritesAction; +import org.eclipse.mylar.bugzilla.core.compare.BugzillaCompareInput; import org.eclipse.mylar.bugzilla.ui.OfflineView; +import org.eclipse.mylar.bugzilla.ui.favorites.actions.AddToFavoritesAction; import org.eclipse.mylar.bugzilla.ui.outline.BugzillaOutlineNode; import org.eclipse.mylar.bugzilla.ui.outline.BugzillaReportSelection; import org.eclipse.swt.SWT; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditor.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditor.java index e822b7a70..10bb28ce4 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditor.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditor.java @@ -17,10 +17,10 @@ import javax.security.auth.login.LoginException; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; import org.eclipse.mylar.bugzilla.core.Attribute; 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.ui.OfflineView; import org.eclipse.mylar.bugzilla.ui.outline.BugzillaOutlineNode; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/Favorite.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/Favorite.java index dfed35c45..9eb9b348a 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/Favorite.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/Favorite.java @@ -8,14 +8,14 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.favorites; +package org.eclipse.mylar.bugzilla.ui.favorites; import java.io.Serializable; import java.util.Date; import java.util.Map; import org.eclipse.mylar.bugzilla.core.BugReport; -import org.eclipse.mylar.bugzilla.search.BugzillaSearchResultCollector; +import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchResultCollector; /** diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/FavoritesFile.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/FavoritesFile.java index 4742eee3c..7eecfc372 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/FavoritesFile.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/FavoritesFile.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.favorites; +package org.eclipse.mylar.bugzilla.ui.favorites; import java.io.File; import java.io.FileInputStream; @@ -22,8 +22,8 @@ import java.util.Comparator; import java.util.List; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; +import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; +import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; /** diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/actions/AbstractFavoritesAction.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/AbstractFavoritesAction.java index f64e4a7b7..2caf881be 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/actions/AbstractFavoritesAction.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/AbstractFavoritesAction.java @@ -8,14 +8,14 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.favorites.actions; +package org.eclipse.mylar.bugzilla.ui.favorites.actions; import java.net.MalformedURLException; import java.net.URL; import org.eclipse.jface.action.Action; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; +import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; import org.eclipse.swt.widgets.Shell; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/actions/AddFavoriteAction.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/AddFavoriteAction.java index b65853c25..68846e25a 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/actions/AddFavoriteAction.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/AddFavoriteAction.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.favorites.actions; +package org.eclipse.mylar.bugzilla.ui.favorites.actions; import java.util.ArrayList; import java.util.HashMap; @@ -19,11 +19,11 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; -import org.eclipse.mylar.bugzilla.favorites.Favorite; -import org.eclipse.mylar.bugzilla.search.BugzillaSearchResultView; +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.ui.FavoritesView; +import org.eclipse.mylar.bugzilla.ui.favorites.Favorite; /** diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/actions/AddToFavoritesAction.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/AddToFavoritesAction.java index 9ab0920e4..263bdc4ca 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/actions/AddToFavoritesAction.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/AddToFavoritesAction.java @@ -8,14 +8,14 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.favorites.actions; +package org.eclipse.mylar.bugzilla.ui.favorites.actions; import org.eclipse.jface.action.Action; -import org.eclipse.mylar.bugzilla.BugzillaImages; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.favorites.Favorite; +import org.eclipse.mylar.bugzilla.core.BugzillaImages; +import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; 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/favorites/actions/DeleteFavoriteAction.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/DeleteFavoriteAction.java index 4498cf895..49829d002 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/actions/DeleteFavoriteAction.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/DeleteFavoriteAction.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.favorites.actions; +package org.eclipse.mylar.bugzilla.ui.favorites.actions; import org.eclipse.mylar.bugzilla.ui.FavoritesView; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/actions/ViewFavoriteAction.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/ViewFavoriteAction.java index 2eda2d52a..f83e5bb4b 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/actions/ViewFavoriteAction.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/favorites/actions/ViewFavoriteAction.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.favorites.actions; +package org.eclipse.mylar.bugzilla.ui.favorites.actions; import java.util.List; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlineNode.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlineNode.java index c8ae32c23..e5c8f1ba9 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlineNode.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlineNode.java @@ -13,8 +13,8 @@ package org.eclipse.mylar.bugzilla.ui.outline; import java.util.ArrayList; import java.util.Iterator; -import org.eclipse.mylar.bugzilla.BugzillaImages; 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; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/saveQuery/GetQueryDialog.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/query/GetQueryDialog.java index 5531a6e02..37a9ba2f4 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/saveQuery/GetQueryDialog.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/query/GetQueryDialog.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.saveQuery; +package org.eclipse.mylar.bugzilla.ui.query; import java.util.ArrayList; import java.util.Iterator; @@ -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.search.BugzillaSearchPage; +import org.eclipse.mylar.bugzilla.core.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/saveQuery/SaveQueryDialog.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/query/SaveQueryDialog.java index 75a8ce3cd..e8788c59c 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/saveQuery/SaveQueryDialog.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/query/SaveQueryDialog.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.saveQuery; +package org.eclipse.mylar.bugzilla.ui.query; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/saveQuery/SavedQueryFile.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/query/SavedQueryFile.java index 4efa11d6a..11da9d2df 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/saveQuery/SavedQueryFile.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/query/SavedQueryFile.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.bugzilla.saveQuery; +package org.eclipse.mylar.bugzilla.ui.query; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -21,7 +21,7 @@ import java.io.OutputStream; import java.util.ArrayList; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; +import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; /** diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractBugWizard.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractBugWizard.java index 4aaa5c6a0..e52831098 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractBugWizard.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractBugWizard.java @@ -19,12 +19,12 @@ import javax.security.auth.login.LoginException; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.BugzillaPreferences; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; import org.eclipse.mylar.bugzilla.core.Attribute; 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.BugzillaPreferences; +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.util.ExceptionHandler; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/NewBugWizard.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/NewBugWizard.java index 5e5178d28..48e3393db 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/NewBugWizard.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/NewBugWizard.java @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; +import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; import org.eclipse.mylar.bugzilla.core.BugzillaRepository; import org.eclipse.mylar.bugzilla.ui.OfflineView; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/WizardProductPage.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/WizardProductPage.java index 45fc32384..682cd66e6 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/WizardProductPage.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/wizard/WizardProductPage.java @@ -13,7 +13,7 @@ package org.eclipse.mylar.bugzilla.ui.wizard; import java.util.Iterator; import org.eclipse.jface.wizard.IWizardPage; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; +import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; import org.eclipse.mylar.bugzilla.core.BugzillaRepository; import org.eclipse.swt.widgets.Event; import org.eclipse.ui.IWorkbench; diff --git a/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF index 8f68efb90..94de6116f 100644 --- a/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.ui.views, org.eclipse.ui.editors, org.eclipse.ui.workbench.texteditor, - org.eclipse.mylar.bugzilla + org.eclipse.mylar.bugzilla.core Eclipse-AutoStart: true Bundle-Vendor: University of British Columbia Export-Package: org.eclipse.mylar.bugzilla.test diff --git a/org.eclipse.mylyn.help.ui/user/limitations.html b/org.eclipse.mylyn.help.ui/user/limitations.html index 0926dcf6a..737e64df5 100644 --- a/org.eclipse.mylyn.help.ui/user/limitations.html +++ b/org.eclipse.mylyn.help.ui/user/limitations.html @@ -12,6 +12,12 @@ <body> <h1> Known Limitations</h1> + <p>Supported platforms</p> + <ul> + <li>Must be using an Eclipse 3.1 final based IDE (e.g. the 3.1m5a based + JBossIDE is not supported)</li> + <li>Must be running on a Java 5 VM</li> + </ul> <p>Folding must be toggled off in order to view all the matches for "mark occurrences". This is not a Mylar-specific limitation but is more noticeable when Automatic Folding is enabled.</p> diff --git a/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF index d575b7dde..5c5b1a55a 100644 --- a/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF @@ -11,10 +11,10 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.mylar.core, org.eclipse.mylar.core.tests, org.eclipse.mylar.tasks, - org.eclipse.mylar.bugzilla, org.eclipse.jdt.core, org.eclipse.core.resources, - org.eclipse.ui + org.eclipse.ui, + org.eclipse.mylar.bugzilla.core Eclipse-AutoStart: true Bundle-ClassPath: mylar-tasklist-tests.jar Export-Package: org.eclipse.mylar.tasks.bugzilla.tests, diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/bugzilla/tests/BugzillaStackTraceTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/bugzilla/tests/BugzillaStackTraceTest.java index 1ca6993e0..9c029cc7e 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/bugzilla/tests/BugzillaStackTraceTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/bugzilla/tests/BugzillaStackTraceTest.java @@ -21,7 +21,7 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.Path; import org.eclipse.mylar.bugzilla.core.internal.BugParser; -import org.eclipse.mylar.bugzilla.search.BugzillaSearchHit; +import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchHit; import org.eclipse.mylar.core.tests.MylarCoreTestsPlugin; import org.eclipse.mylar.core.tests.support.FileTool; import org.eclipse.mylar.tasks.bugzilla.BugzillaReportNode; diff --git a/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF index 575796910..1ed9eabb1 100644 --- a/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF @@ -18,8 +18,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.pde.ui, org.eclipse.mylar.core, org.eclipse.mylar.ui, - org.eclipse.mylar.bugzilla, - org.eclipse.jdt.core + org.eclipse.jdt.core, + org.eclipse.mylar.bugzilla.core 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/BugzillaHit.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/BugzillaHit.java index f7af99ef1..2e7a28de4 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/BugzillaHit.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/BugzillaHit.java @@ -11,7 +11,7 @@ package org.eclipse.mylar.tasks; -import org.eclipse.mylar.bugzilla.BugzillaImages; +import org.eclipse.mylar.bugzilla.core.BugzillaImages; import org.eclipse.mylar.bugzilla.core.BugzillaRepository; import org.eclipse.mylar.ui.MylarImages; import org.eclipse.swt.graphics.Image; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/BugzillaQueryCategory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/BugzillaQueryCategory.java index 2858c3236..7a7259a0e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/BugzillaQueryCategory.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/BugzillaQueryCategory.java @@ -22,9 +22,9 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; -import org.eclipse.mylar.bugzilla.search.BugzillaSearchHit; +import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; +import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; +import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchHit; import org.eclipse.mylar.tasks.bugzilla.search.BugzillaCategorySearchOperation; import org.eclipse.mylar.tasks.bugzilla.search.BugzillaResultCollector; import org.eclipse.mylar.tasks.bugzilla.search.BugzillaCategorySearchOperation.ICategorySearchListener; @@ -152,4 +152,13 @@ public class BugzillaQueryCategory extends AbstractCategory { this.url = url; } + public String getPriority() { + String highestPriority = "P5"; + for (BugzillaHit hit : hits) { + if (highestPriority.compareTo(hit.getPriority()) > 0) { + highestPriority = hit.getPriority(); + } + } + return highestPriority; + } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/BugzillaTask.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/BugzillaTask.java index 37db23c1b..bd5cc65d4 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/BugzillaTask.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/BugzillaTask.java @@ -28,11 +28,11 @@ import org.eclipse.core.runtime.jobs.IJobChangeListener; import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; import org.eclipse.mylar.bugzilla.core.BugReport; +import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; import org.eclipse.mylar.bugzilla.core.BugzillaRepository; import org.eclipse.mylar.bugzilla.core.IBugzillaBug; -import org.eclipse.mylar.bugzilla.offlineReports.OfflineReportsFile; +import org.eclipse.mylar.bugzilla.core.offline.OfflineReportsFile; import org.eclipse.mylar.bugzilla.ui.OfflineView; import org.eclipse.mylar.core.MylarPlugin; import org.eclipse.mylar.tasks.ui.BugzillaTaskEditorInput; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/MylarTasksPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/MylarTasksPlugin.java index 3483dd815..b3d2e10b5 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/MylarTasksPlugin.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/MylarTasksPlugin.java @@ -11,7 +11,6 @@ package org.eclipse.mylar.tasks; import java.io.File; -import java.util.ArrayList; import java.util.List; import java.util.MissingResourceException; import java.util.ResourceBundle; @@ -55,11 +54,7 @@ public class MylarTasksPlugin extends AbstractUIPlugin implements IStartup { public static final String TASK_ID = "org.eclipse.mylar.tasks.userid"; public static final String DEFAULT_TASK_LIST_FILE = "tasklist" + FILE_EXTENSION; public static final String TASK_EDITOR_ID = "org.eclipse.mylar.tasks.ui.taskEditor"; - public static final String SHOW_P1_MODE = "org.eclipse.mylar.tasks.show.p1"; - public static final String SHOW_P2_MODE = "org.eclipse.mylar.tasks.show.p2"; - public static final String SHOW_P3_MODE = "org.eclipse.mylar.tasks.show.p3"; - public static final String SHOW_P4_MODE = "org.eclipse.mylar.tasks.show.p4"; - public static final String SHOW_P5_MODE = "org.eclipse.mylar.tasks.show.p5"; + public static final String SELECTED_PRIORITY = "org.eclipse.mylar.tasks.filter.priority"; public static final String FILTER_COMPLETE_MODE = "org.eclipse.mylar.tasks.filter.complete"; public static final String FILTER_INCOMPLETE_MODE = "org.eclipse.mylar.tasks.filter.incomplete"; @@ -70,7 +65,7 @@ public class MylarTasksPlugin extends AbstractUIPlugin implements IStartup { INTERNAL_BROWSER, EXTERNAL_BROWSER; } - public enum Priority_Level { + public enum PriorityLevel { P1, P2, P3, @@ -85,10 +80,10 @@ public class MylarTasksPlugin extends AbstractUIPlugin implements IStartup { case P3: return "P3"; case P4: return "P4"; case P5: return "P5"; - default: return "null"; + default: return "P5"; } } - public static Priority_Level fromString(String string) { + public static PriorityLevel fromString(String string) { if (string == null) return null; if (string.equals("P1")) return P1; if (string.equals("P2")) return P2; @@ -223,11 +218,12 @@ public class MylarTasksPlugin extends AbstractUIPlugin implements IStartup { @Override protected void initializeDefaultPreferences(IPreferenceStore store) { - store.setDefault(SHOW_P1_MODE, true); - store.setDefault(SHOW_P2_MODE, true); - store.setDefault(SHOW_P3_MODE, true); - store.setDefault(SHOW_P4_MODE, true); - store.setDefault(SHOW_P5_MODE, true); +// store.setDefault(SHOW_P1_MODE, true); +// store.setDefault(SHOW_P2_MODE, true); +// store.setDefault(SHOW_P3_MODE, true); +// store.setDefault(SHOW_P4_MODE, true); +// store.setDefault(SHOW_P5_MODE, true); + store.setDefault(SELECTED_PRIORITY, "P5"); store.setDefault(MylarPlugin.CLOSE_EDITORS, true); store.setDefault(REFRESH_QUERIES, false); store.setDefault(REPORT_OPEN_EDITOR, true); @@ -308,53 +304,17 @@ public class MylarTasksPlugin extends AbstractUIPlugin implements IStartup { return MylarPlugin.getDefault().getPreferenceStore(); } - public static void setPriorityLevel(Priority_Level pl, boolean showPriority) { - String key = ""; - switch(pl) { - case P1: key = SHOW_P1_MODE; break; - case P2: key = SHOW_P2_MODE; break; - case P3: key = SHOW_P3_MODE; break; - case P4: key = SHOW_P4_MODE; break; - case P5: key = SHOW_P5_MODE; break; - default: key = SHOW_P1_MODE; break; - } - getPrefs().setValue(key, showPriority); + public static void setPriorityLevel(PriorityLevel pl) { + getPrefs().setValue(SELECTED_PRIORITY, pl.toString()); } - public static boolean getPriorityLevel(Priority_Level pl) { - String key = ""; - switch(pl) { - case P1: key = SHOW_P1_MODE; break; - case P2: key = SHOW_P2_MODE; break; - case P3: key = SHOW_P3_MODE; break; - case P4: key = SHOW_P4_MODE; break; - case P5: key = SHOW_P5_MODE; break; - default: key = SHOW_P1_MODE; break; - } - if(getPrefs().contains(key)) { - return getPrefs().getBoolean(key); + public static String getPriorityLevel() { + if(getPrefs().contains(SELECTED_PRIORITY)) { + return getPrefs().getString(SELECTED_PRIORITY); } else { - return true; + return PriorityLevel.P5.toString(); } } - public static List<Priority_Level> getPriorityLevels() { - List<Priority_Level> levels = new ArrayList<Priority_Level>(); - if (getPriorityLevel(Priority_Level.P1)) { - levels.add(Priority_Level.P1); - } - if (getPriorityLevel(Priority_Level.P2)) { - levels.add(Priority_Level.P2); - } - if (getPriorityLevel(Priority_Level.P3)) { - levels.add(Priority_Level.P3); - } - if (getPriorityLevel(Priority_Level.P4)) { - levels.add(Priority_Level.P4); - } - if (getPriorityLevel(Priority_Level.P5)) { - levels.add(Priority_Level.P5); - } - return levels; - } + public void setFilterCompleteMode(boolean isFilterOn) { getPrefs().setValue(FILTER_COMPLETE_MODE, isFilterOn); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/TaskCategory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/TaskCategory.java index 5562381d1..50f69f9c1 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/TaskCategory.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/TaskCategory.java @@ -38,6 +38,17 @@ public class TaskCategory extends AbstractCategory implements Serializable { return MylarImages.getImage(MylarImages.CATEGORY); } + + public String getPriority() { + String highestPriority = "P5"; + for (ITask task : tasks) { + if (highestPriority.compareTo(task.getPriority()) > 0) { + highestPriority = task.getPriority(); + } + } + return highestPriority; + } + public void addTask(ITask task) { if(task instanceof BugzillaTask){ BugzillaTask bugTask = MylarTasksPlugin.getTaskListManager().getTaskList().getFromBugzillaTaskRegistry(task.getHandle()); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/BugzillaCacheFile.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/BugzillaCacheFile.java index 7da0be56e..706e9ecf0 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/BugzillaCacheFile.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/BugzillaCacheFile.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; +import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; import org.eclipse.mylar.bugzilla.core.IBugzillaBug; /** diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/BugzillaReportNode.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/BugzillaReportNode.java index 6ac4c26a5..9552f5f21 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/BugzillaReportNode.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/BugzillaReportNode.java @@ -22,7 +22,7 @@ import javax.security.auth.login.LoginException; import org.eclipse.mylar.bugzilla.core.BugReport; import org.eclipse.mylar.bugzilla.core.BugzillaRepository; -import org.eclipse.mylar.bugzilla.search.BugzillaSearchHit; +import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchHit; /** 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 b3b62224d..812d455f5 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 @@ -27,7 +27,7 @@ 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.IBugzillaBug; -import org.eclipse.mylar.bugzilla.search.BugzillaSearchHit; +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; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/Util.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/Util.java index fb26f0500..1eb287c9c 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/Util.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/Util.java @@ -24,9 +24,9 @@ import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IMember; import org.eclipse.jdt.core.IType; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.BugzillaPreferences; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; +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.core.model.InterestComparator; import org.eclipse.mylar.tasks.bugzilla.search.BugzillaMylarSearchOperation; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/search/BugzillaCategorySearchOperation.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/search/BugzillaCategorySearchOperation.java index 5fd74e240..ea144c0e8 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/search/BugzillaCategorySearchOperation.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/search/BugzillaCategorySearchOperation.java @@ -21,9 +21,9 @@ import javax.security.auth.login.LoginException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.mylar.bugzilla.search.BugzillaSearchEngine; -import org.eclipse.mylar.bugzilla.search.BugzillaSearchQuery; -import org.eclipse.mylar.bugzilla.search.IBugzillaSearchOperation; +import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchEngine; +import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchQuery; +import org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchOperation; import org.eclipse.mylar.core.MylarPlugin; import org.eclipse.ui.actions.WorkspaceModifyOperation; @@ -110,7 +110,7 @@ public class BugzillaCategorySearchOperation extends WorkspaceModifyOperation } /** - * @see org.eclipse.mylar.bugzilla.search.IBugzillaSearchOperation#getStatus() + * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchOperation#getStatus() */ public IStatus getStatus() throws LoginException { // if a LoginException was thrown while trying to search, throw this diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/search/BugzillaMylarSearchJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/search/BugzillaMylarSearchJob.java index 209d17434..d6900c5c2 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/search/BugzillaMylarSearchJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/search/BugzillaMylarSearchJob.java @@ -21,8 +21,8 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.mylar.bugzilla.BugzillaPlugin; -import org.eclipse.mylar.bugzilla.IBugzillaConstants; +import org.eclipse.mylar.bugzilla.core.BugzillaPlugin; +import org.eclipse.mylar.bugzilla.core.IBugzillaConstants; import org.eclipse.mylar.tasks.bugzilla.BugzillaMylarBridge; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/search/BugzillaMylarSearchOperation.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/search/BugzillaMylarSearchOperation.java index f1396a849..4ab4e16c5 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/search/BugzillaMylarSearchOperation.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/search/BugzillaMylarSearchOperation.java @@ -29,10 +29,10 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.mylar.bugzilla.core.BugReport; import org.eclipse.mylar.bugzilla.core.Comment; -import org.eclipse.mylar.bugzilla.search.BugzillaSearchEngine; -import org.eclipse.mylar.bugzilla.search.BugzillaSearchHit; -import org.eclipse.mylar.bugzilla.search.BugzillaSearchQuery; -import org.eclipse.mylar.bugzilla.search.IBugzillaSearchOperation; +import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchEngine; +import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchHit; +import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchQuery; +import org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchOperation; import org.eclipse.mylar.core.MylarPlugin; import org.eclipse.mylar.tasks.BugzillaTask; import org.eclipse.mylar.tasks.ITask; @@ -458,7 +458,7 @@ public class BugzillaMylarSearchOperation extends WorkspaceModifyOperation } /** - * @see org.eclipse.mylar.bugzilla.search.IBugzillaSearchOperation#getStatus() + * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchOperation#getStatus() */ public IStatus getStatus() throws LoginException { // if a LoginException was thrown while trying to search, throw this @@ -469,7 +469,7 @@ public class BugzillaMylarSearchOperation extends WorkspaceModifyOperation } /** - * @see org.eclipse.mylar.bugzilla.search.IBugzillaSearchOperation#getImageDescriptor() + * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchOperation#getImageDescriptor() */ public ImageDescriptor getImageDescriptor() { return null; @@ -494,14 +494,14 @@ public class BugzillaMylarSearchOperation extends WorkspaceModifyOperation } /** - * @see org.eclipse.mylar.bugzilla.search.IBugzillaSearchOperation#getQuery() + * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchOperation#getQuery() */ public BugzillaSearchQuery getQuery() { return query; } /** - * @see org.eclipse.mylar.bugzilla.search.IBugzillaSearchOperation#setQuery(org.eclipse.mylar.bugzilla.search.BugzillaSearchQuery) + * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchOperation#setQuery(org.eclipse.mylar.bugzilla.core.search.BugzillaSearchQuery) */ public void setQuery(BugzillaSearchQuery newQuery) { this.query = newQuery; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/search/BugzillaResultCollector.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/search/BugzillaResultCollector.java index 3bbc47c2b..8325771ec 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/search/BugzillaResultCollector.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/search/BugzillaResultCollector.java @@ -19,9 +19,9 @@ import java.util.List; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.mylar.bugzilla.search.BugzillaSearchHit; -import org.eclipse.mylar.bugzilla.search.IBugzillaSearchOperation; -import org.eclipse.mylar.bugzilla.search.IBugzillaSearchResultCollector; +import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchHit; +import org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchOperation; +import org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchResultCollector; /** @@ -55,7 +55,7 @@ public class BugzillaResultCollector implements IBugzillaSearchResultCollector { private static final String MATCHES = "Bugzilla Mylar search - {0} matches"; /** - * @see org.eclipse.mylar.bugzilla.search.IBugzillaSearchResultCollector#aboutToStart() + * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchResultCollector#aboutToStart() */ public void aboutToStart(int startMatchCount) throws CoreException { // initiailize the number of matches @@ -66,7 +66,7 @@ public class BugzillaResultCollector implements IBugzillaSearchResultCollector { } /** - * @see org.eclipse.mylar.bugzilla.search.IBugzillaSearchResultCollector#accept(org.eclipse.mylar.bugzilla.search.BugzillaSearchHit) + * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchResultCollector#accept(org.eclipse.mylar.bugzilla.core.search.BugzillaSearchHit) */ public void accept(BugzillaSearchHit hit) throws CoreException { // add the result to the list of results @@ -87,7 +87,7 @@ public class BugzillaResultCollector implements IBugzillaSearchResultCollector { } /** - * @see org.eclipse.mylar.bugzilla.search.IBugzillaSearchResultCollector#done() + * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchResultCollector#done() */ public void done() { if (getProgressMonitor() != null) { @@ -104,28 +104,28 @@ public class BugzillaResultCollector implements IBugzillaSearchResultCollector { } /** - * @see org.eclipse.mylar.bugzilla.search.IBugzillaSearchResultCollector#getProgressMonitor() + * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchResultCollector#getProgressMonitor() */ public IProgressMonitor getProgressMonitor() { return monitor; } /** - * @see org.eclipse.mylar.bugzilla.search.IBugzillaSearchResultCollector#setProgressMonitor(org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchResultCollector#setProgressMonitor(org.eclipse.core.runtime.IProgressMonitor) */ public void setProgressMonitor(IProgressMonitor monitor) { this.monitor = monitor; } /** - * @see org.eclipse.mylar.bugzilla.search.IBugzillaSearchResultCollector#setOperation(org.eclipse.mylar.bugzilla.search.BugzillaSearchOperation) + * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchResultCollector#setOperation(org.eclipse.mylar.bugzilla.core.search.BugzillaSearchOperation) */ public void setOperation(IBugzillaSearchOperation operation) { this.operation = operation; } /** - * @see org.eclipse.mylar.bugzilla.search.IBugzillaSearchResultCollector#getOperation() + * @see org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchResultCollector#getOperation() */ public IBugzillaSearchOperation getOperation() { return operation; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/BugzillaTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/BugzillaTaskEditor.java index bc450ce42..66de9939e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/BugzillaTaskEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/BugzillaTaskEditor.java @@ -16,8 +16,8 @@ package org.eclipse.mylar.tasks.ui; import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.mylar.bugzilla.IBugzillaAttributeListener; import org.eclipse.mylar.bugzilla.core.BugReport; +import org.eclipse.mylar.bugzilla.core.IBugzillaAttributeListener; import org.eclipse.mylar.bugzilla.ui.editor.AbstractBugEditor; import org.eclipse.mylar.bugzilla.ui.editor.ExistingBugEditor; import org.eclipse.mylar.bugzilla.ui.editor.ExistingBugEditorInput; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/ClearContextAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/ClearContextAction.java index 458f1ad56..3537a371d 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/ClearContextAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/ClearContextAction.java @@ -39,18 +39,19 @@ public class ClearContextAction extends Action { setId(ID); setImageDescriptor(MylarImages.ERASE_TASKSCAPE); } + @Override public void run() { // MylarPlugin.getDefault().actionObserved(this); Object selectedObject = ((IStructuredSelection)this.view.getViewer().getSelection()).getFirstElement(); if (selectedObject != null && selectedObject instanceof ITask) { - ITask task = (ITask) selectedObject; - if (task.isActive()) { - MessageDialog.openError(Workbench.getInstance() - .getActiveWorkbenchWindow().getShell(), "Clear context failed", - "Task must be deactivated before clearing task context."); - return; - } +// ITask task = (ITask) selectedObject; +// if (task.isActive()) { +// MessageDialog.openError(Workbench.getInstance() +// .getActiveWorkbenchWindow().getShell(), "Clear context failed", +// "Task must be deactivated before clearing task context."); +// return; +// } boolean deleteConfirmed = MessageDialog.openQuestion( Workbench.getInstance().getActiveWorkbenchWindow().getShell(), "Confirm clear context", 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 3ce476e95..3cc3e4762 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.saveQuery.GetQueryDialog; -import org.eclipse.mylar.bugzilla.saveQuery.SaveQueryDialog; -import org.eclipse.mylar.bugzilla.search.BugzillaSearchPage; +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.search.ui.ISearchPageContainer; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/views/TaskListLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/views/TaskListLabelProvider.java index 756788d93..19c6325a3 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/views/TaskListLabelProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/views/TaskListLabelProvider.java @@ -47,6 +47,9 @@ public class TaskListLabelProvider extends LabelProvider implements ITableLabelP case 1: return ""; case 2: + if (element instanceof AbstractCategory) { + return ""; + } return element.getPriority(); case 3: return element.getDescription(true); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/views/TaskListView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/views/TaskListView.java index 0bb2693df..e04efcbc4 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/views/TaskListView.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/views/TaskListView.java @@ -60,7 +60,6 @@ import org.eclipse.mylar.tasks.ITaskListElement; import org.eclipse.mylar.tasks.MylarTasksPlugin; import org.eclipse.mylar.tasks.Task; import org.eclipse.mylar.tasks.TaskCategory; -import org.eclipse.mylar.tasks.MylarTasksPlugin.Priority_Level; import org.eclipse.mylar.tasks.ui.BugzillaTaskEditorInput; import org.eclipse.mylar.tasks.ui.TaskEditorInput; import org.eclipse.mylar.tasks.ui.actions.ClearContextAction; @@ -157,7 +156,7 @@ public class TaskListView extends ViewPart { public static final String tableSortIdentifier = "org.eclipse.mylar.tasks.ui.views.tasklist.sortIndex"; private int sortIndex = 2; - private String[] PRIORITY_LEVELS = { "P1", "P2", "P3", "P4", "P5" }; + private static String[] PRIORITY_LEVELS = { "P1", "P2", "P3", "P4", "P5" }; private final class PriorityDropDownAction extends Action implements IMenuCreator { private Menu dropDownMenu = null; @@ -199,17 +198,12 @@ public class TaskListView extends ViewPart { Action P1 = new Action(PRIORITY_LEVELS[0], AS_CHECK_BOX) { @Override public void run() { - MylarTasksPlugin.setPriorityLevel(MylarTasksPlugin.Priority_Level.P1, isChecked()); - if (isChecked()) { - priorityFilter.displayPriority(PRIORITY_LEVELS[0]); - } else { - priorityFilter.hidePriority(PRIORITY_LEVELS[0]); - } + MylarTasksPlugin.setPriorityLevel(MylarTasksPlugin.PriorityLevel.P1); + priorityFilter.displayPrioritiesAbove(PRIORITY_LEVELS[0]); viewer.refresh(); } }; P1.setEnabled(true); - P1.setChecked(MylarTasksPlugin.getPriorityLevel(MylarTasksPlugin.Priority_Level.P1)); P1.setToolTipText(PRIORITY_LEVELS[0]); ActionContributionItem item= new ActionContributionItem(P1); item.fill(dropDownMenu, -1); @@ -217,17 +211,12 @@ public class TaskListView extends ViewPart { Action P2 = new Action(PRIORITY_LEVELS[1], AS_CHECK_BOX) { @Override public void run() { - MylarTasksPlugin.setPriorityLevel(MylarTasksPlugin.Priority_Level.P2, isChecked()); - if (isChecked()) { - priorityFilter.displayPriority(PRIORITY_LEVELS[1]); - } else { - priorityFilter.hidePriority(PRIORITY_LEVELS[1]); - } + MylarTasksPlugin.setPriorityLevel(MylarTasksPlugin.PriorityLevel.P2); + priorityFilter.displayPrioritiesAbove(PRIORITY_LEVELS[1]); viewer.refresh(); } }; - P2.setEnabled(true); - P2.setChecked(MylarTasksPlugin.getPriorityLevel(MylarTasksPlugin.Priority_Level.P2)); + P2.setEnabled(true); P2.setToolTipText(PRIORITY_LEVELS[1]); item= new ActionContributionItem(P2); item.fill(dropDownMenu, -1); @@ -235,17 +224,12 @@ public class TaskListView extends ViewPart { Action P3 = new Action(PRIORITY_LEVELS[2], AS_CHECK_BOX) { @Override public void run() { - MylarTasksPlugin.setPriorityLevel(MylarTasksPlugin.Priority_Level.P3, isChecked()); - if (isChecked()) { - priorityFilter.displayPriority(PRIORITY_LEVELS[2]); - } else { - priorityFilter.hidePriority(PRIORITY_LEVELS[2]); - } + MylarTasksPlugin.setPriorityLevel(MylarTasksPlugin.PriorityLevel.P3); + priorityFilter.displayPrioritiesAbove(PRIORITY_LEVELS[2]); viewer.refresh(); } }; - P3.setEnabled(true); - P3.setChecked(MylarTasksPlugin.getPriorityLevel(MylarTasksPlugin.Priority_Level.P3)); + P3.setEnabled(true); P3.setToolTipText(PRIORITY_LEVELS[2]); item= new ActionContributionItem(P3); item.fill(dropDownMenu, -1); @@ -253,17 +237,12 @@ public class TaskListView extends ViewPart { Action P4 = new Action(PRIORITY_LEVELS[3], AS_CHECK_BOX) { @Override public void run() { - MylarTasksPlugin.setPriorityLevel(MylarTasksPlugin.Priority_Level.P4, isChecked()); - if (isChecked()) { - priorityFilter.displayPriority(PRIORITY_LEVELS[3]); - } else { - priorityFilter.hidePriority(PRIORITY_LEVELS[3]); - } + MylarTasksPlugin.setPriorityLevel(MylarTasksPlugin.PriorityLevel.P4); + priorityFilter.displayPrioritiesAbove(PRIORITY_LEVELS[3]); viewer.refresh(); } }; - P4.setEnabled(true); - P4.setChecked(MylarTasksPlugin.getPriorityLevel(MylarTasksPlugin.Priority_Level.P4)); + P4.setEnabled(true); P4.setToolTipText(PRIORITY_LEVELS[3]); item= new ActionContributionItem(P4); item.fill(dropDownMenu, -1); @@ -271,20 +250,38 @@ public class TaskListView extends ViewPart { Action P5 = new Action(PRIORITY_LEVELS[4], AS_CHECK_BOX) { @Override public void run() { - MylarTasksPlugin.setPriorityLevel(MylarTasksPlugin.Priority_Level.P5, isChecked()); - if (isChecked()) { - priorityFilter.displayPriority(PRIORITY_LEVELS[4]); - } else { - priorityFilter.hidePriority(PRIORITY_LEVELS[4]); - } + MylarTasksPlugin.setPriorityLevel(MylarTasksPlugin.PriorityLevel.P5); + priorityFilter.displayPrioritiesAbove(PRIORITY_LEVELS[4]); viewer.refresh(); } }; P5.setEnabled(true); - P5.setChecked(MylarTasksPlugin.getPriorityLevel(MylarTasksPlugin.Priority_Level.P5)); P5.setToolTipText(PRIORITY_LEVELS[4]); item= new ActionContributionItem(P5); - item.fill(dropDownMenu, -1); + item.fill(dropDownMenu, -1); + + String priority = MylarTasksPlugin.getPriorityLevel(); + if (priority.equals(PRIORITY_LEVELS[0])) { + P1.setChecked(true); + } else if (priority.equals(PRIORITY_LEVELS[1])) { + P1.setChecked(true); + P2.setChecked(true); + } else if (priority.equals(PRIORITY_LEVELS[2])) { + P1.setChecked(true); + P2.setChecked(true); + P3.setChecked(true); + } else if (priority.equals(PRIORITY_LEVELS[3])) { + P1.setChecked(true); + P2.setChecked(true); + P3.setChecked(true); + P4.setChecked(true); + } else if (priority.equals(PRIORITY_LEVELS[4])) { + P1.setChecked(true); + P2.setChecked(true); + P3.setChecked(true); + P4.setChecked(true); + P5.setChecked(true); + } } public void run() { this.setChecked(isChecked()); @@ -321,19 +318,36 @@ public class TaskListView extends ViewPart { }; public class PriorityFilter extends ViewerFilter { - // list of priorities that will be shown in the tasklistview private List<String> priorities = new ArrayList<String>(); - public PriorityFilter() { - for (Priority_Level level : MylarTasksPlugin.getPriorityLevels()) { - displayPriority(level.toString()); - } + public PriorityFilter() { + displayPrioritiesAbove(MylarTasksPlugin.getPriorityLevel()); } - public void displayPriority(String p) { - if (!priorities.contains(p)) { - priorities.add(p); - } + public void displayPrioritiesAbove(String p) { + priorities.clear(); + if (p.equals(PRIORITY_LEVELS[0])) { + priorities.add(PRIORITY_LEVELS[0]); + } + if (p.equals(PRIORITY_LEVELS[1])) { + priorities.add(PRIORITY_LEVELS[0]); + priorities.add(PRIORITY_LEVELS[1]); + } else if (p.equals(PRIORITY_LEVELS[2])) { + priorities.add(PRIORITY_LEVELS[0]); + priorities.add(PRIORITY_LEVELS[1]); + priorities.add(PRIORITY_LEVELS[2]); + } else if (p.equals(PRIORITY_LEVELS[3])) { + priorities.add(PRIORITY_LEVELS[0]); + priorities.add(PRIORITY_LEVELS[1]); + priorities.add(PRIORITY_LEVELS[2]); + priorities.add(PRIORITY_LEVELS[3]); + } else if (p.equals(PRIORITY_LEVELS[4])) { + priorities.add(PRIORITY_LEVELS[0]); + priorities.add(PRIORITY_LEVELS[1]); + priorities.add(PRIORITY_LEVELS[2]); + priorities.add(PRIORITY_LEVELS[3]); + priorities.add(PRIORITY_LEVELS[4]); + } } public void hidePriority(String p) { @@ -341,23 +355,25 @@ public class TaskListView extends ViewPart { } @Override public boolean select(Viewer viewer, Object parentElement, Object element) { - if (element instanceof ITaskListElement && !(element instanceof AbstractCategory)) { + if (element instanceof ITaskListElement) { ITaskListElement task = (ITaskListElement) element; if (priorities.size() == PRIORITY_LEVELS.length) { return true; } else { - for (String filter : priorities) { - if (task.getPriority().equals(filter)) { - return true; - } - } - return false; + return checkTask(task); } } else { return true; - } + } + } + private boolean checkTask(ITaskListElement task) { + for (String filter : priorities) { + if (task.getPriority().equals(filter)) { + return true; + } + } + return false; } - }; class TaskListContentProvider implements IStructuredContentProvider, ITreeContentProvider { @@ -590,7 +606,8 @@ public class TaskListView extends ViewPart { public int compare(Viewer compareViewer, Object o1, Object o2) { if (o1 instanceof AbstractCategory) { if (o2 instanceof AbstractCategory) { - return 0; + return ((AbstractCategory)o1).getDescription(false).compareTo( + ((AbstractCategory)o2).getDescription(false)); } else { return -1; } @@ -696,7 +713,7 @@ public class TaskListView extends ViewPart { } viewer.refresh(); } - + /** * This is a callback that will allow us * to create the viewer and initialize it. @@ -847,7 +864,7 @@ public class TaskListView extends ViewPart { MylarTasksPlugin.getTaskListManager().getTaskList().addToBugzillaTaskRegistry(bt); } viewer.setSelection(null); - viewer.refresh(); + viewer.refresh(); return true; } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/util/XmlUtil.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/util/XmlUtil.java index 0ac234ab8..541532f5c 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/util/XmlUtil.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/util/XmlUtil.java @@ -89,7 +89,11 @@ public class XmlUtil { } } for (ITask task : tlist.getRootTasks()) { - writeTask(task, doc, root); + try { + writeTask(task, doc, root); + }catch (Exception e) { + MylarPlugin.log(e, e.getMessage()); + } } doc.appendChild(root); writeDOMtoFile(doc, outFile); @@ -100,7 +104,12 @@ public class XmlUtil { Element node = doc.createElement("BugzillaTaskRegistry"); for (BugzillaTask t : bugzillaTaskRegistry.values()) { - writeTask(t, doc, node); + try { + writeTask(t, doc, node); + } catch (Exception e) { + MylarPlugin.log(e, e.getMessage()); + } + } parent.appendChild(node); } @@ -236,7 +245,12 @@ public class XmlUtil { node.setAttribute("Name", cat.getDescription(false)); for (ITask t : cat.getChildren()) { - writeTask(t, doc, node); + try { + writeTask(t, doc, node); + } catch (Exception e) { + MylarPlugin.log(e, e.getMessage()); + } + } parent.appendChild(node); } @@ -268,8 +282,13 @@ public class XmlUtil { if (task instanceof BugzillaTask) { BugzillaTask bt = (BugzillaTask) task; node.setAttribute("Bugzilla", "true"); - node.setAttribute("LastDate", new Long(bt.getLastRefreshTime() - .getTime()).toString()); + if (bt.getLastRefresh() != null) { + node.setAttribute("LastDate", new Long(bt.getLastRefreshTime() + .getTime()).toString()); + } else { + node.setAttribute("LastDate", new Long(new Date().getTime()).toString()); + } + if (bt.isDirty()) { node.setAttribute("Dirty", "true"); } else { |