Attachment 190347 Details for Bug 338499 – fix two

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

[patch] fix two

clipboard.txt (text/plain), 7.07 KB, created by Steffen Pingel

on 2011-03-03 22:25:10 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Steffen Pingel

Created: 2011-03-03 22:25:10 EST

Size: 7.07 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/internal/tasks/ui/actions/HideQueryAction.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/HideQueryAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 HideQueryAction.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/actions/HideQueryAction.java	4 Mar 2011 01:52:05 -0000	1.1
>+++ src/org/eclipse/mylyn/internal/tasks/ui/actions/HideQueryAction.java	4 Mar 2011 02:11:25 -0000
>@@ -32,39 +32,45 @@
> public class HideQueryAction extends BaseSelectionListenerAction {
> 
> 	public HideQueryAction() {
>-		super("Hidden");
>+		super(Messages.HideQueryAction_Hidden_Label);
> 		setChecked(false);
> 		setEnabled(false);
> 	}
> 
> 	@Override
> 	protected boolean updateSelection(IStructuredSelection selection) {
>-		if (selection.size() == 1) {
>-			Object element = selection.getFirstElement();
>+		if (selection.isEmpty()) {
>+			return false;
>+		}
>+		boolean hidden = true;
>+		for (Object element : selection.toList()) {
> 			if (element instanceof IRepositoryQuery) {
>-				setChecked(Boolean.parseBoolean((((IRepositoryQuery) element).getAttribute(ITasksCoreConstants.ATTRIBUTE_HIDDEN))));
>-				return true;
>+				hidden &= Boolean.parseBoolean((((IRepositoryQuery) element).getAttribute(ITasksCoreConstants.ATTRIBUTE_HIDDEN)));
>+			} else {
>+				return false;
> 			}
> 		}
>-		setChecked(false);
>-		return false;
>+		setChecked(hidden);
>+		return true;
> 	}
> 
> 	@Override
> 	public void run() {
>-		final Object element = getStructuredSelection().getFirstElement();
>-		if (element instanceof IRepositoryQuery) {
>-			try {
>-				final IRepositoryQuery query = ((IRepositoryQuery) element);
>-				TasksUiPlugin.getTaskList().run(new ITaskListRunnable() {
>-					public void execute(IProgressMonitor monitor) throws CoreException {
>-						query.setAttribute(ITasksCoreConstants.ATTRIBUTE_HIDDEN, Boolean.toString(isChecked()));
>-					}
>-				});
>-				TasksUiPlugin.getTaskList().notifyElementsChanged(Collections.singleton((IRepositoryElement) query));
>-			} catch (CoreException e) {
>-				StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN,
>-						"Failed to set hidden status for query", e)); //$NON-NLS-1$
>+		for (Object element : getStructuredSelection().toList()) {
>+			if (element instanceof IRepositoryQuery) {
>+				try {
>+					final IRepositoryQuery query = ((IRepositoryQuery) element);
>+					TasksUiPlugin.getTaskList().run(new ITaskListRunnable() {
>+						public void execute(IProgressMonitor monitor) throws CoreException {
>+							query.setAttribute(ITasksCoreConstants.ATTRIBUTE_HIDDEN, Boolean.toString(isChecked()));
>+						}
>+					});
>+					TasksUiPlugin.getTaskList()
>+							.notifyElementsChanged(Collections.singleton((IRepositoryElement) query));
>+				} catch (CoreException e) {
>+					StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN,
>+							"Failed to set hidden status for query", e)); //$NON-NLS-1$
>+				}
> 			}
> 		}
> 	}
>Index: src/org/eclipse/mylyn/internal/tasks/ui/actions/Messages.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/Messages.java,v
>retrieving revision 1.26
>diff -u -r1.26 Messages.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/actions/Messages.java	8 Jun 2010 23:10:08 -0000	1.26
>+++ src/org/eclipse/mylyn/internal/tasks/ui/actions/Messages.java	4 Mar 2011 02:11:25 -0000
>@@ -149,6 +149,8 @@
> 
> 	public static String GroupSubTasksAction_Group_Subtasks;
> 
>+	public static String HideQueryAction_Hidden_Label;
>+
> 	public static String ImportAction_Dialog_Title;
> 
> 	public static String ImportAction_Problems_encountered;
>Index: src/org/eclipse/mylyn/internal/tasks/ui/actions/messages.properties
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/messages.properties,v
>retrieving revision 1.31
>diff -u -r1.31 messages.properties
>--- src/org/eclipse/mylyn/internal/tasks/ui/actions/messages.properties	8 Jun 2010 23:10:08 -0000	1.31
>+++ src/org/eclipse/mylyn/internal/tasks/ui/actions/messages.properties	4 Mar 2011 02:11:25 -0000
>@@ -89,6 +89,7 @@
> GoUpAction_Go_Up_To_Root=Go Up To Root
> 
> GroupSubTasksAction_Group_Subtasks=Group Subtasks
>+HideQueryAction_Hidden_Label=Hidden
> ImportAction_Dialog_Title=Task List Import
> ImportAction_Problems_encountered=Problems encountered during importing. See error log for details
> 
>Index: src/org/eclipse/mylyn/internal/tasks/ui/views/Messages.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/Messages.java,v
>retrieving revision 1.16
>diff -u -r1.16 Messages.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/views/Messages.java	2 Feb 2011 03:57:57 -0000	1.16
>+++ src/org/eclipse/mylyn/internal/tasks/ui/views/Messages.java	4 Mar 2011 02:11:25 -0000
>@@ -85,6 +85,8 @@
> 
> 	public static String TaskListView__paused_;
> 
>+	public static String TaskListView_Advanced_Filters_Label;
>+
> 	public static String TaskListView_Repository;
> 
> 	public static String TaskListView_Summary;
>Index: src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java,v
>retrieving revision 1.355
>diff -u -r1.355 TaskListView.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java	4 Mar 2011 01:52:05 -0000	1.355
>+++ src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java	4 Mar 2011 02:11:25 -0000
>@@ -1216,7 +1216,7 @@
> 		manager.add(sortDialogAction);
> 		manager.add(filterOnPriorityAction);
> 		manager.add(filterCompleteTask);
>-		IMenuManager advancedMenu = new MenuManager("Advanced Filters");
>+		IMenuManager advancedMenu = new MenuManager(Messages.TaskListView_Advanced_Filters_Label);
> 		advancedMenu.add(new ShowAllQueriesAction());
> 		advancedMenu.add(new ShowNonMatchingSubtasksAction());
> 		advancedMenu.add(new Separator());
>Index: src/org/eclipse/mylyn/internal/tasks/ui/views/messages.properties
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/messages.properties,v
>retrieving revision 1.17
>diff -u -r1.17 messages.properties
>--- src/org/eclipse/mylyn/internal/tasks/ui/views/messages.properties	2 Feb 2011 03:57:57 -0000	1.17
>+++ src/org/eclipse/mylyn/internal/tasks/ui/views/messages.properties	4 Mar 2011 02:11:25 -0000
>@@ -43,6 +43,7 @@
> 
> TaskListView_Mylyn_context_capture_paused=Mylyn context capture paused
> TaskListView__paused_=(paused) 
>+TaskListView_Advanced_Filters_Label=Advanced Filters
> TaskListView_Repository=Repository
> TaskListView_Summary=Summary
> TaskListView_Task_List=Task List

Actions: View | Diff

Attachments on bug 338499: 190242 | 190243 | 190244 | 190337 | 190338 | 190339 | 190340 | 190347