Attachment #134922 for bug #216150

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





PlanningPageFactory_Planning=Planning

PreviewAttributeEditor_Edit=Edit
PreviewAttributeEditor_Error=Error
PreviewAttributeEditor_Formatting_Wiki_Text=Formatting Wiki Text
PreviewAttributeEditor_Loading_preview_=Loading preview...
PreviewAttributeEditor_Preview=Preview

RichTextAttributeEditor_Viewer_Source=View Unformatted Text

TaskAttachmentDropListener_Note_that_only_the_first_file_dragged_will_be_attached=Note that only the first file dragged will be attached.





	public static String PlanningPageFactory_Planning;

	public static String PreviewAttributeEditor_Edit;

	public static String PreviewAttributeEditor_Error;

	public static String PreviewAttributeEditor_Formatting_Wiki_Text;

	public static String PreviewAttributeEditor_Loading_preview_;

	public static String PreviewAttributeEditor_Preview;

	public static String RichTextAttributeEditor_Viewer_Source;

	public static String TaskAttachmentDropListener_Note_that_only_the_first_file_dragged_will_be_attached;

Lines 47-58 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/search/Messages.java (-6 / +2 lines)
47		47
48	public static String RepositorySearchResultView_Refine_Search_;	48	public static String RepositorySearchResultView_Refine_Search_;
49		49
50	public static String RepositorySearchResultView_Sort_by;
51
52	public static String RepositorySearchResultView_Task_Priority;
53
54	public static String RepositorySearchResultView_Task_Summary;
55
56	public static String SearchHitCollector_Max_allowed_number_of_hits_returned_exceeded;	50	public static String SearchHitCollector_Max_allowed_number_of_hits_returned_exceeded;
57		51
58	public static String SearchHitCollector_Querying_Repository_;	52	public static String SearchHitCollector_Querying_Repository_;
Lines 72-75 Link Here
72	public static String SearchResultTreeContentProvider_Incomplete;	66	public static String SearchResultTreeContentProvider_Incomplete;
73		67
74	public static String SearchResultTreeContentProvider__unknown_;	68	public static String SearchResultTreeContentProvider__unknown_;
		69
		70	public static String SearchResultSortAction_Sort_Label;
75	}	71	}




package org.eclipse.mylyn.internal.tasks.ui.search;

import org.eclipse.jface.action.Action;
import org.eclipse.jface.window.Window;
import org.eclipse.mylyn.internal.tasks.ui.dialogs.TaskCompareDialog;

/**
 * @author Steffen Pingel
 * 
 * @author Rob Elves (moved to tasks.ui)
 */
public class SearchResultSortAction extends Action {

	private final RepositorySearchResultView view;
	private final int bugSortOrder;

	public SearchResultSortAction(RepositorySearchResultView view) {
		super(Messages.SearchResultSortAction_Sort_Label);
		this.view = view;
		setEnabled(true);
	 * Constructor
	 * 
	 * @param label
	 *            The string used as the text for the action, or null if there is no text
	 * @param page
	 *            The view where the Bugzilla search results are displayed.
	 * @param sortOrder
	 *            The category that this class sorts Bugzilla search results by
	 */
	public SearchResultSortAction(String label, RepositorySearchResultView page, int sortOrder) {
		super(label);
		bugPage = page;
		bugSortOrder = sortOrder;
	}

	/**
	 * Reorder the Bugzilla search results.
	 */
	@Override
	public void run() {
		TaskCompareDialog dialog = new TaskCompareDialog(view.getSite(), view.getSorter().getTaskComparator());
		if (dialog.open() == Window.OK) {
			view.getViewer().refresh();
		}
	 * Returns the category that this class sorts Bugzilla search results by.
	 */
	public int getSortOrder() {
		return bugSortOrder;
	}
}




/*******************************************************************************
 * Copyright (c) 2004, 2008 Tasktop Technologies and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Tasktop Technologies - initial API and implementation
 *******************************************************************************/

package org.eclipse.mylyn.internal.tasks.ui.search;

import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerSorter;
import org.eclipse.mylyn.tasks.core.ITask;

/**
 * Sorts results of Bugzilla search by bug priority.
 * 
 * @author Rob Elves (modifications)
 */
public class SearchResultSorterPriority extends ViewerSorter {

	/**
	 * Returns a negative, zero, or positive number depending on whether the first bug's priority goes before, is the
	 * same as, or goes after the second element's priority.
	 * <p>
	 * 
	 * @see org.eclipse.jface.viewers.ViewerSorter#compare(org.eclipse.jface.viewers.Viewer, java.lang.Object,
	 *      java.lang.Object)
	 */
	@Override
	public int compare(Viewer viewer, Object e1, Object e2) {
		try {
			ITask hit1 = (ITask) e1;
			ITask hit2 = (ITask) e2;
			return hit1.getPriority().compareTo(hit2.getPriority());
		} catch (Exception ignored) {
			// do nothing
		}
		// if that didn't work, use the default compare method
		return super.compare(viewer, e1, e2);
	}

	/**
	 * Returns the category of the given element. The category is a number used to allocate elements to bins; the bins
	 * are arranged in ascending numeric order. The elements within a bin are arranged via a second level sort
	 * criterion.
	 * <p>
	 * 
	 * @see org.eclipse.jface.viewers.ViewerSorter#category(Object)
	 */
	@Override
	public int category(Object element) {
		try {
			ITask hit = (ITask) element;
			return Integer.parseInt(hit.getTaskId());
		} catch (Exception ignored) {
			// ignore if there is a problem
		}
		// if that didn't work, use the default category method
		return super.category(element);
	}
}




/*******************************************************************************
 * Copyright (c) 2004, 2008 Tasktop Technologies and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Tasktop Technologies - initial API and implementation
 *******************************************************************************/

package org.eclipse.mylyn.internal.tasks.ui.search;

import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerSorter;
import org.eclipse.mylyn.tasks.core.ITask;

/**
 * Sorts search results (AbstractQueryHit) by taskId.
 */
public class SearchResultSorterId extends ViewerSorter {

	/**
	 * Returns a negative, zero, or positive number depending on whether the first bug's taskId is less than, equal to,
	 * or greater than the second bug's taskId.
	 * <p>
	 * 
	 * @see org.eclipse.jface.viewers.ViewerSorter#compare(org.eclipse.jface.viewers.Viewer, java.lang.Object,
	 *      java.lang.Object)
	 */
	@Override
	public int compare(Viewer viewer, Object e1, Object e2) {
		try {
			// cast the object and get its bug taskId
			ITask entry1 = (ITask) e1;
			Integer id1 = Integer.parseInt(entry1.getTaskId());

			// cast the other object and get its bug taskId
			ITask entry2 = (ITask) e2;
			Integer id2 = Integer.parseInt(entry2.getTaskId());

			// if neither is null, compare the bug taskId's
			if (id1 != null && id2 != null) {
				return id1.compareTo(id2);
			}
		} catch (Exception ignored) {
			// ignore if there is a problem
		}

		// if that didn't work, use the default compare method
		return super.compare(viewer, e1, e2);
	}

	/**
	 * Returns the category of the given element. The category is a number used to allocate elements to bins; the bins
	 * are arranged in ascending numeric order. The elements within a bin are arranged via a second level sort
	 * criterion.
	 * <p>
	 * 
	 * @see org.eclipse.jface.viewers.ViewerSorter#category(Object)
	 */
	@Override
	public int category(Object element) {
		try {
			ITask hit = (ITask) element;
			return Integer.parseInt(hit.getTaskId());
		} catch (Exception ignored) {
			// ignore
		}
		// if that didn't work, use the default category method
		return super.category(element);
	}
}




 *
 * Contributors:
 *     Tasktop Technologies - initial API and implementation
 *     Frank Becker - fix for bug 216150
 *******************************************************************************/

package org.eclipse.mylyn.internal.tasks.ui.search;

import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerSorter;
import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
import org.eclipse.mylyn.internal.tasks.ui.util.TaskComparator;
import org.eclipse.mylyn.internal.tasks.ui.views.TaskKeyComparator;
import org.eclipse.mylyn.tasks.core.ITask;

/**
 * Sorts search results.
 * 
 * @see TaskComparator
 * @author Rob Elves
 * @author Frank Becker
 */
public class SearchResultSorter extends ViewerSorter {

	private final TaskComparator taskComparator;

	public SearchResultSorter() {
		taskComparator = new TaskComparator();
	}

	/**
	 * Returns a negative, zero, or positive number depending on whether the first bug's summary goes before, is the
	 * same as, or goes after the second element's summary.
	 * <p>
	 * 
	 * @see org.eclipse.jface.viewers.ViewerSorter#compare(org.eclipse.jface.viewers.Viewer, java.lang.Object,
	 *      java.lang.Object)
	 */
	@Override
	public int compare(Viewer viewer, Object e1, Object e2) {
		if (e1 instanceof ITask && e2 instanceof ITask) {
			ITask entry1 = (ITask) e1;
			ITask entry2 = (ITask) e2;
			return taskComparator.compare(entry1, entry2);
		} else {
			return super.compare(viewer, e1, e2);
			return taskKeyComparator.compare(TaskComparator.getSortableFromElement(entry1),
					TaskComparator.getSortableFromElement(entry2));
			// return taskKeyComparator.compare(entry1.getDescription(),
			// entry2.getDescription());
		} catch (Exception ignored) {
			// do nothing
		}

		// if that didn't work, use the default compare method
		return super.compare(viewer, e1, e2);
	}

	public TaskComparator getTaskComparator() {
		return taskComparator;
	 * are arranged in ascending numeric order. The elements within a bin are arranged via a second level sort
	 * criterion.
	 * <p>
	 * 
	 * @see org.eclipse.jface.viewers.ViewerSorter#category(Object)
	 */
	@Override
	public int category(Object element) {
		try {
			ITask hit = (ITask) element;
			return Integer.parseInt(hit.getTaskId());
		} catch (Exception ignored) {
			// ignore if
		}
		// if that didn't work, use the default category method
		return super.category(element);
	}

}




import org.eclipse.mylyn.internal.tasks.core.TaskGroup;
import org.eclipse.mylyn.internal.tasks.core.UnmatchedTaskContainer;
import org.eclipse.mylyn.internal.tasks.ui.AddExistingTaskJob;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
import org.eclipse.mylyn.internal.tasks.ui.actions.OpenTaskSearchAction;
import org.eclipse.mylyn.internal.tasks.ui.actions.OpenWithBrowserAction;
import org.eclipse.mylyn.internal.tasks.ui.search.SearchResultTreeContentProvider.GroupBy;

import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Layout;
import org.eclipse.ui.IMemento;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.FilteredTree;

			groupingActions.add(this);
		}

		public GroupBy getGroupBy() {
			return groupBy;
		}

		@Override
		public void run() {
			for (GroupingAction action : groupingActions) {

		}
	}

	private static final String MEMENTO_KEY_SORT = "sort"; //$NON-NLS-1$

	public static final int ORDER_DESCRIPTION = 2;

	public static final int ORDER_SEVERITY = 3;

	public static final int ORDER_STATUS = 4;

	public static final int ORDER_ID = 5;

	public static final int ORDER_DEFAULT = ORDER_PRIORITY;

	private static final String KEY_SORTING = TasksUiPlugin.ID_PLUGIN + ".search.resultpage.sorting"; //$NON-NLS-1$

	private SearchResultContentProvider searchResultProvider;

	private int currentSortOrder;

	private final SearchResultSortAction sortByPriorityAction;

	private final SearchResultSortAction sortByDescriptionAction;

	private final OpenSearchResultAction openInEditorAction;

	private final CreateQueryFromSearchAction createQueryAction;


	private final OpenWithBrowserAction openSearchWithBrowserAction;

	private final SearchResultSorter searchResultSorter;

	private SearchResultSortAction sortByDialogAction;

	private static final IShowInTargetList SHOW_IN_TARGET_LIST = new IShowInTargetList() {
		public String[] getShowInTargetIds() {
			return SHOW_IN_TARGETS;

		// Only use the table layout.
		super(FLAG_LAYOUT_TREE);

		sortByPriorityAction = new SearchResultSortAction(Messages.RepositorySearchResultView_Task_Priority, this,
				ORDER_PRIORITY);
		sortByDescriptionAction = new SearchResultSortAction(Messages.RepositorySearchResultView_Task_Summary, this,
				ORDER_DESCRIPTION);
		currentSortOrder = ORDER_DEFAULT;

		openInEditorAction = new OpenSearchResultAction(Messages.RepositorySearchResultView_Open_in_Editor, this);
		createQueryAction = new CreateQueryFromSearchAction(
				Messages.RepositorySearchResultView_Create_Query_from_Search_, this);


		groupingActions = new ArrayList<GroupingAction>();
		new GroupingAction(Messages.RepositorySearchResultView_Group_By_Owner, GroupBy.OWNER);
//		new GroupingAction(Messages.RepositorySearchResultView_Group_By_Complete, GroupBy.COMPLETION);

		filterActions = new ArrayList<FilteringAction>();
		new FilteringAction(Messages.RepositorySearchResultView_Filter_Completed_Tasks, new ViewerFilter() {

				return true;
			}
		});

		// construct early since to be ready when restoreState() is invoked
		searchResultSorter = new SearchResultSorter();
	}

	@Override

		DecoratingLabelProvider labelProvider = new DecoratingLabelProvider(new SearchResultsLabelProvider(
				searchResultProvider, viewer), PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator());
		viewer.setLabelProvider(labelProvider);
		viewer.setSorter(searchResultSorter);
		sortByDialogAction = new SearchResultSortAction(this);
		// sorted right away
		setSortOrder(currentSortOrder);

		toolTip = new TaskListToolTip(viewer.getControl());
	}

		super.dispose();
	}

	/**
	 * Sets the new sorting category, and reorders all of the tasks.
	 * 
	 * @param sortOrder
	 *            The new category to sort by
	 */
	public void setSortOrder(int sortOrder) {
		StructuredViewer viewer = getViewer();

		switch (sortOrder) {
		case ORDER_ID:
			viewer.setSorter(new SearchResultSorterId());
			break;
		case ORDER_DESCRIPTION:
			viewer.setSorter(new SearchResultSorter());
			break;
		case ORDER_PRIORITY:
			viewer.setSorter(new SearchResultSorterPriority());
			break;
		default:
			// If the setting is not one of the four valid ones,
			// use the default order setting.
			sortOrder = ORDER_DEFAULT;
			viewer.setSorter(new SearchResultSorterPriority());
			break;
		}
		currentSortOrder = sortOrder;
		getSettings().put(KEY_SORTING, currentSortOrder);
	}

	@SuppressWarnings("unchecked")
	public Object getAdapter(Class adapter) {
		return getAdapterDelegate(adapter);

		super.fillContextMenu(menuManager);

		// open actions

		menuManager.appendToGroup(IContextMenuConstants.GROUP_OPEN, openInEditorAction);

		// Add to Task List menu

		menuManager.appendToGroup(IContextMenuConstants.GROUP_SEARCH, refineSearchAction);
		menuManager.appendToGroup(IContextMenuConstants.GROUP_SEARCH, openSearchWithBrowserAction);

		menuManager.appendToGroup(IContextMenuConstants.GROUP_VIEWER_SETUP, sortByDialogAction);

		MenuManager sortMenuManager = new MenuManager(Messages.RepositorySearchResultView_Sort_by);
		sortMenuManager.add(sortByPriorityAction);
		sortMenuManager.add(sortByDescriptionAction);

		sortByPriorityAction.setChecked(currentSortOrder == sortByPriorityAction.getSortOrder());
		sortByDescriptionAction.setChecked(currentSortOrder == sortByDescriptionAction.getSortOrder());

		menuManager.appendToGroup(IContextMenuConstants.GROUP_VIEWER_SETUP, sortMenuManager);
		for (Action action : groupingActions) {
			menuManager.appendToGroup(IContextMenuConstants.GROUP_VIEWER_SETUP, action);
		}

		}
	}

	public SearchResultSorter getSorter() {
		return searchResultSorter;
	}

	@Override
	public void restoreState(IMemento memento) {
		super.restoreState(memento);
		IMemento child = memento.getChild(MEMENTO_KEY_SORT);
		if (child != null && searchResultSorter != null) {
			searchResultSorter.getTaskComparator().restoreState(child);
		}
	}

	@Override
	public void saveState(IMemento memento) {
		super.saveState(memento);
		IMemento child = memento.createChild(MEMENTO_KEY_SORT);
		if (searchResultSorter != null) {
			searchResultSorter.getTaskComparator().saveState(child);
		}
	}

}

Lines 9-17 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/search/messages.properties (-3 / +2 lines)
9	RepositorySearchResultView_Open_in_Editor=Open in Editor	9	RepositorySearchResultView_Open_in_Editor=Open in Editor
10	RepositorySearchResultView_Open_Search_with_Browser_Label=Open Search with Browser	10	RepositorySearchResultView_Open_Search_with_Browser_Label=Open Search with Browser
11	RepositorySearchResultView_Refine_Search_=Refine Search...	11	RepositorySearchResultView_Refine_Search_=Refine Search...
12	RepositorySearchResultView_Sort_by=S&ort by
13	RepositorySearchResultView_Task_Priority=Task Priority
14	RepositorySearchResultView_Task_Summary=Task Summary
15		12
16	SearchHitCollector_Max_allowed_number_of_hits_returned_exceeded=Max allowed number of hits returned exceeded. Some hits may not be displayed. Please narrow query scope.	13	SearchHitCollector_Max_allowed_number_of_hits_returned_exceeded=Max allowed number of hits returned exceeded. Some hits may not be displayed. Please narrow query scope.
17	SearchHitCollector_Querying_Repository_=Querying Repository...	14	SearchHitCollector_Querying_Repository_=Querying Repository...
Lines 25-27 Link Here
25	SearchResultTreeContentProvider_Complete=Complete	22	SearchResultTreeContentProvider_Complete=Complete
26	SearchResultTreeContentProvider_Incomplete=Incomplete	23	SearchResultTreeContentProvider_Incomplete=Incomplete
27	SearchResultTreeContentProvider__unknown_=<unknown>	24	SearchResultTreeContentProvider__unknown_=<unknown>
		25
		26	SearchResultSortAction_Sort_Label=Sort...





TaskLabelDecorator____unknown_host___=\ \ \ [ <unknown host> ]

TaskListBackupManager_Could_not_backup_task_data=Could not backup task data. Check backup preferences.\n
TaskListBackupManager_Error_occured_during_scheduled_tasklist_backup=Error occured during scheduled tasklist backup.\nCheck settings on Tasklist preferences page.
TaskListBackupManager_Scheduled_task_data_backup=Scheduled task data backup
TaskListBackupManager_Tasklist_Backup=Tasklist Backup

TaskListNotificationManager_Open_Notification_Job=Open Notification Job


TasksUiUtil_Browser_could_not_be_initiated=Browser could not be initiated
TasksUiUtil_Browser_init_error=Browser init error
TasksUiUtil_Could_not_open_URL_=Could not open URL: 
TasksUiUtil_create_task=Create Task
TasksUiUtil_failed_to_create_new_task=Failed to create new task:\n\n
TasksUiUtil_No_URL_to_open=No URL to open.

AbstractRetrieveTitleFromUrlJob_Retrieving_summary_from_URL=Retrieving summary from URL





	public static String TaskLabelDecorator____unknown_host___;

	public static String TaskListBackupManager_Could_not_backup_task_data;

	public static String TaskListBackupManager_Error_occured_during_scheduled_tasklist_backup;

	public static String TaskListBackupManager_Scheduled_task_data_backup;

	public static String TaskListBackupManager_Tasklist_Backup;

	public static String TaskListNotificationManager_Open_Notification_Job;

	public static String TaskRepositoryLocationUi_Enter_HTTP_password;


	public static String TasksUiUtil_Could_not_open_URL_;

	public static String TasksUiUtil_create_task;

	public static String TasksUiUtil_failed_to_create_new_task;

	public static String TasksUiUtil_No_URL_to_open;

	public static String AbstractRetrieveTitleFromUrlJob_Retrieving_summary_from_URL;




package org.eclipse.mylyn.internal.tasks.ui.util;

import java.util.Comparator;
import java.util.Date;

import org.eclipse.core.runtime.Assert;
import org.eclipse.mylyn.internal.tasks.ui.dialogs.Messages;
import org.eclipse.mylyn.internal.tasks.ui.views.TaskKeyComparator;
import org.eclipse.mylyn.tasks.core.IRepositoryElement;
import org.eclipse.mylyn.tasks.core.ITask;
import org.eclipse.ui.IMemento;

/**
 * @author Mik Kersten

 */
public class TaskComparator implements Comparator<ITask> {

	private final TaskKeyComparator taskKeyComparator = new TaskKeyComparator();

	public enum SortByIndex {
		DATE_CREATED, PRIORITY, SUMMARY, TASK_ID;

		public static SortByIndex valueOfLabel(String label) {
			for (SortByIndex value : values()) {
				if (value.getLabel().equals(label)) {
					return value;
				}
			}
			return null;
		}

		public String getLabel() {
			switch (this) {

			}
		}

		public static SortByIndex valueOfLabel(String label) {
			for (SortByIndex value : values()) {
				if (value.getLabel().equals(label)) {
					return value;
				}
			}
			return null;
		}

	}

	public static final int DEFAULT_SORT_DIRECTION = 1;

	private static final SortByIndex DEFAULT_SORT_INDEX = SortByIndex.PRIORITY;

	private static final SortByIndex DEFAULT_SORT_INDEX2 = SortByIndex.DATE_CREATED;

	private static final String MEMENTO_KEY_SORT_DIRECTION = "sortDirection"; //$NON-NLS-1$

	private static final String MEMENTO_KEY_SORT_DIRECTION2 = "sortDirection2"; //$NON-NLS-1$

	private static final String MEMENTO_KEY_SORT_INDEX = "sortIndex"; //$NON-NLS-1$

	private static final String MEMENTO_KEY_SORT_INDEX2 = "sortIndex2"; //$NON-NLS-1$

	/**
	 * Return a array of values to pass to taskKeyComparator.compare() for sorting
	 * 

		return a;
	}

	private SortByIndex sortByIndex = DEFAULT_SORT_INDEX;

	private SortByIndex sortByIndex2 = DEFAULT_SORT_INDEX2;

	private int sortDirection = DEFAULT_SORT_DIRECTION;

	private int sortDirection2 = DEFAULT_SORT_DIRECTION;

	private final TaskKeyComparator taskKeyComparator = new TaskKeyComparator();

	public TaskComparator() {
	}

	public int compare(ITask element1, ITask element2) {
		if (DEFAULT_SORT_INDEX.equals(sortByIndex)) {
			int result = sortByPriority(element1, element2, sortDirection);
			if (result != 0) {
				return result;
			}

			if (DEFAULT_SORT_INDEX2.equals(sortByIndex2)) {
				return sortByDate(element1, element2, sortDirection2);
			} else {
				if (SortByIndex.SUMMARY.equals(sortByIndex2)) {

					return result;
				}
			}
		} else if (DEFAULT_SORT_INDEX2.equals(sortByIndex)) {
			int result = sortByDate(element1, element2, sortDirection);
			if (result != 0) {
				return result;
			}
			if (DEFAULT_SORT_INDEX.equals(sortByIndex2)) {
				return sortByPriority(element1, element2, sortDirection2);
			} else {
				if (SortByIndex.SUMMARY.equals(sortByIndex2)) {

			if (result != 0) {
				return result;
			}
			if (DEFAULT_SORT_INDEX2.equals(sortByIndex2)) {
				return sortByDate(element1, element2, sortDirection2);
			} else {
				if (DEFAULT_SORT_INDEX.equals(sortByIndex2)) {
					return sortByPriority(element1, element2, sortDirection2);
				} else if (SortByIndex.TASK_ID.equals(sortByIndex2)) {
					return sortByID(element1, element2, sortDirection2);

			if (result != 0) {
				return result;
			}
			if (DEFAULT_SORT_INDEX2.equals(sortByIndex2)) {
				return sortByDate(element1, element2, sortDirection2);
			} else {
				if (DEFAULT_SORT_INDEX.equals(sortByIndex2)) {
					return sortByPriority(element1, element2, sortDirection2);
				} else if (SortByIndex.SUMMARY.equals(sortByIndex2)) {
					return sortBySummary(element1, element2, sortDirection2);

		}
	}

	public SortByIndex getSortByIndex() {
		return sortByIndex;
		String key2 = element2.getSummary();
		if (key1 == null) {
			return (key2 != null) ? sortDirection : 0;
		} else if (key2 == null) {
			return -sortDirection;
		}
		return sortDirection * key1.compareToIgnoreCase(key2);
	}

	public SortByIndex getSortByIndex2() {
		return sortByIndex2;
	}

	public int getSortDirection() {
		return sortDirection;
	}

	private int getSortDirection(IMemento memento, String key, int defaultValue) {
		Integer value = memento.getInteger(key);
		if (value != null) {
			return value >= 0 ? 1 : -1;
		}
		return defaultValue;
	}

	public int getSortDirection2() {
		return sortDirection2;
	}

	private SortByIndex getSortIndex(IMemento memento, String key, SortByIndex defaultValue) {
		String value = memento.getString(key);
		if (value != null) {
			try {
				return SortByIndex.valueOf(value);
			} catch (IllegalArgumentException e) {
				// ignore
			}
		}
		return defaultValue;
	}

	public void restoreState(IMemento memento) {
		setSortByIndex(getSortIndex(memento, MEMENTO_KEY_SORT_INDEX, DEFAULT_SORT_INDEX));
		setSortDirection(getSortDirection(memento, MEMENTO_KEY_SORT_DIRECTION, DEFAULT_SORT_DIRECTION));
		setSortByIndex2(getSortIndex(memento, MEMENTO_KEY_SORT_INDEX2, DEFAULT_SORT_INDEX2));
		setSortDirection(getSortDirection(memento, MEMENTO_KEY_SORT_DIRECTION2, DEFAULT_SORT_DIRECTION));
	}

	public void saveState(IMemento memento) {
		memento.putString(MEMENTO_KEY_SORT_INDEX, getSortByIndex().name());
		memento.putInteger(MEMENTO_KEY_SORT_DIRECTION, getSortDirection());
		memento.putString(MEMENTO_KEY_SORT_INDEX2, getSortByIndex2().name());
		memento.putInteger(MEMENTO_KEY_SORT_DIRECTION2, getSortDirection2());
	}

	public void setSortByIndex(SortByIndex sortByIndex) {

		this.sortByIndex = sortByIndex;
	}

	public void setSortByIndex2(SortByIndex sortByIndex) {
		Assert.isNotNull(sortByIndex);
		this.sortByIndex2 = sortByIndex;
	}

	public void setSortDirection(int sortDirection) {
		Assert.isTrue(sortDirection == -1 || sortDirection == 1);
		this.sortDirection = sortDirection;
	}

	public void setSortDirection2(int sortDirection) {
		Assert.isTrue(sortDirection == -1 || sortDirection == 1);
		this.sortDirection2 = sortDirection;
	}

	private int sortByDate(ITask element1, ITask element2, int sortDirection) {
		Date date1 = element1.getCreationDate();
		Date date2 = element2.getCreationDate();
		if (date1 == null) {
			return (date2 != null) ? sortDirection : 0;
		} else if (date2 == null) {
			return -sortDirection;
		}
		return sortDirection * date1.compareTo(date2);
	}

	private int sortByID(ITask element1, ITask element2, int sortDirection) {
		String key1 = element1.getTaskKey();
		String key2 = element2.getTaskKey();
		if (key1 == null) {
			return (key2 != null) ? sortDirection : 0;
		} else if (key2 == null) {
			return -sortDirection;
		}
		return sortDirection * taskKeyComparator.compare2(key1, key2);
	}

	private int sortByPriority(ITask element1, ITask element2, int sortDirection) {
		return sortDirection * element1.getPriority().compareToIgnoreCase(element2.getPriority());
	}

	private int sortBySummary(ITask element1, ITask element2, int sortDirection) {
		String key1 = element1.getSummary();
		String key2 = element2.getSummary();
		if (key1 == null) {
			return (key2 != null) ? sortDirection : 0;
		} else if (key2 == null) {
			return -sortDirection;
		}
		return sortDirection * key1.compareToIgnoreCase(key2);
	}

}

Added Link Here

(-).refactorings/2009/3/13/refactorings.history (+4 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<session version="1.0">
3	<refactoring accessors="true" comment="Delete 2 element(s) from project 'org.eclipse.mylyn.tasks.ui' - Original project: 'org.eclipse.mylyn.tasks.ui' - Original elements: org.eclipse.mylyn.internal.tasks.ui.search.SearchResultSorterId.java org.eclipse.mylyn.internal.tasks.ui.search.SearchResultSorterPriority.java" description="Delete elements" element1="/src<org.eclipse.mylyn.internal.tasks.ui.search{SearchResultSorterId.java" element2="/src<org.eclipse.mylyn.internal.tasks.ui.search{SearchResultSorterPriority.java" elements="2" flags="589830" id="org.eclipse.jdt.ui.delete" resources="0" stamp="1238277505401" subPackages="false" version="1.0"/>
4	</session>

Added Link Here

(-).refactorings/2009/3/13/refactorings.index (+1 lines)
1	1238277505401 Delete elements

Return to bug 216150

Lines 37-43 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java (-76 / +35 lines)
37	import org.eclipse.mylyn.internal.tasks.core.TaskGroup;	37	import org.eclipse.mylyn.internal.tasks.core.TaskGroup;
38	import org.eclipse.mylyn.internal.tasks.core.UnmatchedTaskContainer;	38	import org.eclipse.mylyn.internal.tasks.core.UnmatchedTaskContainer;
39	import org.eclipse.mylyn.internal.tasks.ui.AddExistingTaskJob;	39	import org.eclipse.mylyn.internal.tasks.ui.AddExistingTaskJob;
40	import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
41	import org.eclipse.mylyn.internal.tasks.ui.actions.OpenTaskSearchAction;	40	import org.eclipse.mylyn.internal.tasks.ui.actions.OpenTaskSearchAction;
42	import org.eclipse.mylyn.internal.tasks.ui.actions.OpenWithBrowserAction;	41	import org.eclipse.mylyn.internal.tasks.ui.actions.OpenWithBrowserAction;
43	import org.eclipse.mylyn.internal.tasks.ui.search.SearchResultTreeContentProvider.GroupBy;	42	import org.eclipse.mylyn.internal.tasks.ui.search.SearchResultTreeContentProvider.GroupBy;
Lines 60-65 Link Here
60	import org.eclipse.swt.widgets.Composite;	59	import org.eclipse.swt.widgets.Composite;
61	import org.eclipse.swt.widgets.Event;	60	import org.eclipse.swt.widgets.Event;
62	import org.eclipse.swt.widgets.Layout;	61	import org.eclipse.swt.widgets.Layout;
		62	import org.eclipse.ui.IMemento;
63	import org.eclipse.ui.PartInitException;	63	import org.eclipse.ui.PartInitException;
64	import org.eclipse.ui.PlatformUI;	64	import org.eclipse.ui.PlatformUI;
65	import org.eclipse.ui.dialogs.FilteredTree;	65	import org.eclipse.ui.dialogs.FilteredTree;
Lines 89-98 Link Here
89	groupingActions.add(this);	89	groupingActions.add(this);
90	}	90	}
91		91
92	public GroupBy getGroupBy() {
93	return groupBy;
94	}
95
96	@Override	92	@Override
97	public void run() {	93	public void run() {
98	for (GroupingAction action : groupingActions) {	94	for (GroupingAction action : groupingActions) {
Lines 130-157 Link Here
130	}	126	}
131	}	127	}
132		128
133	public static final int ORDER_PRIORITY = 1;	129	private static final String MEMENTO_KEY_SORT = "sort"; //$NON-NLS-1$
134
135	public static final int ORDER_DESCRIPTION = 2;
136
137	public static final int ORDER_SEVERITY = 3;
138
139	public static final int ORDER_STATUS = 4;
140
141	public static final int ORDER_ID = 5;
142
143	public static final int ORDER_DEFAULT = ORDER_PRIORITY;
144
145	private static final String KEY_SORTING = TasksUiPlugin.ID_PLUGIN + ".search.resultpage.sorting"; //$NON-NLS-1$
146		130
147	private SearchResultContentProvider searchResultProvider;	131	private SearchResultContentProvider searchResultProvider;
148		132
149	private int currentSortOrder;
150
151	private final SearchResultSortAction sortByPriorityAction;
152
153	private final SearchResultSortAction sortByDescriptionAction;
154
155	private final OpenSearchResultAction openInEditorAction;	133	private final OpenSearchResultAction openInEditorAction;
156		134
157	private final CreateQueryFromSearchAction createQueryAction;	135	private final CreateQueryFromSearchAction createQueryAction;
Lines 168-173 Link Here
168		146
169	private final OpenWithBrowserAction openSearchWithBrowserAction;	147	private final OpenWithBrowserAction openSearchWithBrowserAction;
170		148
		149	private final SearchResultSorter searchResultSorter;
		150
		151	private SearchResultSortAction sortByDialogAction;
		152
171	private static final IShowInTargetList SHOW_IN_TARGET_LIST = new IShowInTargetList() {	153	private static final IShowInTargetList SHOW_IN_TARGET_LIST = new IShowInTargetList() {
172	public String[] getShowInTargetIds() {	154	public String[] getShowInTargetIds() {
173	return SHOW_IN_TARGETS;	155	return SHOW_IN_TARGETS;
Lines 178-189 Link Here
178	// Only use the table layout.	160	// Only use the table layout.
179	super(FLAG_LAYOUT_TREE);	161	super(FLAG_LAYOUT_TREE);
180		162
181	sortByPriorityAction = new SearchResultSortAction(Messages.RepositorySearchResultView_Task_Priority, this,
182	ORDER_PRIORITY);
183	sortByDescriptionAction = new SearchResultSortAction(Messages.RepositorySearchResultView_Task_Summary, this,
184	ORDER_DESCRIPTION);
185	currentSortOrder = ORDER_DEFAULT;
186
187	openInEditorAction = new OpenSearchResultAction(Messages.RepositorySearchResultView_Open_in_Editor, this);	163	openInEditorAction = new OpenSearchResultAction(Messages.RepositorySearchResultView_Open_in_Editor, this);
188	createQueryAction = new CreateQueryFromSearchAction(	164	createQueryAction = new CreateQueryFromSearchAction(
189	Messages.RepositorySearchResultView_Create_Query_from_Search_, this);	165	Messages.RepositorySearchResultView_Create_Query_from_Search_, this);
Lines 194-200 Link Here
194		170
195	groupingActions = new ArrayList<GroupingAction>();	171	groupingActions = new ArrayList<GroupingAction>();
196	new GroupingAction(Messages.RepositorySearchResultView_Group_By_Owner, GroupBy.OWNER);	172	new GroupingAction(Messages.RepositorySearchResultView_Group_By_Owner, GroupBy.OWNER);
197	//new GroupingAction("Group By Complete", GroupBy.COMPLETION);	173	// new GroupingAction(Messages.RepositorySearchResultView_Group_By_Complete, GroupBy.COMPLETION);
198		174
199	filterActions = new ArrayList<FilteringAction>();	175	filterActions = new ArrayList<FilteringAction>();
200	new FilteringAction(Messages.RepositorySearchResultView_Filter_Completed_Tasks, new ViewerFilter() {	176	new FilteringAction(Messages.RepositorySearchResultView_Filter_Completed_Tasks, new ViewerFilter() {
Lines 209-214 Link Here
209	return true;	185	return true;
210	}	186	}
211	});	187	});
		188
		189	// construct early since to be ready when restoreState() is invoked
		190	searchResultSorter = new SearchResultSorter();
212	}	191	}
213		192
214	@Override	193	@Override
Lines 242-251 Link Here
242	DecoratingLabelProvider labelProvider = new DecoratingLabelProvider(new SearchResultsLabelProvider(	221	DecoratingLabelProvider labelProvider = new DecoratingLabelProvider(new SearchResultsLabelProvider(
243	searchResultProvider, viewer), PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator());	222	searchResultProvider, viewer), PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator());
244	viewer.setLabelProvider(labelProvider);	223	viewer.setLabelProvider(labelProvider);
245		224	viewer.setSorter(searchResultSorter);
246	// Set the order when the search view is loading so that the items are	225	sortByDialogAction = new SearchResultSortAction(this);
247	// sorted right away
248	setSortOrder(currentSortOrder);
249		226
250	toolTip = new TaskListToolTip(viewer.getControl());	227	toolTip = new TaskListToolTip(viewer.getControl());
251	}	228	}
Lines 319-354 Link Here
319	super.dispose();	296	super.dispose();
320	}	297	}
321		298
322	/**
323	* Sets the new sorting category, and reorders all of the tasks.
324	*
325	* @param sortOrder
326	* The new category to sort by
327	*/
328	public void setSortOrder(int sortOrder) {
329	StructuredViewer viewer = getViewer();
330
331	switch (sortOrder) {
332	case ORDER_ID:
333	viewer.setSorter(new SearchResultSorterId());
334	break;
335	case ORDER_DESCRIPTION:
336	viewer.setSorter(new SearchResultSorter());
337	break;
338	case ORDER_PRIORITY:
339	viewer.setSorter(new SearchResultSorterPriority());
340	break;
341	default:
342	// If the setting is not one of the four valid ones,
343	// use the default order setting.
344	sortOrder = ORDER_DEFAULT;
345	viewer.setSorter(new SearchResultSorterPriority());
346	break;
347	}
348	currentSortOrder = sortOrder;
349	getSettings().put(KEY_SORTING, currentSortOrder);
350	}
351
352	@SuppressWarnings("unchecked")	299	@SuppressWarnings("unchecked")
353	public Object getAdapter(Class adapter) {	300	public Object getAdapter(Class adapter) {
354	return getAdapterDelegate(adapter);	301	return getAdapterDelegate(adapter);
Lines 373-379 Link Here
373	super.fillContextMenu(menuManager);	320	super.fillContextMenu(menuManager);
374		321
375	// open actions	322	// open actions
376
377	menuManager.appendToGroup(IContextMenuConstants.GROUP_OPEN, openInEditorAction);	323	menuManager.appendToGroup(IContextMenuConstants.GROUP_OPEN, openInEditorAction);
378		324
379	// Add to Task List menu	325	// Add to Task List menu
Lines 405-420 Link Here
405	menuManager.appendToGroup(IContextMenuConstants.GROUP_SEARCH, refineSearchAction);	351	menuManager.appendToGroup(IContextMenuConstants.GROUP_SEARCH, refineSearchAction);
406	menuManager.appendToGroup(IContextMenuConstants.GROUP_SEARCH, openSearchWithBrowserAction);	352	menuManager.appendToGroup(IContextMenuConstants.GROUP_SEARCH, openSearchWithBrowserAction);
407		353
408	// sort actions	354	menuManager.appendToGroup(IContextMenuConstants.GROUP_VIEWER_SETUP, sortByDialogAction);
409
410	MenuManager sortMenuManager = new MenuManager(Messages.RepositorySearchResultView_Sort_by);
411	sortMenuManager.add(sortByPriorityAction);
412	sortMenuManager.add(sortByDescriptionAction);
413
414	sortByPriorityAction.setChecked(currentSortOrder == sortByPriorityAction.getSortOrder());
415	sortByDescriptionAction.setChecked(currentSortOrder == sortByDescriptionAction.getSortOrder());
416
417	menuManager.appendToGroup(IContextMenuConstants.GROUP_VIEWER_SETUP, sortMenuManager);
418	for (Action action : groupingActions) {	355	for (Action action : groupingActions) {
419	menuManager.appendToGroup(IContextMenuConstants.GROUP_VIEWER_SETUP, action);	356	menuManager.appendToGroup(IContextMenuConstants.GROUP_VIEWER_SETUP, action);
420	}	357	}
Lines 469-472 Link Here
469	}	406	}
470	}	407	}
471		408
		409	public SearchResultSorter getSorter() {
		410	return searchResultSorter;
		411	}
		412
		413	@Override
		414	public void restoreState(IMemento memento) {
		415	super.restoreState(memento);
		416	IMemento child = memento.getChild(MEMENTO_KEY_SORT);
		417	if (child != null && searchResultSorter != null) {
		418	searchResultSorter.getTaskComparator().restoreState(child);
		419	}
		420	}
		421
		422	@Override
		423	public void saveState(IMemento memento) {
		424	super.saveState(memento);
		425	IMemento child = memento.createChild(MEMENTO_KEY_SORT);
		426	if (searchResultSorter != null) {
		427	searchResultSorter.getTaskComparator().saveState(child);
		428	}
		429	}
		430
472	}	431	}

Lines 29-40 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/editors/messages.properties (-6 lines)
29		29
30	PlanningPageFactory_Planning=Planning	30	PlanningPageFactory_Planning=Planning
31		31
32	PreviewAttributeEditor_Edit=Edit
33	PreviewAttributeEditor_Error=Error
34	PreviewAttributeEditor_Formatting_Wiki_Text=Formatting Wiki Text
35	PreviewAttributeEditor_Loading_preview_=Loading preview...
36	PreviewAttributeEditor_Preview=Preview
37
38	RichTextAttributeEditor_Viewer_Source=View Unformatted Text	32	RichTextAttributeEditor_Viewer_Source=View Unformatted Text
39		33
40	TaskAttachmentDropListener_Note_that_only_the_first_file_dragged_will_be_attached=Note that only the first file dragged will be attached.	34	TaskAttachmentDropListener_Note_that_only_the_first_file_dragged_will_be_attached=Note that only the first file dragged will be attached.

Lines 71-86 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/editors/Messages.java (-10 lines)
71		71
72	public static String PlanningPageFactory_Planning;	72	public static String PlanningPageFactory_Planning;
73		73
74	public static String PreviewAttributeEditor_Edit;
75
76	public static String PreviewAttributeEditor_Error;
77
78	public static String PreviewAttributeEditor_Formatting_Wiki_Text;
79
80	public static String PreviewAttributeEditor_Loading_preview_;
81
82	public static String PreviewAttributeEditor_Preview;
83
84	public static String RichTextAttributeEditor_Viewer_Source;	74	public static String RichTextAttributeEditor_Viewer_Source;
85		75
86	public static String TaskAttachmentDropListener_Note_that_only_the_first_file_dragged_will_be_attached;	76	public static String TaskAttachmentDropListener_Note_that_only_the_first_file_dragged_will_be_attached;

Lines 12-59 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSortAction.java (-33 / +12 lines)
12	package org.eclipse.mylyn.internal.tasks.ui.search;	12	package org.eclipse.mylyn.internal.tasks.ui.search;
13		13
14	import org.eclipse.jface.action.Action;	14	import org.eclipse.jface.action.Action;
		15	import org.eclipse.jface.window.Window;
		16	import org.eclipse.mylyn.internal.tasks.ui.dialogs.TaskCompareDialog;
15		17
16	/**	18	/**
17	* This class sorts search results by a supplied category.	19	* @author Steffen Pingel
18	*
19	* @author Rob Elves (moved to tasks.ui)
20	*/	20	*/
21	public class SearchResultSortAction extends Action {	21	public class SearchResultSortAction extends Action {
22		22
23	/** The category that this class sorts Bugzilla search results by. */	23	private final RepositorySearchResultView view;
24	private final int bugSortOrder;
25		24
26	/** The view where the Bugzilla search results are displayed. */	25	public SearchResultSortAction(RepositorySearchResultView view) {
27	private final RepositorySearchResultView bugPage;	26	super(Messages.SearchResultSortAction_Sort_Label);
28		27	this.view = view;
29	/**	28	setEnabled(true);
30	* Constructor
31	*
32	* @param label
33	* The string used as the text for the action, or null if there is no text
34	* @param page
35	* The view where the Bugzilla search results are displayed.
36	* @param sortOrder
37	* The category that this class sorts Bugzilla search results by
38	*/
39	public SearchResultSortAction(String label, RepositorySearchResultView page, int sortOrder) {
40	super(label);
41	bugPage = page;
42	bugSortOrder = sortOrder;
43	}	29	}
44		30
45	/**
46	* Reorder the Bugzilla search results.
47	*/
48	@Override	31	@Override
49	public void run() {	32	public void run() {
50	bugPage.setSortOrder(bugSortOrder);	33	TaskCompareDialog dialog = new TaskCompareDialog(view.getSite(), view.getSorter().getTaskComparator());
51	}	34	if (dialog.open() == Window.OK) {
52		35	view.getViewer().refresh();
53	/**	36	}
54	* Returns the category that this class sorts Bugzilla search results by.
55	*/
56	public int getSortOrder() {
57	return bugSortOrder;
58	}	37	}
59	}	38	}

Removed Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterPriority.java (-65 lines)
1	/*******************************************************************************
2	* Copyright (c) 2004, 2008 Tasktop Technologies and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Tasktop Technologies - initial API and implementation
10	*******************************************************************************/
11
12	package org.eclipse.mylyn.internal.tasks.ui.search;
13
14	import org.eclipse.jface.viewers.Viewer;
15	import org.eclipse.jface.viewers.ViewerSorter;
16	import org.eclipse.mylyn.tasks.core.ITask;
17
18	/**
19	* Sorts results of Bugzilla search by bug priority.
20	*
21	* @author Rob Elves (modifications)
22	*/
23	public class SearchResultSorterPriority extends ViewerSorter {
24
25	/**
26	* Returns a negative, zero, or positive number depending on whether the first bug's priority goes before, is the
27	* same as, or goes after the second element's priority.
28	* <p>
29	*
30	* @see org.eclipse.jface.viewers.ViewerSorter#compare(org.eclipse.jface.viewers.Viewer, java.lang.Object,
31	* java.lang.Object)
32	*/
33	@Override
34	public int compare(Viewer viewer, Object e1, Object e2) {
35	try {
36	ITask hit1 = (ITask) e1;
37	ITask hit2 = (ITask) e2;
38	return hit1.getPriority().compareTo(hit2.getPriority());
39	} catch (Exception ignored) {
40	// do nothing
41	}
42	// if that didn't work, use the default compare method
43	return super.compare(viewer, e1, e2);
44	}
45
46	/**
47	* Returns the category of the given element. The category is a number used to allocate elements to bins; the bins
48	* are arranged in ascending numeric order. The elements within a bin are arranged via a second level sort
49	* criterion.
50	* <p>
51	*
52	* @see org.eclipse.jface.viewers.ViewerSorter#category(Object)
53	*/
54	@Override
55	public int category(Object element) {
56	try {
57	ITask hit = (ITask) element;
58	return Integer.parseInt(hit.getTaskId());
59	} catch (Exception ignored) {
60	// ignore if there is a problem
61	}
62	// if that didn't work, use the default category method
63	return super.category(element);
64	}
65	}

Lines 35-44 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/messages.properties (-4 lines)
35		35
36	TaskLabelDecorator____unknown_host___=\ \ \ [ <unknown host> ]	36	TaskLabelDecorator____unknown_host___=\ \ \ [ <unknown host> ]
37		37
38	TaskListBackupManager_Could_not_backup_task_data=Could not backup task data. Check backup preferences.\n
39	TaskListBackupManager_Error_occured_during_scheduled_tasklist_backup=Error occured during scheduled tasklist backup.\nCheck settings on Tasklist preferences page.	38	TaskListBackupManager_Error_occured_during_scheduled_tasklist_backup=Error occured during scheduled tasklist backup.\nCheck settings on Tasklist preferences page.
40	TaskListBackupManager_Scheduled_task_data_backup=Scheduled task data backup	39	TaskListBackupManager_Scheduled_task_data_backup=Scheduled task data backup
41	TaskListBackupManager_Tasklist_Backup=Tasklist Backup
42		40
43	TaskListNotificationManager_Open_Notification_Job=Open Notification Job	41	TaskListNotificationManager_Open_Notification_Job=Open Notification Job
44		42
Lines 79-86 Link Here
79	TasksUiUtil_Browser_could_not_be_initiated=Browser could not be initiated	77	TasksUiUtil_Browser_could_not_be_initiated=Browser could not be initiated
80	TasksUiUtil_Browser_init_error=Browser init error	78	TasksUiUtil_Browser_init_error=Browser init error
81	TasksUiUtil_Could_not_open_URL_=Could not open URL:	79	TasksUiUtil_Could_not_open_URL_=Could not open URL:
82	TasksUiUtil_create_task=Create Task
83	TasksUiUtil_failed_to_create_new_task=Failed to create new task:\n\n
84	TasksUiUtil_No_URL_to_open=No URL to open.	80	TasksUiUtil_No_URL_to_open=No URL to open.
85		81
86	AbstractRetrieveTitleFromUrlJob_Retrieving_summary_from_URL=Retrieving summary from URL	82	AbstractRetrieveTitleFromUrlJob_Retrieving_summary_from_URL=Retrieving summary from URL

Lines 71-84 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/Messages.java (-8 lines)
71		71
72	public static String TaskLabelDecorator____unknown_host___;	72	public static String TaskLabelDecorator____unknown_host___;
73		73
74	public static String TaskListBackupManager_Could_not_backup_task_data;
75
76	public static String TaskListBackupManager_Error_occured_during_scheduled_tasklist_backup;	74	public static String TaskListBackupManager_Error_occured_during_scheduled_tasklist_backup;
77		75
78	public static String TaskListBackupManager_Scheduled_task_data_backup;	76	public static String TaskListBackupManager_Scheduled_task_data_backup;
79		77
80	public static String TaskListBackupManager_Tasklist_Backup;
81
82	public static String TaskListNotificationManager_Open_Notification_Job;	78	public static String TaskListNotificationManager_Open_Notification_Job;
83		79
84	public static String TaskRepositoryLocationUi_Enter_HTTP_password;	80	public static String TaskRepositoryLocationUi_Enter_HTTP_password;
Lines 139-148 Link Here
139		135
140	public static String TasksUiUtil_Could_not_open_URL_;	136	public static String TasksUiUtil_Could_not_open_URL_;
141		137
142	public static String TasksUiUtil_create_task;
143
144	public static String TasksUiUtil_failed_to_create_new_task;
145
146	public static String TasksUiUtil_No_URL_to_open;	138	public static String TasksUiUtil_No_URL_to_open;
147		139
148	public static String AbstractRetrieveTitleFromUrlJob_Retrieving_summary_from_URL;	140	public static String AbstractRetrieveTitleFromUrlJob_Retrieving_summary_from_URL;