diff options
123 files changed, 393 insertions, 317 deletions
diff --git a/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.jdt.core.prefs index 4f6160a5e..888de1277 100644 --- a/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Wed Jun 06 17:09:48 EDT 2007 +#Sun Jun 24 11:52:58 EDT 2007 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 @@ -36,6 +36,7 @@ org.eclipse.jdt.core.compiler.problem.nullReference=error org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled @@ -45,7 +46,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled diff --git a/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.jdt.ui.prefs index 875341e62..276c2e6d8 100644 --- a/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.jdt.ui.prefs +++ b/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.jdt.ui.prefs @@ -1,5 +1,6 @@ -#Mon Feb 05 18:45:11 PST 2007 +#Mon Feb 05 18:45:19 PST 2007 eclipse.preferences.version=1 formatter_profile=_Mylar based on Eclipse [built-in] formatter_settings_version=11 +internal.default.compliance=default org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"></template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004 - 2006 University Of British Columbia and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n * University Of British Columbia - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.ltk.core.refactoring.prefs index bbebc5a04..7ab03bdac 100644 --- a/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.ltk.core.refactoring.prefs +++ b/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.ltk.core.refactoring.prefs @@ -1,3 +1,3 @@ -#Fri Jun 02 15:30:24 PDT 2006 +#Fri Jun 02 15:30:09 PDT 2006 eclipse.preferences.version=1 org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true diff --git a/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.mylar.tasklist.prefs b/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.mylar.tasklist.prefs index 0e4ba04f5..a6cf96a98 100644 --- a/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.mylar.tasklist.prefs +++ b/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.mylar.tasklist.prefs @@ -1,4 +1,4 @@ -#Mon Feb 26 18:26:11 PST 2007 +#Fri Oct 20 16:54:30 PDT 2006 eclipse.preferences.version=1 project.repository.kind=bugzilla project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.mylyn.tasklist.prefs b/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.mylyn.tasklist.prefs index b08df4b63..0a2cc0b30 100644 --- a/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.mylyn.tasklist.prefs +++ b/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.mylyn.tasklist.prefs @@ -1,4 +1,4 @@ -#Mon Jun 18 17:13:11 PDT 2007 +#Mon Jun 18 17:14:59 PDT 2007 eclipse.preferences.version=1 project.repository.kind=bugzilla project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.mylyn.tasks.ui.prefs new file mode 100644 index 000000000..d8c6d26af --- /dev/null +++ b/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.mylyn.tasks.ui.prefs @@ -0,0 +1,4 @@ +#Mon Jun 25 03:02:37 GMT 2007 +eclipse.preferences.version=1 +project.repository.kind=bugzilla +project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.pde.prefs index ff6cc56eb..769b229ff 100644 --- a/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.pde.prefs +++ b/org.eclipse.mylyn.bugzilla.core/.settings/org.eclipse.pde.prefs @@ -1,4 +1,4 @@ -#Thu Nov 03 15:46:01 PST 2005 +#Thu Nov 03 15:45:55 PST 2005 compilers.p.deprecated=2 compilers.p.no-required-att=0 compilers.p.not-externalized-att=2 diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/AbstractReportFactory.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/AbstractReportFactory.java index 55116c784..e16d8c82c 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/AbstractReportFactory.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/AbstractReportFactory.java @@ -60,6 +60,7 @@ public class AbstractReportFactory { final BufferedInputStream is = new BufferedInputStream(inStream, 1024); InputStream iis = new InputStream() { + @Override public int read() throws IOException { int c; while ((c = is.read()) != -1) { @@ -78,7 +79,7 @@ public class AbstractReportFactory { in = new InputStreamReader(iis); } - if (in != null && clean) { + if (clean) { StringBuffer result = XmlCleaner.clean(in); StringReader strReader = new StringReader(result.toString()); in = new BufferedReader(strReader); diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttachmentHandler.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttachmentHandler.java index 0c1b1eb25..3e9183e26 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttachmentHandler.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttachmentHandler.java @@ -36,6 +36,7 @@ public class BugzillaAttachmentHandler extends AbstractAttachmentHandler { this.connector = connector; } + @Override public InputStream getAttachmentAsStream(TaskRepository repository, RepositoryAttachment attachment, IProgressMonitor monitor) throws CoreException { try { BugzillaClient client = connector.getClientManager().getClient(repository); @@ -46,6 +47,7 @@ public class BugzillaAttachmentHandler extends AbstractAttachmentHandler { } } + @Override public void uploadAttachment(TaskRepository repository, AbstractTask task, ITaskAttachment attachment, String comment, IProgressMonitor monitor) throws CoreException { try { @@ -58,18 +60,22 @@ public class BugzillaAttachmentHandler extends AbstractAttachmentHandler { } } + @Override public boolean canDownloadAttachment(TaskRepository repository, AbstractTask task) { return true; } + @Override public boolean canUploadAttachment(TaskRepository repository, AbstractTask task) { return true; } + @Override public boolean canDeprecate(TaskRepository repository, RepositoryAttachment attachment) { return false; } + @Override public void updateAttachment(TaskRepository repository, RepositoryAttachment attachment) throws CoreException { // implement } diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttributeFactory.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttributeFactory.java index 6f53c99b4..d84af4c72 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttributeFactory.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttributeFactory.java @@ -122,6 +122,7 @@ public class BugzillaAttributeFactory extends AbstractAttributeFactory { } } + @Override public Date getDateForAttributeType(String attributeKey, String dateString) { if (dateString == null || dateString.equals("")) { return null; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java index a0bccbc8a..a6ac922fb 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java @@ -745,7 +745,7 @@ public class BugzillaClient { if (!taskData.isNew() && (title.toLowerCase(Locale.ENGLISH).indexOf("processed") != -1)) { existingBugPosted = true; } else if (taskData.isNew() && prefix != null && prefix2 != null && postfix != null - && postfix2 != null && result == null) { + && postfix2 != null) { int startIndex = -1; int startIndexPrefix = title.toLowerCase(Locale.ENGLISH).indexOf( prefix.toLowerCase(Locale.ENGLISH)); diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaCorePlugin.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaCorePlugin.java index 08eeabff5..240df51a5 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaCorePlugin.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaCorePlugin.java @@ -321,11 +321,7 @@ public class BugzillaCorePlugin extends Plugin { // Bugzilla Platform to null, and juse use "other" bugzillaPlatform = null; } - } else { - // If we have a strange platform, then just set bugzillaPatforrm - // to null, and use "other" - bugzillaPlatform = null; - } + } // Set the OS and the Platform in the taskData if (bugzillaOS != null && opSysAttribute != null) { opSysAttribute.setValue(bugzillaOS); diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java index 7a302b501..6595f407b 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java @@ -96,12 +96,14 @@ public class BugzillaRepositoryConnector extends AbstractRepositoryConnector { return BugzillaCorePlugin.REPOSITORY_KIND; } + @Override public AbstractTask createTask(String repositoryUrl, String id, String summary) { BugzillaTask task = new BugzillaTask(repositoryUrl, id, summary); task.setCreationDate(new Date()); return task; } + @Override public void updateTaskFromTaskData(TaskRepository repository, AbstractTask repositoryTask, RepositoryTaskData taskData) { BugzillaTask bugzillaTask = (BugzillaTask) repositoryTask; @@ -539,7 +541,7 @@ public class BugzillaRepositoryConnector extends AbstractRepositoryConnector { for (String option : optionValues) { a.addOption(option, option); } - if (optionValues != null && optionValues.size() > 0) { + if (optionValues.size() > 0) { a.setValue(optionValues.get(optionValues.size() - 1)); } @@ -552,7 +554,7 @@ public class BugzillaRepositoryConnector extends AbstractRepositoryConnector { for (String option : optionValues) { a.addOption(option, option); } - if (optionValues != null && optionValues.size() > 0) { + if (optionValues.size() > 0) { a.setValue(optionValues.get(0)); } @@ -564,7 +566,7 @@ public class BugzillaRepositoryConnector extends AbstractRepositoryConnector { for (String option : optionValues) { a.addOption(option, option); } - if (optionValues != null && optionValues.size() > 0) { + if (optionValues.size() > 0) { a.setValue(optionValues.get(0)); } @@ -576,7 +578,7 @@ public class BugzillaRepositoryConnector extends AbstractRepositoryConnector { for (String option : optionValues) { a.addOption(option, option); } - if (optionValues != null && optionValues.size() > 0) { + if (optionValues.size() > 0) { a.setValue(optionValues.get(optionValues.size() - 1)); } diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaStatus.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaStatus.java index 0b850f182..0024e6937 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaStatus.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaStatus.java @@ -54,6 +54,7 @@ public class BugzillaStatus extends Status { /** * Returns the message that is relevant to the code of this status. */ + @Override public String getMessage() { switch (getCode()) { diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java index 47a65618a..011fcdecc 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java @@ -67,6 +67,7 @@ public class BugzillaTaskDataHandler extends AbstractTaskDataHandler { this.connector = connector; } + @Override public RepositoryTaskData getTaskData(TaskRepository repository, String taskId, IProgressMonitor monitor) throws CoreException { try { @@ -103,6 +104,7 @@ public class BugzillaTaskDataHandler extends AbstractTaskDataHandler { } } + @Override public Set<RepositoryTaskData> getMultiTaskData(TaskRepository repository, Set<String> taskIds, IProgressMonitor monitor) throws CoreException { try { @@ -144,6 +146,7 @@ public class BugzillaTaskDataHandler extends AbstractTaskDataHandler { } } + @Override public String postTaskData(TaskRepository repository, RepositoryTaskData taskData, IProgressMonitor monitor) throws CoreException { try { @@ -166,11 +169,13 @@ public class BugzillaTaskDataHandler extends AbstractTaskDataHandler { } } + @Override public AbstractAttributeFactory getAttributeFactory(String repositoryUrl, String repositoryKind, String taskKind) { // we don't care about the repository information right now return attributeFactory; } + @Override public AbstractAttributeFactory getAttributeFactory(RepositoryTaskData taskData) { return getAttributeFactory(taskData.getRepositoryUrl(), taskData.getRepositoryKind(), taskData.getTaskKind()); } @@ -274,6 +279,7 @@ public class BugzillaTaskDataHandler extends AbstractTaskDataHandler { } } + @Override public boolean initializeTaskData(TaskRepository repository, RepositoryTaskData data, IProgressMonitor monitor) throws CoreException { // Bugzilla needs a product to create task data @@ -281,6 +287,7 @@ public class BugzillaTaskDataHandler extends AbstractTaskDataHandler { } // TODO: Move to AbstractTaskDataHandler + @Override public Set<String> getSubTaskIds(RepositoryTaskData taskData) { Set<String> result = new HashSet<String>(); RepositoryTaskAttribute attribute = taskData.getAttribute(BugzillaReportElement.DEPENDSON.getKeyString()); diff --git a/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.jdt.core.prefs index 4f6160a5e..888de1277 100644 --- a/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Wed Jun 06 17:09:48 EDT 2007 +#Sun Jun 24 11:52:58 EDT 2007 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 @@ -36,6 +36,7 @@ org.eclipse.jdt.core.compiler.problem.nullReference=error org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled @@ -45,7 +46,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled diff --git a/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.jdt.ui.prefs index 2b9ce078a..276c2e6d8 100644 --- a/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.jdt.ui.prefs +++ b/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.jdt.ui.prefs @@ -1,5 +1,6 @@ -#Mon Feb 05 18:45:12 PST 2007 +#Mon Feb 05 18:45:19 PST 2007 eclipse.preferences.version=1 formatter_profile=_Mylar based on Eclipse [built-in] formatter_settings_version=11 +internal.default.compliance=default org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"></template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004 - 2006 University Of British Columbia and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n * University Of British Columbia - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.ltk.core.refactoring.prefs index 8fb3ac0b0..7ab03bdac 100644 --- a/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.ltk.core.refactoring.prefs +++ b/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.ltk.core.refactoring.prefs @@ -1,3 +1,3 @@ -#Fri Jun 02 15:30:27 PDT 2006 +#Fri Jun 02 15:30:09 PDT 2006 eclipse.preferences.version=1 org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true diff --git a/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.mylar.tasklist.prefs b/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.mylar.tasklist.prefs index e77f8940f..a6cf96a98 100644 --- a/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.mylar.tasklist.prefs +++ b/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.mylar.tasklist.prefs @@ -1,4 +1,4 @@ -#Fri Oct 20 16:43:53 PDT 2006 +#Fri Oct 20 16:54:30 PDT 2006 eclipse.preferences.version=1 project.repository.kind=bugzilla project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.mylyn.tasklist.prefs b/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.mylyn.tasklist.prefs index 4628af948..0a2cc0b30 100644 --- a/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.mylyn.tasklist.prefs +++ b/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.mylyn.tasklist.prefs @@ -1,4 +1,4 @@ -#Mon Jun 18 17:13:21 PDT 2007 +#Mon Jun 18 17:14:59 PDT 2007 eclipse.preferences.version=1 project.repository.kind=bugzilla project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs new file mode 100644 index 000000000..d8c6d26af --- /dev/null +++ b/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs @@ -0,0 +1,4 @@ +#Mon Jun 25 03:02:37 GMT 2007 +eclipse.preferences.version=1 +project.repository.kind=bugzilla +project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.pde.prefs index 9317b0316..769b229ff 100644 --- a/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.pde.prefs +++ b/org.eclipse.mylyn.bugzilla.tests/.settings/org.eclipse.pde.prefs @@ -1,4 +1,4 @@ -#Thu Nov 03 15:46:07 PST 2005 +#Thu Nov 03 15:45:55 PST 2005 compilers.p.deprecated=2 compilers.p.no-required-att=0 compilers.p.not-externalized-att=2 diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java index 6b660a374..fbee65a92 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java @@ -578,7 +578,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { init222(); int bugId = 19; String taskNumber = "" + bugId; - BugzillaTask task = (BugzillaTask) generateLocalTaskAndDownload(taskNumber); + BugzillaTask task = generateLocalTaskAndDownload(taskNumber); // TasksUiPlugin.getSynchronizationManager().synchronize(connector, // task, true, null); diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java index 960c88fa9..c4dca0dd0 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java @@ -101,7 +101,7 @@ public class BugzillaTaskListManagerTest extends TestCase { // manager.setTaskList(list); manager.readExistingOrCreateNewList(); assertEquals(1, manager.getTaskList().getDefaultCategory().getChildren().size()); - AbstractTask readTask = (AbstractTask) manager.getTaskList().getDefaultCategory().getChildren().iterator() + AbstractTask readTask = manager.getTaskList().getDefaultCategory().getChildren().iterator() .next(); assertEquals(repositoryTask.getHandleIdentifier(), readTask.getHandleIdentifier()); diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryReportFactoryTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryReportFactoryTest.java index bad867857..cc6786d65 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryReportFactoryTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryReportFactoryTest.java @@ -430,7 +430,7 @@ public class RepositoryReportFactoryTest extends TestCase { setRepository(BugzillaCorePlugin.REPOSITORY_KIND, IBugzillaConstants.TEST_BUGZILLA_222_URL); RepositoryTaskData report = init(bugid); assertNotNull(report); - assertTrue(report instanceof RepositoryTaskData); + assertTrue(report != null); RepositoryTaskData bugReport = report; assertEquals("search-match-test 2", bugReport.getSummary()); assertEquals("search-match-test 2", bugReport.getDescription()); diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java index be9d7fdf4..d423add5d 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java @@ -84,7 +84,7 @@ public class TaskListNotificationManagerTest extends TestCase { TaskListNotificationManager notificationManager = TasksUiPlugin.getTaskListNotificationManager(); notificationManager.collectNotifications(); assertTrue(notificationManager.getNotifications().contains(new TaskListNotificationIncoming(task))); - task = (AbstractTask) TasksUiPlugin.getTaskListManager().getTaskList().getTask( + task = TasksUiPlugin.getTaskListManager().getTaskList().getTask( "https://bugs.eclipse.org/bugs-142891"); assertNotNull(task); assertTrue(task.isNotified()); diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaTaskHistoryTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaTaskHistoryTest.java index 055073c46..429e9ab32 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaTaskHistoryTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaTaskHistoryTest.java @@ -42,6 +42,7 @@ public class BugzillaTaskHistoryTest extends AbstractBugzillaTest { private static final String REPORT_ID = "1"; + @Override public void setUp() throws Exception { super.setUp(); connector = new BugzillaRepositoryConnector(); diff --git a/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.jdt.core.prefs index 4f6160a5e..888de1277 100644 --- a/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Wed Jun 06 17:09:48 EDT 2007 +#Sun Jun 24 11:52:58 EDT 2007 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 @@ -36,6 +36,7 @@ org.eclipse.jdt.core.compiler.problem.nullReference=error org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled @@ -45,7 +46,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled diff --git a/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.jdt.ui.prefs index b92934268..276c2e6d8 100644 --- a/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.jdt.ui.prefs +++ b/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.jdt.ui.prefs @@ -2,4 +2,5 @@ eclipse.preferences.version=1 formatter_profile=_Mylar based on Eclipse [built-in] formatter_settings_version=11 -org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004 - 2006 Mylar committers and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template></templates> +internal.default.compliance=default +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"></template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004 - 2006 University Of British Columbia and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n * University Of British Columbia - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.ltk.core.refactoring.prefs index 438f8ff80..7ab03bdac 100644 --- a/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.ltk.core.refactoring.prefs +++ b/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.ltk.core.refactoring.prefs @@ -1,3 +1,3 @@ -#Fri Jun 02 15:31:40 PDT 2006 +#Fri Jun 02 15:30:09 PDT 2006 eclipse.preferences.version=1 org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true diff --git a/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.mylar.tasklist.prefs b/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.mylar.tasklist.prefs index ab5406b74..a6cf96a98 100644 --- a/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.mylar.tasklist.prefs +++ b/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.mylar.tasklist.prefs @@ -1,4 +1,4 @@ -#Fri Oct 20 16:54:37 PDT 2006 +#Fri Oct 20 16:54:30 PDT 2006 eclipse.preferences.version=1 project.repository.kind=bugzilla project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.mylyn.tasklist.prefs b/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.mylyn.tasklist.prefs index 9442c3d7d..0a2cc0b30 100644 --- a/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.mylyn.tasklist.prefs +++ b/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.mylyn.tasklist.prefs @@ -1,4 +1,4 @@ -#Mon Jun 18 17:15:02 PDT 2007 +#Mon Jun 18 17:14:59 PDT 2007 eclipse.preferences.version=1 project.repository.kind=bugzilla project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs new file mode 100644 index 000000000..d8c6d26af --- /dev/null +++ b/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs @@ -0,0 +1,4 @@ +#Mon Jun 25 03:02:37 GMT 2007 +eclipse.preferences.version=1 +project.repository.kind=bugzilla +project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.pde.prefs index 2862be626..769b229ff 100644 --- a/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.pde.prefs +++ b/org.eclipse.mylyn.tasks.tests/.settings/org.eclipse.pde.prefs @@ -1,4 +1,4 @@ -#Thu Nov 03 15:47:25 PST 2005 +#Thu Nov 03 15:45:55 PST 2005 compilers.p.deprecated=2 compilers.p.no-required-att=0 compilers.p.not-externalized-att=2 diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/OfflineCachingStorageTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/OfflineCachingStorageTest.java index 5a09b31a3..dc1abbc6b 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/OfflineCachingStorageTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/OfflineCachingStorageTest.java @@ -34,6 +34,7 @@ public class OfflineCachingStorageTest extends TestCase { private OfflineCachingStorage storage; + @Override protected void setUp() throws Exception { //dataDir = new File("c:/offline"); dataDir = new File(TasksUiPlugin.getDefault().getDataDirectory() + '/' + "offline"); @@ -42,6 +43,7 @@ public class OfflineCachingStorageTest extends TestCase { super.setUp(); } + @Override protected void tearDown() throws Exception { storage.stop(); storage.clear(); diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTaskSynchronizationTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTaskSynchronizationTest.java index af5156132..5b2843b1c 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTaskSynchronizationTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTaskSynchronizationTest.java @@ -334,6 +334,7 @@ public class RepositoryTaskSynchronizationTest extends TestCase { private class TestOfflineTaskHandler extends AbstractTaskDataHandler { + @Override public AbstractAttributeFactory getAttributeFactory(String repositoryUrl, String repositoryKind, String taskKind) { // ignore return null; @@ -344,26 +345,31 @@ public class RepositoryTaskSynchronizationTest extends TestCase { return null; } + @Override public RepositoryTaskData getTaskData(TaskRepository repository, String taskId, IProgressMonitor monitor) throws CoreException { return null; } + @Override public String postTaskData(TaskRepository repository, RepositoryTaskData taskData, IProgressMonitor monitor) throws CoreException { // ignore return null; } + @Override public boolean initializeTaskData(TaskRepository repository, RepositoryTaskData data, IProgressMonitor monitor) throws CoreException { // ignore return false; } + @Override public AbstractAttributeFactory getAttributeFactory(RepositoryTaskData taskData) { // ignore return null; } + @Override public Set<String> getSubTaskIds(RepositoryTaskData taskData) { return Collections.emptySet(); } diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositorySorterTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositorySorterTest.java index 531448cb4..8b44ad69b 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositorySorterTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositorySorterTest.java @@ -19,10 +19,12 @@ import junit.framework.TestCase; */ public class TaskRepositorySorterTest extends TestCase { + @Override protected void setUp() throws Exception { super.setUp(); } + @Override protected void tearDown() throws Exception { super.tearDown(); } diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockAttachmentHandler.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockAttachmentHandler.java index 3834f381a..764180a65 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockAttachmentHandler.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockAttachmentHandler.java @@ -28,21 +28,25 @@ public class MockAttachmentHandler extends AbstractAttachmentHandler { private byte[] data; + @Override public boolean canDeprecate(TaskRepository repository, RepositoryAttachment attachment) { // ignore return false; } + @Override public boolean canDownloadAttachment(TaskRepository repository, AbstractTask task) { // ignore return true; } + @Override public boolean canUploadAttachment(TaskRepository repository, AbstractTask task) { // ignore return true; } + @Override public void downloadAttachment(TaskRepository repository, RepositoryAttachment attachment, OutputStream target, IProgressMonitor monitor) throws CoreException { try { @@ -52,16 +56,19 @@ public class MockAttachmentHandler extends AbstractAttachmentHandler { } } + @Override public InputStream getAttachmentAsStream(TaskRepository repository, RepositoryAttachment attachment, IProgressMonitor monitor) throws CoreException { // ignore return new ByteArrayInputStream(data); } + @Override public void updateAttachment(TaskRepository repository, RepositoryAttachment attachment) throws CoreException { // ignore } + @Override public void uploadAttachment(TaskRepository repository, AbstractTask task, ITaskAttachment attachment, String comment, IProgressMonitor monitor) throws CoreException { // ignore diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockAttributeFactory.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockAttributeFactory.java index 38ae94fe2..f01075277 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockAttributeFactory.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockAttributeFactory.java @@ -44,6 +44,7 @@ public class MockAttributeFactory extends AbstractAttributeFactory { return key; } + @Override public Date getDateForAttributeType(String attributeKey, String dateString) { // ignore return null; diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java index 9a42de18d..198576db2 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java @@ -66,33 +66,39 @@ public class MockRepositoryConnector extends AbstractRepositoryConnector { // ignore return new AbstractTaskDataHandler() { + @Override public AbstractAttributeFactory getAttributeFactory(String repositoryUrl, String repositoryKind, String taskKind) { // we don't care about the repository information right now return new MockAttributeFactory(); } + @Override public RepositoryTaskData getTaskData(TaskRepository repository, String taskId, IProgressMonitor monitor) throws CoreException { // ignore return null; } + @Override public String postTaskData(TaskRepository repository, RepositoryTaskData taskData, IProgressMonitor monitor) throws CoreException { // ignore return null; } + @Override public boolean initializeTaskData(TaskRepository repository, RepositoryTaskData data, IProgressMonitor monitor) throws CoreException { // ignore return false; } + @Override public AbstractAttributeFactory getAttributeFactory(RepositoryTaskData taskData) { // ignore return new MockAttributeFactory(); } + @Override public Set<String> getSubTaskIds(RepositoryTaskData taskData) { return Collections.emptySet(); } diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryTask.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryTask.java index 7f5b2ff71..01d96ac67 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryTask.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryTask.java @@ -37,6 +37,7 @@ public class MockRepositoryTask extends AbstractTask { return "mock"; } + @Override public void setOwner(String ownerId) { this.ownerId = ownerId; } diff --git a/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.jdt.core.prefs index 4f6160a5e..888de1277 100644 --- a/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Wed Jun 06 17:09:48 EDT 2007 +#Sun Jun 24 11:52:58 EDT 2007 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 @@ -36,6 +36,7 @@ org.eclipse.jdt.core.compiler.problem.nullReference=error org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled @@ -45,7 +46,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled diff --git a/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.jdt.ui.prefs index 7842fafdb..276c2e6d8 100644 --- a/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.jdt.ui.prefs +++ b/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.jdt.ui.prefs @@ -2,4 +2,5 @@ eclipse.preferences.version=1 formatter_profile=_Mylar based on Eclipse [built-in] formatter_settings_version=11 -org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"></template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004 - 2006 Mylar committers and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template></templates> +internal.default.compliance=default +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"></template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004 - 2006 University Of British Columbia and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n * University Of British Columbia - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.ltk.core.refactoring.prefs index 52cdd70a2..7ab03bdac 100644 --- a/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.ltk.core.refactoring.prefs +++ b/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.ltk.core.refactoring.prefs @@ -1,3 +1,3 @@ -#Fri Jun 02 15:31:36 PDT 2006 +#Fri Jun 02 15:30:09 PDT 2006 eclipse.preferences.version=1 org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true diff --git a/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.mylar.tasklist.prefs b/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.mylar.tasklist.prefs index 270ff89e8..a6cf96a98 100644 --- a/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.mylar.tasklist.prefs +++ b/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.mylar.tasklist.prefs @@ -1,4 +1,4 @@ -#Fri Oct 20 16:54:42 PDT 2006 +#Fri Oct 20 16:54:30 PDT 2006 eclipse.preferences.version=1 project.repository.kind=bugzilla project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.mylyn.tasklist.prefs b/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.mylyn.tasklist.prefs index b09036701..0a2cc0b30 100644 --- a/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.mylyn.tasklist.prefs +++ b/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.mylyn.tasklist.prefs @@ -1,4 +1,4 @@ -#Tue Jun 12 20:33:52 PDT 2007 +#Mon Jun 18 17:14:59 PDT 2007 eclipse.preferences.version=1 project.repository.kind=bugzilla project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs index 44efeb086..d8c6d26af 100644 --- a/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ b/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs @@ -1,4 +1,4 @@ -#Mon Jun 25 02:18:36 GMT 2007 +#Mon Jun 25 03:02:37 GMT 2007 eclipse.preferences.version=1 project.repository.kind=bugzilla project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.pde.prefs index 3076fc847..769b229ff 100644 --- a/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.pde.prefs +++ b/org.eclipse.mylyn.tasks.ui/.settings/org.eclipse.pde.prefs @@ -1,5 +1,4 @@ -#Thu Feb 16 13:46:11 PST 2006 -compilers.p.build=1 +#Thu Nov 03 15:45:55 PST 2005 compilers.p.deprecated=2 compilers.p.no-required-att=0 compilers.p.not-externalized-att=2 diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OfflineCachingStorage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OfflineCachingStorage.java index fd684fa27..61a5165ee 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OfflineCachingStorage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OfflineCachingStorage.java @@ -215,6 +215,7 @@ public class OfflineCachingStorage implements ITaskDataStorage { setSystem(true); } + @Override protected IStatus run(IProgressMonitor monitor) { while (true) { if (saveRequested) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OfflineFileStorage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OfflineFileStorage.java index f64da8ea2..da46a946b 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OfflineFileStorage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OfflineFileStorage.java @@ -250,7 +250,6 @@ public class OfflineFileStorage implements ITaskDataStorage { } fileOutputStream = new FileOutputStream(dataFile); FileChannel channel = fileOutputStream.getChannel(); - lock = null; lock = channel.tryLock(); if (lock != null) { final ZipOutputStream outputStream = new ZipOutputStream(fileOutputStream); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalLabelProvider.java index f55249d74..dd45647d3 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalLabelProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalLabelProvider.java @@ -16,6 +16,7 @@ import org.eclipse.swt.graphics.Image; */ public class PersonProposalLabelProvider extends LabelProvider { + @Override public Image getImage(Object element) { if (element instanceof PersonContentProposal) { return ((PersonContentProposal)element).getImage(); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java index 0977e29d6..f33cf2e57 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java @@ -117,8 +117,8 @@ public class PersonProposalProvider implements IContentProposalProvider { Collection<AbstractTask> allTasks = TasksUiPlugin.getTaskListManager().getTaskList().getAllTasks(); for (AbstractTask task : allTasks) { - if (task instanceof AbstractTask) { - AbstractTask repositoryTask = (AbstractTask) task; + if (task != null) { + AbstractTask repositoryTask = task; if (repositoryTask.getRepositoryUrl().equals(repositoryUrl)) { tasks.add(repositoryTask); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationIncoming.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationIncoming.java index 5d9177ef5..439520715 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationIncoming.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationIncoming.java @@ -103,7 +103,7 @@ public class TaskListNotificationIncoming implements ITaskListNotification { } public int compareTo(ITaskListNotification anotherNotification) throws ClassCastException { - if (!(anotherNotification instanceof ITaskListNotification)) + if (!(anotherNotification != null)) throw new ClassCastException("A ITaskListNotification object expected."); Date anotherDate = (anotherNotification).getDate(); if(date != null && anotherDate != null) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationPopup.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationPopup.java index d78b24c57..06a6d3e93 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationPopup.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationPopup.java @@ -148,6 +148,7 @@ public class TaskListNotificationPopup extends PopupDialog { hyperlink.setBackground(null); hyperlink.setImage(TasksUiImages.getImage(TasksUiImages.NOTIFICATION_CLOSE)); hyperlink.addHyperlinkListener(new HyperlinkAdapter() { + @Override public void linkActivated(HyperlinkEvent e) { close(); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationQueryIncoming.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationQueryIncoming.java index 376ef6a4e..ef4b8aed3 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationQueryIncoming.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationQueryIncoming.java @@ -89,7 +89,7 @@ public class TaskListNotificationQueryIncoming implements ITaskListNotification } public int compareTo(ITaskListNotification anotherNotification) throws ClassCastException { - if (!(anotherNotification instanceof ITaskListNotification)) + if (!(anotherNotification != null)) throw new ClassCastException("A ITaskListNotification object expected."); Date anotherDate = (anotherNotification).getDate(); if(date != null && anotherDate != null) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationReminder.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationReminder.java index 67acdf1e6..593dd7947 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationReminder.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationReminder.java @@ -93,7 +93,7 @@ public class TaskListNotificationReminder implements ITaskListNotification { } public int compareTo(ITaskListNotification anotherNotification) throws ClassCastException { - if (!(anotherNotification instanceof ITaskListNotification)) + if (!(anotherNotification != null)) throw new ClassCastException("A ITaskListNotification object expected."); Date anotherDate = (anotherNotification).getDate(); if(date != null && anotherDate != null) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskTrimWidget.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskTrimWidget.java index 2fe10d51c..98c19898d 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskTrimWidget.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskTrimWidget.java @@ -176,6 +176,7 @@ public class TaskTrimWidget extends WorkbenchWindowControlContribution { }); activeTaskLabel.addHyperlinkListener(new HyperlinkAdapter() { + @Override public void linkActivated(HyperlinkEvent e) { if (TaskListView.getFromActivePerspective().getDrilledIntoCategory() != null) { TaskListView.getFromActivePerspective().goUpToRoot(); @@ -221,6 +222,7 @@ public class TaskTrimWidget extends WorkbenchWindowControlContribution { copyTaskDetailsAction.selectionChanged(selection); manager.add(new OpenTaskListElementAction(null) { + @Override public void run() { TasksUiUtil.refreshAndOpenTaskListElement(activeTask); } @@ -235,12 +237,14 @@ public class TaskTrimWidget extends WorkbenchWindowControlContribution { if (activeTask.isActive()) { manager.add(new TaskDeactivateAction() { + @Override public void run() { super.run(activeTask); } }); } else { manager.add(new TaskActivateAction() { + @Override public void run() { TasksUiPlugin.getTaskListManager().getTaskActivationHistory().addTask(activeTask); super.run(activeTask); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskWorkingSetFilter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskWorkingSetFilter.java index 1c2936ac5..33c90ee9c 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskWorkingSetFilter.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskWorkingSetFilter.java @@ -31,6 +31,7 @@ public class TaskWorkingSetFilter extends AbstractTaskListFilter { private IWorkingSet currentWorkingSet; + @Override public boolean select(Object parent, Object element) { if (parent instanceof AbstractTaskContainer && !(parent instanceof ScheduledTaskContainer)) { return selectWorkingSet((AbstractTaskContainer) parent); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AbstractTaskAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AbstractTaskAction.java index 5781b76b9..b1b1c3251 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AbstractTaskAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AbstractTaskAction.java @@ -34,11 +34,11 @@ public abstract class AbstractTaskAction extends Action { for (AbstractTask queryHit : repositoryQuery.getChildren()) { performActionOnTask(queryHit); } - } else if (element instanceof AbstractTaskContainer) { - AbstractTaskContainer container = (AbstractTaskContainer) element; + } else if (element != null) { + AbstractTaskContainer container = element; for (AbstractTask iTask : container.getChildren()) { - if (iTask instanceof AbstractTask) { - AbstractTask repositoryTask = (AbstractTask) iTask; + if (iTask != null) { + AbstractTask repositoryTask = iTask; performActionOnTask(repositoryTask); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ActivityReportAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ActivityReportAction.java index 990ec9db3..b79b48d02 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ActivityReportAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ActivityReportAction.java @@ -40,7 +40,7 @@ public class ActivityReportAction extends Action { TaskActivityWizard wizard = new TaskActivityWizard(); Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); - if (wizard != null && shell != null && !shell.isDisposed()) { + if (shell != null && !shell.isDisposed()) { WizardDialog dialog = new WizardDialog(shell, wizard); dialog.setBlockOnOpen(true); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CopyTaskDetailsAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CopyTaskDetailsAction.java index 46e75b9f4..7e6af18ce 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CopyTaskDetailsAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CopyTaskDetailsAction.java @@ -69,9 +69,7 @@ public class CopyTaskDetailsAction extends BaseSelectionListenerAction { task = (AbstractTask) object; } if (task != null) { - if (task instanceof AbstractTask) { - text += ((AbstractTask) task).getTaskKey() + ": "; - } + text += task.getTaskKey() + ": "; text += task.getSummary(); if (task.hasValidUrl()) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskCompleteAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskCompleteAction.java index 2a634d09e..7712b401d 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskCompleteAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskCompleteAction.java @@ -14,7 +14,6 @@ package org.eclipse.mylyn.internal.tasks.ui.actions; import java.util.ArrayList; import java.util.List; -import org.eclipse.jface.action.Action; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; import org.eclipse.mylyn.tasks.core.AbstractTask; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskIncompleteAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskIncompleteAction.java index 2340a58b0..f9b23b749 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskIncompleteAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskIncompleteAction.java @@ -14,7 +14,6 @@ package org.eclipse.mylyn.internal.tasks.ui.actions; import java.util.ArrayList; import java.util.List; -import org.eclipse.jface.action.Action; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; import org.eclipse.mylyn.tasks.core.AbstractTask; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskListElementAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskListElementAction.java index 64a038ca9..4641a492b 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskListElementAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskListElementAction.java @@ -43,7 +43,7 @@ public class OpenTaskListElementAction extends Action { ISelection selection = viewer.getSelection(); List<?> list = ((IStructuredSelection) selection).toList(); for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) { - Object element = (Object) iterator.next(); + Object element = iterator.next(); // if (element instanceof ITaskListElement && !(element instanceof AbstractTaskContainer)) { if (element instanceof AbstractTask) { TasksUiUtil.refreshAndOpenTaskListElement((AbstractTaskContainer) element); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenWithBrowserAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenWithBrowserAction.java index 32cd9203f..70ca1d18b 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenWithBrowserAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenWithBrowserAction.java @@ -48,7 +48,7 @@ public class OpenWithBrowserAction extends BaseSelectionListenerAction { String urlString = null; if (selectedObject instanceof AbstractTask) { AbstractTask task = (AbstractTask)selectedObject; - if (task != null && task.hasValidUrl()) { + if (task.hasValidUrl()) { urlString = task.getUrl(); } } else if (selectedObject instanceof AbstractTaskContainer) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RestoreTaskListAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RestoreTaskListAction.java index 51752501f..9ce3a4343 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RestoreTaskListAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RestoreTaskListAction.java @@ -32,7 +32,7 @@ public class RestoreTaskListAction implements IViewActionDelegate { try { IWizard wizard = new TaskDataImportWizard(); Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); - if (wizard != null && shell != null && !shell.isDisposed()) { + if (shell != null && !shell.isDisposed()) { WizardDialog dialog = new WizardDialog(shell, wizard); dialog.create(); dialog.setTitle("Restore Task List from History"); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeEditorAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeEditorAction.java index 0abcb94cb..bff7196a6 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeEditorAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeEditorAction.java @@ -56,8 +56,8 @@ public class SynchronizeEditorAction extends BaseSelectionListenerAction { if (selectedObject instanceof TaskEditor) { TaskEditor editor = (TaskEditor) selectedObject; AbstractTask task = editor.getTaskEditorInput().getTask(); - if (task instanceof AbstractTask) { - repositoryTask = (AbstractTask) task; + if (task != null) { + repositoryTask = task; } } else if (selectedObject instanceof AbstractRepositoryTaskEditor) { AbstractRepositoryTaskEditor editor = (AbstractRepositoryTaskEditor) selectedObject; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeSelectedAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeSelectedAction.java index d2e7da55e..ed1ebbafb 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeSelectedAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeSelectedAction.java @@ -70,8 +70,8 @@ public class SynchronizeSelectedAction extends ActionDelegate implements IViewAc TaskCategory cat = (TaskCategory) obj; for (AbstractTask task : cat.getChildren()) { AbstractRepositoryConnector client = TasksUiPlugin.getRepositoryManager() - .getRepositoryConnector(((AbstractTask) task).getConnectorKind()); - addTaskToSync(client, (AbstractTask) task); + .getRepositoryConnector(task.getConnectorKind()); + addTaskToSync(client, task); } } else if (obj instanceof AbstractTask) { AbstractTask repositoryTask = (AbstractTask) obj; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskNavigateDropDownAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskNavigateDropDownAction.java index 1cfb08256..d04ee8f95 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskNavigateDropDownAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskNavigateDropDownAction.java @@ -21,14 +21,13 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Menu; /** - * This abstract class contains some common code used by NextTaskDropDownAction - * and PreviousTaskDropDownAction + * This abstract class contains some common code used by NextTaskDropDownAction and PreviousTaskDropDownAction * * @author Wesley Coelho * @author Mik Kersten */ public abstract class TaskNavigateDropDownAction extends Action implements IMenuCreator { - + protected TaskActivationHistory taskHistory; protected Menu dropDownMenu = null; @@ -45,8 +44,8 @@ public abstract class TaskNavigateDropDownAction extends Action implements IMenu } /** - * Action for navigating to a specified task. This class should be protected - * but has been made public for testing only + * Action for navigating to a specified task. This class should be protected but has been made public for testing + * only */ public class TaskNavigateAction extends Action { @@ -63,10 +62,8 @@ public abstract class TaskNavigateDropDownAction extends Action implements IMenu setText(taskDescription); setEnabled(true); setToolTipText(task.getSummary()); - if (task != null) { - Image image = labelProvider.getImage(task); - setImageDescriptor(ImageDescriptor.createFromImage(image)); - } + Image image = labelProvider.getImage(task); + setImageDescriptor(ImageDescriptor.createFromImage(image)); } @Override diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskWorkingSetAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskWorkingSetAction.java index 006dbdacb..3fb2f9937 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskWorkingSetAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskWorkingSetAction.java @@ -115,7 +115,7 @@ public class TaskWorkingSetAction extends Action implements IMenuCreator { Iterator<IWorkingSet> iter = sortedWorkingSets.iterator(); while (iter.hasNext()) { - IWorkingSet workingSet = (IWorkingSet) iter.next(); + IWorkingSet workingSet = iter.next(); if (workingSet != null && workingSet.getId().equalsIgnoreCase(ID_TASK_WORKING_SET)) { ActionContributionItem itemSet = new ActionContributionItem(new ToggleWorkingSetAction(workingSet)); itemSet.fill(dropDownMenu, -1); @@ -225,6 +225,7 @@ public class TaskWorkingSetAction extends Action implements IMenuCreator { super(WorkbenchMessages.Edit); } + @Override public void run() { TaskWorkingSetAction.this.run(this); } @@ -238,20 +239,21 @@ public class TaskWorkingSetAction extends Action implements IMenuCreator { setChecked(areNoTaskWorkingSetsEnabled()); } + @Override public void runWithEvent(Event event) { Set<IWorkingSet> newList = new HashSet<IWorkingSet>(Arrays.asList(getEnabledSets())); Set<IWorkingSet> tempList = new HashSet<IWorkingSet>(); Iterator<IWorkingSet> iter = newList.iterator(); while (iter.hasNext()) { - IWorkingSet workingSet = (IWorkingSet) iter.next(); + IWorkingSet workingSet = iter.next(); if (workingSet != null && workingSet.getId().equalsIgnoreCase(ID_TASK_WORKING_SET)) { tempList.add(workingSet); } } newList.removeAll(tempList); getWindow().getActivePage() - .setWorkingSets((IWorkingSet[]) newList.toArray(new IWorkingSet[newList.size()])); + .setWorkingSets(newList.toArray(new IWorkingSet[newList.size()])); } } @@ -264,13 +266,14 @@ public class TaskWorkingSetAction extends Action implements IMenuCreator { // setChecked(!areAllTaskWorkingSetsEnabled()); } + @Override public void runWithEvent(Event event) { Set<IWorkingSet> newList = new HashSet<IWorkingSet>(Arrays.asList(getEnabledSets())); Set<IWorkingSet> tempList = new HashSet<IWorkingSet>(); Iterator<IWorkingSet> iter = newList.iterator(); while (iter.hasNext()) { - IWorkingSet workingSet = (IWorkingSet) iter.next(); + IWorkingSet workingSet = iter.next(); if (workingSet != null && workingSet.getId().equalsIgnoreCase(ID_TASK_WORKING_SET)) { tempList.add(workingSet); } @@ -287,7 +290,7 @@ public class TaskWorkingSetAction extends Action implements IMenuCreator { } getWindow().getActivePage() - .setWorkingSets((IWorkingSet[]) newList.toArray(new IWorkingSet[newList.size()])); + .setWorkingSets(newList.toArray(new IWorkingSet[newList.size()])); } } @@ -325,6 +328,7 @@ public class TaskWorkingSetAction extends Action implements IMenuCreator { // .setWorkingSets((IWorkingSet[]) newList.toArray(new IWorkingSet[newList.size()])); // } + @Override public void runWithEvent(Event event) { Set<IWorkingSet> newList = new HashSet<IWorkingSet>(Arrays.asList(getEnabledSets())); @@ -336,7 +340,7 @@ public class TaskWorkingSetAction extends Action implements IMenuCreator { Set<IWorkingSet> tempList = new HashSet<IWorkingSet>(); Iterator<IWorkingSet> iter = newList.iterator(); while (iter.hasNext()) { - IWorkingSet workingSet = (IWorkingSet) iter.next(); + IWorkingSet workingSet = iter.next(); if (workingSet != null && workingSet.getId().equalsIgnoreCase(ID_TASK_WORKING_SET)) { tempList.add(workingSet); } @@ -362,7 +366,7 @@ public class TaskWorkingSetAction extends Action implements IMenuCreator { } getWindow().getActivePage() - .setWorkingSets((IWorkingSet[]) newList.toArray(new IWorkingSet[newList.size()])); + .setWorkingSets(newList.toArray(new IWorkingSet[newList.size()])); } } @@ -397,6 +401,7 @@ public class TaskWorkingSetAction extends Action implements IMenuCreator { } } + @Override protected Control createDialogArea(Composite parent) { initializeDialogUnits(parent); @@ -445,6 +450,7 @@ public class TaskWorkingSetAction extends Action implements IMenuCreator { return composite; } + @Override protected void okPressed() { Set<IWorkingSet> newList = new HashSet<IWorkingSet>(Arrays.asList(getEnabledSets())); Set<IWorkingSet> tempList = new HashSet<IWorkingSet>(); @@ -462,10 +468,11 @@ public class TaskWorkingSetAction extends Action implements IMenuCreator { System.arraycopy(selection, 0, setsToEnable, 0, selection.length); newList.addAll(new HashSet<IWorkingSet>(Arrays.asList(setsToEnable))); - window.getActivePage().setWorkingSets((IWorkingSet[]) newList.toArray(new IWorkingSet[newList.size()])); + window.getActivePage().setWorkingSets(newList.toArray(new IWorkingSet[newList.size()])); super.okPressed(); } + @Override protected List<?> getSelectedWorkingSets() { ISelection selection = viewer.getSelection(); if (selection instanceof IStructuredSelection) { @@ -474,6 +481,7 @@ public class TaskWorkingSetAction extends Action implements IMenuCreator { return null; } + @Override protected void availableWorkingSetsChanged() { viewer.setInput(window.getWorkbench().getWorkingSetManager().getWorkingSets()); super.availableWorkingSetsChanged(); @@ -486,15 +494,18 @@ public class TaskWorkingSetAction extends Action implements IMenuCreator { updateButtonAvailability(); } + @Override protected void configureShell(Shell shell) { super.configureShell(shell); } + @Override protected void selectAllSets() { viewer.setCheckedElements(window.getWorkbench().getWorkingSetManager().getWorkingSets()); updateButtonAvailability(); } + @Override protected void deselectAllSets() { viewer.setCheckedElements(new Object[0]); updateButtonAvailability(); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/AddTaskRepositoryHandler.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/AddTaskRepositoryHandler.java index 14ca39cf8..fb6885844 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/AddTaskRepositoryHandler.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/AddTaskRepositoryHandler.java @@ -23,11 +23,12 @@ import org.eclipse.ui.PlatformUI; */ public class AddTaskRepositoryHandler extends AbstractHandler { + @Override public Object execute(ExecutionEvent event) throws ExecutionException { String param = event.getParameter("org.eclipse.mylyn.tasks.command.taskRepositoryId"); NewRepositoryWizard wizard = new NewRepositoryWizard(param); Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); - if (wizard != null && shell != null && !shell.isDisposed()) { + if (shell != null && !shell.isDisposed()) { WizardDialog dialog = new WizardDialog(shell, wizard); dialog.create(); dialog.getShell().setText("Add Task Repository"); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java index 5064e1b75..f41badc00 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java @@ -290,8 +290,8 @@ public class RemoteTaskSelectionDialog extends SelectionStatusDialog { return TasksUiPlugin.getDefault().getRepositoryForResource(resource, true); } else { AbstractTask task = (AbstractTask) adaptable.getAdapter(AbstractTask.class); - if (task instanceof AbstractTask) { - AbstractTask rtask = (AbstractTask) task; + if (task != null) { + AbstractTask rtask = task; return getRepository(rtask.getRepositoryUrl(), rtask.getConnectorKind()); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/EditorBusyIndicator.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/EditorBusyIndicator.java index e57195547..5bed1f2f0 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/EditorBusyIndicator.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/EditorBusyIndicator.java @@ -90,6 +90,7 @@ public class EditorBusyIndicator { animateTask = new TimerTask() { + @Override public void run() { try { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskOutlineNode.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskOutlineNode.java index f68a17f43..dae4f7e22 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskOutlineNode.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskOutlineNode.java @@ -172,7 +172,7 @@ public class RepositoryTaskOutlineNode implements IRepositoryTaskSelection { // if (bug instanceof NewBugzillaReport) { // return parseNewBugReport((NewBugzillaReport) bug); // } else - if (bug instanceof RepositoryTaskData) { + if (bug != null) { return parseExistingBugReport(bug, hasNewComment); } else { return null; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java index 44a604023..8fabe85ab 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java @@ -85,7 +85,7 @@ public class TaskEditorActionContributor extends MultiPageEditorActionBarContrib private SynchronizeEditorAction synchronizeEditorAction = new SynchronizeEditorAction(); private ShowInTaskListAction showInTaskListAction = new ShowInTaskListAction(); - + private GlobalAction cutAction; private GlobalAction undoAction; @@ -213,10 +213,8 @@ public class TaskEditorActionContributor extends MultiPageEditorActionBarContrib showInTaskListAction.selectionChanged(selection); manager.add(openWithBrowserAction); - if (task instanceof AbstractTask) { - manager.add(attachFileAction); - manager.add(synchronizeEditorAction); - } + manager.add(attachFileAction); + manager.add(synchronizeEditorAction); if (task.isActive()) { manager.add(new TaskDeactivateAction() { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java index 9858e4bdf..ee5a9abd3 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java @@ -188,7 +188,7 @@ public class TaskPlanningEditor extends TaskFormPage { summary.setText(updateTask.getSummary()); TaskPlanningEditor.this.markDirty(wasDirty); } - if (parentEditor != null && updateTask != null) { + if (parentEditor != null) { parentEditor.changeTitle(); parentEditor.updateTitle(updateTask.getSummary()); } @@ -218,7 +218,7 @@ public class TaskPlanningEditor extends TaskFormPage { if (task instanceof LocalTask) { String label = summary.getText(); // task.setDescription(label); - TasksUiPlugin.getTaskListManager().getTaskList().renameTask((AbstractTask) task, label); + TasksUiPlugin.getTaskListManager().getTaskList().renameTask(task, label); // TODO: refactor mutation into TaskList? task.setUrl(issueReportURL.getText()); @@ -388,6 +388,7 @@ public class TaskPlanningEditor extends TaskFormPage { } else { priorityCombo.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { TaskPlanningEditor.this.markDirty(true); @@ -413,6 +414,7 @@ public class TaskPlanningEditor extends TaskFormPage { } else { statusCombo.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { if (statusCombo.getSelectionIndex() == 0) { task.setCompleted(true); @@ -636,6 +638,7 @@ public class TaskPlanningEditor extends TaskFormPage { dueDatePicker.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_WHITE)); dueDatePicker.addPickerSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent arg0) { TaskPlanningEditor.this.markDirty(true); } @@ -657,9 +660,9 @@ public class TaskPlanningEditor extends TaskFormPage { } }); - if (task instanceof AbstractTask && !(task instanceof LocalTask)) { - AbstractRepositoryConnectorUi connector = TasksUiPlugin.getConnectorUi(((AbstractTask) task).getConnectorKind()); - if (connector != null && connector.supportsDueDates((AbstractTask) task)) { + if (task != null && !(task instanceof LocalTask)) { + AbstractRepositoryConnectorUi connector = TasksUiPlugin.getConnectorUi(task.getConnectorKind()); + if (connector != null && connector.supportsDueDates(task)) { dueDatePicker.setEnabled(false); clearDueDate.setEnabled(false); } @@ -768,8 +771,8 @@ public class TaskPlanningEditor extends TaskFormPage { container.setLayoutData(new GridData(GridData.FILL_BOTH)); TaskRepository repository = null; - if (task instanceof AbstractTask && !(task instanceof LocalTask)) { - AbstractTask repositoryTask = (AbstractTask) task; + if (task != null && !(task instanceof LocalTask)) { + AbstractTask repositoryTask = task; repository = TasksUiPlugin.getRepositoryManager().getRepository(repositoryTask.getConnectorKind(), repositoryTask.getRepositoryUrl()); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/RemoveTaskAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/RemoveTaskAction.java index 9582b678a..365248ca4 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/RemoveTaskAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/RemoveTaskAction.java @@ -37,9 +37,7 @@ public class RemoveTaskAction extends Action { for (Object object : ((IStructuredSelection) viewer.getSelection()).toList()) { if (object instanceof AbstractTask) { AbstractTask task = (AbstractTask) object; - if (task != null) { - ((ITaskPlannerContentProvider) (viewer.getContentProvider())).removeTask(task); - } + ((ITaskPlannerContentProvider) (viewer.getContentProvider())).removeTask(task); } } viewer.refresh(); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/properties/ProjectPropertiesLinkProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/properties/ProjectPropertiesLinkProvider.java index 1678f6b13..f5cfe8396 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/properties/ProjectPropertiesLinkProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/properties/ProjectPropertiesLinkProvider.java @@ -33,6 +33,7 @@ public class ProjectPropertiesLinkProvider extends AbstractTaskRepositoryLinkPro private static final String PROJECT_REPOSITORY_URL = PROPERTY_PREFIX + ".url"; + @Override public TaskRepository getTaskRepository(IResource resource, TaskRepositoryManager repositoryManager) { IProject project = resource.getProject(); if (project == null || !project.isAccessible()) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/CreateQueryFromSearchAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/CreateQueryFromSearchAction.java index ac76f9a06..759fdcb0f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/CreateQueryFromSearchAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/CreateQueryFromSearchAction.java @@ -52,6 +52,7 @@ public class CreateQueryFromSearchAction extends Action { /** * Add the search result to the Task List. */ + @Override public void run() { ISelection selection = resultView.getViewer().getSelection(); if (selection instanceof IStructuredSelection) { @@ -63,7 +64,7 @@ public class CreateQueryFromSearchAction extends Action { task.getConnectorKind()); if (queries.length != 0 && connector != null) { SearchHitCollector searchHitCollector = (SearchHitCollector) queries[0]; - AbstractRepositoryQuery query = (AbstractRepositoryQuery) searchHitCollector.getRepositoryQuery(); + AbstractRepositoryQuery query = searchHitCollector.getRepositoryQuery(); InputDialog dialog = new InputDialog(PlatformUI.getWorkbench() .getActiveWorkbenchWindow() .getShell(), "Create Query", "Name of query to be added to the " + TaskListView.LABEL_VIEW + ": ", "", null); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java index db556423c..3d3c6f81a 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java @@ -26,7 +26,6 @@ import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.mylyn.internal.tasks.ui.AddExistingTaskJob; -import org.eclipse.mylyn.internal.tasks.ui.IDynamicSubMenuContributor; import org.eclipse.mylyn.internal.tasks.ui.TaskListColorsAndFonts; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; import org.eclipse.mylyn.internal.tasks.ui.views.TaskElementLabelProvider; @@ -34,11 +33,9 @@ import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView; import org.eclipse.mylyn.internal.tasks.ui.views.TaskTableLabelProvider; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.AbstractTaskCategory; -import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.tasks.ui.TasksUiUtil; -import org.eclipse.mylyn.tasks.ui.editors.RepositoryTaskEditorInput; import org.eclipse.search.internal.ui.SearchMessages; import org.eclipse.search.ui.IContextMenuConstants; import org.eclipse.search.ui.text.AbstractTextSearchViewPage; @@ -48,7 +45,6 @@ import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IPageLayout; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/DelegatingTaskExternalizer.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/DelegatingTaskExternalizer.java index 843e12bf4..5aa96d2c3 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/DelegatingTaskExternalizer.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/DelegatingTaskExternalizer.java @@ -63,11 +63,11 @@ final class DelegatingTaskExternalizer { static final String KEY_NOTIFIED_INCOMING = "NotifiedIncoming"; static final String KEY_NAME = "Name"; - + static final String KEY_LABEL = "Label"; static final String KEY_HANDLE = "Handle"; - + static final String KEY_REPOSITORY_URL = "RepositoryUrl"; static final String KEY_CATEGORY = "Category"; @@ -103,7 +103,7 @@ final class DelegatingTaskExternalizer { static final String VAL_TRUE = "true"; static final String KEY_DATE_END = "EndDate"; - + static final String KEY_QUERY_HIT = "QueryHit"; static final String KEY_DATE_CREATION = "CreationDate"; @@ -126,7 +126,7 @@ final class DelegatingTaskExternalizer { static final String KEY_OWNER = "Owner"; static final String KEY_STALE = "Stale"; - + static final String KEY_LAST_REFRESH = "LastRefreshTimeStamp"; private List<AbstractTaskListFactory> factories = new ArrayList<AbstractTaskListFactory>(); @@ -163,7 +163,7 @@ final class DelegatingTaskExternalizer { break; } } - + String taskTagName; if (factory != null) { taskTagName = factory.getTaskElementName(); @@ -172,11 +172,9 @@ final class DelegatingTaskExternalizer { return null; // taskTagName = getTaskTagName(); } - Element node = doc.createElement(taskTagName); - if (factory != null) { - factory.setAdditionalAttributes(task, node); - } - + Element node = doc.createElement(taskTagName); + factory.setAdditionalAttributes(task, node); + node.setAttribute(KEY_LABEL, stripControlCharacters(task.getSummary())); node.setAttribute(KEY_HANDLE, task.getHandleIdentifier()); node.setAttribute(KEY_REPOSITORY_URL, task.getRepositoryUrl()); @@ -230,27 +228,25 @@ final class DelegatingTaskExternalizer { node.setAttribute(KEY_STALE, VAL_FALSE); } - if (task instanceof AbstractTask) { - AbstractTask abstractTask = (AbstractTask) task; - if (abstractTask.getLastReadTimeStamp() != null) { - node.setAttribute(KEY_LAST_MOD_DATE, abstractTask.getLastReadTimeStamp()); - } + AbstractTask abstractTask = task; + if (abstractTask.getLastReadTimeStamp() != null) { + node.setAttribute(KEY_LAST_MOD_DATE, abstractTask.getLastReadTimeStamp()); + } - if (abstractTask.isNotified()) { - node.setAttribute(KEY_NOTIFIED_INCOMING, VAL_TRUE); - } else { - node.setAttribute(KEY_NOTIFIED_INCOMING, VAL_FALSE); - } + if (abstractTask.isNotified()) { + node.setAttribute(KEY_NOTIFIED_INCOMING, VAL_TRUE); + } else { + node.setAttribute(KEY_NOTIFIED_INCOMING, VAL_FALSE); + } - if (abstractTask.getSynchronizationState() != null) { - node.setAttribute(KEY_SYNC_STATE, abstractTask.getSynchronizationState().toString()); - } else { - node.setAttribute(KEY_SYNC_STATE, RepositoryTaskSyncState.SYNCHRONIZED.toString()); - } + if (abstractTask.getSynchronizationState() != null) { + node.setAttribute(KEY_SYNC_STATE, abstractTask.getSynchronizationState().toString()); + } else { + node.setAttribute(KEY_SYNC_STATE, RepositoryTaskSyncState.SYNCHRONIZED.toString()); + } - if (abstractTask.getOwner() != null) { - node.setAttribute(KEY_OWNER, abstractTask.getOwner()); - } + if (abstractTask.getOwner() != null) { + node.setAttribute(KEY_OWNER, abstractTask.getOwner()); } for (AbstractTask t : task.getChildren()) { @@ -269,7 +265,7 @@ final class DelegatingTaskExternalizer { String handle = element.getAttribute(KEY_HANDLE); AbstractTask subTask = tasklist.getTask(handle); if (subTask != null) { - tasklist.addTask(subTask, (AbstractTask) task); + tasklist.addTask(subTask, task); } } } @@ -386,6 +382,9 @@ final class DelegatingTaskExternalizer { private void readTaskInfo(AbstractTask task, TaskList taskList, Element element, AbstractTask parent, AbstractTaskCategory legacyCategory) throws TaskExternalizationException { + if (task == null) { + return; + } String categoryHandle = null; if (element.hasAttribute(KEY_CATEGORY)) { @@ -404,11 +403,7 @@ final class DelegatingTaskExternalizer { task.addParentContainer(legacyCategory); legacyCategory.internalAddChild(task); } else if (legacyCategory == null && parent == null) { - if (task instanceof AbstractTask) { - taskList.internalAddTask(task, taskList.getArchiveContainer()); - } else { - taskList.internalAddRootTask(task); - } + taskList.internalAddTask(task, taskList.getArchiveContainer()); } else { taskList.internalAddTask(task, taskList.getArchiveContainer()); } @@ -487,39 +482,37 @@ final class DelegatingTaskExternalizer { task.setStale(false); } - if (task instanceof AbstractTask) { - AbstractTask abstractTask = (AbstractTask) task; - abstractTask.setSynchronizing(false); - - if (element.hasAttribute(DelegatingTaskExternalizer.KEY_REPOSITORY_URL)) { - abstractTask.setRepositoryUrl(element.getAttribute(DelegatingTaskExternalizer.KEY_REPOSITORY_URL)); - } + AbstractTask abstractTask = task; + abstractTask.setSynchronizing(false); - if (element.hasAttribute(KEY_LAST_MOD_DATE) && !element.getAttribute(KEY_LAST_MOD_DATE).equals("")) { - abstractTask.setLastReadTimeStamp(element.getAttribute(KEY_LAST_MOD_DATE)); - } + if (element.hasAttribute(DelegatingTaskExternalizer.KEY_REPOSITORY_URL)) { + abstractTask.setRepositoryUrl(element.getAttribute(DelegatingTaskExternalizer.KEY_REPOSITORY_URL)); + } - if (element.hasAttribute(KEY_OWNER)) { - abstractTask.setOwner(element.getAttribute(KEY_OWNER)); - } + if (element.hasAttribute(KEY_LAST_MOD_DATE) && !element.getAttribute(KEY_LAST_MOD_DATE).equals("")) { + abstractTask.setLastReadTimeStamp(element.getAttribute(KEY_LAST_MOD_DATE)); + } - if (VAL_TRUE.equals(element.getAttribute(KEY_NOTIFIED_INCOMING))) { - abstractTask.setNotified(true); - } else { - abstractTask.setNotified(false); - } + if (element.hasAttribute(KEY_OWNER)) { + abstractTask.setOwner(element.getAttribute(KEY_OWNER)); + } - if (element.hasAttribute(KEY_SYNC_STATE)) { - String syncState = element.getAttribute(KEY_SYNC_STATE); - if (syncState.compareTo(RepositoryTaskSyncState.SYNCHRONIZED.toString()) == 0) { - abstractTask.setSynchronizationState(RepositoryTaskSyncState.SYNCHRONIZED); - } else if (syncState.compareTo(RepositoryTaskSyncState.INCOMING.toString()) == 0) { - abstractTask.setSynchronizationState(RepositoryTaskSyncState.INCOMING); - } else if (syncState.compareTo(RepositoryTaskSyncState.OUTGOING.toString()) == 0) { - abstractTask.setSynchronizationState(RepositoryTaskSyncState.OUTGOING); - } else if (syncState.compareTo(RepositoryTaskSyncState.CONFLICT.toString()) == 0) { - abstractTask.setSynchronizationState(RepositoryTaskSyncState.CONFLICT); - } + if (VAL_TRUE.equals(element.getAttribute(KEY_NOTIFIED_INCOMING))) { + abstractTask.setNotified(true); + } else { + abstractTask.setNotified(false); + } + + if (element.hasAttribute(KEY_SYNC_STATE)) { + String syncState = element.getAttribute(KEY_SYNC_STATE); + if (syncState.compareTo(RepositoryTaskSyncState.SYNCHRONIZED.toString()) == 0) { + abstractTask.setSynchronizationState(RepositoryTaskSyncState.SYNCHRONIZED); + } else if (syncState.compareTo(RepositoryTaskSyncState.INCOMING.toString()) == 0) { + abstractTask.setSynchronizationState(RepositoryTaskSyncState.INCOMING); + } else if (syncState.compareTo(RepositoryTaskSyncState.OUTGOING.toString()) == 0) { + abstractTask.setSynchronizationState(RepositoryTaskSyncState.OUTGOING); + } else if (syncState.compareTo(RepositoryTaskSyncState.CONFLICT.toString()) == 0) { + abstractTask.setSynchronizationState(RepositoryTaskSyncState.CONFLICT); } } @@ -596,26 +589,21 @@ final class DelegatingTaskExternalizer { for (AbstractTaskListFactory currentFactory : factories) { if (currentFactory.canCreate(query)) { factory = currentFactory; - if (factory != null) { - queryTagName = factory.getQueryElementName(query); - break; - } + queryTagName = factory.getQueryElementName(query); + break; } } - if (factory == null || queryTagName == null) { + if (factory == null || queryTagName == null) { StatusHandler.log("No externalizer for query: " + query, this); return null; // queryTagName = getQueryTagNameForElement(query); } - + // String queryTagName = getQueryTagNameForElement(query); - + Element node = doc.createElement(queryTagName); - - if (factory != null) { - factory.setAdditionalAttributes(query, node); - } - + factory.setAdditionalAttributes(query, node); + node.setAttribute(DelegatingTaskExternalizer.KEY_NAME, query.getSummary()); node.setAttribute(AbstractTaskListFactory.KEY_QUERY_STRING, query.getUrl()); node.setAttribute(DelegatingTaskExternalizer.KEY_REPOSITORY_URL, query.getRepositoryUrl()); @@ -655,7 +643,7 @@ final class DelegatingTaskExternalizer { node.setAttribute(KEY_HANDLE, queryHit.getHandleIdentifier()); parent.appendChild(node); return node; - } + } // public boolean canReadQueryHit(Node node) { // return false; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListSaveManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListSaveManager.java index 3d3925554..038cecb79 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListSaveManager.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListSaveManager.java @@ -260,6 +260,7 @@ public class TaskListSaveManager implements ITaskListChangeListener, IBackground setSystem(true); } + @Override protected IStatus run(IProgressMonitor monitor) { while (true) { if (saveRequested) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java index 8b439de80..836434872 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java @@ -224,7 +224,7 @@ public class TasksUiExtensionReader { AbstractDuplicateDetector duplicateDetector = (AbstractDuplicateDetector) obj; duplicateDetector.setName(element.getAttribute(ATTR_NAME)); duplicateDetector.setKind(element.getAttribute(ATTR_KIND)); - TasksUiPlugin.getDefault().addDuplicateDetector((AbstractDuplicateDetector) duplicateDetector); + TasksUiPlugin.getDefault().addDuplicateDetector(duplicateDetector); } else { StatusHandler.log("Could not load duplicate detector: " + obj.getClass().getCanonicalName(), null); } @@ -302,7 +302,7 @@ public class TasksUiExtensionReader { Object connectorUiObject = element.createExecutableExtension(ATTR_CLASS); if (connectorUiObject instanceof AbstractRepositoryConnectorUi) { AbstractRepositoryConnectorUi connectorUi = (AbstractRepositoryConnectorUi) connectorUiObject; - TasksUiPlugin.getDefault().addRepositoryConnectorUi((AbstractRepositoryConnectorUi) connectorUi); + TasksUiPlugin.getDefault().addRepositoryConnectorUi(connectorUi); String customNotificationsString = element.getAttribute(ATTR_CUSTOM_NOTIFICATIONS); if (customNotificationsString != null) { @@ -316,7 +316,7 @@ public class TasksUiExtensionReader { .getName(), iconPath); if (descriptor != null) { TasksUiPlugin.getDefault().addBrandingIcon( - ((AbstractRepositoryConnectorUi) connectorUi).getConnectorKind(), + connectorUi.getConnectorKind(), TasksUiImages.getImage(descriptor)); } } @@ -326,7 +326,7 @@ public class TasksUiExtensionReader { .getName(), overlayIconPath); if (descriptor != null) { TasksUiPlugin.getDefault().addOverlayIcon( - ((AbstractRepositoryConnectorUi) connectorUi).getConnectorKind(), descriptor); + connectorUi.getConnectorKind(), descriptor); } } } else { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/AbstractFilteredTree.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/AbstractFilteredTree.java index 3f5cf8406..9aabf84c3 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/AbstractFilteredTree.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/AbstractFilteredTree.java @@ -153,6 +153,7 @@ public abstract class AbstractFilteredTree extends FilteredTree { * * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { clearText(); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java index 30ebada98..e562cbfb5 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java @@ -109,8 +109,8 @@ class CustomTaskListDecorationDrawer implements Listener { offsetX = event.x + 18 - platformSpecificSquish; offsetY += 2; } - if (element instanceof AbstractTaskContainer && !(element instanceof AbstractTask)) { - if (!hideDecorationOnContainer(element) && hasIncoming((AbstractTaskContainer) element)) { + if (element != null && !(element instanceof AbstractTask)) { + if (!hideDecorationOnContainer(element) && hasIncoming(element)) { int additionalSquish = 0; if (platformSpecificSquish > 0 && taskListView.synchronizationOverlaid) { additionalSquish = platformSpecificSquish + 3; @@ -141,8 +141,8 @@ class CustomTaskListDecorationDrawer implements Listener { private boolean hasIncoming(AbstractTaskContainer container) { for (AbstractTask task : container.getChildren()) { - if (task instanceof AbstractTask) { - AbstractTask containedRepositoryTask = (AbstractTask) task; + if (task != null) { + AbstractTask containedRepositoryTask = task; if (containedRepositoryTask.getSynchronizationState() == RepositoryTaskSyncState.INCOMING) { return true; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java index aa6dc38c3..27424040c 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java @@ -52,7 +52,7 @@ public class TaskActivityLabelProvider extends DecoratingLabelProvider implement public Image getColumnImage(Object element, int columnIndex) { if (columnIndex == 0) { if (element instanceof ScheduledTaskContainer) { - super.getImage((ScheduledTaskContainer)element); + super.getImage(element); } else if (element instanceof ScheduledTaskDelegate) { return super.getImage(((ScheduledTaskDelegate) element).getCorrespondingTask()); } else { @@ -73,11 +73,9 @@ public class TaskActivityLabelProvider extends DecoratingLabelProvider implement AbstractTask task = activityDelegate.getCorrespondingTask(); switch (columnIndex) { case 2: - if(task instanceof AbstractTask) { - return ((AbstractTask)task).getTaskKey() +": " + task.getSummary(); - } else { - return task.getSummary(); - } + if (task != null) { + return task.getTaskKey() +": " + task.getSummary(); + } case 3: return DateUtil.getFormattedDurationShort(activityDelegate.getDateRangeContainer().getElapsed(activityDelegate)); case 4: diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java index 77ae67c20..2c82ffb23 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java @@ -277,8 +277,8 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro return null; } AbstractTask task = getCorrespondingTask((AbstractTaskContainer) element); - if (task instanceof AbstractTask) { - AbstractTask repositoryTask = (AbstractTask) task; + if (task != null) { + AbstractTask repositoryTask = task; if (repositoryTask.isSynchronizing()) { return TaskListColorsAndFonts.ITALIC; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListCellModifier.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListCellModifier.java index b9e5b0646..8b36bb99e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListCellModifier.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListCellModifier.java @@ -64,8 +64,8 @@ class TaskListCellModifier implements ICellModifier { AbstractTask task = (AbstractTask) taskListElement; switch (columnIndex) { case 0: - if (!(task instanceof AbstractTask)) { - TasksUiPlugin.getTaskListManager().getTaskList().renameTask((AbstractTask) task, + if (!(task != null)) { + TasksUiPlugin.getTaskListManager().getTaskList().renameTask(task, ((String) value).trim()); } break; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java index 568e2ed2a..537784ee6 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java @@ -134,7 +134,7 @@ public class TaskListContentProvider implements IStructuredContentProvider, ITre filteredRoots.add(element); } } else if (element instanceof AbstractTaskCategory) { - if (selectContainer((AbstractTaskCategory) element)) { + if (selectContainer(element)) { filteredRoots.add(element); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java index ba29f2f9c..27d401e8c 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java @@ -19,7 +19,6 @@ import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; import org.eclipse.jface.layout.TreeColumnLayout; -import org.eclipse.jface.resource.JFaceColors; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ISelectionProvider; @@ -54,16 +53,13 @@ import org.eclipse.swt.events.MouseTrackListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Link; import org.eclipse.swt.widgets.Menu; import org.eclipse.ui.IWorkingSet; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.PatternFilter; -import org.eclipse.ui.dialogs.PreferenceLinkArea; import org.eclipse.ui.forms.events.IHyperlinkListener; import org.eclipse.ui.forms.widgets.ImageHyperlink; import org.eclipse.ui.internal.ObjectActionContributorManager; -import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; /** * @author Mik Kersten @@ -256,6 +252,7 @@ public class TaskListFilteredTree extends AbstractFilteredTree { indicateActiveTaskWorkingSet(); workingSetLink.addMouseListener(new MouseAdapter() { + @Override public void mouseDown(MouseEvent e) { if (currentWorkingSet != null) { workingSetAction.run(currentWorkingSet); @@ -416,6 +413,7 @@ public class TaskListFilteredTree extends AbstractFilteredTree { copyTaskDetailsAction.selectionChanged(selection); manager.add(new OpenTaskListElementAction(null) { + @Override public void run() { TasksUiUtil.refreshAndOpenTaskListElement(activeTask); } @@ -423,12 +421,14 @@ public class TaskListFilteredTree extends AbstractFilteredTree { if (activeTask.isActive()) { manager.add(new TaskDeactivateAction() { + @Override public void run() { super.run(activeTask); } }); } else { manager.add(new TaskActivateAction() { + @Override public void run() { TasksUiPlugin.getTaskListManager().getTaskActivationHistory().addTask(activeTask); super.run(activeTask); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTipHandler.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTipHandler.java index 0ad675294..609913e8f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTipHandler.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTipHandler.java @@ -27,7 +27,6 @@ import org.eclipse.mylyn.monitor.core.DateUtil; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.AbstractTask; -import org.eclipse.mylyn.tasks.core.AbstractTaskCategory; import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.tasks.core.RepositoryStatus; import org.eclipse.mylyn.tasks.core.TaskRepository; @@ -244,12 +243,10 @@ public class TaskListToolTipHandler { } } else if (element instanceof AbstractTask) { AbstractTask repositoryTask = (AbstractTask) element; - if (repositoryTask != null) { - AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector( - repositoryTask.getConnectorKind()); - if (connector != null) { - return TasksUiPlugin.getDefault().getBrandingIcon(connector.getConnectorKind()); - } + AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector( + repositoryTask.getConnectorKind()); + if (connector != null) { + return TasksUiPlugin.getDefault().getBrandingIcon(connector.getConnectorKind()); } } else if (element instanceof ScheduledTaskContainer) { return TasksUiImages.getImage(TasksUiImages.CALENDAR); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java index 9012075f3..7d3cd2d84 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java @@ -1200,11 +1200,11 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { addAction(removeFromCategoryAction, manager, element); } addAction(deleteAction, manager, element); - if (!(element instanceof AbstractTask) || element instanceof AbstractTaskContainer) { + if (!(element instanceof AbstractTask)) { addAction(renameAction, manager, element); } - if (element instanceof AbstractTaskContainer && !(element instanceof AbstractTask)) { + if (element != null && !(element instanceof AbstractTask)) { manager.add(goIntoAction); } if (drilledIntoCategory != null) { @@ -1236,8 +1236,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { } private void addMenuManager(IMenuManager menuToAdd, IMenuManager manager, AbstractTaskContainer element) { - if ((element instanceof AbstractTask) - || (element instanceof AbstractTaskContainer || element instanceof AbstractRepositoryQuery)) { + if ((element instanceof AbstractTask) || element instanceof AbstractRepositoryQuery) { manager.add(menuToAdd); } } @@ -1275,7 +1274,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { } else if (action instanceof RenameAction) { action.setEnabled(true); } - } else if (element instanceof AbstractTaskContainer) { + } else if (element != null) { if (action instanceof MarkTaskCompleteAction) { action.setEnabled(false); } else if (action instanceof MarkTaskIncompleteAction) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskScheduleContentProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskScheduleContentProvider.java index 2391d7d29..283cf18fd 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskScheduleContentProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskScheduleContentProvider.java @@ -58,6 +58,7 @@ public class TaskScheduleContentProvider extends TaskListContentProvider { return customChildren; } + @Override public String getPriority() { return PriorityLevel.P1.toString(); } @@ -83,6 +84,7 @@ public class TaskScheduleContentProvider extends TaskListContentProvider { this.taskListManager = taskActivityManager; } + @Override public Object[] getElements(Object parent) { if (parent.equals(this.view.getViewSite())) { unscheduledCategory.activeTask = null; @@ -94,8 +96,8 @@ public class TaskScheduleContentProvider extends TaskListContentProvider { boolean containsActiveTask = false; if (activeTask != null) { for (AbstractTaskContainer taskListElement : ranges) { - if (taskListElement instanceof AbstractTaskContainer) { - if (((AbstractTaskContainer) taskListElement).getChildren().contains(activeTask)) { + if (taskListElement != null) { + if (taskListElement.getChildren().contains(activeTask)) { containsActiveTask = true; } } @@ -112,6 +114,7 @@ public class TaskScheduleContentProvider extends TaskListContentProvider { } } + @Override public Object getParent(Object child) { // if (child instanceof DateRangeActivityDelegate) { // DateRangeActivityDelegate dateRangeTaskWrapper = (DateRangeActivityDelegate) child; @@ -121,6 +124,7 @@ public class TaskScheduleContentProvider extends TaskListContentProvider { // } } + @Override public boolean hasChildren(Object parent) { if (parent instanceof ScheduledTaskContainer) { ScheduledTaskContainer dateRangeTaskCategory = (ScheduledTaskContainer) parent; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetElementAdapter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetElementAdapter.java index cd15e76d8..bc7b2c973 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetElementAdapter.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetElementAdapter.java @@ -42,7 +42,7 @@ public class TaskWorkingSetElementAdapter implements IWorkingSetElementAdapter { containers.add(adaptable); } } - return (IAdaptable[]) containers.toArray(new IAdaptable[containers.size()]); + return containers.toArray(new IAdaptable[containers.size()]); } public void dispose() { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetElementFactory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetElementFactory.java index 36bbc5abe..41a2f1dbf 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetElementFactory.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetElementFactory.java @@ -37,7 +37,7 @@ public class TaskWorkingSetElementFactory implements IElementFactory { TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList(); for (AbstractTaskContainer element : taskList.getRootElements()) { if (element.getHandleIdentifier().equals(taskHandle)) { - return (IAdaptable) element; + return element; } } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetPage.java index 82be6a409..a9cc7bcfb 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetPage.java @@ -147,6 +147,7 @@ public class TaskWorkingSetPage extends WizardPage implements IWorkingSetPage { } class CustomSorter extends ViewerSorter { + @Override public int compare(Viewer viewer, Object e1, Object e2) { if (e1 instanceof ElementCategory && ((ElementCategory) e1).getLabel(e1).equals(LABEL_TASKS)) { return -1; @@ -296,10 +297,10 @@ public class TaskWorkingSetPage extends WizardPage implements IWorkingSetPage { tree.setSorter(new CustomSorter()); ArrayList<Object> containers = new ArrayList<Object>(); - for (AbstractTaskContainer element : (Set<AbstractTaskContainer>) TasksUiPlugin.getTaskListManager() + for (AbstractTaskContainer element : TasksUiPlugin.getTaskListManager() .getTaskList() .getRootElements()) { - if (element instanceof AbstractTaskContainer && !(element instanceof TaskArchive)) { + if (!(element instanceof TaskArchive)) { containers.add(element); } } @@ -352,6 +353,7 @@ public class TaskWorkingSetPage extends WizardPage implements IWorkingSetPage { selectAllButton.setText(IDEWorkbenchMessages.ResourceWorkingSetPage_selectAll_label); selectAllButton.setToolTipText(IDEWorkbenchMessages.ResourceWorkingSetPage_selectAll_toolTip); selectAllButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent selectionEvent) { tree.setCheckedElements(treeContentProvider.getElements(tree.getInput())); validateInput(); @@ -363,6 +365,7 @@ public class TaskWorkingSetPage extends WizardPage implements IWorkingSetPage { deselectAllButton.setText(IDEWorkbenchMessages.ResourceWorkingSetPage_deselectAll_label); deselectAllButton.setToolTipText(IDEWorkbenchMessages.ResourceWorkingSetPage_deselectAll_toolTip); deselectAllButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent selectionEvent) { tree.setCheckedElements(new Object[0]); validateInput(); @@ -442,7 +445,7 @@ public class TaskWorkingSetPage extends WizardPage implements IWorkingSetPage { } } } - if (infoMessage == null && tree.getCheckedElements().length == 0) { + if (tree.getCheckedElements().length == 0) { infoMessage = "No categories/queries selected."; } setMessage(infoMessage, INFORMATION); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetUpdater.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetUpdater.java index cdb7314c3..9239ca27d 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetUpdater.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetUpdater.java @@ -50,7 +50,7 @@ public class TaskWorkingSetUpdater implements IWorkingSetUpdater, ITaskListChang if (adaptable instanceof AbstractTaskContainer) { String handle = ((AbstractTaskContainer) adaptable).getHandleIdentifier(); for (AbstractTaskContainer element : TasksUiPlugin.getTaskListManager().getTaskList().getRootElements()) { - if (element instanceof AbstractTaskContainer && element.getHandleIdentifier().equals(handle)) { + if (element != null && element.getHandleIdentifier().equals(handle)) { list.add(adaptable); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/DatePicker.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/DatePicker.java index e01a2da94..a92d3f328 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/DatePicker.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/DatePicker.java @@ -188,6 +188,7 @@ public class DatePicker extends Composite { return date; } + @Override public void setBackground(Color backgroundColor) { dateText.setBackground(backgroundColor); super.setBackground(backgroundColor); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java index cf5903ca7..64026e255 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java @@ -68,8 +68,7 @@ import org.eclipse.swt.widgets.Display; /** * Provides facilities for using and managing the Task List and task activity information. * - * TODO: pull task activity management out into new TaskActivityManager - * NOTE: likely to change for 3.0 + * TODO: pull task activity management out into new TaskActivityManager NOTE: likely to change for 3.0 * * @author Mik Kersten * @author Rob Elves (task activity) @@ -214,7 +213,7 @@ public class TaskListManager implements IPropertyChangeListener { public void containersChanged(Set<TaskContainerDelta> containers) { for (TaskContainerDelta taskContainerDelta : containers) { if (taskContainerDelta.getContainer() instanceof AbstractTask) { - switch(taskContainerDelta.getKind()) { + switch (taskContainerDelta.getKind()) { case REMOVED: TaskListManager.this.resetAndRollOver(); return; @@ -325,15 +324,14 @@ public class TaskListManager implements IPropertyChangeListener { activityNextWeek.addTask(new ScheduledTaskDelegate(activityNextWeek, task, tempCalendar, tempCalendar)); } else if (activityFuture.includes(tempCalendar)) { - activityFuture.addTask(new ScheduledTaskDelegate(activityFuture, task, tempCalendar, - tempCalendar)); + activityFuture.addTask(new ScheduledTaskDelegate(activityFuture, task, tempCalendar, tempCalendar)); } else if (activityThisWeek.includes(tempCalendar) && !activityThisWeek.getChildren().contains(task)) { activityThisWeek.addTask(new ScheduledTaskDelegate(activityThisWeek, task, tempCalendar, tempCalendar)); } else if (activityPreviousWeek.includes(tempCalendar) && !activityPreviousWeek.getChildren().contains(task)) { - activityPreviousWeek.addTask(new ScheduledTaskDelegate(activityPreviousWeek, task, - tempCalendar, tempCalendar)); + activityPreviousWeek.addTask(new ScheduledTaskDelegate(activityPreviousWeek, task, tempCalendar, + tempCalendar)); } else if (activityPast.includes(tempCalendar) && !activityPast.getChildren().contains(task)) { activityPast.addTask(new ScheduledTaskDelegate(activityPast, task, tempCalendar, tempCalendar)); } @@ -436,8 +434,8 @@ public class TaskListManager implements IPropertyChangeListener { if (activeTime == null) { activeTime = new Long(0); } - ScheduledTaskDelegate delegate = new ScheduledTaskDelegate(week, currentTask, - currentTaskStart, currentTaskEnd, activeTime); + ScheduledTaskDelegate delegate = new ScheduledTaskDelegate(week, currentTask, currentTaskStart, + currentTaskEnd, activeTime); week.addTask(delegate); if (taskActivityHistoryInitialized) { for (ITaskActivityListener listener : activityListeners) { @@ -732,12 +730,15 @@ public class TaskListManager implements IPropertyChangeListener { private void refactorOfflineHandles(String oldRepositoryUrl, String newRepositoryUrl) { TaskDataManager taskDataManager = TasksUiPlugin.getTaskDataManager(); for (AbstractTask task : taskList.getAllTasks()) { - if (task instanceof AbstractTask) { - AbstractTask repositoryTask = (AbstractTask) task; + if (task != null) { + AbstractTask repositoryTask = task; if (repositoryTask.getRepositoryUrl().equals(oldRepositoryUrl)) { - RepositoryTaskData newTaskData = taskDataManager.getNewTaskData(repositoryTask.getRepositoryUrl(), repositoryTask.getTaskId()); - RepositoryTaskData oldTaskData = taskDataManager.getOldTaskData(repositoryTask.getRepositoryUrl(), repositoryTask.getTaskId()); - Set<RepositoryTaskAttribute> edits = taskDataManager.getEdits(repositoryTask.getRepositoryUrl(), repositoryTask.getTaskId()); + RepositoryTaskData newTaskData = taskDataManager.getNewTaskData(repositoryTask.getRepositoryUrl(), + repositoryTask.getTaskId()); + RepositoryTaskData oldTaskData = taskDataManager.getOldTaskData(repositoryTask.getRepositoryUrl(), + repositoryTask.getTaskId()); + Set<RepositoryTaskAttribute> edits = taskDataManager.getEdits(repositoryTask.getRepositoryUrl(), + repositoryTask.getTaskId()); taskDataManager.remove(repositoryTask.getRepositoryUrl(), repositoryTask.getTaskId()); if (newTaskData != null) { @@ -921,18 +922,15 @@ public class TaskListManager implements IPropertyChangeListener { } public boolean isOwnedByUser(AbstractTask task) { -// if (task instanceof WebTask || (task instanceof AbstractTask && ((AbstractTask) task).isLocal())) { if (task.isLocal()) { return true; } - if (task instanceof AbstractTask) { - AbstractTask repositoryTask = (AbstractTask) task; - TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository( - repositoryTask.getConnectorKind(), repositoryTask.getRepositoryUrl()); - if (repository != null && repositoryTask.getOwner() != null) { - return repositoryTask.getOwner().equals(repository.getUserName()); - } + AbstractTask repositoryTask = task; + TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository( + repositoryTask.getConnectorKind(), repositoryTask.getRepositoryUrl()); + if (repository != null && repositoryTask.getOwner() != null) { + return repositoryTask.getOwner().equals(repository.getUserName()); } return false; @@ -1153,13 +1151,15 @@ public class TaskListManager implements IPropertyChangeListener { /** * Creates a new local task and schedules for today - * @param summary if null DEFAULT_SUMMARY (New Task) used. + * + * @param summary + * if null DEFAULT_SUMMARY (New Task) used. */ public LocalTask createNewLocalTask(String summary) { if (summary == null) { summary = LocalRepositoryConnector.DEFAULT_SUMMARY; } - LocalTask newTask = new LocalTask(""+taskList.getNextLocalTaskId(), summary); + LocalTask newTask = new LocalTask("" + taskList.getNextLocalTaskId(), summary); newTask.setPriority(PriorityLevel.P3.toString()); scheduleNewTask(newTask); @@ -1173,9 +1173,9 @@ public class TaskListManager implements IPropertyChangeListener { taskList.addTask(newTask, (TaskCategory) selectedObject); } else if (selectedObject instanceof AbstractTask) { AbstractTask task = (AbstractTask) selectedObject; - + AbstractTaskContainer container = null; - if(task.getChildren().size() > 0 && task.getParentContainers().iterator().hasNext()) { + if (task.getChildren().size() > 0 && task.getParentContainers().iterator().hasNext()) { container = task.getParentContainers().iterator().next(); } if (container instanceof TaskCategory) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java index 82bcac269..418bee7ac 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java @@ -479,7 +479,7 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { try { EditRepositoryWizard wizard = new EditRepositoryWizard(repository); Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); - if (wizard != null && shell != null && !shell.isDisposed()) { + if (shell != null && !shell.isDisposed()) { WizardDialog dialog = new WizardDialog(shell, wizard); dialog.create(); // dialog.setTitle("Repository Credentials Missing"); 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 4439caa80..255c44f7e 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 @@ -218,9 +218,9 @@ public class TasksUiUtil { if (task instanceof LocalTask) { TasksUiUtil.openEditor(task, false); - } else if (task instanceof AbstractTask) { + } else if (task != null) { - final AbstractTask repositoryTask = (AbstractTask) task; + final AbstractTask repositoryTask = task; String repositoryKind = repositoryTask.getConnectorKind(); final AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager() .getRepositoryConnector(repositoryKind); @@ -272,8 +272,8 @@ public class TasksUiUtil { private static String getTaskEditorId(final AbstractTask task) { String taskEditorId = TaskEditor.ID_EDITOR; - if (task instanceof AbstractTask) { - AbstractTask repositoryTask = (AbstractTask) task; + if (task != null) { + AbstractTask repositoryTask = task; AbstractRepositoryConnectorUi repositoryUi = TasksUiPlugin.getConnectorUi(repositoryTask.getConnectorKind()); String customTaskEditorId = repositoryUi.getTaskEditorId(repositoryTask); if (customTaskEditorId != null) { @@ -335,8 +335,8 @@ public class TasksUiUtil { @Override protected IStatus run(IProgressMonitor monitor) { - if (task instanceof AbstractTask) { - AbstractTask repositoryTask = (AbstractTask) task; + if (task != null) { + AbstractTask repositoryTask = task; if (!wasOpen) { TasksUiPlugin.getSynchronizationManager().setTaskRead(repositoryTask, true); } @@ -369,8 +369,8 @@ public class TasksUiUtil { IWorkbenchPage page = window.getActivePage(); openEditor(editorInput, taskEditorId, page); } - if (task instanceof AbstractTask) { - TasksUiPlugin.getSynchronizationManager().setTaskRead((AbstractTask) task, true); + if (task != null) { + TasksUiPlugin.getSynchronizationManager().setTaskRead(task, true); } } else { StatusHandler.log("Unable to open editor for " + task.getSummary(), TasksUiUtil.class); @@ -382,9 +382,9 @@ public class TasksUiUtil { * If task is already open and has incoming, must force refresh in place */ private static boolean refreshIfOpen(AbstractTask task, IEditorInput editorInput) { - if (task instanceof AbstractTask) { - if (((AbstractTask) task).getSynchronizationState() == RepositoryTaskSyncState.INCOMING - || ((AbstractTask) task).getSynchronizationState() == RepositoryTaskSyncState.CONFLICT) { + if (task != null) { + if (task.getSynchronizationState() == RepositoryTaskSyncState.INCOMING + || task.getSynchronizationState() == RepositoryTaskSyncState.CONFLICT) { for (TaskEditor editor : getActiveRepositoryTaskEditors()) { if (editor.getEditorInput().equals(editorInput)) { editor.refreshEditorContents(); @@ -423,7 +423,7 @@ public class TasksUiUtil { try { EditRepositoryWizard wizard = new EditRepositoryWizard(repository); Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); - if (wizard != null && shell != null && !shell.isDisposed()) { + if (shell != null && !shell.isDisposed()) { WizardDialog dialog = new WizardDialog(shell, wizard); dialog.create(); dialog.setBlockOnOpen(true); @@ -454,7 +454,7 @@ public class TasksUiUtil { TaskEditor taskEditor = (TaskEditor) editor; if (taskEditor.getEditorInput() instanceof TaskEditorInput) { TaskEditorInput input = (TaskEditorInput) taskEditor.getEditorInput(); - if (input.getTask() instanceof AbstractTask) { + if (input.getTask() != null) { repositoryTaskEditors.add((TaskEditor) editor); } } @@ -509,8 +509,8 @@ public class TasksUiUtil { return TasksUiPlugin.getDefault().getRepositoryForResource(resource, true); } else { AbstractTask task = (AbstractTask) adaptable.getAdapter(AbstractTask.class); - if (task instanceof AbstractTask) { - AbstractTask rtask = (AbstractTask) task; + if (task != null) { + AbstractTask rtask = task; return TasksUiPlugin.getRepositoryManager().getRepository(rtask.getConnectorKind(), rtask.getRepositoryUrl()); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java index d0f659e90..7ec80fb5a 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java @@ -393,6 +393,7 @@ public abstract class AbstractNewRepositoryTaskEditor extends AbstractRepository * @return {@link AbstractTaskContainer category} where the new task must be * added to, or null if it must not be added to the task list */ + @Override @SuppressWarnings("unchecked") protected AbstractTaskCategory getCategory() { int index = categoryChooser.getSelectionIndex(); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java index 2ce5af199..117ffcd95 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java @@ -367,7 +367,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { if (select instanceof RepositoryTaskOutlineNode) { RepositoryTaskOutlineNode n = (RepositoryTaskOutlineNode) select; - if (n != null && lastSelected != null + if (lastSelected != null && ContentOutlineTools.getHandle(n).equals(ContentOutlineTools.getHandle(lastSelected))) { // we don't need to set the selection if it is already // set @@ -995,7 +995,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { if (getDuplicateSearchCollectorsList() != null) { allCollectors.addAll(getDuplicateSearchCollectorsList()); } - if (allCollectors != null) { + if (allCollectors.isEmpty()) { duplicateDetectorLabel = new Label(relatedBugsComposite, SWT.LEFT); duplicateDetectorLabel.setText(LABEL_SELECT_DETECTOR); @@ -1034,9 +1034,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { } else { Label label = new Label(relatedBugsComposite, SWT.LEFT); label.setText(LABEL_NO_DETECTOR); - } - } protected SearchHitCollector getDuplicateSearchCollector(String name) { @@ -1432,12 +1430,12 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { public void widgetSelected(SelectionEvent e) { AbstractTask task = TasksUiPlugin.getTaskListManager().getTaskList().getTask(repository.getUrl(), taskData.getId()); - if (!(task instanceof AbstractTask)) { + if (!(task != null)) { // Should not happen return; } if (AbstractRepositoryTaskEditor.this.isDirty - || ((AbstractTask) task).getSynchronizationState().equals(RepositoryTaskSyncState.OUTGOING)) { + || task.getSynchronizationState().equals(RepositoryTaskSyncState.OUTGOING)) { MessageDialog.openInformation(attachmentsComposite.getShell(), "Task not synchronized or dirty editor", "Commit edits or synchronize task before adding attachments."); @@ -1463,12 +1461,12 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { public void widgetSelected(SelectionEvent e) { AbstractTask task = TasksUiPlugin.getTaskListManager().getTaskList().getTask(repository.getUrl(), taskData.getId()); - if (task == null || !(task instanceof AbstractTask)) { + if (task == null) { // Should not happen return; } if (AbstractRepositoryTaskEditor.this.isDirty - || ((AbstractTask) task).getSynchronizationState().equals(RepositoryTaskSyncState.OUTGOING)) { + || task.getSynchronizationState().equals(RepositoryTaskSyncState.OUTGOING)) { MessageDialog.openInformation(attachmentsComposite.getShell(), "Task not synchronized or dirty editor", "Commit edits or synchronize task before deleting attachments."); @@ -1532,7 +1530,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { descriptionTextViewer.getTextWidget().addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { String newValue = descriptionTextViewer.getTextWidget().getText(); - RepositoryTaskAttribute attribute = (RepositoryTaskAttribute) taskData.getAttribute(RepositoryTaskAttribute.DESCRIPTION); + RepositoryTaskAttribute attribute = taskData.getAttribute(RepositoryTaskAttribute.DESCRIPTION); attribute.setValue(newValue); attributeChanged(attribute); taskData.setDescription(newValue); @@ -1817,10 +1815,8 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { @Override public void linkActivated(HyperlinkEvent e) { - if (taskComment != null) { - deleteComment(taskComment); - submitToRepository(); - } + deleteComment(taskComment); + submitToRepository(); } }); @@ -2715,8 +2711,8 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { "Task could not be created. No additional information was provided by the connector.")); } } else { - modifiedTask = (AbstractTask) TasksUiPlugin.getTaskListManager().getTaskList().getTask( - repository.getUrl(), taskData.getId()); + modifiedTask = TasksUiPlugin.getTaskListManager().getTaskList().getTask(repository.getUrl(), + taskData.getId()); } // Synchronization accounting... diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/NewTaskEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/NewTaskEditorInput.java index 846a42499..c0dcc3de6 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/NewTaskEditorInput.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/NewTaskEditorInput.java @@ -28,6 +28,7 @@ public class NewTaskEditorInput extends RepositoryTaskEditorInput { super.setEditableTaskData(taskData); } + @Override public String getName() { return this.toolTipText; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskEditorDropListener.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskEditorDropListener.java index e59a1857b..7706b1242 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskEditorDropListener.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskEditorDropListener.java @@ -104,14 +104,14 @@ class RepositoryTaskEditorDropListener implements DropTargetListener { AbstractTask task = TasksUiPlugin.getTaskListManager().getTaskList().getTask( this.AbstractTaskEditor.repository.getUrl(), this.AbstractTaskEditor.taskData.getId()); - if (!(task instanceof AbstractTask)) { + if (!(task != null)) { // Should not happen return; } AbstractTaskEditor.setGlobalBusy(true); NewAttachmentWizard naw = new NewAttachmentWizard(this.AbstractTaskEditor.repository, - (AbstractTask) task, text); + task, text); openDialog(naw); } if (fileTransfer.isSupportedType(event.currentDataType)) { @@ -120,13 +120,13 @@ class RepositoryTaskEditorDropListener implements DropTargetListener { AbstractTask task = TasksUiPlugin.getTaskListManager().getTaskList().getTask( this.AbstractTaskEditor.repository.getUrl(), this.AbstractTaskEditor.taskData.getId()); - if (!(task instanceof AbstractTask)) { + if (task == null) { // Should not happen return; } NewAttachmentWizard naw = new NewAttachmentWizard(this.AbstractTaskEditor.repository, - (AbstractTask) task, new File(files[0])); + task, new File(files[0])); openDialog(naw); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskEditorInput.java index 276f315c9..b9113c5e4 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskEditorInput.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskEditorInput.java @@ -34,8 +34,8 @@ public class RepositoryTaskEditorInput extends AbstractRepositoryTaskEditorInput this.taskId = taskId; this.url = taskUrl; AbstractTask task = TasksUiPlugin.getTaskListManager().getTaskList().getTask(repository.getUrl(), taskId); - if (task != null && task instanceof AbstractTask) { - this.repositoryTask = (AbstractTask) task; + if (task != null) { + this.repositoryTask = task; } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java index b60c05858..38dc211a7 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java @@ -318,7 +318,7 @@ public final class TaskEditor extends SharedHeaderFormEditor implements IBusyEdi setActivePage(selectedIndex); } - if (task instanceof AbstractTask) { + if (task != null) { setTitleImage(TasksUiImages.getImage(TasksUiImages.TASK_REPOSITORY)); } else if (getEditorInput() instanceof AbstractRepositoryTaskEditorInput) { this.setTitleImage(TasksUiImages.getImage(TasksUiImages.TASK_REMOTE)); @@ -351,6 +351,7 @@ public final class TaskEditor extends SharedHeaderFormEditor implements IBusyEdi updateFormTitle(); } + @Override public void showBusy(boolean busy) { // if (!this.getHeaderForm().getForm().isDisposed()) { // this.getHeaderForm().getForm().setBusy(busy); @@ -392,15 +393,15 @@ public final class TaskEditor extends SharedHeaderFormEditor implements IBusyEdi if (task instanceof LocalTask) { getHeaderForm().getForm().setText("Task: " + task.getSummary()); } else { - setFormHeaderImage(((AbstractTask) task).getConnectorKind()); - setFormHeaderLabel((AbstractTask) task); + setFormHeaderImage(task.getConnectorKind()); + setFormHeaderLabel(task); return; } } else if (input instanceof RepositoryTaskEditorInput) { AbstractTask task = ((RepositoryTaskEditorInput) input).getRepositoryTask(); - if (task != null && task instanceof AbstractTask) { - setFormHeaderImage(((AbstractTask) task).getConnectorKind()); - setFormHeaderLabel((AbstractTask) task); + if (task != null) { + setFormHeaderImage(task.getConnectorKind()); + setFormHeaderLabel(task); return; } else { RepositoryTaskData data = ((RepositoryTaskEditorInput) input).getTaskData(); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditorInput.java index b2fdfbc0f..9aae6111c 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditorInput.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditorInput.java @@ -118,8 +118,8 @@ public class TaskEditorInput implements IEditorInput, IPersistableElement { * @return Returns the label. */ public String getLabel() { - if (task instanceof AbstractTask) { - AbstractTask repositoryTask = (AbstractTask)task; + if (task != null) { + AbstractTask repositoryTask = task; String idLabel = repositoryTask.getTaskKey(); summary = ""; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/SearchHitCollector.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/SearchHitCollector.java index ba742e94f..4c788aace 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/SearchHitCollector.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/SearchHitCollector.java @@ -119,7 +119,7 @@ public class SearchHitCollector implements ISearchQuery, ITaskCollector { monitor.worked(1); } - taskResults.add((AbstractTask)hitTask); + taskResults.add(hitTask); this.searchResult.addMatch(new Match(hitTask, 0, 0)); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/NewTaskWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/NewTaskWizard.java index c8302d41d..fd423313e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/NewTaskWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/NewTaskWizard.java @@ -64,7 +64,7 @@ public class NewTaskWizard extends Wizard implements INewWizard { AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector( taskRepository.getConnectorKind()); - final AbstractTaskDataHandler taskDataHandler = (AbstractTaskDataHandler) connector.getTaskDataHandler(); + final AbstractTaskDataHandler taskDataHandler = connector.getTaskDataHandler(); if (taskDataHandler == null) { StatusHandler.displayStatus("Error creating new task", new RepositoryStatus(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, RepositoryStatus.ERROR_REPOSITORY, "The selected repository does not support creating new tasks.")); diff --git a/org.eclipse.mylyn.trac.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.trac.core/.settings/org.eclipse.jdt.core.prefs index 4f6160a5e..888de1277 100644 --- a/org.eclipse.mylyn.trac.core/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.mylyn.trac.core/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Wed Jun 06 17:09:48 EDT 2007 +#Sun Jun 24 11:52:58 EDT 2007 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 @@ -36,6 +36,7 @@ org.eclipse.jdt.core.compiler.problem.nullReference=error org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled @@ -45,7 +46,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled diff --git a/org.eclipse.mylyn.trac.core/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.trac.core/.settings/org.eclipse.jdt.ui.prefs index 366e51c21..276c2e6d8 100644 --- a/org.eclipse.mylyn.trac.core/.settings/org.eclipse.jdt.ui.prefs +++ b/org.eclipse.mylyn.trac.core/.settings/org.eclipse.jdt.ui.prefs @@ -1,6 +1,6 @@ -#Mon Feb 05 18:45:21 PST 2007 +#Mon Feb 05 18:45:19 PST 2007 eclipse.preferences.version=1 formatter_profile=_Mylar based on Eclipse [built-in] formatter_settings_version=11 internal.default.compliance=default -org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004 - 2006 Mylar committers and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"></template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004 - 2006 University Of British Columbia and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n * University Of British Columbia - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/org.eclipse.mylyn.trac.core/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.trac.core/.settings/org.eclipse.ltk.core.refactoring.prefs index f157fc425..7ab03bdac 100644 --- a/org.eclipse.mylyn.trac.core/.settings/org.eclipse.ltk.core.refactoring.prefs +++ b/org.eclipse.mylyn.trac.core/.settings/org.eclipse.ltk.core.refactoring.prefs @@ -1,3 +1,3 @@ -#Fri Jun 02 15:31:04 PDT 2006 +#Fri Jun 02 15:30:09 PDT 2006 eclipse.preferences.version=1 org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true diff --git a/org.eclipse.mylyn.trac.core/.settings/org.eclipse.mylar.tasklist.prefs b/org.eclipse.mylyn.trac.core/.settings/org.eclipse.mylar.tasklist.prefs index 6b6306dda..a6cf96a98 100644 --- a/org.eclipse.mylyn.trac.core/.settings/org.eclipse.mylar.tasklist.prefs +++ b/org.eclipse.mylyn.trac.core/.settings/org.eclipse.mylar.tasklist.prefs @@ -1,4 +1,4 @@ -#Fri Oct 20 16:55:01 PDT 2006 +#Fri Oct 20 16:54:30 PDT 2006 eclipse.preferences.version=1 project.repository.kind=bugzilla project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.mylyn.trac.core/.settings/org.eclipse.mylyn.tasklist.prefs b/org.eclipse.mylyn.trac.core/.settings/org.eclipse.mylyn.tasklist.prefs index d19906421..0a2cc0b30 100644 --- a/org.eclipse.mylyn.trac.core/.settings/org.eclipse.mylyn.tasklist.prefs +++ b/org.eclipse.mylyn.trac.core/.settings/org.eclipse.mylyn.tasklist.prefs @@ -1,4 +1,4 @@ -#Mon Jun 18 17:15:28 PDT 2007 +#Mon Jun 18 17:14:59 PDT 2007 eclipse.preferences.version=1 project.repository.kind=bugzilla project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.mylyn.trac.core/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.trac.core/.settings/org.eclipse.mylyn.tasks.ui.prefs new file mode 100644 index 000000000..d8c6d26af --- /dev/null +++ b/org.eclipse.mylyn.trac.core/.settings/org.eclipse.mylyn.tasks.ui.prefs @@ -0,0 +1,4 @@ +#Mon Jun 25 03:02:37 GMT 2007 +eclipse.preferences.version=1 +project.repository.kind=bugzilla +project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.mylyn.trac.core/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.trac.core/.settings/org.eclipse.pde.prefs index 8f16aca3d..769b229ff 100644 --- a/org.eclipse.mylyn.trac.core/.settings/org.eclipse.pde.prefs +++ b/org.eclipse.mylyn.trac.core/.settings/org.eclipse.pde.prefs @@ -1,5 +1,4 @@ -#Tue Feb 07 16:04:38 PST 2006 -compilers.p.build=2 +#Thu Nov 03 15:45:55 PST 2005 compilers.p.deprecated=2 compilers.p.no-required-att=0 compilers.p.not-externalized-att=2 diff --git a/org.eclipse.mylyn.trac.core/build.properties b/org.eclipse.mylyn.trac.core/build.properties index fa2e3ef66..ccc23e04b 100644 --- a/org.eclipse.mylyn.trac.core/build.properties +++ b/org.eclipse.mylyn.trac.core/build.properties @@ -2,12 +2,8 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ .,\ - plugin.xml,\ - icons/,\ about.html -src.includes = icons/,\ - src/,\ - plugin.xml,\ +src.includes = src/,\ META-INF/,\ about.html,\ build.properties diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracAttachmentHandler.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracAttachmentHandler.java index c2fb82091..6d977da28 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracAttachmentHandler.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracAttachmentHandler.java @@ -36,6 +36,7 @@ public class TracAttachmentHandler extends AbstractAttachmentHandler { this.connector = connector; } + @Override public InputStream getAttachmentAsStream(TaskRepository repository, RepositoryAttachment attachment, IProgressMonitor monitor) throws CoreException { String filename = attachment.getAttributeValue(RepositoryTaskAttribute.ATTACHMENT_FILENAME); @@ -54,6 +55,7 @@ public class TracAttachmentHandler extends AbstractAttachmentHandler { } } + @Override public void uploadAttachment(TaskRepository repository, AbstractTask task, ITaskAttachment attachment, String comment, IProgressMonitor monitor) throws CoreException { if (!TracRepositoryConnector.hasAttachmentSupport(repository, task)) { @@ -80,6 +82,7 @@ public class TracAttachmentHandler extends AbstractAttachmentHandler { } } + @Override public boolean canDownloadAttachment(TaskRepository repository, AbstractTask task) { if (repository == null) { return false; @@ -87,6 +90,7 @@ public class TracAttachmentHandler extends AbstractAttachmentHandler { return TracRepositoryConnector.hasAttachmentSupport(repository, task); } + @Override public boolean canUploadAttachment(TaskRepository repository, AbstractTask task) { if (repository == null) { return false; @@ -94,10 +98,12 @@ public class TracAttachmentHandler extends AbstractAttachmentHandler { return TracRepositoryConnector.hasAttachmentSupport(repository, task); } + @Override public boolean canDeprecate(TaskRepository repository, RepositoryAttachment attachment) { return false; } + @Override public void updateAttachment(TaskRepository repository, RepositoryAttachment attachment) throws CoreException { throw new UnsupportedOperationException(); } diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracAttributeFactory.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracAttributeFactory.java index 957a76096..cbf232f70 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracAttributeFactory.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracAttributeFactory.java @@ -156,6 +156,7 @@ public class TracAttributeFactory extends AbstractAttributeFactory { return RepositoryTaskAttribute.COMMENT_NEW.equals(id) || RepositoryTaskAttribute.REMOVE_CC.equals(id) || RepositoryTaskAttribute.NEW_CC.equals(id) || RepositoryTaskAttribute.ADD_SELF_CC.equals(id); } + @Override public Date getDateForAttributeType(String attributeKey, String dateString) { if (dateString == null || dateString.length() == 0) { return null; diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java index d08c48e34..59e59d274 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java @@ -85,6 +85,7 @@ public class TracRepositoryConnector extends AbstractRepositoryConnector { return index == -1 ? null : url.substring(0, index); } + @Override public String getTaskIdFromTaskUrl(String url) { if (url == null) { return null; @@ -218,12 +219,14 @@ public class TracRepositoryConnector extends AbstractRepositoryConnector { return task; } + @Override public AbstractTask createTask(String repositoryUrl, String id, String summary) { TracTask tracTask = new TracTask(repositoryUrl, id, summary); tracTask.setCreationDate(new Date()); return tracTask; } + @Override public void updateTaskFromTaskData(TaskRepository repository, AbstractTask repositoryTask, RepositoryTaskData taskData) { if (taskData != null) { diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracTaskDataHandler.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracTaskDataHandler.java index 848f28761..b59caaf14 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracTaskDataHandler.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracTaskDataHandler.java @@ -54,6 +54,7 @@ public class TracTaskDataHandler extends AbstractTaskDataHandler { this.connector = connector; } + @Override public RepositoryTaskData getTaskData(TaskRepository repository, String taskId, IProgressMonitor monitor) throws CoreException { return downloadTaskData(repository, TracRepositoryConnector.getTicketId(taskId)); @@ -79,11 +80,13 @@ public class TracTaskDataHandler extends AbstractTaskDataHandler { } } + @Override public AbstractAttributeFactory getAttributeFactory(String repositoryUrl, String repositoryKind, String taskKind) { // we don't care about the repository information right now return attributeFactory; } + @Override public AbstractAttributeFactory getAttributeFactory(RepositoryTaskData taskData) { return getAttributeFactory(taskData.getRepositoryUrl(), taskData.getRepositoryKind(), taskData.getTaskKind()); } @@ -323,11 +326,12 @@ public class TracTaskDataHandler extends AbstractTaskDataHandler { return createAttribute(factory, data, attribute, values, false); } + @Override public String postTaskData(TaskRepository repository, RepositoryTaskData taskData, IProgressMonitor monitor) throws CoreException { try { TracTicket ticket = TracRepositoryConnector.getTracTicket(repository, taskData); - ITracClient server = ((TracRepositoryConnector) connector).getClientManager().getRepository(repository); + ITracClient server = connector.getClientManager().getRepository(repository); if (taskData.isNew()) { int id = server.createTicket(ticket); return id + ""; @@ -344,6 +348,7 @@ public class TracTaskDataHandler extends AbstractTaskDataHandler { } } + @Override public boolean initializeTaskData(TaskRepository repository, RepositoryTaskData data, IProgressMonitor monitor) throws CoreException { try { @@ -356,6 +361,7 @@ public class TracTaskDataHandler extends AbstractTaskDataHandler { } } + @Override public Set<String> getSubTaskIds(RepositoryTaskData taskData) { // TODO Auto-generated method stub return Collections.emptySet(); diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracTicket.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracTicket.java index 6f72a3f80..77b229162 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracTicket.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracTicket.java @@ -163,7 +163,7 @@ public class TracTicket { return false; } putBuiltinValue(key, value); - } else if (value instanceof String) { + } else if (value != null) { putCustomValue(keyName, value); } else { throw new InvalidTicketException("Expected string value for custom key '" + keyName + "', got '" + value |