Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 318045 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/mylyn/internal/tasks/ui/ITasksUiPreferenceConstants.java (+2 lines)
Lines 101-104 Link Here
101
	public static final String LAST_SERVICE_MESSAGE_LAST_MODIFIED = "org.eclipse.mylyn.tasks.ui.servicemessage.lastmodified"; //$NON-NLS-1$
101
	public static final String LAST_SERVICE_MESSAGE_LAST_MODIFIED = "org.eclipse.mylyn.tasks.ui.servicemessage.lastmodified"; //$NON-NLS-1$
102
102
103
	public static final String LAST_SERVICE_MESSAGE_CHECKTIME = "org.eclipse.mylyn.tasks.ui.servicemessage.checktime"; //$NON-NLS-1$
103
	public static final String LAST_SERVICE_MESSAGE_CHECKTIME = "org.eclipse.mylyn.tasks.ui.servicemessage.checktime"; //$NON-NLS-1$
104
105
	public static final String TASK_LIST_TRIM_WHITESPACE_ENABLED = "org.eclipse.mylyn.tasks.ui.task.list.trim.whitespace"; //$NON-NLS-1$
104
}
106
}
(-)src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java (-2 / +3 lines)
Lines 72-79 Link Here
72
import org.eclipse.mylyn.internal.tasks.core.TaskActivityUtil;
72
import org.eclipse.mylyn.internal.tasks.core.TaskActivityUtil;
73
import org.eclipse.mylyn.internal.tasks.core.TaskList;
73
import org.eclipse.mylyn.internal.tasks.core.TaskList;
74
import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryDelta;
74
import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryDelta;
75
import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryManager;
76
import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryDelta.Type;
75
import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryDelta.Type;
76
import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryManager;
77
import org.eclipse.mylyn.internal.tasks.core.data.TaskDataManager;
77
import org.eclipse.mylyn.internal.tasks.core.data.TaskDataManager;
78
import org.eclipse.mylyn.internal.tasks.core.data.TaskDataStore;
78
import org.eclipse.mylyn.internal.tasks.core.data.TaskDataStore;
79
import org.eclipse.mylyn.internal.tasks.core.externalization.ExternalizationManager;
79
import org.eclipse.mylyn.internal.tasks.core.externalization.ExternalizationManager;
Lines 91-102 Link Here
91
import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
91
import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
92
import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
92
import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
93
import org.eclipse.mylyn.tasks.core.ITask;
93
import org.eclipse.mylyn.tasks.core.ITask;
94
import org.eclipse.mylyn.tasks.core.ITask.PriorityLevel;
94
import org.eclipse.mylyn.tasks.core.ITaskActivationListener;
95
import org.eclipse.mylyn.tasks.core.ITaskActivationListener;
95
import org.eclipse.mylyn.tasks.core.ITaskContainer;
96
import org.eclipse.mylyn.tasks.core.ITaskContainer;
96
import org.eclipse.mylyn.tasks.core.RepositoryTemplate;
97
import org.eclipse.mylyn.tasks.core.RepositoryTemplate;
97
import org.eclipse.mylyn.tasks.core.TaskActivationAdapter;
98
import org.eclipse.mylyn.tasks.core.TaskActivationAdapter;
98
import org.eclipse.mylyn.tasks.core.TaskRepository;
99
import org.eclipse.mylyn.tasks.core.TaskRepository;
99
import org.eclipse.mylyn.tasks.core.ITask.PriorityLevel;
100
import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi;
100
import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi;
101
import org.eclipse.mylyn.tasks.ui.AbstractTaskRepositoryLinkProvider;
101
import org.eclipse.mylyn.tasks.ui.AbstractTaskRepositoryLinkProvider;
102
import org.eclipse.mylyn.tasks.ui.TasksUi;
102
import org.eclipse.mylyn.tasks.ui.TasksUi;
Lines 957-962 Link Here
957
957
958
		store.setDefault(ITasksUiPreferenceConstants.AUTO_EXPAND_TASK_LIST, true);
958
		store.setDefault(ITasksUiPreferenceConstants.AUTO_EXPAND_TASK_LIST, true);
959
		store.setDefault(ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED, true);
959
		store.setDefault(ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED, true);
960
		store.setDefault(ITasksUiPreferenceConstants.TASK_LIST_TRIM_WHITESPACE_ENABLED, true);
960
961
961
		store.setDefault(ITasksUiPreferenceConstants.SERVICE_MESSAGE_URL, "http://eclipse.org/mylyn/message.xml"); //$NON-NLS-1$
962
		store.setDefault(ITasksUiPreferenceConstants.SERVICE_MESSAGE_URL, "http://eclipse.org/mylyn/message.xml"); //$NON-NLS-1$
962
	}
963
	}
(-)src/org/eclipse/mylyn/internal/tasks/ui/preferences/Messages.java (+2 lines)
Lines 91-96 Link Here
91
91
92
	public static String TasksUiPreferencePage_Track_Time_Spent;
92
	public static String TasksUiPreferencePage_Track_Time_Spent;
93
93
94
	public static String TasksUiPreferencePage_TrimLeadingAndTrailingWhitespaces;
95
94
	public static String TasksUiPreferencePage_Use_the_Restore_dialog_to_recover_missing_tasks;
96
	public static String TasksUiPreferencePage_Use_the_Restore_dialog_to_recover_missing_tasks;
95
97
96
	public static String TasksUiPreferencePage_Web_Browser;
98
	public static String TasksUiPreferencePage_Web_Browser;
(-)src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksUiPreferencePage.java (+16 lines)
Lines 109-114 Link Here
109
109
110
	private Button taskListTooltipEnabledButton;
110
	private Button taskListTooltipEnabledButton;
111
111
112
	private Button taskListTrimWhitespaceButton;
113
112
	// Disabled for initial 3.4 release as per bug#263528
114
	// Disabled for initial 3.4 release as per bug#263528
113
//	private Button taskListServiceMessageEnabledButton;
115
//	private Button taskListServiceMessageEnabledButton;
114
116
Lines 211-216 Link Here
211
		getPreferenceStore().setValue(ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED,
213
		getPreferenceStore().setValue(ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED,
212
				taskListTooltipEnabledButton.getSelection());
214
				taskListTooltipEnabledButton.getSelection());
213
215
216
		getPreferenceStore().setValue(ITasksUiPreferenceConstants.TASK_LIST_TRIM_WHITESPACE_ENABLED,
217
				taskListTrimWhitespaceButton.getSelection());
218
214
		// Disabled for initial 3.4 release as per bug#263528
219
		// Disabled for initial 3.4 release as per bug#263528
215
//		getPreferenceStore().setValue(ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED,
220
//		getPreferenceStore().setValue(ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED,
216
//				taskListServiceMessageEnabledButton.getSelection());
221
//				taskListServiceMessageEnabledButton.getSelection());
Lines 283-288 Link Here
283
		taskListTooltipEnabledButton.setSelection(getPreferenceStore().getBoolean(
288
		taskListTooltipEnabledButton.setSelection(getPreferenceStore().getBoolean(
284
				ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));
289
				ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));
285
290
291
		taskListTrimWhitespaceButton.setSelection(getPreferenceStore().getBoolean(
292
				ITasksUiPreferenceConstants.TASK_LIST_TRIM_WHITESPACE_ENABLED));
293
286
		// Disabled for initial 3.4 release as per bug#263528
294
		// Disabled for initial 3.4 release as per bug#263528
287
//		taskListServiceMessageEnabledButton.setSelection(getPreferenceStore().getBoolean(
295
//		taskListServiceMessageEnabledButton.setSelection(getPreferenceStore().getBoolean(
288
//				ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));
296
//				ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));
Lines 321-326 Link Here
321
		taskListTooltipEnabledButton.setSelection(getPreferenceStore().getDefaultBoolean(
329
		taskListTooltipEnabledButton.setSelection(getPreferenceStore().getDefaultBoolean(
322
				ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));
330
				ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));
323
331
332
		taskListTrimWhitespaceButton.setSelection(getPreferenceStore().getDefaultBoolean(
333
				ITasksUiPreferenceConstants.TASK_LIST_TRIM_WHITESPACE_ENABLED));
334
324
		// Disabled for initial 3.4 release as per bug#263528
335
		// Disabled for initial 3.4 release as per bug#263528
325
//		taskListServiceMessageEnabledButton.setSelection(getPreferenceStore().getDefaultBoolean(
336
//		taskListServiceMessageEnabledButton.setSelection(getPreferenceStore().getDefaultBoolean(
326
//				ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));
337
//				ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));
Lines 496-501 Link Here
496
		taskListTooltipEnabledButton.setSelection(getPreferenceStore().getBoolean(
507
		taskListTooltipEnabledButton.setSelection(getPreferenceStore().getBoolean(
497
				ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));
508
				ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));
498
509
510
		taskListTrimWhitespaceButton = new Button(group, SWT.CHECK);
511
		taskListTrimWhitespaceButton.setText(Messages.TasksUiPreferencePage_TrimLeadingAndTrailingWhitespaces);
512
		taskListTrimWhitespaceButton.setSelection(getPreferenceStore().getBoolean(
513
				ITasksUiPreferenceConstants.TASK_LIST_TRIM_WHITESPACE_ENABLED));
514
499
		// Disabled for initial 3.4 release as per bug#263528
515
		// Disabled for initial 3.4 release as per bug#263528
500
//		taskListServiceMessageEnabledButton = new Button(group, SWT.CHECK);
516
//		taskListServiceMessageEnabledButton = new Button(group, SWT.CHECK);
501
//		taskListServiceMessageEnabledButton.setText(Messages.TasksUiPreferencePage_show_service_messages);
517
//		taskListServiceMessageEnabledButton.setText(Messages.TasksUiPreferencePage_show_service_messages);
(-)src/org/eclipse/mylyn/internal/tasks/ui/preferences/messages.properties (+1 lines)
Lines 41-46 Link Here
41
TasksUiPreferencePage_Task_List_Group=Task List
41
TasksUiPreferencePage_Task_List_Group=Task List
42
TasksUiPreferencePage_Task_Timing=Time Tracking
42
TasksUiPreferencePage_Task_Timing=Time Tracking
43
TasksUiPreferencePage_Track_Time_Spent=Track time spent within Eclipse when a task is active
43
TasksUiPreferencePage_Track_Time_Spent=Track time spent within Eclipse when a task is active
44
TasksUiPreferencePage_TrimLeadingAndTrailingWhitespaces=Trim leading and trailing whitespaces in the task list find
44
TasksUiPreferencePage_Use_the_Restore_dialog_to_recover_missing_tasks=Use the Restore dialog to recover missing tasks
45
TasksUiPreferencePage_Use_the_Restore_dialog_to_recover_missing_tasks=Use the Restore dialog to recover missing tasks
45
TasksUiPreferencePage_Web_Browser=Web Browser
46
TasksUiPreferencePage_Web_Browser=Web Browser
46
TasksUiPreferencePage_Week_Start=Week Start:
47
TasksUiPreferencePage_Week_Start=Week Start:
(-)src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java (-1 / +4 lines)
Lines 32-37 Link Here
32
import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
32
import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
33
import org.eclipse.mylyn.internal.tasks.core.ITaskListChangeListener;
33
import org.eclipse.mylyn.internal.tasks.core.ITaskListChangeListener;
34
import org.eclipse.mylyn.internal.tasks.core.TaskContainerDelta;
34
import org.eclipse.mylyn.internal.tasks.core.TaskContainerDelta;
35
import org.eclipse.mylyn.internal.tasks.ui.ITasksUiPreferenceConstants;
35
import org.eclipse.mylyn.internal.tasks.ui.TaskHistoryDropDown;
36
import org.eclipse.mylyn.internal.tasks.ui.TaskHistoryDropDown;
36
import org.eclipse.mylyn.internal.tasks.ui.TaskScalingHyperlink;
37
import org.eclipse.mylyn.internal.tasks.ui.TaskScalingHyperlink;
37
import org.eclipse.mylyn.internal.tasks.ui.TaskWorkingSetFilter;
38
import org.eclipse.mylyn.internal.tasks.ui.TaskWorkingSetFilter;
Lines 556-562 Link Here
556
	@Override
557
	@Override
557
	protected String getFilterString() {
558
	protected String getFilterString() {
558
		String text = super.getFilterString();
559
		String text = super.getFilterString();
559
		return (text != null) ? text.trim() : null;
560
		return (text != null && TasksUiPlugin.getDefault()
561
				.getPreferenceStore()
562
				.getBoolean(ITasksUiPreferenceConstants.TASK_LIST_TRIM_WHITESPACE_ENABLED)) ? text.trim() : text;
560
	}
563
	}
561
564
562
	public TaskWorkingSetFilter getWorkingSetFilter() {
565
	public TaskWorkingSetFilter getWorkingSetFilter() {

Return to bug 318045