Attachment 172824 Details for Bug 318045 – patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch

clipboard.txt (text/plain), 9.86 KB, created by Thomas Ehrnhoefer

on 2010-06-25 18:31:17 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Ehrnhoefer

Created: 2010-06-25 18:31:17 EDT

Size: 9.86 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/internal/tasks/ui/ITasksUiPreferenceConstants.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ITasksUiPreferenceConstants.java,v
>retrieving revision 1.15
>diff -u -r1.15 ITasksUiPreferenceConstants.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/ITasksUiPreferenceConstants.java	25 May 2010 21:08:31 -0000	1.15
>+++ src/org/eclipse/mylyn/internal/tasks/ui/ITasksUiPreferenceConstants.java	25 Jun 2010 22:30:03 -0000
>@@ -101,4 +101,6 @@
> 	public static final String LAST_SERVICE_MESSAGE_LAST_MODIFIED = "org.eclipse.mylyn.tasks.ui.servicemessage.lastmodified"; //$NON-NLS-1$
> 
> 	public static final String LAST_SERVICE_MESSAGE_CHECKTIME = "org.eclipse.mylyn.tasks.ui.servicemessage.checktime"; //$NON-NLS-1$
>+
>+	public static final String TASK_LIST_TRIM_WHITESPACE_ENABLED = "org.eclipse.mylyn.tasks.ui.task.list.trim.whitespace"; //$NON-NLS-1$
> }
>Index: src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java,v
>retrieving revision 1.138
>diff -u -r1.138 TasksUiPlugin.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java	4 Jun 2010 03:05:38 -0000	1.138
>+++ src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java	25 Jun 2010 22:30:03 -0000
>@@ -72,8 +72,8 @@
> import org.eclipse.mylyn.internal.tasks.core.TaskActivityUtil;
> import org.eclipse.mylyn.internal.tasks.core.TaskList;
> import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryDelta;
>-import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryManager;
> import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryDelta.Type;
>+import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryManager;
> import org.eclipse.mylyn.internal.tasks.core.data.TaskDataManager;
> import org.eclipse.mylyn.internal.tasks.core.data.TaskDataStore;
> import org.eclipse.mylyn.internal.tasks.core.externalization.ExternalizationManager;
>@@ -91,12 +91,12 @@
> import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
> import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
> import org.eclipse.mylyn.tasks.core.ITask;
>+import org.eclipse.mylyn.tasks.core.ITask.PriorityLevel;
> import org.eclipse.mylyn.tasks.core.ITaskActivationListener;
> import org.eclipse.mylyn.tasks.core.ITaskContainer;
> import org.eclipse.mylyn.tasks.core.RepositoryTemplate;
> import org.eclipse.mylyn.tasks.core.TaskActivationAdapter;
> import org.eclipse.mylyn.tasks.core.TaskRepository;
>-import org.eclipse.mylyn.tasks.core.ITask.PriorityLevel;
> import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi;
> import org.eclipse.mylyn.tasks.ui.AbstractTaskRepositoryLinkProvider;
> import org.eclipse.mylyn.tasks.ui.TasksUi;
>@@ -957,6 +957,7 @@
> 
> 		store.setDefault(ITasksUiPreferenceConstants.AUTO_EXPAND_TASK_LIST, true);
> 		store.setDefault(ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED, true);
>+		store.setDefault(ITasksUiPreferenceConstants.TASK_LIST_TRIM_WHITESPACE_ENABLED, true);
> 
> 		store.setDefault(ITasksUiPreferenceConstants.SERVICE_MESSAGE_URL, "http://eclipse.org/mylyn/message.xml"); //$NON-NLS-1$
> 	}
>Index: src/org/eclipse/mylyn/internal/tasks/ui/preferences/Messages.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/Messages.java,v
>retrieving revision 1.7
>diff -u -r1.7 Messages.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/preferences/Messages.java	25 May 2010 20:03:24 -0000	1.7
>+++ src/org/eclipse/mylyn/internal/tasks/ui/preferences/Messages.java	25 Jun 2010 22:30:03 -0000
>@@ -91,6 +91,8 @@
> 
> 	public static String TasksUiPreferencePage_Track_Time_Spent;
> 
>+	public static String TasksUiPreferencePage_TrimLeadingAndTrailingWhitespaces;
>+
> 	public static String TasksUiPreferencePage_Use_the_Restore_dialog_to_recover_missing_tasks;
> 
> 	public static String TasksUiPreferencePage_Web_Browser;
>Index: src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksUiPreferencePage.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksUiPreferencePage.java,v
>retrieving revision 1.43
>diff -u -r1.43 TasksUiPreferencePage.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksUiPreferencePage.java	4 Jun 2010 03:05:38 -0000	1.43
>+++ src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksUiPreferencePage.java	25 Jun 2010 22:30:04 -0000
>@@ -109,6 +109,8 @@
> 
> 	private Button taskListTooltipEnabledButton;
> 
>+	private Button taskListTrimWhitespaceButton;
>+
> 	// Disabled for initial 3.4 release as per bug#263528
> //	private Button taskListServiceMessageEnabledButton;
> 
>@@ -211,6 +213,9 @@
> 		getPreferenceStore().setValue(ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED,
> 				taskListTooltipEnabledButton.getSelection());
> 
>+		getPreferenceStore().setValue(ITasksUiPreferenceConstants.TASK_LIST_TRIM_WHITESPACE_ENABLED,
>+				taskListTrimWhitespaceButton.getSelection());
>+
> 		// Disabled for initial 3.4 release as per bug#263528
> //		getPreferenceStore().setValue(ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED,
> //				taskListServiceMessageEnabledButton.getSelection());
>@@ -283,6 +288,9 @@
> 		taskListTooltipEnabledButton.setSelection(getPreferenceStore().getBoolean(
> 				ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));
> 
>+		taskListTrimWhitespaceButton.setSelection(getPreferenceStore().getBoolean(
>+				ITasksUiPreferenceConstants.TASK_LIST_TRIM_WHITESPACE_ENABLED));
>+
> 		// Disabled for initial 3.4 release as per bug#263528
> //		taskListServiceMessageEnabledButton.setSelection(getPreferenceStore().getBoolean(
> //				ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));
>@@ -321,6 +329,9 @@
> 		taskListTooltipEnabledButton.setSelection(getPreferenceStore().getDefaultBoolean(
> 				ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));
> 
>+		taskListTrimWhitespaceButton.setSelection(getPreferenceStore().getDefaultBoolean(
>+				ITasksUiPreferenceConstants.TASK_LIST_TRIM_WHITESPACE_ENABLED));
>+
> 		// Disabled for initial 3.4 release as per bug#263528
> //		taskListServiceMessageEnabledButton.setSelection(getPreferenceStore().getDefaultBoolean(
> //				ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));
>@@ -496,6 +507,11 @@
> 		taskListTooltipEnabledButton.setSelection(getPreferenceStore().getBoolean(
> 				ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));
> 
>+		taskListTrimWhitespaceButton = new Button(group, SWT.CHECK);
>+		taskListTrimWhitespaceButton.setText(Messages.TasksUiPreferencePage_TrimLeadingAndTrailingWhitespaces);
>+		taskListTrimWhitespaceButton.setSelection(getPreferenceStore().getBoolean(
>+				ITasksUiPreferenceConstants.TASK_LIST_TRIM_WHITESPACE_ENABLED));
>+
> 		// Disabled for initial 3.4 release as per bug#263528
> //		taskListServiceMessageEnabledButton = new Button(group, SWT.CHECK);
> //		taskListServiceMessageEnabledButton.setText(Messages.TasksUiPreferencePage_show_service_messages);
>Index: src/org/eclipse/mylyn/internal/tasks/ui/preferences/messages.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/messages.properties,v
>retrieving revision 1.11
>diff -u -r1.11 messages.properties
>--- src/org/eclipse/mylyn/internal/tasks/ui/preferences/messages.properties	25 May 2010 20:03:24 -0000	1.11
>+++ src/org/eclipse/mylyn/internal/tasks/ui/preferences/messages.properties	25 Jun 2010 22:30:04 -0000
>@@ -41,6 +41,7 @@
> TasksUiPreferencePage_Task_List_Group=Task List
> TasksUiPreferencePage_Task_Timing=Time Tracking
> TasksUiPreferencePage_Track_Time_Spent=Track time spent within Eclipse when a task is active
>+TasksUiPreferencePage_TrimLeadingAndTrailingWhitespaces=Trim leading and trailing whitespaces in the task list find
> TasksUiPreferencePage_Use_the_Restore_dialog_to_recover_missing_tasks=Use the Restore dialog to recover missing tasks
> TasksUiPreferencePage_Web_Browser=Web Browser
> TasksUiPreferencePage_Week_Start=Week Start:
>Index: src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java,v
>retrieving revision 1.125
>diff -u -r1.125 TaskListFilteredTree.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java	15 Jun 2010 18:12:25 -0000	1.125
>+++ src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java	25 Jun 2010 22:30:04 -0000
>@@ -32,6 +32,7 @@
> import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
> import org.eclipse.mylyn.internal.tasks.core.ITaskListChangeListener;
> import org.eclipse.mylyn.internal.tasks.core.TaskContainerDelta;
>+import org.eclipse.mylyn.internal.tasks.ui.ITasksUiPreferenceConstants;
> import org.eclipse.mylyn.internal.tasks.ui.TaskHistoryDropDown;
> import org.eclipse.mylyn.internal.tasks.ui.TaskScalingHyperlink;
> import org.eclipse.mylyn.internal.tasks.ui.TaskWorkingSetFilter;
>@@ -556,7 +557,9 @@
> 	@Override
> 	protected String getFilterString() {
> 		String text = super.getFilterString();
>-		return (text != null) ? text.trim() : null;
>+		return (text != null && TasksUiPlugin.getDefault()
>+				.getPreferenceStore()
>+				.getBoolean(ITasksUiPreferenceConstants.TASK_LIST_TRIM_WHITESPACE_ENABLED)) ? text.trim() : text;
> 	}
> 
> 	public TaskWorkingSetFilter getWorkingSetFilter() {

Flags:

thomas.ehrnhoefer: review?

Actions: View | Diff

Attachments on bug 318045: 172824 | 172825 | 182409 | 182410