diff options
author | spingel | 2008-03-01 21:39:32 +0000 |
---|---|---|
committer | spingel | 2008-03-01 21:39:32 +0000 |
commit | 98c2cb986a8f23c187b19ace847aacb7e5071c16 (patch) | |
tree | 316ea6233aee61c9935f5ec7b592d92079fcdc2c /org.eclipse.mylyn.trac.core | |
parent | 37e447ac80a2b6d0856f40866cadb40618af4776 (diff) | |
download | org.eclipse.mylyn.tasks-98c2cb986a8f23c187b19ace847aacb7e5071c16.tar.gz org.eclipse.mylyn.tasks-98c2cb986a8f23c187b19ace847aacb7e5071c16.tar.xz org.eclipse.mylyn.tasks-98c2cb986a8f23c187b19ace847aacb7e5071c16.zip |
NEW - bug 210040: activate automatic formating on Java editor savebug_210040_code_cleanup_after
https://bugs.eclipse.org/bugs/show_bug.cgi?id=210040
Diffstat (limited to 'org.eclipse.mylyn.trac.core')
18 files changed, 98 insertions, 87 deletions
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 f6c095dbe..aa9e9b46f 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 @@ -#Sun Jan 27 19:49:22 PST 2008 +#Sat Mar 01 02:52:50 PST 2008 eclipse.preferences.version=1 org.eclipse.jdt.core.codeComplete.argumentPrefixes= org.eclipse.jdt.core.codeComplete.argumentSuffixes= @@ -142,6 +142,9 @@ org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false org.eclipse.jdt.core.formatter.indentation.size=4 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert 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 56ac9918d..5e70d0848 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,4 +1,4 @@ -#Mon Jan 28 19:23:21 PST 2008 +#Sat Mar 01 03:38:47 PST 2008 cleanup_settings_version=2 eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true @@ -8,6 +8,7 @@ internal.default.compliance=default org.eclipse.jdt.ui.exception.name=e org.eclipse.jdt.ui.gettersetter.use.is=true org.eclipse.jdt.ui.javadoc=false +org.eclipse.jdt.ui.keywordthis=false org.eclipse.jdt.ui.overrideannotation=true 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">/**\n * @return the ${bare_field_name}\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">/**\n * @param ${param} the ${bare_field_name} to set\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">/**\n * ${tags}\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">/**\n * \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">/**\n * @author ${user}\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">/**\n * \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">/**\n * ${tags}\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">/*******************************************************************************\n * Copyright (c) 2004, 2007 Mylyn project committers and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *******************************************************************************/\n\n${package_declaration}\n\n${typecomment}\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">\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">\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">\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">\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\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\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}\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">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * \n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\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.wst.jsdt.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.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> sp_cleanup.add_default_serial_version_id=true @@ -22,9 +23,9 @@ sp_cleanup.always_use_blocks=true sp_cleanup.always_use_parentheses_in_expressions=false sp_cleanup.always_use_this_for_non_static_field_access=false sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=false +sp_cleanup.convert_to_enhanced_for_loop=true +sp_cleanup.correct_indentation=true +sp_cleanup.format_source_code=true sp_cleanup.format_source_code_changes_only=false sp_cleanup.make_local_variable_final=false sp_cleanup.make_parameters_final=false @@ -32,12 +33,12 @@ sp_cleanup.make_private_fields_final=true sp_cleanup.make_variable_declarations_final=true sp_cleanup.never_use_blocks=false sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=false +sp_cleanup.on_save_use_additional_actions=true sp_cleanup.organize_imports=true sp_cleanup.qualify_static_field_accesses_with_declaring_class=false sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_with_declaring_class=true sp_cleanup.qualify_static_method_accesses_with_declaring_class=false sp_cleanup.remove_private_constructors=true sp_cleanup.remove_trailing_whitespaces=true diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/AbstractTracClient.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/AbstractTracClient.java index e2ad26dab..12bfa44c0 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/AbstractTracClient.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/AbstractTracClient.java @@ -84,9 +84,8 @@ public abstract class AbstractTracClient implements ITracClient { String formToken = getFormToken(httpClient); NameValuePair[] data = { new NameValuePair("referer", ""), new NameValuePair("user", credentials.getUserName()), - new NameValuePair("password", credentials.getPassword()), - new NameValuePair("__FORM_TOKEN", formToken)}; - + new NameValuePair("password", credentials.getPassword()), new NameValuePair("__FORM_TOKEN", formToken) }; + post.setRequestBody(data); try { int code = WebClientUtil.execute(httpClient, hostConfiguration, post, monitor); 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 fd407061f..cfbbf6779 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 @@ -27,7 +27,7 @@ import org.eclipse.mylyn.tasks.core.TaskRepository; */ public class TracAttachmentHandler extends AbstractAttachmentHandler { - private TracRepositoryConnector connector; + private final TracRepositoryConnector connector; public TracAttachmentHandler(TracRepositoryConnector connector) { this.connector = connector; diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracClientData.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracClientData.java index 4a822902b..3a51c14aa 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracClientData.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracClientData.java @@ -12,10 +12,10 @@ import java.io.Serializable; import java.util.List; import org.eclipse.mylyn.internal.trac.core.model.TracComponent; -import org.eclipse.mylyn.internal.trac.core.model.TracTicketField; import org.eclipse.mylyn.internal.trac.core.model.TracMilestone; import org.eclipse.mylyn.internal.trac.core.model.TracPriority; import org.eclipse.mylyn.internal.trac.core.model.TracSeverity; +import org.eclipse.mylyn.internal.trac.core.model.TracTicketField; import org.eclipse.mylyn.internal.trac.core.model.TracTicketResolution; import org.eclipse.mylyn.internal.trac.core.model.TracTicketStatus; import org.eclipse.mylyn.internal.trac.core.model.TracTicketType; diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracClientManager.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracClientManager.java index 4333450fa..d59b8fc98 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracClientManager.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracClientManager.java @@ -33,11 +33,11 @@ import org.eclipse.mylyn.web.core.AbstractWebLocation; */ public class TracClientManager implements ITaskRepositoryListener { - private Map<String, ITracClient> clientByUrl = new HashMap<String, ITracClient>(); + private final Map<String, ITracClient> clientByUrl = new HashMap<String, ITracClient>(); - private Map<String, TracClientData> clientDataByUrl = new HashMap<String, TracClientData>(); + private final Map<String, TracClientData> clientDataByUrl = new HashMap<String, TracClientData>(); - private File cacheFile; + private final File cacheFile; private TaskRepositoryLocationFactory taskRepositoryLocationFactory; @@ -104,7 +104,8 @@ public class TracClientManager implements ITaskRepositoryListener { } } } catch (Throwable e) { - StatusHandler.log(new Status(IStatus.WARNING, TracCorePlugin.PLUGIN_ID, "The Trac respository configuration cache could not be read", e)); + StatusHandler.log(new Status(IStatus.WARNING, TracCorePlugin.PLUGIN_ID, + "The Trac respository configuration cache could not be read", e)); } finally { if (in != null) { try { @@ -131,7 +132,8 @@ public class TracClientManager implements ITaskRepositoryListener { out.writeObject(clientDataByUrl.get(url)); } } catch (IOException e) { - StatusHandler.log(new Status(IStatus.WARNING, TracCorePlugin.PLUGIN_ID, "The Trac respository configuration cache could not be written", e)); + StatusHandler.log(new Status(IStatus.WARNING, TracCorePlugin.PLUGIN_ID, + "The Trac respository configuration cache could not be written", e)); } finally { if (out != null) { try { @@ -146,9 +148,9 @@ public class TracClientManager implements ITaskRepositoryListener { public TaskRepositoryLocationFactory getTaskRepositoryLocationFactory() { return taskRepositoryLocationFactory; } - + public void setTaskRepositoryLocationFactory(TaskRepositoryLocationFactory taskRepositoryLocationFactory) { this.taskRepositoryLocationFactory = taskRepositoryLocationFactory; } - + } diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracCorePlugin.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracCorePlugin.java index 9f67399e9..079376434 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracCorePlugin.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracCorePlugin.java @@ -13,7 +13,6 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Plugin; -import org.eclipse.core.runtime.Status; import org.eclipse.mylyn.tasks.core.RepositoryStatus; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.osgi.framework.BundleContext; @@ -86,16 +85,17 @@ public class TracCorePlugin extends Plugin { if (message == null) { message = "I/O error has occured"; } - return new RepositoryStatus(repository.getUrl(), Status.ERROR, PLUGIN_ID, RepositoryStatus.ERROR_IO, + return new RepositoryStatus(repository.getUrl(), IStatus.ERROR, PLUGIN_ID, RepositoryStatus.ERROR_IO, message, e); } else if (e instanceof ClassCastException) { - return new RepositoryStatus(Status.ERROR, PLUGIN_ID, RepositoryStatus.ERROR_IO, + return new RepositoryStatus(IStatus.ERROR, PLUGIN_ID, RepositoryStatus.ERROR_IO, "Unexpected server response: " + e.getMessage(), e); } else if (e instanceof MalformedURLException) { - return new RepositoryStatus(Status.ERROR, PLUGIN_ID, RepositoryStatus.ERROR_IO, + return new RepositoryStatus(IStatus.ERROR, PLUGIN_ID, RepositoryStatus.ERROR_IO, "Repository URL is invalid", e); } else { - return new RepositoryStatus(Status.ERROR, PLUGIN_ID, RepositoryStatus.ERROR_INTERNAL, "Unexpected error", e); + return new RepositoryStatus(IStatus.ERROR, PLUGIN_ID, RepositoryStatus.ERROR_INTERNAL, "Unexpected error", + e); } } diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracProxyAuthenticationException.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracProxyAuthenticationException.java index 2aace4e6a..7f69e3067 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracProxyAuthenticationException.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracProxyAuthenticationException.java @@ -15,8 +15,8 @@ public class TracProxyAuthenticationException extends TracException { public TracProxyAuthenticationException(String message) { super(message); } - + public TracProxyAuthenticationException() { } - + } 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 4da5f94d8..c0aed7a57 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 @@ -158,14 +158,14 @@ public class TracRepositoryConnector extends AbstractRepositoryConnector { // handled by updateTaskFromTaskData return false; } - + boolean changed = super.updateTaskFromQueryHit(repository, existingTask, queryHit); if (existingTask instanceof TracTask) { - ((TracTask)existingTask).setSupportsSubtasks(false); + ((TracTask) existingTask).setSupportsSubtasks(false); } return changed; } - + @Override public IStatus performQuery(AbstractRepositoryQuery query, TaskRepository repository, IProgressMonitor monitor, ITaskCollector resultCollector) { @@ -291,25 +291,24 @@ public class TracRepositoryConnector extends AbstractRepositoryConnector { } @Override - public void updateTaskFromTaskData(TaskRepository taskRepository, AbstractTask task, - RepositoryTaskData taskData) { + public void updateTaskFromTaskData(TaskRepository taskRepository, AbstractTask task, RepositoryTaskData taskData) { // API 3.0 taskData should never be null if (taskData != null && task instanceof TracTask) { ITracClient client = getClientManager().getRepository(taskRepository); - + task.setSummary(taskData.getSummary()); task.setOwner(taskData.getAttributeValue(RepositoryTaskAttribute.USER_ASSIGNED)); task.setCompleted(TracTask.isCompleted(taskData.getStatus())); task.setUrl(taskRepository.getUrl() + ITracClient.TICKET_URL + taskData.getId()); - + String priority = taskData.getAttributeValue(Attribute.PRIORITY.getTracKey()); TracPriority[] tracPriorities = client.getPriorities(); task.setPriority(TracTask.getTaskPriority(priority, tracPriorities)); Kind kind = TracTask.Kind.fromType(taskData.getAttributeValue(Attribute.TYPE.getTracKey())); task.setTaskKind((kind != null) ? kind.toString() : null); - - ((TracTask)task).setSupportsSubtasks(taskDataHandler.canInitializeSubTaskData(null, taskData)); + + ((TracTask) task).setSupportsSubtasks(taskDataHandler.canInitializeSubTaskData(null, taskData)); // TODO: Completion Date } } @@ -332,30 +331,31 @@ public class TracRepositoryConnector extends AbstractRepositoryConnector { /** * Updates fields of <code>task</code> from <code>ticket</code>. - * @param client + * + * @param client */ public void updateTaskFromTicket(TracTask task, TracTicket ticket, boolean notify, ITracClient client) { if (ticket.getValue(Key.SUMMARY) != null) { task.setSummary(ticket.getValue(Key.SUMMARY)); } - + task.setCompleted(TracTask.isCompleted(ticket.getValue(Key.STATUS))); - + String priority = ticket.getValue(Key.PRIORITY); TracPriority[] tracPriorities = client.getPriorities(); task.setPriority(TracTask.getTaskPriority(priority, tracPriorities)); - + if (ticket.getValue(Key.TYPE) != null) { Kind kind = TracTask.Kind.fromType(ticket.getValue(Key.TYPE)); task.setTaskKind((kind != null) ? kind.toString() : ticket.getValue(Key.TYPE)); } - + if (ticket.getCreated() != null) { task.setCreationDate(ticket.getCreated()); } task.setSupportsSubtasks(ticket.getCustomValue(TracTaskDataHandler.ATTRIBUTE_BLOCKING) != null); - + if (notify) { taskList.notifyTaskChanged(task, false); } diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracTask.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracTask.java index ca3127033..6bd696e46 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracTask.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracTask.java @@ -218,7 +218,7 @@ public class TracTask extends AbstractTask { } private boolean supportsSubtasks = false; - + public TracTask(String repositoryUrl, String id, String label) { super(repositoryUrl, id, label); setUrl(repositoryUrl + ITracClient.TICKET_URL + id); @@ -237,9 +237,9 @@ public class TracTask extends AbstractTask { public boolean getSupportsSubtasks() { return supportsSubtasks; } - + public void setSupportsSubtasks(boolean supportsSubtasks) { this.supportsSubtasks = supportsSubtasks; } - + } 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 6a041b544..4d0026f09 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 @@ -52,9 +52,9 @@ public class TracTaskDataHandler extends AbstractTaskDataHandler { private static final String CC_DELIMETER = ", "; - private AbstractAttributeFactory attributeFactory = new TracAttributeFactory(); + private final AbstractAttributeFactory attributeFactory = new TracAttributeFactory(); - private TracRepositoryConnector connector; + private final TracRepositoryConnector connector; public TracTaskDataHandler(TracRepositoryConnector connector) { this.connector = connector; @@ -105,7 +105,7 @@ public class TracTaskDataHandler extends AbstractTaskDataHandler { if (ticket.getCreated() != null) { data.setAttributeValue(Attribute.TIME.getTracKey(), TracUtils.toTracTime(ticket.getCreated()) + ""); } - + Date lastChanged = ticket.getLastChanged(); Map<String, String> valueByKey = ticket.getValues(); @@ -146,16 +146,15 @@ public class TracTaskDataHandler extends AbstractTaskDataHandler { taskAttachment.setAttributeValue(Attribute.DESCRIPTION.getTracKey(), attachments[i].getDescription()); taskAttachment.setAttributeValue(RepositoryTaskAttribute.ATTACHMENT_FILENAME, attachments[i].getFilename()); - taskAttachment.setAttributeValue(RepositoryTaskAttribute.ATTACHMENT_SIZE, - attachments[i].getSize() + ""); + taskAttachment.setAttributeValue(RepositoryTaskAttribute.ATTACHMENT_SIZE, attachments[i].getSize() + ""); taskAttachment.setAttributeValue(RepositoryTaskAttribute.USER_OWNER, attachments[i].getAuthor()); if (attachments[i].getCreated() != null) { if (lastChanged == null || attachments[i].getCreated().after(lastChanged)) { - lastChanged = attachments[i].getCreated(); + lastChanged = attachments[i].getCreated(); } - - taskAttachment.setAttributeValue(RepositoryTaskAttribute.ATTACHMENT_DATE, attachments[i].getCreated() - .toString()); + + taskAttachment.setAttributeValue(RepositoryTaskAttribute.ATTACHMENT_DATE, + attachments[i].getCreated().toString()); } taskAttachment.setAttributeValue(RepositoryTaskAttribute.ATTACHMENT_URL, repository.getUrl() + ITracClient.TICKET_ATTACHMENT_URL + ticket.getId() + "/" + attachments[i].getFilename()); @@ -273,8 +272,8 @@ public class TracTaskDataHandler extends AbstractTaskDataHandler { if (field.isOptional()) { attr.addOption("", ""); } - for (int i = 0; i < values.length; i++) { - attr.addOption(values[i], values[i]); + for (String value : values) { + attr.addOption(value, value); } if (field.getDefaultValue() != null) { @@ -284,9 +283,9 @@ public class TracTaskDataHandler extends AbstractTaskDataHandler { attr.setValue(values[index]); } } catch (NumberFormatException e) { - for (int i = 0; i < values.length; i++) { - if (field.getDefaultValue().equals(values[i].toString())) { - attr.setValue(values[i]); + for (String value : values) { + if (field.getDefaultValue().equals(value.toString())) { + attr.setValue(value); break; } } @@ -308,8 +307,8 @@ public class TracTaskDataHandler extends AbstractTaskDataHandler { if (allowEmtpy) { attr.addOption("", ""); } - for (int i = 0; i < values.length; i++) { - attr.addOption(values[i].toString(), values[i].toString()); + for (Object value : values) { + attr.addOption(value.toString(), value.toString()); } } else { attr.setHidden(true); @@ -374,15 +373,16 @@ public class TracTaskDataHandler extends AbstractTaskDataHandler { initializeTaskData(repository, taskData, monitor); RepositoryTaskAttribute attribute = taskData.getAttribute(ATTRIBUTE_BLOCKING); if (attribute == null) { - throw new CoreException(new RepositoryStatus(repository, IStatus.ERROR, TracCorePlugin.PLUGIN_ID, RepositoryStatus.ERROR_REPOSITORY, "The repository does not support subtasks")); - } + throw new CoreException(new RepositoryStatus(repository, IStatus.ERROR, TracCorePlugin.PLUGIN_ID, + RepositoryStatus.ERROR_REPOSITORY, "The repository does not support subtasks")); + } cloneTaskData(parentTaskData, taskData); taskData.setDescription(""); taskData.setSummary(""); attribute.setValue(parentTaskData.getId()); return true; } - + @Override public Set<String> getSubTaskIds(RepositoryTaskData taskData) { RepositoryTaskAttribute attribute = taskData.getAttribute(ATTRIBUTE_BLOCKED_BY); @@ -402,9 +402,9 @@ public class TracTaskDataHandler extends AbstractTaskDataHandler { if (parentTaskData != null) { return parentTaskData.getAttribute(ATTRIBUTE_BLOCKED_BY) != null; } else if (task instanceof TracTask) { - return ((TracTask)task).getSupportsSubtasks(); + return ((TracTask) task).getSupportsSubtasks(); } return false; } - + } diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracWebClient.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracWebClient.java index cec583806..fd79cbab8 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracWebClient.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracWebClient.java @@ -25,6 +25,7 @@ import java.util.Set; import java.util.StringTokenizer; import javax.security.auth.login.LoginException; +import javax.swing.text.html.HTML.Tag; import org.apache.commons.httpclient.HostConfiguration; import org.apache.commons.httpclient.HttpClient; @@ -226,7 +227,7 @@ public class TracWebClient extends AbstractTracClient { for (Token token = tokenizer.nextToken(); token.getType() != Token.EOF; token = tokenizer.nextToken()) { if (token.getType() == Token.TAG) { HtmlTag tag = (HtmlTag) token.getValue(); - if (tag.getTagType() == HtmlTag.Type.TD) { + if (tag.getTagType() == Tag.TD) { String headers = tag.getAttribute("headers"); if ("h_component".equals(headers)) { ticket.putBuiltinValue(Key.COMPONENT, getText(tokenizer)); @@ -248,9 +249,9 @@ public class TracWebClient extends AbstractTracClient { ticket.putBuiltinValue(Key.REPORTER, getText(tokenizer)); } // TODO handle custom fields - } else if (tag.getTagType() == HtmlTag.Type.H2 && "summary".equals(tag.getAttribute("class"))) { + } else if (tag.getTagType() == Tag.H2 && "summary".equals(tag.getAttribute("class"))) { ticket.putBuiltinValue(Key.SUMMARY, getText(tokenizer)); - } else if (tag.getTagType() == HtmlTag.Type.H3 && "status".equals(tag.getAttribute("class"))) { + } else if (tag.getTagType() == Tag.H3 && "status".equals(tag.getAttribute("class"))) { String text = getStrongText(tokenizer); if (text.length() > 0) { // Trac 0.9 format: status / status (resolution) @@ -262,7 +263,7 @@ public class TracWebClient extends AbstractTracClient { ticket.putBuiltinValue(Key.STATUS, text); } } - } else if (tag.getTagType() == HtmlTag.Type.SPAN) { + } else if (tag.getTagType() == Tag.SPAN) { String clazz = tag.getAttribute("class"); if ("status".equals(clazz)) { // Trac 0.10 format: (status type) / (status type: resolution) @@ -396,12 +397,12 @@ public class TracWebClient extends AbstractTracClient { for (Token token = tokenizer.nextToken(); token.getType() != Token.EOF; token = tokenizer.nextToken()) { if (token.getType() == Token.TAG) { HtmlTag tag = (HtmlTag) token.getValue(); - if (tag.getTagType() == HtmlTag.Type.DIV) { + if (tag.getTagType() == Tag.DIV) { String id = tag.getAttribute("id"); inFooter = !tag.isEndTag() && "footer".equals(id); - } else if (tag.getTagType() == HtmlTag.Type.STRONG && inFooter) { + } else if (tag.getTagType() == Tag.STRONG && inFooter) { version = getText(tokenizer); - } else if (tag.getTagType() == HtmlTag.Type.A) { + } else if (tag.getTagType() == Tag.A) { String id = tag.getAttribute("id"); if ("tracpowered".equals(id)) { valid = true; @@ -443,7 +444,7 @@ public class TracWebClient extends AbstractTracClient { if (token.getType() == Token.TAG) { HtmlTag tag = (HtmlTag) token.getValue(); - if (tag.getTagType() == HtmlTag.Type.SCRIPT) { + if (tag.getTagType() == Tag.SCRIPT) { String text = getText(tokenizer).trim(); if (text.startsWith("var properties=")) { parseAttributes(text); @@ -610,7 +611,7 @@ public class TracWebClient extends AbstractTracClient { if (token.getType() == Token.TAG) { HtmlTag tag = (HtmlTag) token.getValue(); - if (tag.getTagType() == HtmlTag.Type.SELECT) { + if (tag.getTagType() == Tag.SELECT) { String name = tag.getAttribute("id"); if ("component".equals(name)) { List<String> values = getOptionValues(tokenizer); @@ -683,7 +684,7 @@ public class TracWebClient extends AbstractTracClient { for (Token token = tokenizer.nextToken(); token.getType() != Token.EOF; token = tokenizer.nextToken()) { if (token.getType() == Token.TAG) { HtmlTag tag = (HtmlTag) token.getValue(); - if (tag.getTagType() == HtmlTag.Type.OPTION && !tag.isEndTag()) { + if (tag.getTagType() == Tag.OPTION && !tag.isEndTag()) { String value = getText(tokenizer).trim(); if (value.length() > 0) { values.add(value); @@ -715,7 +716,7 @@ public class TracWebClient extends AbstractTracClient { */ private String getStrongText(HtmlStreamTokenizer tokenizer) throws IOException, ParseException { for (Token token = tokenizer.nextToken(); token.getType() != Token.EOF; token = tokenizer.nextToken()) { - if (token.getType() == Token.TAG && ((HtmlTag) token.getValue()).getTagType() == HtmlTag.Type.STRONG) { + if (token.getType() == Token.TAG && ((HtmlTag) token.getValue()).getTagType() == Tag.STRONG) { return getText(tokenizer); } else if (token.getType() == Token.COMMENT) { // ignore diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracWikiHandler.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracWikiHandler.java index 80ad431aa..de393b623 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracWikiHandler.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracWikiHandler.java @@ -22,7 +22,7 @@ import org.eclipse.mylyn.tasks.core.TaskRepository; */ public class TracWikiHandler extends AbstractWikiHandler { - private TracRepositoryConnector connector; + private final TracRepositoryConnector connector; public TracWikiHandler(TracRepositoryConnector connector) { this.connector = connector; @@ -55,6 +55,7 @@ public class TracWikiHandler extends AbstractWikiHandler { } } + @Override public void postWikiPage(TaskRepository repository, TracWikiPage newPage, IProgressMonitor monitor) throws CoreException { monitor.beginTask("Upload Wiki Page", IProgressMonitor.UNKNOWN); @@ -78,6 +79,7 @@ public class TracWikiHandler extends AbstractWikiHandler { } } + @Override public TracWikiPageInfo[] getPageHistory(TaskRepository repository, String pageName, IProgressMonitor monitor) throws CoreException { monitor.beginTask("Retrieve Wiki Page History", IProgressMonitor.UNKNOWN); diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracSearch.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracSearch.java index ff8edee70..32de58903 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracSearch.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracSearch.java @@ -33,7 +33,7 @@ import org.eclipse.mylyn.monitor.core.StatusHandler; public class TracSearch { /** Stores search criteria in the order entered by the user. */ - private Map<String, TracSearchFilter> filterByFieldName = new LinkedHashMap<String, TracSearchFilter>(); + private final Map<String, TracSearchFilter> filterByFieldName = new LinkedHashMap<String, TracSearchFilter>(); /** The field the result is ordered by. */ private String orderBy; @@ -142,7 +142,8 @@ public class TracSearch { sb.append(URLEncoder.encode(filter.getOperator().getQueryValue(), ITracClient.CHARSET)); sb.append(URLEncoder.encode(value, ITracClient.CHARSET)); } catch (UnsupportedEncodingException e) { - StatusHandler.log(new Status(IStatus.WARNING, TracCorePlugin.PLUGIN_ID, "Unexpected exception while decoding URL", e)); + StatusHandler.log(new Status(IStatus.WARNING, TracCorePlugin.PLUGIN_ID, + "Unexpected exception while decoding URL", e)); } } } @@ -169,7 +170,8 @@ public class TracSearch { addFilter(key, value); } } catch (UnsupportedEncodingException e) { - StatusHandler.log(new Status(IStatus.WARNING, TracCorePlugin.PLUGIN_ID, "Unexpected exception while decoding URL", e)); + StatusHandler.log(new Status(IStatus.WARNING, TracCorePlugin.PLUGIN_ID, + "Unexpected exception while decoding URL", e)); } } } diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracSearchFilter.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracSearchFilter.java index b48dd25a0..0ba93e3ff 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracSearchFilter.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracSearchFilter.java @@ -72,11 +72,11 @@ public class TracSearchFilter { } - private String fieldName; + private final String fieldName; private CompareOperator operator; - private List<String> values = new ArrayList<String>(); + private final List<String> values = new ArrayList<String>(); public TracSearchFilter(String fieldName) { this.fieldName = fieldName; 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 dfc6fbb7f..1c356b688 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 @@ -75,7 +75,7 @@ public class TracTicket { private Date lastChanged; /** Trac's built-in ticket properties. */ - private Map<Key, String> valueByKey = new HashMap<Key, String>(); + private final Map<Key, String> valueByKey = new HashMap<Key, String>(); private List<TracComment> comments; diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracTicketAttribute.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracTicketAttribute.java index a51161643..decea9a5f 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracTicketAttribute.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracTicketAttribute.java @@ -17,9 +17,9 @@ public class TracTicketAttribute implements Comparable<TracTicketAttribute>, Ser private static final long serialVersionUID = -8611030780681519787L; - private String name; + private final String name; - private int value; + private final int value; public TracTicketAttribute(String name, int value) { this.name = name; diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracWikiPageInfo.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracWikiPageInfo.java index 729e2996d..36983a035 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracWikiPageInfo.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracWikiPageInfo.java @@ -29,7 +29,7 @@ public class TracWikiPageInfo { public TracWikiPageInfo() { } - + public String getPageName() { return pageName; } @@ -70,8 +70,9 @@ public class TracWikiPageInfo { this.comment = comment; } + @Override public String toString() { return pageName + ": version " + version + " by " + author + " last modified at " + lastModified; } - + } |