diff options
14 files changed, 65 insertions, 23 deletions
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/XmlCleaner.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/XmlCleaner.java index bff26bf5b..acfec87b5 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/XmlCleaner.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/XmlCleaner.java @@ -20,9 +20,9 @@ import java.io.IOException; import java.io.Reader; import java.text.ParseException; -import org.eclipse.mylyn.commons.net.HtmlStreamTokenizer; -import org.eclipse.mylyn.commons.net.HtmlStreamTokenizer.Token; -import org.eclipse.mylyn.commons.net.HtmlTag; +import org.eclipse.mylyn.commons.core.HtmlStreamTokenizer; +import org.eclipse.mylyn.commons.core.HtmlStreamTokenizer.Token; +import org.eclipse.mylyn.commons.core.HtmlTag; /** * This is in place to escape & characters within the resource and rdf:about attributes. Currently the values are not diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaXmlRpcClientTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaXmlRpcClientTest.java index 06402a926..572f4c7d6 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaXmlRpcClientTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaXmlRpcClientTest.java @@ -642,9 +642,6 @@ public class BugzillaXmlRpcClientTest extends AbstractBugzillaTest { } if (metaHTML != null && metaXMLRPC != null) { - String a0 = metaHTML.getKind(); - String a1 = metaXMLRPC.getKind(); - if (metaHTML.getKind() != null && metaXMLRPC.getKind() == null) { div += (prefix + attributeNameHTML + " MetaData Kind not in XMLRPC\n"); } else if (metaHTML.getKind() != null && metaHTML.getKind().compareTo(metaXMLRPC.getKind()) != 0) { diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorPage.java index 92bfd668c..413895be5 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorPage.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorPage.java @@ -701,7 +701,7 @@ public class BugzillaTaskEditorPage extends AbstractTaskEditorPage { detail.append(MessageFormat.format(Messages.BugzillaTaskEditorPage_DetailLine, message)); } else { for (String key : proposals.keySet()) { - detail.append(MessageFormat.format("\t{0}\n", key)); + detail.append(MessageFormat.format(Messages.BugzillaTaskEditorPage_Proposal_Detail, key)); for (String proposalValue : proposals.get(key)) { detail.append(MessageFormat.format(Messages.BugzillaTaskEditorPage_DetailLine, proposalValue)); diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/Messages.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/Messages.java index e7834c155..ac61d4cca 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/Messages.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/Messages.java @@ -97,6 +97,8 @@ public class Messages extends NLS { public static String BugzillaTaskEditorPage_Please_enter_a_bugid_for_duplicate_of_before_submitting; + public static String BugzillaTaskEditorPage_Proposal_Detail; + public static String BugzillaTaskEditorPage_submit_disabled_please_refresh; public static String BugzillaTaskEditorPage_submitted_Changes_Details; diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/messages.properties b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/messages.properties index 9b1d40750..723c2a3bf 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/messages.properties +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/messages.properties @@ -47,6 +47,7 @@ BugzillaTaskEditorPage_Please_enter_a_description_before_submitting=Please enter BugzillaTaskEditorPage_Please_enter_a_short_summary_before_submitting=Please enter a short summary before submitting BugzillaTaskEditorPage_Please_select_a_component_before_submitting=Please select a component before submitting BugzillaTaskEditorPage_Please_enter_a_bugid_for_duplicate_of_before_submitting=Please enter a bugid for \"duplicate of\" before submitting +BugzillaTaskEditorPage_Proposal_Detail=\t{0}\n BugzillaTaskEditorPage_submit_disabled_please_refresh=submit disabled, please check Credentials and refresh BugzillaTaskEditorPage_submitted_Changes_Details=submitted Changes Details diff --git a/org.eclipse.mylyn.tasks.activity.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.tasks.activity.ui/.settings/org.eclipse.pde.prefs index e8f2d5620..4600c1209 100644 --- a/org.eclipse.mylyn.tasks.activity.ui/.settings/org.eclipse.pde.prefs +++ b/org.eclipse.mylyn.tasks.activity.ui/.settings/org.eclipse.pde.prefs @@ -1,10 +1,24 @@ -#Tue Apr 15 11:07:59 PDT 2008 +compilers.f.unresolved-features=1 +compilers.f.unresolved-plugins=1 compilers.incompatible-environment=1 compilers.p.build=1 +compilers.p.build.bin.includes=1 +compilers.p.build.encodings=2 +compilers.p.build.java.compiler=2 +compilers.p.build.java.compliance=1 +compilers.p.build.missing.output=2 +compilers.p.build.output.library=1 +compilers.p.build.source.library=1 +compilers.p.build.src.includes=1 compilers.p.deprecated=1 compilers.p.discouraged-class=2 +compilers.p.internal=2 +compilers.p.matching-pom-version=2 compilers.p.missing-bundle-classpath-entries=1 compilers.p.missing-packages=1 +compilers.p.missing-version-export-package=2 +compilers.p.missing-version-import-package=2 +compilers.p.missing-version-require-bundle=2 compilers.p.no-required-att=0 compilers.p.not-externalized-att=2 compilers.p.unknown-attribute=0 @@ -14,5 +28,8 @@ compilers.p.unknown-identifier=1 compilers.p.unknown-resource=0 compilers.p.unresolved-ex-points=0 compilers.p.unresolved-import=0 +compilers.s.create-docs=false +compilers.s.doc-folder=doc +compilers.s.open-tags=1 compilers.use-project=true eclipse.preferences.version=1 diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/IRepositoryConstants.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/IRepositoryConstants.java index 14948b3ca..c947e77e3 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/IRepositoryConstants.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/IRepositoryConstants.java @@ -44,22 +44,26 @@ public interface IRepositoryConstants { /** * @deprecated Use {@link TaskRepository#CATEGORY_TASKS} instead */ - public static final String CATEGORY_TASKS = TaskRepository.CATEGORY_TASKS; //$NON-NLS-1$ + @Deprecated + public static final String CATEGORY_TASKS = TaskRepository.CATEGORY_TASKS; /** * @deprecated Use {@link TaskRepository#CATEGORY_BUGS} instead */ - public static final String CATEGORY_BUGS = TaskRepository.CATEGORY_BUGS; //$NON-NLS-1$ + @Deprecated + public static final String CATEGORY_BUGS = TaskRepository.CATEGORY_BUGS; /** * @deprecated Use {@link TaskRepository#CATEGORY_BUILD} instead */ - public static final String CATEGORY_BUILD = TaskRepository.CATEGORY_BUILD; //$NON-NLS-1$ + @Deprecated + public static final String CATEGORY_BUILD = TaskRepository.CATEGORY_BUILD; /** * @deprecated Use {@link TaskRepository#CATEGORY_REVIEW} instead */ - public static final String CATEGORY_REVIEW = TaskRepository.CATEGORY_REVIEW; //$NON-NLS-1$ + @Deprecated + public static final String CATEGORY_REVIEW = TaskRepository.CATEGORY_REVIEW; public static final String CATEGORY_OTHER = "org.eclipse.mylyn.category.other"; //$NON-NLS-1$ diff --git a/org.eclipse.mylyn.tasks.search/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.tasks.search/.settings/org.eclipse.pde.prefs index e8f2d5620..4600c1209 100644 --- a/org.eclipse.mylyn.tasks.search/.settings/org.eclipse.pde.prefs +++ b/org.eclipse.mylyn.tasks.search/.settings/org.eclipse.pde.prefs @@ -1,10 +1,24 @@ -#Tue Apr 15 11:07:59 PDT 2008 +compilers.f.unresolved-features=1 +compilers.f.unresolved-plugins=1 compilers.incompatible-environment=1 compilers.p.build=1 +compilers.p.build.bin.includes=1 +compilers.p.build.encodings=2 +compilers.p.build.java.compiler=2 +compilers.p.build.java.compliance=1 +compilers.p.build.missing.output=2 +compilers.p.build.output.library=1 +compilers.p.build.source.library=1 +compilers.p.build.src.includes=1 compilers.p.deprecated=1 compilers.p.discouraged-class=2 +compilers.p.internal=2 +compilers.p.matching-pom-version=2 compilers.p.missing-bundle-classpath-entries=1 compilers.p.missing-packages=1 +compilers.p.missing-version-export-package=2 +compilers.p.missing-version-import-package=2 +compilers.p.missing-version-require-bundle=2 compilers.p.no-required-att=0 compilers.p.not-externalized-att=2 compilers.p.unknown-attribute=0 @@ -14,5 +28,8 @@ compilers.p.unknown-identifier=1 compilers.p.unknown-resource=0 compilers.p.unresolved-ex-points=0 compilers.p.unresolved-import=0 +compilers.s.create-docs=false +compilers.s.doc-folder=doc +compilers.s.open-tags=1 compilers.use-project=true eclipse.preferences.version=1 diff --git a/org.eclipse.mylyn.tasks.tests/plugin.xml b/org.eclipse.mylyn.tasks.tests/plugin.xml index 5c77d9382..669610cf5 100644 --- a/org.eclipse.mylyn.tasks.tests/plugin.xml +++ b/org.eclipse.mylyn.tasks.tests/plugin.xml @@ -28,7 +28,7 @@ </extension> <extension - point="org.eclipse.core.runtime.contentTypes"> + point="org.eclipse.core.contenttype.contentTypes"> <!-- content types used in tests --> <content-type base-type="org.eclipse.core.runtime.text" diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java index dec13eeca..5d40fa008 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java @@ -354,6 +354,7 @@ public class TasksUiPlugin extends AbstractUIPlugin { private AbstractTaskActivityMonitor taskActivityMonitor; + @SuppressWarnings("rawtypes") private ServiceReference proxyServiceReference; private IProxyChangeListener proxyChangeListener; @@ -559,6 +560,7 @@ public class TasksUiPlugin extends AbstractUIPlugin { proxyServiceReference = context.getServiceReference(IProxyService.class.getName()); if (proxyServiceReference != null) { + @SuppressWarnings("unchecked") IProxyService proxyService = (IProxyService) context.getService(proxyServiceReference); if (proxyService != null) { proxyChangeListener = new IProxyChangeListener() { @@ -763,6 +765,7 @@ public class TasksUiPlugin extends AbstractUIPlugin { } if (proxyServiceReference != null) { + @SuppressWarnings("unchecked") IProxyService proxyService = (IProxyService) context.getService(proxyServiceReference); if (proxyService != null) { proxyService.removeProxyChangeListener(proxyChangeListener); @@ -1004,6 +1007,7 @@ public class TasksUiPlugin extends AbstractUIPlugin { private final Map<String, List<IDynamicSubMenuContributor>> menuContributors = new HashMap<String, List<IDynamicSubMenuContributor>>(); + @SuppressWarnings("rawtypes") private ServiceTracker identityServiceTracker; public Map<String, List<IDynamicSubMenuContributor>> getDynamicMenuMap() { @@ -1375,6 +1379,7 @@ public class TasksUiPlugin extends AbstractUIPlugin { } } + @SuppressWarnings("restriction") public ServiceMessageManager getServiceMessageManager() { return serviceMessageManager; } @@ -1383,6 +1388,7 @@ public class TasksUiPlugin extends AbstractUIPlugin { return synchronizationManger; } + @SuppressWarnings({ "rawtypes", "unchecked", "restriction" }) public IIdentityService getIdentityService() { if (identityServiceTracker == null) { identityServiceTracker = new ServiceTracker(getBundle().getBundleContext(), diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java index dab8d9417..1e3a0b099 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java @@ -405,7 +405,7 @@ public class TasksUiUtil { */ public static boolean openWithBrowser(IRepositoryElement element) { TaskRepository repository = TasksUiInternal.getRepository(element); - return (repository != null) ? openWithBrowser(repository, element) : null; + return (repository != null) ? openWithBrowser(repository, element) : false; } /** diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/TracWebClient.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/TracWebClient.java index 13c4be1fa..b974fc5ac 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/TracWebClient.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/TracWebClient.java @@ -38,12 +38,12 @@ import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.lang.StringEscapeUtils; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.mylyn.commons.core.HtmlStreamTokenizer; +import org.eclipse.mylyn.commons.core.HtmlStreamTokenizer.Token; +import org.eclipse.mylyn.commons.core.HtmlTag; import org.eclipse.mylyn.commons.net.AbstractWebLocation; import org.eclipse.mylyn.commons.net.AuthenticationCredentials; import org.eclipse.mylyn.commons.net.AuthenticationType; -import org.eclipse.mylyn.commons.net.HtmlStreamTokenizer; -import org.eclipse.mylyn.commons.net.HtmlStreamTokenizer.Token; -import org.eclipse.mylyn.commons.net.HtmlTag; import org.eclipse.mylyn.commons.net.Policy; import org.eclipse.mylyn.commons.net.SslCertificateException; import org.eclipse.mylyn.commons.net.UnsupportedRequestException; diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracConnectorUi.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracConnectorUi.java index 0bd1b9063..dc7684cea 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracConnectorUi.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracConnectorUi.java @@ -53,8 +53,8 @@ public class TracConnectorUi extends AbstractRepositoryConnectorUi { } @Override - public IHyperlink[] findHyperlinks(TaskRepository repository, String text, int lineOffset, int regionOffset) { - return TracHyperlinkUtil.findTicketHyperlinks(repository, text, lineOffset, regionOffset); + public IHyperlink[] findHyperlinks(TaskRepository repository, ITask task, String text, int index, int textOffset) { + return TracHyperlinkUtil.findTicketHyperlinks(repository, text, index, textOffset); } @Override diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracQueryPage.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracQueryPage.java index 0b96c1196..1086358e2 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracQueryPage.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracQueryPage.java @@ -475,9 +475,7 @@ public class TracQueryPage extends AbstractRepositoryQueryPage2 { } @Override - protected void createPageContent(@SuppressWarnings("restriction") - SectionComposite composite) { - @SuppressWarnings("restriction") + protected void createPageContent(SectionComposite composite) { Composite control = composite.getContent(); GridLayout layout = new GridLayout(4, false); |