Attachment #71325 for bug #191575

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





	@Override
	public boolean equals(Object object) {
		if (object instanceof TaskRepository) {
			TaskRepository repository = (TaskRepository) object;
			if (getUrl() == null) {
				if (repository.getUrl() != null) {
					return false;
				}
			} else {
				if(!getUrl().equals(repository.getUrl())) {
					return false;
				}
			}
			if (getKind() == null) {
				return repository.getKind() == null;
			} else {
				return getKind().equals(repository.getKind());
			}

		} else {
			return super.equals(object);
		}


	@Override
	public int hashCode() {
		int res = getUrl()==null ? 1 : getUrl().hashCode();
		return res * 31 + (getKind()==null ? 1 : getKind().hashCode());
		} else {
			return super.hashCode();
		}
	}

	@Override

Lines 66-71 Link Here

(-)src/org/eclipse/mylyn/tasks/core/AbstractTask.java (+11 lines)
66		66
67	// transient	67	// transient
68	private IStatus errorStatus = null;	68	private IStatus errorStatus = null;
		69
		70	private boolean needsSynchronization = false;
69		71
70	public enum RepositoryTaskSyncState {	72	public enum RepositoryTaskSyncState {
71	OUTGOING, SYNCHRONIZED, INCOMING, CONFLICT	73	OUTGOING, SYNCHRONIZED, INCOMING, CONFLICT
Lines 442-445 Link Here
442	public void setDueDate(Date date) {	444	public void setDueDate(Date date) {
443	this.dueDate = date;	445	this.dueDate = date;
444	}	446	}
		447
		448	public boolean getNeedsSynchronization() {
		449	return needsSynchronization;
		450	}
		451
		452	public void setNeedsSynchronization(boolean needsSynchronization) {
		453	this.needsSynchronization = needsSynchronization;
		454	}
		455
445	}	456	}




	 *            IQueryHitCollector that collects the hits found
	 */
	public abstract IStatus performQuery(AbstractRepositoryQuery query, TaskRepository repository,
			IProgressMonitor monitor, ITaskCollector resultCollector);

	/**
	 * The connector's summary i.e. "JIRA (supports 3.3.1 and later)"

	}

	/**
	 * Of <code>tasks</code> provided, return all that have changed since last synchronization of
	 * <code>repository</code>.
	 * 
	 * Tasks that need to be synchronized (i.e. task data updated) should be passed to
	 * <code>collector.accept(Task)</code> method, or if repository connector can update task data, it can use
	 * <code>collector.accept(RepositoryTaskData)</code> call.
	 * 
	 * All errors should be thrown as <code>CoreException</code> for the framework to handle, since background
	 * synchronizations fail silently when disconnected.
	 * @param tasks TODO
	 * 
	 * @return null if there was no tasks changed in the repository, otherwise collection of updated tasks (within
	 *         <code>tasks</code> collection), so empty collection means that there are some other tasks changed
	 * 
	 * @throws CoreException
	 */
	public abstract boolean updateNeedsSynchronization(TaskRepository repository, 
			Set<AbstractTask> tasks, IProgressMonitor monitor) throws CoreException;

	/**

	 * synchronization timestamp. Override to return actual timestamp from
	 * repository.
	 */
	public String getSynchronizationTimestamp(TaskRepository repository, Set<AbstractTask> changedTasks) {
		Date mostRecent = new Date(0);
		String mostRecentTimeStamp = repository.getSyncTimeStamp();
		for (AbstractTask task : changedTasks) {

		this.taskDataManager = taskDataManager;
	}


}

Lines 23-28 Link Here

(-)src/org/eclipse/mylyn/tasks/core/ITaskFactory.java (-1 / +1 lines)
23	* @param forced -	23	* @param forced -
24	* user requested synchronization	24	* user requested synchronization
25	*/	25	*/
26	public abstract AbstractTask createTask(RepositoryTaskData taskData, boolean synchData, boolean forced, IProgressMonitor monitor) throws CoreException;	26	public abstract AbstractTask createTask(RepositoryTaskData taskData, IProgressMonitor monitor) throws CoreException;
27		27
28	}	28	}




 *******************************************************************************/
package org.eclipse.mylyn.tasks.core;

import java.text.MessageFormat;
import java.util.HashSet;
import java.util.Set;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.SubProgressMonitor;

/**
 * Collects QueryHits resulting from repository search
 * 
 * @author Shawn Minto
 * @author Rob Elves (generalized from bugzilla)
 * @author Steffen Pingel
 */
public class QueryHitCollector implements ITaskCollector {

	public static final int MAX_HITS = 5000;

	public static final String MAX_HITS_REACHED = "Max allowed number of hits returned exceeded. Some hits may not be displayed. Please narrow query scope.";

	private final Set<AbstractTask> taskResults = new HashSet<AbstractTask>();

	private final TaskList taskList;
	private IProgressMonitor monitor = new NullProgressMonitor();

	private final ITaskFactory taskFactory;
	private int matchCount;

	/** The string to display to the user while querying */
	private static final String STARTING = "querying the server";

	/** The string to display to the user when we have 1 match */
	private static final String MATCH = "1 match";

	/** The string to display to the user when we have multiple or no matches */
	private static final String MATCHES = "{0} matches";

	/** The string to display to the user when the query is done */
	private static final String DONE = "done";

	protected TaskList taskList;

	protected ITaskFactory taskFactory;

	public QueryHitCollector(TaskList tasklist, ITaskFactory taskFactory) {
		this.taskList = tasklist;
		this.taskFactory = taskFactory;
	}

	public void aboutToStart(int startMatchCount) throws CoreException {
		taskResults.clear();
		matchCount = startMatchCount;
		monitor.setTaskName(STARTING);
	}

	public void accept(AbstractTask task) {
		if (task == null) {
			throw new IllegalArgumentException();
			getProgressMonitor().subTask(getFormattedMatchesString(matchCount));
			getProgressMonitor().worked(1);
		}
		
		AbstractTask existingTask = taskList.getTask(task.getHandleIdentifier());
		if (existingTask == null) {
			task.setNeedsSynchronization(true);
		} else {
			// preserve meta attributes of existing task
			task.setLastSyncDateStamp(existingTask.getLastSyncDateStamp());
			task.setNeedsSynchronization(existingTask.getNeedsSynchronization());
			taskList.addTask(hitTask);
		}
		
		taskResults.add((AbstractTask) task);
	}

	public void accept(RepositoryTaskData taskData) throws CoreException {
		if (taskData == null) {
			throw new IllegalArgumentException();

		if (!getProgressMonitor().isCanceled()) {
			getProgressMonitor().subTask(getFormattedMatchesString(matchCount));
			getProgressMonitor().worked(1);
		}

		AbstractTask task = taskFactory.createTask(taskData, new NullProgressMonitor());
		taskResults.add(task);
		matchCount++;
	}

	public void done() {
		if (monitor != null && !monitor.isCanceled()) {
			// if the operation is cancelled, finish with the data that we
			// already have
			String matchesString = getFormattedMatchesString(matchCount);
			monitor.setTaskName(MessageFormat.format(DONE, new Object[] { matchesString }));
			monitor.done();
		}

		// Cut no longer used references because the collector might be re-used
		monitor = null;
	}

	protected String getFormattedMatchesString(int count) {
		if (count == 1) {
			return MATCH;
		}
		Object[] messageFormatArgs = { new Integer(count) };
		return MessageFormat.format(MATCHES, messageFormatArgs);
	}

	public IProgressMonitor getProgressMonitor() {
		return monitor;
	}

	public void setProgressMonitor(IProgressMonitor monitor) {
		this.monitor = monitor;
	}

	public Set<AbstractTask> getTaskHits() {
		return taskResults;
	}

	public void clear() {
		taskResults.clear();
	}

}

Lines 130-135 Link Here

(-)src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java (+12 lines)
130	public static final String KEY_SYNC_STATE = "offlineSyncState";	130	public static final String KEY_SYNC_STATE = "offlineSyncState";
131		131
132	public static final String KEY_OWNER = "Owner";	132	public static final String KEY_OWNER = "Owner";
		133
		134	public static final String KEY_NEEDS_SYNCHRONIZATION = "NeedsSynchronization";
133		135
134	private List<ITaskListExternalizer> delegateExternalizers = new ArrayList<ITaskListExternalizer>();	136	private List<ITaskListExternalizer> delegateExternalizers = new ArrayList<ITaskListExternalizer>();
135		137
Lines 204-209 Link Here
204	} else {	206	} else {
205	node.setAttribute(KEY_REMINDED, VAL_FALSE);	207	node.setAttribute(KEY_REMINDED, VAL_FALSE);
206	}	208	}
		209	if (task.getNeedsSynchronization()) {
		210	node.setAttribute(KEY_NEEDS_SYNCHRONIZATION, VAL_TRUE);
		211	} else {
		212	node.setAttribute(KEY_NEEDS_SYNCHRONIZATION, VAL_FALSE);
		213	}
207		214
208	if (task instanceof AbstractTask) {	215	if (task instanceof AbstractTask) {
209	AbstractTask abstractTask = (AbstractTask) task;	216	AbstractTask abstractTask = (AbstractTask) task;
Lines 484-489 Link Here
484	} else {	491	} else {
485	task.setReminded(false);	492	task.setReminded(false);
486	}	493	}
		494	if (element.hasAttribute(KEY_NEEDS_SYNCHRONIZATION) && element.getAttribute(KEY_NEEDS_SYNCHRONIZATION).compareTo(VAL_TRUE) == 0) {
		495	task.setNeedsSynchronization(true);
		496	} else {
		497	task.setNeedsSynchronization(false);
		498	}
487		499
488	if (task instanceof AbstractTask) {	500	if (task instanceof AbstractTask) {
489	AbstractTask abstractTask = (AbstractTask) task;	501	AbstractTask abstractTask = (AbstractTask) task;

Lines 23-31 Link Here

(-).refactorings/2007/6/24/refactorings.index (-6 / +8 lines)
23	1181767990694 Rename type 'AbstractTaskListElement'	23	1181767990694 Rename type 'AbstractTaskListElement'
24	1181769454884 Rename type 'DateRangeContainer'	24	1181769454884 Rename type 'DateRangeContainer'
25	1181769501743 Rename type 'DateRangeActivityDelegate'	25	1181769501743 Rename type 'DateRangeActivityDelegate'
26	1181781818576 Rename method 'notifyLocalInfoChanged'	26	1181782714681 Rename method 'getChangedSinceLastSync'
27	1181788002784 Rename method 'add'	27	1181782786972 Change method 'updateNeedSynchronization'
28	1181788017786 Rename method 'remove'	28	1181785485666 Change method 'performQuery'
29	1181803285976 Rename field 'automaticCategory'	29	1181789110090 Change method 'updateNeedsSynchronization'
30	1181803314502 Rename method 'getAutomaticCategory'	30	1181791320957 Change method 'performQuery'
31	1181808412801 Change method 'moveToContainer'	31	1181799708110 Rename type 'IQueryHitCollector'
		32	1181800787610 Rename method 'getLastModifiedTimestamp'
		33	1181800884406 Rename method 'getTaskRepositorySynchronizationTimestamp'




<?xml version="1.0" encoding="utf-8"?>
<session version="1.0">
<refactoring comment="Rename field 'DESCRIPTION_DEFAULT' in 'org.eclipse.mylyn.internal.tasks.core.LocalRepositoryConnector' to 'DEFAULT_SUMMARY'&#13;&#10;- Original project: 'org.eclipse.mylyn.tasks.core'&#13;&#10;- Original element: 'org.eclipse.mylyn.internal.tasks.core.LocalRepositoryConnector.DESCRIPTION_DEFAULT'&#13;&#10;- Renamed element: 'org.eclipse.mylyn.internal.tasks.core.LocalRepositoryConnector.DEFAULT_SUMMARY'&#13;&#10;- Update references to refactored element&#13;&#10;- Update textual occurrences in comments and strings" delegate="false" deprecate="false" description="Rename field 'DESCRIPTION_DEFAULT'" flags="589830" getter="false" id="org.eclipse.jdt.ui.rename.field" input="/src&lt;org.eclipse.mylyn.internal.tasks.core{LocalRepositoryConnector.java[LocalRepositoryConnector^DESCRIPTION_DEFAULT" name="DEFAULT_SUMMARY" references="true" setter="false" stamp="1181677842500" textual="true" version="1.0"/>
<refactoring comment="Push down members from 'org.eclipse.mylyn.tasks.core.Task'&#13;&#10;- Original project: 'org.eclipse.mylyn.tasks.core'&#13;&#10;- Original elements:&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.active&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.hasReminded&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.summary&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.priority&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.notes&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.estimatedTimeHours&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.completed&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.taskUrl&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.parentCategory&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.completionDate&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.creationDate&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.scheduledForDate&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.dueDate&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.kind&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.toString()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setActive(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.isActive()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.equals(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.hashCode()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.isCompleted()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setCompleted(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.getPriority()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setPriority(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setTaskUrl(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.getTaskUrl()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.getNotes()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setNotes(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.getEstimateTimeHours()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setEstimatedTimeHours(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setContainer(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.getContainer()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.getSummary()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.getCompletionDate()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setScheduledForDate(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.getScheduledForDate()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.hasBeenReminded()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setReminded(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.getCreationDate()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setCreationDate(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setSummary(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setCompletionDate(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.isPastReminder()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.hasValidUrl()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.getTaskKind()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setKind(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.compareTo(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.getDueDate()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setDueDate(...)&#13;&#10;- Pushed members:&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.active&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.hasReminded&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.summary&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.priority&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.notes&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.estimatedTimeHours&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.completed&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.taskUrl&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.parentCategory&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.completionDate&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.creationDate&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.scheduledForDate&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.dueDate&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.kind&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.toString()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setActive(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.isActive()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.equals(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.hashCode()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.isCompleted()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setCompleted(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.getPriority()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setPriority(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setTaskUrl(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.getTaskUrl()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.getNotes()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setNotes(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.getEstimateTimeHours()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setEstimatedTimeHours(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setContainer(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.getContainer()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.getSummary()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.getCompletionDate()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setScheduledForDate(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.getScheduledForDate()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.hasBeenReminded()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setReminded(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.getCreationDate()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setCreationDate(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setSummary(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setCompletionDate(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.isPastReminder()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.hasValidUrl()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.getTaskKind()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setKind(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.compareTo(...)&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.getDueDate()&#13;&#10;     org.eclipse.mylyn.tasks.core.Task.setDueDate(...)" description="Push down" element1="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task^active" element10="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task^completionDate" element11="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task^creationDate" element12="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task^scheduledForDate" element13="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task^dueDate" element14="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~toSt" element15="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~toString" element16="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~isActivee~Z" element17="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~isActive" element18="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~hashCodeObject;" element19="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~hashCode" element2="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~isCompleted" element20="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~isCompleted" element21="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~getPriorityd~Z" element22="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~getPriority" element23="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~setTaskUrl~QString;;" element24="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~setTaskUrl~QString;" element25="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~getNotesrl" element26="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~getNotes" element27="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~getEstimateTimeHo" element28="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~getEstimateTimeHours" element29="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task^summarymatedTimeHours~I" element3="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task^summary" element30="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~getContainer~QAbstractTaskContainer;" element31="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~getContainer" element32="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~getComplet" element33="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~getCompletionDate" element34="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~getScheduledForDate~QDate;" element35="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~getScheduledForDate" element36="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~setReminded~Zed" element37="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~setReminded~Z" element38="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~setCreationDate" element39="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~setCreationDate~QDate;" element4="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~setSumma" element40="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~setSummary~QString;" element41="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~isPastReminderate~QDate;" element42="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~isPastReminder" element43="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~getTaskKind" element44="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~getTaskKind" element45="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~compareTo~QITask" element46="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~compareTo~QITaskListElement;" element47="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~setDueDate" element48="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task~setDueDate~QDate;" element5="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task^estim" element6="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task^estimatedTimeHours" element7="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task^taskUrled" element8="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task^taskUrl" element9="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task^parentCategory" flags="589830" id="org.eclipse.jdt.ui.push.down" input="/src&lt;org.eclipse.mylyn.tasks.core{Task.java[Task" push1="true" push10="true" push11="true" push12="true" push13="true" push14="true" push15="true" push16="true" push17="true" push18="true" push19="true" push2="true" push20="true" push21="true" push22="true" push23="true" push24="true" push25="true" push26="true" push27="true" push28="true" push29="true" push3="true" push30="true" push31="true" push32="true" push33="true" push34="true" push35="true" push36="true" push37="true" push38="true" push39="true" push4="true" push40="true" push41="true" push42="true" push43="true" push44="true" push45="true" push46="true" push47="true" push48="true" push5="true" push6="true" push7="true" push8="true" push9="true" stamp="1181700191533" version="1.0"/>

<refactoring comment="Move 1 elements(s) to 'org.eclipse.mylyn.tasks.core/src/org.eclipse.mylyn.internal.tasks.core'&#13;&#10;- Original project: 'org.eclipse.mylyn.tasks.core'&#13;&#10;- Destination element: 'org.eclipse.mylyn.tasks.core/src/org.eclipse.mylyn.internal.tasks.core'&#13;&#10;- Original element: 'org.eclipse.mylyn.tasks.core.UnfiledCategory.java'&#13;&#10;- Update references to refactored element" description="Move compilation unit" destination="/src&lt;org.eclipse.mylyn.internal.tasks.core" element1="/src&lt;org.eclipse.mylyn.tasks.core{UnfiledCategory.java" files="0" flags="589830" folders="0" id="org.eclipse.jdt.ui.move" patterns="*.xml, *.mf" policy="org.eclipse.jdt.ui.moveResources" qualified="false" references="true" stamp="1181766121554" units="1" version="1.0"/>
<refactoring comment="Move 2 elements(s) to 'org.eclipse.mylyn.tasks.core/src/org.eclipse.mylyn.internal.tasks.core'&#13;&#10;- Original project: 'org.eclipse.mylyn.tasks.core'&#13;&#10;- Destination element: 'org.eclipse.mylyn.tasks.core/src/org.eclipse.mylyn.internal.tasks.core'&#13;&#10;- Original elements:&#13;&#10;     org.eclipse.mylyn.tasks.core.DateRangeActivityDelegate.java&#13;&#10;     org.eclipse.mylyn.tasks.core.DateRangeContainer.java&#13;&#10;- Update references to refactored element&#13;&#10;- Update fully qualified names in '*.xml, *.mf' files" description="Move compilation units" destination="/src&lt;org.eclipse.mylyn.internal.tasks.core" element1="/src&lt;org.eclipse.mylyn.tasks.core{DateRangeActivityDelegate.java" element2="/src&lt;org.eclipse.mylyn.tasks.core{DateRangeContainer.java" files="0" flags="589830" folders="0" id="org.eclipse.jdt.ui.move" patterns="*.xml, *.mf" policy="org.eclipse.jdt.ui.moveResources" qualified="true" references="true" stamp="1181766148799" units="2" version="1.0"/>
<refactoring comment="Move 1 elements(s) to 'org.eclipse.mylyn.tasks.core/src/org.eclipse.mylyn.internal.tasks.core'&#13;&#10;- Original project: 'org.eclipse.mylyn.tasks.core'&#13;&#10;- Destination element: 'org.eclipse.mylyn.tasks.core/src/org.eclipse.mylyn.internal.tasks.core'&#13;&#10;- Original element: 'org.eclipse.mylyn.tasks.core.TaskArchive.java'&#13;&#10;- Update references to refactored element&#13;&#10;- Update fully qualified names in '*.xml, *.mf' files" description="Move compilation unit" destination="/src&lt;org.eclipse.mylyn.internal.tasks.core" element1="/src&lt;org.eclipse.mylyn.tasks.core{TaskArchive.java" files="0" flags="589830" folders="0" id="org.eclipse.jdt.ui.move" patterns="*.xml, *.mf" policy="org.eclipse.jdt.ui.moveResources" qualified="true" references="true" stamp="1181766292096" units="1" version="1.0"/>

<refactoring comment="Rename type 'org.eclipse.mylyn.tasks.core.AbstractTaskContainer' to 'AbstractTaskCategory'&#13;&#10;- Original project: 'org.eclipse.mylyn.tasks.core'&#13;&#10;- Original element: 'org.eclipse.mylyn.tasks.core.AbstractTaskContainer'&#13;&#10;- Renamed element: 'org.eclipse.mylyn.tasks.core.AbstractTaskCategory'&#13;&#10;- Update references to refactored element&#13;&#10;- Update fully qualified names in '*.xml, *.properties, *.exsd, *.mf' files&#13;&#10;- Update textual occurrences in comments and strings" description="Rename type 'AbstractTaskContainer'" flags="589830" id="org.eclipse.jdt.ui.rename.type" input="/src&lt;org.eclipse.mylyn.tasks.core{AbstractTaskContainer.java[AbstractTaskContainer" matchStrategy="1" name="AbstractTaskCategory" patterns="*.xml, *.properties, *.exsd, *.mf" qualified="true" references="true" similarDeclarations="false" stamp="1181767911702" textual="false" version="1.0"/>
<refactoring comment="Rename type 'org.eclipse.mylyn.tasks.core.AbstractTaskListElement' to 'AbstractTaskContainer'&#13;&#10;- Original project: 'org.eclipse.mylyn.tasks.core'&#13;&#10;- Original element: 'org.eclipse.mylyn.tasks.core.AbstractTaskListElement'&#13;&#10;- Renamed element: 'org.eclipse.mylyn.tasks.core.AbstractTaskContainer'&#13;&#10;- Update references to refactored element&#13;&#10;- Update fully qualified names in '*.xml, *.properties, *.exsd, *.mf' files&#13;&#10;- Update textual occurrences in comments and strings" description="Rename type 'AbstractTaskListElement'" flags="589830" id="org.eclipse.jdt.ui.rename.type" input="/src&lt;org.eclipse.mylyn.tasks.core{AbstractTaskListElement.java[AbstractTaskListElement" matchStrategy="1" name="AbstractTaskContainer" patterns="*.xml, *.properties, *.exsd, *.mf" qualified="true" references="true" similarDeclarations="false" stamp="1181767990694" textual="false" version="1.0"/>
<refactoring comment="Rename type 'org.eclipse.mylyn.internal.tasks.core.DateRangeContainer' to 'ScheduledTaskContainer'&#13;&#10;- Original project: 'org.eclipse.mylyn.tasks.core'&#13;&#10;- Original element: 'org.eclipse.mylyn.internal.tasks.core.DateRangeContainer'&#13;&#10;- Renamed element: 'org.eclipse.mylyn.internal.tasks.core.ScheduledTaskContainer'&#13;&#10;- Update references to refactored element&#13;&#10;- Update fully qualified names in '*.xml, *.properties, *.exsd, *.mf' files&#13;&#10;- Update textual occurrences in comments and strings" description="Rename type 'DateRangeContainer'" flags="589830" id="org.eclipse.jdt.ui.rename.type" input="/src&lt;org.eclipse.mylyn.internal.tasks.core{DateRangeContainer.java[DateRangeContainer" matchStrategy="1" name="ScheduledTaskContainer" patterns="*.xml, *.properties, *.exsd, *.mf" qualified="true" references="true" similarDeclarations="false" stamp="1181769454884" textual="false" version="1.0"/>
<refactoring comment="Rename type 'org.eclipse.mylyn.internal.tasks.core.DateRangeActivityDelegate' to 'ScheduledTaskDelegate'&#13;&#10;- Original project: 'org.eclipse.mylyn.tasks.core'&#13;&#10;- Original element: 'org.eclipse.mylyn.internal.tasks.core.DateRangeActivityDelegate'&#13;&#10;- Renamed element: 'org.eclipse.mylyn.internal.tasks.core.ScheduledTaskDelegate'&#13;&#10;- Update references to refactored element&#13;&#10;- Update fully qualified names in '*.xml, *.properties, *.exsd, *.mf' files&#13;&#10;- Update textual occurrences in comments and strings" description="Rename type 'DateRangeActivityDelegate'" flags="589830" id="org.eclipse.jdt.ui.rename.type" input="/src&lt;org.eclipse.mylyn.internal.tasks.core{DateRangeActivityDelegate.java[DateRangeActivityDelegate" matchStrategy="1" name="ScheduledTaskDelegate" patterns="*.xml, *.properties, *.exsd, *.mf" qualified="true" references="true" similarDeclarations="false" stamp="1181769501743" textual="false" version="1.0"/>
<refactoring comment="Rename method 'org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector.getChangedSinceLastSync(...)' to 'updateNeedSynchronization'&#10;- Original project: 'org.eclipse.mylyn.tasks.core'&#10;- Original element: 'org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector.getChangedSinceLastSync(...)'&#10;- Renamed element: 'org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector.updateNeedSynchronization(...)'&#10;- Update references to refactored element" delegate="false" deprecate="false" description="Rename method 'getChangedSinceLastSync'" flags="589830" id="org.eclipse.jdt.ui.rename.method" input="/src&lt;org.eclipse.mylyn.tasks.core{AbstractRepositoryConnector.java[AbstractRepositoryConnector~getChangedSinceLastSync~QTaskRepository;~QSet\&lt;QAbstractTask;&gt;;~QIProgressMonitor;~QQueryHitCollector;" name="updateNeedSynchronization" references="true" stamp="1181782714681" version="1.0"/>
<refactoring comment="Change method 'public Set&lt;AbstractTask&gt; org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector.updateNeedSynchronization(TaskRepository repository, Set&lt;AbstractTask&gt; tasks, IProgressMonitor monitor, QueryHitCollector collector) throws CoreException' to 'public boolean updateNeedsSynchronization(TaskRepository repository, IProgressMonitor monitor) throws CoreException'&#10;- Original project: 'org.eclipse.mylyn.tasks.core'&#10;- New name: 'updateNeedsSynchronization'&#10;- New return type: 'boolean'&#10;- Removed parameters:&#10;     Set&lt;AbstractTask&gt; tasks&#10;     QueryHitCollector collector" delegate="false" deprecate="true" description="Change method 'updateNeedSynchronization'" element1="/\/usr\/local\/eclipse-3.3RC4\/plugins\/org.eclipse.equinox.common_3.3.0.v20070426.jar&lt;org.eclipse.core.runtime(CoreException.class[CoreException" flags="589830" id="org.eclipse.jdt.ui.change.method.signature" input="/src&lt;org.eclipse.mylyn.tasks.core{AbstractRepositoryConnector.java[AbstractRepositoryConnector~updateNeedSynchronization~QTaskRepository;~QSet\&lt;QAbstractTask;&gt;;~QIProgressMonitor;~QQueryHitCollector;" kind1="0" name="updateNeedsSynchronization" parameter1="TaskRepository repository 0 TaskRepository repository false" parameter2="Set&lt;AbstractTask&gt; tasks 1 Set&lt;AbstractTask&gt; tasks true" parameter3="IProgressMonitor monitor 2 IProgressMonitor monitor false" parameter4="QueryHitCollector collector 3 QueryHitCollector collector true" return="boolean" stamp="1181782786972" version="1.0"/>
<refactoring comment="Change method 'public IStatus org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector.performQuery(AbstractRepositoryQuery query, TaskRepository repository, IProgressMonitor monitor, QueryHitCollector resultCollector, boolean forced)' to 'public IStatus performQuery(AbstractRepositoryQuery query, TaskRepository repository, IProgressMonitor monitor, QueryHitCollector resultCollector)'&#10;- Original project: 'org.eclipse.mylyn.tasks.core'&#10;- Removed parameters:&#10;     boolean forced" delegate="false" deprecate="true" description="Change method 'performQuery'" flags="589830" id="org.eclipse.jdt.ui.change.method.signature" input="/src&lt;org.eclipse.mylyn.tasks.core{AbstractRepositoryConnector.java[AbstractRepositoryConnector~performQuery~QAbstractRepositoryQuery;~QTaskRepository;~QIProgressMonitor;~QQueryHitCollector;~Z" name="performQuery" parameter1="AbstractRepositoryQuery query 0 AbstractRepositoryQuery query false" parameter2="TaskRepository repository 1 TaskRepository repository false" parameter3="IProgressMonitor monitor 2 IProgressMonitor monitor false" parameter4="QueryHitCollector resultCollector 3 QueryHitCollector resultCollector false" parameter5="boolean forced 4 boolean forced true" stamp="1181785485666" version="1.0"/>
<refactoring comment="Change method 'public boolean org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector.updateNeedsSynchronization(TaskRepository repository, IProgressMonitor monitor) throws CoreException' to 'public boolean updateNeedsSynchronization(TaskRepository repository, Set&lt;AbstractTask&gt; tasks, IProgressMonitor monitor) throws CoreException'&#10;- Original project: 'org.eclipse.mylyn.tasks.core'&#10;- Added parameters:&#10;     Set&lt;AbstractTask&gt; tasks" default2="foo" delegate="false" deprecate="true" description="Change method 'updateNeedsSynchronization'" element1="/\/usr\/local\/eclipse-3.3RC4\/plugins\/org.eclipse.equinox.common_3.3.0.v20070426.jar&lt;org.eclipse.core.runtime(CoreException.class[CoreException" flags="589830" id="org.eclipse.jdt.ui.change.method.signature" input="/src&lt;org.eclipse.mylyn.tasks.core{AbstractRepositoryConnector.java[AbstractRepositoryConnector~updateNeedsSynchronization~QTaskRepository;~QIProgressMonitor;" kind1="0" name="updateNeedsSynchronization" parameter1="TaskRepository repository 0 TaskRepository repository false" parameter2="  -1 Set&lt;AbstractTask&gt; tasks false" parameter3="IProgressMonitor monitor 1 IProgressMonitor monitor false" stamp="1181789110090" version="1.0"/>
<refactoring comment="Change method 'public IStatus org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector.performQuery(AbstractRepositoryQuery query, TaskRepository repository, IProgressMonitor monitor, IQueryHitCollector resultCollector)' to 'public IStatus performQuery(AbstractRepositoryQuery query, TaskRepository repository, IProgressMonitor monitor, IQueryHitCollector resultCollector)'&#10;- Original project: 'org.eclipse.mylyn.tasks.core'&#10;- Changed parameters:&#10;     QueryHitCollector resultCollector" delegate="false" deprecate="true" description="Change method 'performQuery'" flags="589830" id="org.eclipse.jdt.ui.change.method.signature" input="/src&lt;org.eclipse.mylyn.tasks.core{AbstractRepositoryConnector.java[AbstractRepositoryConnector~performQuery~QAbstractRepositoryQuery;~QTaskRepository;~QIProgressMonitor;~QQueryHitCollector;" name="performQuery" parameter1="AbstractRepositoryQuery query 0 AbstractRepositoryQuery query false" parameter2="TaskRepository repository 1 TaskRepository repository false" parameter3="IProgressMonitor monitor 2 IProgressMonitor monitor false" parameter4="QueryHitCollector resultCollector 3 IQueryHitCollector resultCollector false" stamp="1181791320957" version="1.0"/>
<refactoring comment="Rename type 'org.eclipse.mylyn.tasks.core.IQueryHitCollector' to 'ITaskCollector'&#10;- Original project: 'org.eclipse.mylyn.tasks.core'&#10;- Original element: 'org.eclipse.mylyn.tasks.core.IQueryHitCollector'&#10;- Renamed element: 'org.eclipse.mylyn.tasks.core.ITaskCollector'&#10;- Update references to refactored element&#10;- Update textual occurrences in comments and strings" description="Rename type 'IQueryHitCollector'" flags="589830" id="org.eclipse.jdt.ui.rename.type" input="/src&lt;org.eclipse.mylyn.tasks.core{IQueryHitCollector.java[IQueryHitCollector" matchStrategy="1" name="ITaskCollector" qualified="false" references="true" similarDeclarations="false" stamp="1181799708110" textual="false" version="1.0"/>
<refactoring comment="Rename method 'org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector.getLastModifiedTimestamp(...)' to 'getTaskRepositorySynchronizationTimestamp'&#10;- Original project: 'org.eclipse.mylyn.tasks.core'&#10;- Original element: 'org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector.getLastModifiedTimestamp(...)'&#10;- Renamed element: 'org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector.getTaskRepositorySynchronizationTimestamp(...)'&#10;- Update references to refactored element" delegate="false" deprecate="false" description="Rename method 'getLastModifiedTimestamp'" flags="589830" id="org.eclipse.jdt.ui.rename.method" input="/src&lt;org.eclipse.mylyn.tasks.core{AbstractRepositoryConnector.java[AbstractRepositoryConnector~getLastModifiedTimestamp~QTaskRepository;~QSet\&lt;QAbstractTask;&gt;;" name="getTaskRepositorySynchronizationTimestamp" references="true" stamp="1181800787610" version="1.0"/>
<refactoring comment="Rename method 'org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector.getTaskRepositorySynchronizationTimestamp(...)' to 'getSynchronizationTimestamp'&#10;- Original project: 'org.eclipse.mylyn.tasks.core'&#10;- Original element: 'org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector.getTaskRepositorySynchronizationTimestamp(...)'&#10;- Renamed element: 'org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector.getSynchronizationTimestamp(...)'&#10;- Update references to refactored element" delegate="false" deprecate="false" description="Rename method 'getTaskRepositorySynchronizationTimestamp'" flags="589830" id="org.eclipse.jdt.ui.rename.method" input="/src&lt;org.eclipse.mylyn.tasks.core{AbstractRepositoryConnector.java[AbstractRepositoryConnector~getTaskRepositorySynchronizationTimestamp~QTaskRepository;~QSet\&lt;QAbstractTask;&gt;;" name="getSynchronizationTimestamp" references="true" stamp="1181800884406" version="1.0"/>
</session>





package org.eclipse.mylyn.internal.tasks.core;


import java.util.Set;

import org.eclipse.core.runtime.CoreException;

import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.IAttachmentHandler;
import org.eclipse.mylyn.tasks.core.ITaskCollector;
import org.eclipse.mylyn.tasks.core.ITaskDataHandler;
import org.eclipse.mylyn.tasks.core.QueryHitCollector;
import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
import org.eclipse.mylyn.tasks.core.TaskRepository;


	}

	@Override
	public boolean updateNeedsSynchronization(TaskRepository repository,
			Set<AbstractTask> tasks, IProgressMonitor monitor) {
		return false;
	}

	@Override


	@Override
	public IStatus performQuery(AbstractRepositoryQuery query, TaskRepository repository, IProgressMonitor monitor,
			ITaskCollector resultCollector) {
		// ignore
		return null;
	}




/*******************************************************************************
 * Copyright (c) 2004 - 2006 University Of British Columbia 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:
 *     University Of British Columbia - initial API and implementation
 *******************************************************************************/

package org.eclipse.mylyn.tasks.core;

import org.eclipse.core.runtime.CoreException;

public interface ITaskCollector {

	void accept(AbstractTask task);

	void accept(RepositoryTaskData taskData) throws CoreException;

}

Lines 55-62 Link Here

(-)src/org/eclipse/mylyn/tests/integration/LiveWebConnectorTemplatesTest.java (-2 / +1 lines)
55	QueryHitCollector collector = new QueryHitCollector(TasksUiPlugin.getTaskListManager().getTaskList(),	55	QueryHitCollector collector = new QueryHitCollector(TasksUiPlugin.getTaskListManager().getTaskList(),
56	new ITaskFactory() {	56	new ITaskFactory() {
57		57
58	public AbstractTask createTask(RepositoryTaskData taskData, boolean synchData,	58	public AbstractTask createTask(RepositoryTaskData taskData, IProgressMonitor monitor) throws CoreException {
59	boolean forced, IProgressMonitor monitor) throws CoreException {
60	// ignore	59	// ignore
61	return null;	60	return null;
62	}	61	}





		QueryHitCollector hitCollector = new QueryHitCollector(taskList, new TaskFactory(repository));

		connector.performQuery(query, repository, new NullProgressMonitor(), hitCollector);
		assertEquals(1, hitCollector.getTaskHits().size());
		assertEquals(issue.getSummary(), hitCollector.getTaskHits().iterator().next().getSummary());
		//assertEquals(PriorityLevel.P1.toString(), hitCollector.getTaskDataHits().iterator().next().getPriority());


		JiraCustomQuery query = new JiraCustomQuery(repository.getUrl(), filter, repository.getCharacterEncoding());
		QueryHitCollector hitCollector = new QueryHitCollector(taskList, new TaskFactory(repository));
		connector.performQuery(query, repository, new NullProgressMonitor(), hitCollector);
		assertEquals(1, hitCollector.getTaskHits().size());
		assertEquals(issue2.getSummary(), hitCollector.getTaskHits().iterator().next().getSummary());

		hitCollector = new QueryHitCollector(taskList, new TaskFactory(repository));
		JiraClientFacade.getDefault().clearClientsAndConfigurationData();
		connector.performQuery(query, repository, new NullProgressMonitor(), hitCollector);
		assertEquals(1, hitCollector.getTaskHits().size());
		assertEquals(issue2.getSummary(), hitCollector.getTaskHits().iterator().next().getSummary());
	}




		TasksUiPlugin.getRepositoryManager().setSyncTime(repository, task5.getLastSyncDateStamp(),
				TasksUiPlugin.getDefault().getRepositoriesFilePath());

		boolean changed = connector.updateNeedsSynchronization(repository, tasks, new NullProgressMonitor());
		assertTrue(changed);
		// Always last known changed returned
		assertFalse(task4.getNeedsSynchronization());
		assertTrue(task5.getNeedsSynchronization());

		String priority4 = null;
		if (task4.getPriority().equals("P1")) {

		submit(task4, taskData4);
		submit(task5, taskData5);

		changed = connector.updateNeedsSynchronization(repository, tasks, new NullProgressMonitor());

		assertTrue(task4.getNeedsSynchronization());
		assertTrue(task5.getNeedsSynchronization());

		TasksUiPlugin.getSynchronizationManager().synchronize(connector, tasks, true, null);


		for (AbstractTask task : tasks) {
			if (task.getTaskId() == "4") {
				assertEquals(priority4, task4.getPriority());
			}

Lines 118-124 Link Here

(-)src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java (-1 / +1 lines)
118	TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();	118	TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
119	QueryHitCollector collector = new QueryHitCollector(taskList, new TaskFactory(repository));	119	QueryHitCollector collector = new QueryHitCollector(taskList, new TaskFactory(repository));
120		120
121	connector.performQuery(repositoryQuery, repository, new NullProgressMonitor(), collector, false);	121	connector.performQuery(repositoryQuery, repository, new NullProgressMonitor(), collector);
122		122
123	// results.addAll(connector.performQuery(repositoryQuery, new	123	// results.addAll(connector.performQuery(repositoryQuery, new
124	// NullProgressMonitor(), new MultiStatus(TasksUiPlugin.PLUGIN_ID,	124	// NullProgressMonitor(), new MultiStatus(TasksUiPlugin.PLUGIN_ID,

Lines 136-142 Link Here

(-)src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java (-1 / +1 lines)
136	BugzillaRepositoryConnector connector = new BugzillaRepositoryConnector();	136	BugzillaRepositoryConnector connector = new BugzillaRepositoryConnector();
137	connector.init(taskList);	137	connector.init(taskList);
138	BugzillaRepositoryQuery query = new BugzillaRepositoryQuery(repository.getUrl(), queryUrlString, "summary");	138	BugzillaRepositoryQuery query = new BugzillaRepositoryQuery(repository.getUrl(), queryUrlString, "summary");
139	connector.performQuery(query, repository, new NullProgressMonitor(), collector, false);	139	connector.performQuery(query, repository, new NullProgressMonitor(), collector);
140	assertEquals(2, collector.getTaskHits().size());	140	assertEquals(2, collector.getTaskHits().size());
141	for (AbstractTask hit : collector.getTaskHits()) {	141	for (AbstractTask hit : collector.getTaskHits()) {
142	assertTrue(hit.getSummary().contains("search-match-test"));	142	assertTrue(hit.getSummary().contains("search-match-test"));




import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.IAttachmentHandler;
import org.eclipse.mylyn.tasks.core.ITaskCollector;
import org.eclipse.mylyn.tasks.core.ITaskDataHandler;
import org.eclipse.mylyn.tasks.core.QueryHitCollector;
import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
import org.eclipse.mylyn.tasks.core.TaskRepository;


	}

	@Override
	public boolean updateNeedsSynchronization(TaskRepository repository,
			Set<AbstractTask> tasks, IProgressMonitor monitor) {
		// ignore
		return false;
	}

	@Override


	@Override
	public IStatus performQuery(AbstractRepositoryQuery query, TaskRepository repository, IProgressMonitor monitor,
			ITaskCollector resultCollector) {
		// ignore
		return null;
	}

Lines 362-369 Link Here

(-)src/org/eclipse/mylyn/internal/web/tasks/WebQueryWizardPage.java (-2 / +1 lines)
362	QueryHitCollector collector = new QueryHitCollector(TasksUiPlugin.getTaskListManager()	362	QueryHitCollector collector = new QueryHitCollector(TasksUiPlugin.getTaskListManager()
363	.getTaskList(), new ITaskFactory() {	363	.getTaskList(), new ITaskFactory() {
364		364
365	public AbstractTask createTask(RepositoryTaskData taskData, boolean synchData,	365	public AbstractTask createTask(RepositoryTaskData taskData, IProgressMonitor monitor) throws CoreException {
366	boolean forced, IProgressMonitor monitor) throws CoreException {
367	return null;	366	return null;
368	}	367	}
369	}) {	368	}) {




import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.IAttachmentHandler;
import org.eclipse.mylyn.tasks.core.ITaskCollector;
import org.eclipse.mylyn.tasks.core.ITaskDataHandler;
import org.eclipse.mylyn.tasks.core.QueryHitCollector;
import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.core.TaskRepositoryManager;


	@Override
	public IStatus performQuery(AbstractRepositoryQuery query, TaskRepository repository, IProgressMonitor monitor,
			ITaskCollector resultCollector) {
		if (query instanceof WebQuery) {
			WebQuery webQuery = (WebQuery) query;
			Map<String, String> queryParameters = webQuery.getQueryParameters();

		return null;
	}

	@Override
	public boolean updateNeedsSynchronization(TaskRepository repository,
			Set<AbstractTask> tasks, IProgressMonitor monitor) {
		// not supported
		return false;
	}

	@Override

	// utility methods

	public static IStatus performQuery(String resource, String regexp, String taskPrefix, IProgressMonitor monitor,
			ITaskCollector resultCollector, TaskRepository repository) {
		Pattern p = Pattern.compile(regexp, Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL
				| Pattern.UNICODE_CASE | Pattern.CANON_EQ);
		Matcher matcher = p.matcher(resource);

				if (matcher.groupCount() >= 1) {
					String id = matcher.group(1);
					String description = matcher.groupCount() > 1 ? cleanup(matcher.group(2), repository) : null;
					resultCollector.accept(new WebTask(id, description, taskPrefix, repository.getUrl(), WebTask.REPOSITORY_TYPE));
				}
			} while (matcher.find() && !monitor.isCanceled());


		return sb.toString();
	}

	public static IStatus performRssQuery(String queryUrl, IProgressMonitor monitor, ITaskCollector resultCollector,
			TaskRepository repository) {
		SyndFeedInput input = new SyndFeedInput();
		try {


				String entrTitle = entry.getTitle();

				resultCollector.accept(new WebTask(entryUri, //
						(date == null ? "" : df.format(date) + " - ") + entrTitle, //
						"", repository.getUrl(), WebTask.REPOSITORY_TYPE));
			}




import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;

import org.eclipse.core.runtime.CoreException;

import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.IAttachmentHandler;
import org.eclipse.mylyn.tasks.core.ITaskCollector;
import org.eclipse.mylyn.tasks.core.ITaskDataHandler;
import org.eclipse.mylyn.tasks.core.ITaskFactory;
import org.eclipse.mylyn.tasks.core.QueryHitCollector;



	@Override
	public boolean updateNeedsSynchronization(TaskRepository repository,
			Set<AbstractTask> tasks, IProgressMonitor monitor) throws CoreException {
		try {
			monitor.beginTask("Running query", IProgressMonitor.UNKNOWN);

			if (repository.getSyncTimeStamp() == null) {
				for (AbstractTask task : tasks) {
					task.setNeedsSynchronization(true);
				}
				return true;
			}

			String dateString = repository.getSyncTimeStamp();
			if (dateString == null) {
				dateString = "";
			}
			String urlQueryBase;
			String urlQueryString;

			String urlQueryBase = repository.getUrl() + CHANGED_BUGS_CGI_QUERY
					+ URLEncoder.encode(dateString, repository.getCharacterEncoding()) + CHANGED_BUGS_CGI_ENDDATE;
			
			String urlQueryString = urlQueryBase + BUG_ID;
			
			// Need to replace this with query that would return list of tasks since last sync
			// the trouble is that bugzilla only have 1 hour granularity for "changed since" query
			// so, we can't say that no tasks has changed in repository
			
			Set<AbstractTask> changedTasks = new HashSet<AbstractTask>();
			int queryCounter = -1;
			Iterator<AbstractTask> itr = tasks.iterator();
			while (itr.hasNext()) {

					queryForChanged(repository, changedTasks, urlQueryString);
					queryCounter = 0;
					urlQueryString = urlQueryBase + BUG_ID;
				}
				urlQueryString += newurlQueryString;
				if (!itr.hasNext()) {
					queryForChanged(repository, changedTasks, urlQueryString);
				} else {
					urlQueryString += newurlQueryString;
				}
			}
			
			for (AbstractTask task : changedTasks) {
				task.setNeedsSynchronization(true);
			}
			
			// FIXME check if new tasks were added
			//return changedTasks.isEmpty();
			return true;
		} catch (UnsupportedEncodingException e) {
			// XXX throw CoreException instead?
			MylarStatusHandler.fail(e, "Repository configured with unsupported encoding: "
					+ repository.getCharacterEncoding() + "\n\n Unable to determine changed tasks.", true);
			return false;
		}
	}


			String urlQueryString) throws UnsupportedEncodingException, CoreException {
		QueryHitCollector collector = new QueryHitCollector(taskList, new ITaskFactory() {

			public AbstractTask createTask(RepositoryTaskData taskData, IProgressMonitor monitor) {
				// do not construct actual task objects here as query shouldn't result in new tasks
				return taskList.getTask(taskData.getRepositoryUrl(), taskData.getId());
			}


		BugzillaRepositoryQuery query = new BugzillaRepositoryQuery(repository.getUrl(), urlQueryString, "");

		performQuery(query, repository, new NullProgressMonitor(), collector);

		for (AbstractTask taskHit : collector.getTaskHits()) {
			// String handle =


	@Override
	public IStatus performQuery(final AbstractRepositoryQuery query, TaskRepository repository,
			IProgressMonitor monitor, ITaskCollector resultCollector) {
		IStatus queryStatus = Status.OK_STATUS;
		try {
			monitor.beginTask("Running query", IProgressMonitor.UNKNOWN);
			BugzillaClient client = getClientManager().getClient(repository);
			boolean hitsReceived = client.getSearchHits(query, resultCollector);
			if (!hitsReceived) {
			if (ids.size() == 0) {
				// XXX: HACK in case of ip change bugzilla can return 0 hits
				// due to invalid authorization token, forcing relogin fixes
				client.logout();
				client.getSearchHits(query, resultCollector);
			}

			if (!forced) {
				// Only retrieve data for hits we don't already have
				for (AbstractTask existingTask : query.getChildren()) {
					AbstractTask repositoryTask = (AbstractTask) existingTask;
					if (ids.contains(repositoryTask.getTaskId())) {
						resultCollector.accept(repositoryTask);
						ids.remove(repositoryTask.getTaskId());
					}
				}
			}

			Map<String, RepositoryTaskData> hits = client.getTaskData(ids);
			for (RepositoryTaskData data : hits.values()) {
				if (data != null) {
					taskDataHandler.configureTaskData(repository, data);
					resultCollector.accept(data);
				}
			}

			return Status.OK_STATUS;
		} catch (UnrecognizedReponseException e) {
			return new Status(IStatus.ERROR, BugzillaCorePlugin.PLUGIN_ID, Status.INFO,
					"Unrecognized response from server", e);
		} catch (IOException e) {
			return new Status(IStatus.ERROR, BugzillaCorePlugin.PLUGIN_ID, Status.ERROR,
					"Check repository configuration: " + e.getMessage(), e);
		} catch (CoreException e) {
			return e.getStatus();
		} finally {
			monitor.done();
		}
		return queryStatus;

	}

	@Override

Lines 17-22 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryQueryResultsFactory.java (-8 / +20 lines)
17	import java.util.HashSet;	17	import java.util.HashSet;
18	import java.util.Set;	18	import java.util.Set;
19		19
		20	import org.eclipse.mylyn.tasks.core.ITaskCollector;
		21	import org.eclipse.mylyn.tasks.core.QueryHitCollector;
		22
20	/**	23	/**
21	* @author Rob Elves	24	* @author Rob Elves
22	*/	25	*/
Lines 28-41 Link Here
28	super(inStream, encoding);	31	super(inStream, encoding);
29	}	32	}
30		33
31	/**	34	// /**
32	* expects rdf returned from repository (ctype=rdf in url)	35	// * expects rdf returned from repository (ctype=rdf in url)
33	*	36	// *
34	* @throws GeneralSecurityException	37	// * @throws GeneralSecurityException
35	*/	38	// */
36	public void performQuery(String repositoryUrl, int maxHits) throws IOException {	39	// public void performQuery(String repositoryUrl, int maxHits) throws IOException {
37		40	//
38	SaxBugzillaQueryContentHandler contentHandler = new SaxBugzillaQueryContentHandler(repositoryUrl, hits, maxHits);	41	// SaxBugzillaQueryContentHandler contentHandler = new SaxBugzillaQueryContentHandler(repositoryUrl, hits, maxHits);
		42	// collectResults(contentHandler, false);
		43	// }
		44
		45	/** expects rdf returned from repository (ctype=rdf in url)
		46	* @throws GeneralSecurityException */
		47	public void performQuery(String repositoryUrl, ITaskCollector collector, int maxHits) throws IOException {
		48
		49	SaxBugzillaQueryContentHandler contentHandler = new SaxBugzillaQueryContentHandler(repositoryUrl,
		50	collector, hits, maxHits);
39	collectResults(contentHandler, false);	51	collectResults(contentHandler, false);
40	}	52	}
41		53

Lines 14-19 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/core/SaxBugzillaQueryContentHandler.java (-46 / +52 lines)
14	import java.util.Locale;	14	import java.util.Locale;
15	import java.util.Set;	15	import java.util.Set;
16		16
		17	import org.eclipse.mylyn.tasks.core.AbstractTask;
		18	import org.eclipse.mylyn.tasks.core.ITaskCollector;
		19	import org.eclipse.mylyn.tasks.core.QueryHitCollector;
17	import org.eclipse.mylyn.web.core.HtmlStreamTokenizer;	20	import org.eclipse.mylyn.web.core.HtmlStreamTokenizer;
18	import org.xml.sax.Attributes;	21	import org.xml.sax.Attributes;
19	import org.xml.sax.SAXException;	22	import org.xml.sax.SAXException;
Lines 29-46 Link Here
29	/** The bug id */	32	/** The bug id */
30	private String id;	33	private String id;
31		34
32	// /** The summary of the bug */	35	/** The summary of the bug */
33	// private String description = "";	36	private String description = "";
34	//	37
35	// /** The priority of the bug */	38	/** The priority of the bug */
36	// private String priority = Task.PriorityLevel.getDefault().toString();	39	private String priority = AbstractTask.PriorityLevel.getDefault().toString();
37	//	40
38	// /** The state of the bug */	41	/** The state of the bug */
39	// private String state = "";	42	private String state = "";
40		43
41	private StringBuffer characters;	44	private StringBuffer characters;
42		45
43	// private String repositoryUrl;	46	private ITaskCollector collector;
		47
		48	private String repositoryUrl;
44		49
45	private Set<String> bugIds;	50	private Set<String> bugIds;
46		51
Lines 48-56 Link Here
48		53
49	private int numCollected = 0;	54	private int numCollected = 0;
50		55
51	public SaxBugzillaQueryContentHandler(String repositoryUrl, Set<String> hits, int maxHits) {	56	public SaxBugzillaQueryContentHandler(String repositoryUrl, ITaskCollector collector, Set<String> hits, int maxHits) {
52	//this.repositoryUrl = repositoryUrl;	57	this.repositoryUrl = repositoryUrl;
53	this.maxHits = maxHits;	58	this.maxHits = maxHits;
		59	this.collector = collector;
54	this.bugIds = hits;	60	this.bugIds = hits;
55	}	61	}
56		62
Lines 96-137 Link Here
96	//System.err.println(">>> "+id);	102	//System.err.println(">>> "+id);
97	bugIds.add(id);	103	bugIds.add(id);
98	numCollected++;	104	numCollected++;
99	}	105	}
100	break;	106	break;
101	// // case BUG_SEVERITY:	107	// case BUG_SEVERITY:
102	// // severity = parsedText;	108	// severity = parsedText;
103	// // break;	109	// break;
104	// case PRIORITY:	110	case PRIORITY:
105	// priority = parsedText;	111	priority = parsedText;
106	// break;	112	break;
107	// // case REP_PLATFORM:	113	// case REP_PLATFORM:
108	// // platform = parsedText;	114	// platform = parsedText;
109	// // break;	115	// break;
110	// case ASSIGNED_TO:	116	case ASSIGNED_TO:
111	// //hit.setOwner(parsedText);	117	//hit.setOwner(parsedText);
112	// break;	118	break;
113	// case BUG_STATUS:	119	case BUG_STATUS:
114	// state = parsedText;	120	state = parsedText;
115	// break;	121	break;
116	// // case RESOLUTION:	122	// case RESOLUTION:
117	// // resolution = parsedText;	123	// resolution = parsedText;
118	// // break;	124	// break;
119	// case SHORT_DESC:	125	case SHORT_DESC:
120	// description = parsedText;	126	description = parsedText;
121	// break;	127	break;
122	// case SHORT_SHORT_DESC:	128	case SHORT_SHORT_DESC:
123	// description = parsedText;	129	description = parsedText;
124	// break;	130	break;
125	// case LI:	131	case LI:
126	// if (numCollected < maxHits \|\| maxHits == IBugzillaConstants.RETURN_ALL_HITS)	132	if (numCollected < maxHits \|\| maxHits == IBugzillaConstants.RETURN_ALL_HITS) {
127	// {	133	BugzillaTask task = new BugzillaTask(repositoryUrl, id, description);
128	// hit = new BugzillaQueryHit(taskList, description, priority, repositoryUrl,	134	task.setPriority(priority);
129	// id, null, state);	135	// TODO set state
130	// collector.accept(hit);	136	collector.accept(task);
131	// numCollected++;	137	numCollected++;
132	// } else {	138	} else {
133	// break;	139	break;
134	// }	140	}
135	}	141	}
136	} catch (RuntimeException e) {	142	} catch (RuntimeException e) {
137	if (e instanceof IllegalArgumentException) {	143	if (e instanceof IllegalArgumentException) {




import org.eclipse.mylyn.internal.bugzilla.core.history.BugzillaTaskHistoryParser;
import org.eclipse.mylyn.internal.bugzilla.core.history.TaskHistory;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
import org.eclipse.mylyn.tasks.core.ITaskCollector;
import org.eclipse.mylyn.tasks.core.ITaskAttachment;
import org.eclipse.mylyn.tasks.core.QueryHitCollector;
import org.eclipse.mylyn.tasks.core.RepositoryOperation;

	// }
	// }

	public boolean getSearchHits(AbstractRepositoryQuery query, ITaskCollector
			collector)
	throws IOException, CoreException {
// GetMethod method = null;
// try {
// String queryUrl = query.getUrl();
// // Test that we don't specify content type twice.
// // Should only be specified here (not in passed in url if possible)
// if (!queryUrl.contains("ctype=rdf")) {
// queryUrl = queryUrl.concat(IBugzillaConstants.CONTENT_TYPE_RDF);
// }
//
// method = getConnect(queryUrl);
// if (method.getResponseHeader("Content-Type") != null) {
// Header responseTypeHeader = method.getResponseHeader("Content-Type");
// for (String type : VALID_CONFIG_CONTENT_TYPES) {
// if (responseTypeHeader.getValue().toLowerCase(Locale.ENGLISH).contains(type))
// {
// RepositoryQueryResultsFactory queryFactory = new
// RepositoryQueryResultsFactory(method
// .getResponseBodyAsStream(), characterEncoding);
// queryFactory.performQuery(taskList, repositoryUrl.toString(), collector,
// QueryHitCollector.MAX_HITS);
//						
//
//						
//						
// //getTaskData(queryFactory.get)
// // pass t
//						
// return;
// }
// }
// }
// parseHtmlError(new BufferedReader(
// new InputStreamReader(method.getResponseBodyAsStream(), characterEncoding)));
// } finally {
// if (method != null) {
// method.releaseConnection();
// }
// }
// }

	/**
	 * Returns ids of bugs that match given query
	 */
	public Set<String> getSearchHits(AbstractRepositoryQuery query) throws IOException, CoreException {
		GetMethod method = null;
		try {
			String queryUrl = query.getUrl();

			if (method.getResponseHeader("Content-Type") != null) {
				Header responseTypeHeader = method.getResponseHeader("Content-Type");
				for (String type : VALID_CONFIG_CONTENT_TYPES) {
					if (responseTypeHeader.getValue().toLowerCase(Locale.ENGLISH).contains(type))
					{
						RepositoryQueryResultsFactory queryFactory = new
						RepositoryQueryResultsFactory(method
								.getResponseBodyAsStream(), characterEncoding);
						queryFactory.performQuery(repositoryUrl.toString(), collector,
								QueryHitCollector.MAX_HITS);
						return !queryFactory.getHits().isEmpty();
					}
				}
			}

				method.releaseConnection();
			}
		}
		return false;
	}

//	/**
//	 * Returns ids of bugs that match given query
//	 */
//	public Set<String> getSearchHits(AbstractRepositoryQuery query) throws IOException, CoreException {
//		GetMethod method = null;
//		try {
//			String queryUrl = query.getUrl();
//			// Test that we don't specify content type twice.
//			// Should only be specified here (not in passed in url if possible)
//			if (!queryUrl.contains("ctype=rdf")) {
//				queryUrl = queryUrl.concat(IBugzillaConstants.CONTENT_TYPE_RDF);
//			}
//
//			method = getConnect(queryUrl);
//			if (method.getResponseHeader("Content-Type") != null) {
//				Header responseTypeHeader = method.getResponseHeader("Content-Type");
//				for (String type : VALID_CONFIG_CONTENT_TYPES) {
//					if (responseTypeHeader.getValue().toLowerCase(Locale.ENGLISH).contains(type)) {
//						RepositoryQueryResultsFactory queryFactory = new RepositoryQueryResultsFactory(method
//								.getResponseBodyAsStream(), characterEncoding);
//						queryFactory.performQuery(repositoryUrl.toString(), QueryHitCollector.MAX_HITS);
//
//						return queryFactory.getHits();
//					}
//				}
//			}
//			parseHtmlError(new BufferedReader(
//					new InputStreamReader(method.getResponseBodyAsStream(), characterEncoding)));
//		} finally {
//			if (method != null) {
//				method.releaseConnection();
//			}
//		}
//		return new HashSet<String>();
//	}

	public static void setupExistingBugAttributes(String serverUrl, RepositoryTaskData existingReport) {
		// ordered list of elements as they appear in UI
		// and additional elements that may not appear in the incoming xml





import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;


import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.IAttachmentHandler;
import org.eclipse.mylyn.tasks.core.ITaskCollector;
import org.eclipse.mylyn.tasks.core.ITaskDataHandler;
import org.eclipse.mylyn.tasks.core.QueryHitCollector;
import org.eclipse.mylyn.tasks.core.RepositoryOperation;
import org.eclipse.mylyn.tasks.core.RepositoryStatus;
import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute;


	@Override
	public IStatus performQuery(AbstractRepositoryQuery query, TaskRepository repository, IProgressMonitor monitor,
			ITaskCollector resultCollector) {

		final List<TracTicket> tickets = new ArrayList<TracTicket>();


	}

	@Override
	public boolean updateNeedsSynchronization(TaskRepository repository,
			Set<AbstractTask> tasks, IProgressMonitor monitor) throws CoreException {
		if (repository.getSyncTimeStamp() == null) {
			return tasks;
		}

		if (!TracRepositoryConnector.hasChangedSince(repository)) {
			// always run the queries for web mode
			return true;
		}
		
		if (repository.getSyncTimeStamp() == null) {
			for (AbstractTask task : tasks) {
				task.setNeedsSynchronization(true);
			}
			return true;
		}

		Date since = new Date(0);

		} catch (NumberFormatException e) {
		}

		ITracClient client;
		try {
			ITracClient client = getClientManager().getRepository(repository);
			Set<Integer> ids = client.getChangedTickets(since);
			if (ids.isEmpty()) {
				// repository is unchanged
				return false; 
			}

			for (AbstractTask task : tasks) {
				Integer id = getTicketId(task.getTaskId());
				if (ids.contains(id)) {
					task.setNeedsSynchronization(true);
					if (ids.contains(id)) {
						result.add(task);
					}
				}
			}
			
			return true;
		} catch (Exception e) {
			throw new CoreException(new Status(IStatus.ERROR, TracCorePlugin.PLUGIN_ID, IStatus.OK,
					"Could not determine changed tasks", e));
		}
	}


Lines 24-31 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/ui/editor/DummySearchHitProvider.java (-2 / +1 lines)
24	public DummySearchHitProvider(TaskList tasklist) {	24	public DummySearchHitProvider(TaskList tasklist) {
25	super(tasklist, new ITaskFactory() {	25	super(tasklist, new ITaskFactory() {
26		26
27	public AbstractTask createTask(RepositoryTaskData taskData, boolean synchData,	27	public AbstractTask createTask(RepositoryTaskData taskData, IProgressMonitor monitor) throws CoreException {
28	boolean forced, IProgressMonitor monitor) throws CoreException {
29	return null;	28	return null;
30	}	29	}
31	});	30	});




import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
import org.eclipse.mylyn.internal.bugzilla.ui.BugzillaUiPlugin;
import org.eclipse.mylyn.internal.tasks.ui.util.WebBrowserDialog;
import org.eclipse.mylyn.tasks.core.QueryHitCollector;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.core.UnrecognizedReponseException;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;

	 * @param collector -
	 *            The collector for the results to go into
	 */
	public IStatus search(ProgressQueryHitCollector collector) throws LoginException {
		return this.search(collector, 0, IBugzillaConstants.RETURN_ALL_HITS);
	}


	 * @param startMatches -
	 *            The number of matches to start with for the progress monitor
	 */
	public IStatus search(ProgressQueryHitCollector collector, int startMatches) throws LoginException {
		return this.search(collector, startMatches, BugzillaUiPlugin.getDefault().getMaxResults());
	}


	 *            the maximum number of matches to return or
	 *            IBugzillaConstants.RETURN_ALL_HITS for unlimited
	 */
	public IStatus search(ProgressQueryHitCollector collector, int startMatches, int maxHits) throws LoginException {
		IProgressMonitor monitor = collector.getProgressMonitor();
		IStatus status = null;
		boolean possibleBadLogin = false;

					.getRepositoryManager().getRepositoryConnector(BugzillaCorePlugin.REPOSITORY_KIND);

			BugzillaClient client = bugzillaConnector.getClientManager().getClient(repository);
			client.getSearchHits(query, collector);

		} catch (CoreException e) {
			status = new MultiStatus(BugzillaUiPlugin.PLUGIN_ID, IStatus.ERROR,




import org.eclipse.mylyn.internal.tasks.ui.search.AbstractRepositorySearchQuery;
import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
import org.eclipse.mylyn.tasks.core.QueryHitCollector;
import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
import org.eclipse.mylyn.tasks.core.TaskComment;
import org.eclipse.mylyn.tasks.core.TaskRepository;

	private IMember javaElement;

	/** The bugzilla collector for the search */
	private  ProgressQueryHitCollector collector = null;//SearchHitCollector

	/** The status of the search operation */
	private IStatus status;

	@Override
	public void execute(IProgressMonitor monitor) {

		ProgressQueryHitCollector searchCollector = null;

		if (scope == BugzillaMylarSearch.FULLY_QUAL) {
			searchCollector = searchQualified(search.getServerUrl(), monitor);

	 *            The progress monitor to search with
	 * @return The QueryHitCollector with the results of the search
	 */
	private ProgressQueryHitCollector searchLocalQual(IProgressMonitor monitor) {

		// get the fully qualified name for searching
		String elementName = getFullyQualifiedName(javaElement);

		// setup the search result collector
		collector = new ProgressQueryHitCollector(TasksUiPlugin.getTaskListManager().getTaskList(), new TaskFactory(null));//SearchHitCollector(TasksUiPlugin.getTaskListManager().getTaskList());
		//collector.setOperation(this);
		collector.setProgressMonitor(monitor);


	 *            The progress monitor to search with
	 * @return The QueryHitCollector with the results of the search
	 */
	private ProgressQueryHitCollector searchLocalUnQual(IProgressMonitor monitor) {

		// get the element name for searching
		String elementName = javaElement.getElementName();

		// setup the search result collector
		collector = new ProgressQueryHitCollector(TasksUiPlugin.getTaskListManager().getTaskList(), new TaskFactory(null));//SearchHitCollector(TasksUiPlugin.getTaskListManager().getTaskList());
		//collector.setOperation(this);
		collector.setProgressMonitor(monitor);


	 * @param monitor
	 *            The progress monitor
	 */
	private void searchLocal(Set<AbstractTask> tasks, ProgressQueryHitCollector searchCollector, String elementName,
			IProgressMonitor monitor) {
		if (tasks == null)
			return;

	 *            The progress monitor to use for the search
	 * @return The QueryHitCollector with the search results
	 */
	private ProgressQueryHitCollector search(String url, TaskRepository repository,
			ProgressQueryHitCollector searchCollector, IProgressMonitor monitor) {

		// set the initial number of matches to 0
		int matches = 0;

	 *            The progress monitor to use
	 * @return The QueryHitCollector with the search results
	 */
	private ProgressQueryHitCollector searchQualified(String repositoryUrl, IProgressMonitor monitor) {
		// create a new collector for the results
		collector = new ProgressQueryHitCollector(TasksUiPlugin.getTaskListManager().getTaskList(), new TaskFactory(null));//SearchHitCollector(TasksUiPlugin.getTaskListManager().getTaskList());
		//collector.setOperation(this);
		collector.setProgressMonitor(monitor);


	 *            The progress monitor to use
	 * @return The QueryHitCollector with the search results
	 */
	private ProgressQueryHitCollector searchUnqualified(String repositoryUrl, IProgressMonitor monitor) {
		// create a new collector for the results
		collector = new ProgressQueryHitCollector(TasksUiPlugin.getTaskListManager().getTaskList(), new TaskFactory(null));//SearchHitCollector(TasksUiPlugin.getTaskListManager().getTaskList());
		//collector.setOperation(this);
		collector.setProgressMonitor(monitor);





/*******************************************************************************
 * Copyright (c) 2004 - 2006 Mylar committers 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
 *******************************************************************************/

package org.eclipse.mylyn.internal.sandbox.bridge.bugs;

import java.text.MessageFormat;
import java.util.HashSet;
import java.util.Set;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.ITaskCollector;
import org.eclipse.mylyn.tasks.core.ITaskFactory;
import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
import org.eclipse.mylyn.tasks.core.TaskList;

public class ProgressQueryHitCollector implements ITaskCollector {

	public static final int MAX_HITS = 5000;

	public static final String MAX_HITS_REACHED = "Max allowed number of hits returned exceeded. Some hits may not be displayed. Please narrow query scope.";

	protected Set<AbstractTask> taskResults = new HashSet<AbstractTask>();

	/** The progress monitor for the search operation */
	private IProgressMonitor monitor = new NullProgressMonitor();

	/** The number of matches found */
	private int matchCount;

	/** The string to display to the user while querying */
	private static final String STARTING = "querying the server";

	/** The string to display to the user when we have 1 match */
	private static final String MATCH = "1 match";

	/** The string to display to the user when we have multiple or no matches */
	private static final String MATCHES = "{0} matches";

	/** The string to display to the user when the query is done */
	private static final String DONE = "done";

	protected TaskList taskList;

	protected ITaskFactory taskFactory;

	public ProgressQueryHitCollector(TaskList tasklist, ITaskFactory taskFactory) {
		this.taskList = tasklist;
		this.taskFactory = taskFactory;
	}

	public void aboutToStart(int startMatchCount) throws CoreException {
		taskResults.clear();
		matchCount = startMatchCount;
		monitor.setTaskName(STARTING);
	}

	public void accept(AbstractTask task) {

		if (!getProgressMonitor().isCanceled()) {
			getProgressMonitor().subTask(getFormattedMatchesString(matchCount));
			getProgressMonitor().worked(1);
		}

		if (task == null)
			return;

		AbstractTask hitTask = taskList.getTask(task.getHandleIdentifier());
		if (hitTask == null) {
			hitTask = task;
			// task is new, add to tasklist
			taskList.addTask(hitTask);
		}
		taskResults.add((AbstractTask) hitTask);
		matchCount++;
	}

	public void accept(RepositoryTaskData taskData) throws CoreException {
		if (taskData == null)
			return;

		if (!getProgressMonitor().isCanceled()) {
			getProgressMonitor().subTask(getFormattedMatchesString(matchCount));
			getProgressMonitor().worked(1);
		}

		AbstractTask task = taskFactory.createTask(taskData, new SubProgressMonitor(monitor, 1));
		taskResults.add(task);
		matchCount++;
	}

	public void done() {
		if (monitor != null && !monitor.isCanceled()) {
			// if the operation is cancelled, finish with the data that we
			// already have
			String matchesString = getFormattedMatchesString(matchCount);
			monitor.setTaskName(MessageFormat.format(DONE, new Object[] { matchesString }));
			monitor.done();
		}

		// Cut no longer used references because the collector might be re-used
		monitor = null;
	}

	protected String getFormattedMatchesString(int count) {
		if (count == 1) {
			return MATCH;
		}
		Object[] messageFormatArgs = { new Integer(count) };
		return MessageFormat.format(MATCHES, messageFormatArgs);
	}

	public IProgressMonitor getProgressMonitor() {
		return monitor;
	}

	public void setProgressMonitor(IProgressMonitor monitor) {
		this.monitor = monitor;
	}

	public Set<AbstractTask> getTaskHits() {
		return taskResults;
	}

	public void clear() {
		taskResults.clear();
	}

}

Lines 1-4 Link Here

(-).refactorings/2007/6/24/refactorings.history (-1 / +2 lines)
1	<?xml version="1.0" encoding="utf-8" standalone="no"?>	1	<?xml version="1.0" encoding="utf-8"?>
2	<session version="1.0">	2	<session version="1.0">
3	<refactoring comment="Rename method 'org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor.createStatusLayout(...)' to 'createSummaryLLayout' - Original project: 'org.eclipse.mylyn.tasks.ui' - Original element: 'org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor.createStatusLayout(...)' - Renamed element: 'org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor.createSummaryLLayout(...)' - Update references to refactored element" delegate="false" deprecate="false" description="Rename method 'createStatusLayout'" flags="589830" id="org.eclipse.jdt.ui.rename.method" input="/src<org.eclipse.mylyn.tasks.ui.editors{AbstractRepositoryTaskEditor.java[AbstractRepositoryTaskEditor~createStatusLayout~QComposite;" name="createSummaryLLayout" references="true" stamp="1181583329656" version="1.0"/>	3	<refactoring comment="Rename method 'org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor.createStatusLayout(...)' to 'createSummaryLLayout' - Original project: 'org.eclipse.mylyn.tasks.ui' - Original element: 'org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor.createStatusLayout(...)' - Renamed element: 'org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor.createSummaryLLayout(...)' - Update references to refactored element" delegate="false" deprecate="false" description="Rename method 'createStatusLayout'" flags="589830" id="org.eclipse.jdt.ui.rename.method" input="/src<org.eclipse.mylyn.tasks.ui.editors{AbstractRepositoryTaskEditor.java[AbstractRepositoryTaskEditor~createStatusLayout~QComposite;" name="createSummaryLLayout" references="true" stamp="1181583329656" version="1.0"/>
4	<refactoring comment="Rename method 'org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor.createSummaryLLayout(...)' to 'createSummaryLayout' - Original project: 'org.eclipse.mylyn.tasks.ui' - Original element: 'org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor.createSummaryLLayout(...)' - Renamed element: 'org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor.createSummaryLayout(...)' - Update references to refactored element" delegate="false" deprecate="false" description="Rename method 'createSummaryLLayout'" flags="589830" id="org.eclipse.jdt.ui.rename.method" input="/src<org.eclipse.mylyn.tasks.ui.editors{AbstractRepositoryTaskEditor.java[AbstractRepositoryTaskEditor~createSummaryLLayout~QComposite;" name="createSummaryLayout" references="true" stamp="1181583348343" version="1.0"/>	4	<refactoring comment="Rename method 'org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor.createSummaryLLayout(...)' to 'createSummaryLayout' - Original project: 'org.eclipse.mylyn.tasks.ui' - Original element: 'org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor.createSummaryLLayout(...)' - Renamed element: 'org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor.createSummaryLayout(...)' - Update references to refactored element" delegate="false" deprecate="false" description="Rename method 'createSummaryLLayout'" flags="589830" id="org.eclipse.jdt.ui.rename.method" input="/src<org.eclipse.mylyn.tasks.ui.editors{AbstractRepositoryTaskEditor.java[AbstractRepositoryTaskEditor~createSummaryLLayout~QComposite;" name="createSummaryLayout" references="true" stamp="1181583348343" version="1.0"/>
Lines 18-21 Link Here
18	<refactoring comment="Rename type 'org.eclipse.mylyn.internal.tasks.ui.wizards.NewRepositoryTaskPage' to 'NewTaskPage' - Original project: 'org.eclipse.mylyn.tasks.ui' - Original element: 'org.eclipse.mylyn.internal.tasks.ui.wizards.NewRepositoryTaskPage' - Renamed element: 'org.eclipse.mylyn.internal.tasks.ui.wizards.NewTaskPage' - Update references to refactored element - Rename similarly named elements - Update fully qualified names in '.xml, .xsd' files - Update textual occurrences in comments and strings" description="Rename type 'NewRepositoryTaskPage'" flags="589830" id="org.eclipse.jdt.ui.rename.type" input="/src<org.eclipse.mylyn.internal.tasks.ui.wizards{NewRepositoryTaskPage.java[NewRepositoryTaskPage" matchStrategy="1" name="NewTaskPage" patterns=".xml, .xsd" qualified="true" references="true" similarDeclarations="true" stamp="1181707563828" textual="true" version="1.0"/>	18	<refactoring comment="Rename type 'org.eclipse.mylyn.internal.tasks.ui.wizards.NewRepositoryTaskPage' to 'NewTaskPage' - Original project: 'org.eclipse.mylyn.tasks.ui' - Original element: 'org.eclipse.mylyn.internal.tasks.ui.wizards.NewRepositoryTaskPage' - Renamed element: 'org.eclipse.mylyn.internal.tasks.ui.wizards.NewTaskPage' - Update references to refactored element - Rename similarly named elements - Update fully qualified names in '.xml, .xsd' files - Update textual occurrences in comments and strings" description="Rename type 'NewRepositoryTaskPage'" flags="589830" id="org.eclipse.jdt.ui.rename.type" input="/src<org.eclipse.mylyn.internal.tasks.ui.wizards{NewRepositoryTaskPage.java[NewRepositoryTaskPage" matchStrategy="1" name="NewTaskPage" patterns=".xml, .xsd" qualified="true" references="true" similarDeclarations="true" stamp="1181707563828" textual="true" version="1.0"/>
19	<refactoring comment="Rename type 'org.eclipse.mylyn.internal.tasks.ui.actions.AbstractTasksAction' to 'AbstractTaskAction' - Original project: 'org.eclipse.mylyn.tasks.ui' - Original element: 'org.eclipse.mylyn.internal.tasks.ui.actions.AbstractTasksAction' - Renamed element: 'org.eclipse.mylyn.internal.tasks.ui.actions.AbstractTaskAction' - Update references to refactored element - Update fully qualified names in '.xml, .properties, .exsd, .mf' files - Update textual occurrences in comments and strings" description="Rename type 'AbstractTasksAction'" flags="589830" id="org.eclipse.jdt.ui.rename.type" input="/src<org.eclipse.mylyn.internal.tasks.ui.actions{AbstractTasksAction.java[AbstractTasksAction" matchStrategy="1" name="AbstractTaskAction" patterns=".xml, .properties, .exsd, .mf" qualified="true" references="true" similarDeclarations="false" stamp="1181717209407" textual="false" version="1.0"/>	19	<refactoring comment="Rename type 'org.eclipse.mylyn.internal.tasks.ui.actions.AbstractTasksAction' to 'AbstractTaskAction' - Original project: 'org.eclipse.mylyn.tasks.ui' - Original element: 'org.eclipse.mylyn.internal.tasks.ui.actions.AbstractTasksAction' - Renamed element: 'org.eclipse.mylyn.internal.tasks.ui.actions.AbstractTaskAction' - Update references to refactored element - Update fully qualified names in '.xml, .properties, .exsd, .mf' files - Update textual occurrences in comments and strings" description="Rename type 'AbstractTasksAction'" flags="589830" id="org.eclipse.jdt.ui.rename.type" input="/src<org.eclipse.mylyn.internal.tasks.ui.actions{AbstractTasksAction.java[AbstractTasksAction" matchStrategy="1" name="AbstractTaskAction" patterns=".xml, .properties, .exsd, .mf" qualified="true" references="true" similarDeclarations="false" stamp="1181717209407" textual="false" version="1.0"/>
20	<refactoring comment="Rename method 'org.eclipse.mylyn.internal.tasks.ui.planner.TaskActivityWizardPage.getSelectedFilters()' to 'getSelectedContainers' - Original project: 'org.eclipse.mylyn.tasks.ui' - Original element: 'org.eclipse.mylyn.internal.tasks.ui.planner.TaskActivityWizardPage.getSelectedFilters()' - Renamed element: 'org.eclipse.mylyn.internal.tasks.ui.planner.TaskActivityWizardPage.getSelectedContainers()' - Update references to refactored element" delegate="false" deprecate="false" description="Rename method 'getSelectedFilters'" flags="589830" id="org.eclipse.jdt.ui.rename.method" input="/src<org.eclipse.mylyn.internal.tasks.ui.planner{TaskActivityWizardPage.java[TaskActivityWizardPage~getSelectedFilters" name="getSelectedContainers" references="true" stamp="1181756785343" version="1.0"/>	20	<refactoring comment="Rename method 'org.eclipse.mylyn.internal.tasks.ui.planner.TaskActivityWizardPage.getSelectedFilters()' to 'getSelectedContainers' - Original project: 'org.eclipse.mylyn.tasks.ui' - Original element: 'org.eclipse.mylyn.internal.tasks.ui.planner.TaskActivityWizardPage.getSelectedFilters()' - Renamed element: 'org.eclipse.mylyn.internal.tasks.ui.planner.TaskActivityWizardPage.getSelectedContainers()' - Update references to refactored element" delegate="false" deprecate="false" description="Rename method 'getSelectedFilters'" flags="589830" id="org.eclipse.jdt.ui.rename.method" input="/src<org.eclipse.mylyn.internal.tasks.ui.planner{TaskActivityWizardPage.java[TaskActivityWizardPage~getSelectedFilters" name="getSelectedContainers" references="true" stamp="1181756785343" version="1.0"/>
		21	<refactoring comment="Convert member type 'org.eclipse.mylyn.tasks.ui.RepositorySynchronizationManager.SynchronizeChangedTasksJob' in 'org.eclipse.mylyn.tasks.ui.RepositorySynchronizationManager' to top level type - Original project: 'org.eclipse.mylyn.tasks.ui' - Original element: 'org.eclipse.mylyn.tasks.ui.RepositorySynchronizationManager.SynchronizeChangedTasksJob' - Field name: 'repositorySynchronizationManager' - Declare field 'final'" description="Convert member type 'SynchronizeChangedTasksJob' to top level" field="false" fieldName="repositorySynchronizationManager" final="true" flags="786438" id="org.eclipse.jdt.ui.move.inner" input="/src<org.eclipse.mylyn.tasks.ui{RepositorySynchronizationManager.java[RepositorySynchronizationManager[SynchronizeChangedTasksJob" mandatory="false" possible="false" stamp="1181789707690" version="1.0"/>
21	</session>	22	</session>

Lines 16-18 Link Here

(-).refactorings/2007/6/24/refactorings.index (+1 lines)
16	1181707563828 Rename type 'NewRepositoryTaskPage'	16	1181707563828 Rename type 'NewRepositoryTaskPage'
17	1181717209407 Rename type 'AbstractTasksAction'	17	1181717209407 Rename type 'AbstractTasksAction'
18	1181756785343 Rename method 'getSelectedFilters'	18	1181756785343 Rename method 'getSelectedFilters'
		19	1181789707690 Convert member type 'SynchronizeChangedTasksJob' to top level

Lines 10-15 Link Here

(-)src/org/eclipse/mylyn/tasks/ui/search/SearchHitCollector.java (-36 / +85 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.mylyn.tasks.ui.search;	11	package org.eclipse.mylyn.tasks.ui.search;
12		12
		13	import java.text.MessageFormat;
		14	import java.util.HashSet;
		15	import java.util.Set;
		16
13	import org.eclipse.core.runtime.CoreException;	17	import org.eclipse.core.runtime.CoreException;
14	import org.eclipse.core.runtime.IProgressMonitor;	18	import org.eclipse.core.runtime.IProgressMonitor;
15	import org.eclipse.core.runtime.IStatus;	19	import org.eclipse.core.runtime.IStatus;
Lines 20-25 Link Here
20	import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;	24	import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
21	import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;	25	import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
22	import org.eclipse.mylyn.tasks.core.AbstractTask;	26	import org.eclipse.mylyn.tasks.core.AbstractTask;
		27	import org.eclipse.mylyn.tasks.core.ITaskCollector;
23	import org.eclipse.mylyn.tasks.core.ITaskFactory;	28	import org.eclipse.mylyn.tasks.core.ITaskFactory;
24	import org.eclipse.mylyn.tasks.core.QueryHitCollector;	29	import org.eclipse.mylyn.tasks.core.QueryHitCollector;
25	import org.eclipse.mylyn.tasks.core.RepositoryStatus;	30	import org.eclipse.mylyn.tasks.core.RepositoryStatus;
Lines 39-45 Link Here
39	*	44	*
40	* @author Rob Elves	45	* @author Rob Elves
41	*/	46	*/
42	public class SearchHitCollector extends QueryHitCollector implements ISearchQuery {	47	public class SearchHitCollector implements ISearchQuery, ITaskCollector {
		48
		49	public static final int MAX_HITS = 5000;
		50
		51	public static final String MAX_HITS_REACHED = "Max allowed number of hits returned exceeded. Some hits may not be displayed. Please narrow query scope.";
		52
		53	protected Set<AbstractTask> taskResults = new HashSet<AbstractTask>();
		54
		55	/** The number of matches found */
		56	private int matchCount;
		57
		58	/** The string to display to the user while querying */
		59	private static final String STARTING = "querying the server";
		60
		61	/** The string to display to the user when we have 1 match */
		62	private static final String MATCH = "1 match";
		63
		64	/** The string to display to the user when we have multiple or no matches */
		65	private static final String MATCHES = "{0} matches";
		66
		67	/** The string to display to the user when the query is done */
		68	private static final String DONE = "done";
		69
		70	private final TaskList taskList;
		71
		72	private final ITaskFactory taskFactory;
43		73
44	private static final String QUERYING_REPOSITORY = "Querying Repository...";	74	private static final String QUERYING_REPOSITORY = "Querying Repository...";
45		75
Lines 51-69 Link Here
51		81
52	private RepositorySearchResult searchResult;	82	private RepositorySearchResult searchResult;
53		83
54	private ITaskFactory taskFactory;	84	private IProgressMonitor monitor;
55		85
56	public SearchHitCollector(TaskList tasklist, TaskRepository repository, AbstractRepositoryQuery repositoryQuery, ITaskFactory taskFactory) {	86	public SearchHitCollector(TaskList tasklist, TaskRepository repository, AbstractRepositoryQuery repositoryQuery, ITaskFactory taskFactory) {
57	super(tasklist, taskFactory);	87	this.taskList = tasklist;
58	this.repository = repository;	88	this.repository = repository;
59	this.repositoryQuery = repositoryQuery;	89	this.repositoryQuery = repositoryQuery;
60	this.searchResult = new RepositorySearchResult(this);	90	this.searchResult = new RepositorySearchResult(this);
61	this.taskFactory = taskFactory;	91	this.taskFactory = taskFactory;
62	}	92	}
63		93
64	@Override	94	public void aboutToStart(int startMatchCount) {
65	public void aboutToStart(int startMatchCount) throws CoreException {	95	taskResults.clear();
66	super.aboutToStart(startMatchCount);	96	matchCount = startMatchCount;
		97	monitor.setTaskName(STARTING);
		98
67	searchResult.removeAll();	99	searchResult.removeAll();
68	PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {	100	PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
69	public void run() {	101	public void run() {
Lines 72-86 Link Here
72	});	104	});
73	}	105	}
74		106
75	@Override
76	public void done() {
77	super.done();
78	}
79
80	@Override
81	public void accept(AbstractTask task) {	107	public void accept(AbstractTask task) {
82	if (task == null)	108	if (task == null) {
83	return;	109	throw new IllegalArgumentException();
		110	}
84		111
85	AbstractTask hitTask = taskList.getTask(task.getHandleIdentifier());	112	AbstractTask hitTask = taskList.getTask(task.getHandleIdentifier());
86	if (hitTask == null) {	113	if (hitTask == null) {
Lines 88-114 Link Here
88	}	115	}
89		116
90		117
91	if (!getProgressMonitor().isCanceled()) {	118	if (!monitor.isCanceled()) {
92	getProgressMonitor().subTask(getFormattedMatchesString(searchResult.getMatchCount()));	119	monitor.subTask(getFormattedMatchesString(searchResult.getMatchCount()));
93	getProgressMonitor().worked(1);	120	monitor.worked(1);
94	}	121	}
95		122
96	taskResults.add((AbstractTask)hitTask);	123	taskResults.add((AbstractTask)hitTask);
97	this.searchResult.addMatch(new Match(hitTask, 0, 0));	124	this.searchResult.addMatch(new Match(hitTask, 0, 0));
98	}	125	}
99		126
100	@Override
101	public void accept(RepositoryTaskData taskData) throws CoreException {	127	public void accept(RepositoryTaskData taskData) throws CoreException {
102	if (taskData == null)	128	if (taskData == null) {
103	return;	129	throw new IllegalArgumentException();
104		130	}
105		131
106	AbstractTask task = taskFactory.createTask(taskData, false, false, new SubProgressMonitor(getProgressMonitor(), 1));	132	AbstractTask task = taskFactory.createTask(taskData, new SubProgressMonitor(monitor, 1));
107	if (task != null) {	133	if (task != null) {
108		134
109	if (!getProgressMonitor().isCanceled()) {	135	if (!monitor.isCanceled()) {
110	getProgressMonitor().subTask(getFormattedMatchesString(searchResult.getMatchCount()));	136	monitor.subTask(getFormattedMatchesString(searchResult.getMatchCount()));
111	getProgressMonitor().worked(1);	137	monitor.worked(1);
112	}	138	}
113		139
114	taskResults.add(task);	140	taskResults.add(task);
Lines 145-155 Link Here
145	}	171	}
146		172
147	public IStatus run(IProgressMonitor monitor) throws OperationCanceledException {	173	public IStatus run(IProgressMonitor monitor) throws OperationCanceledException {
148	this.setProgressMonitor(monitor);	174	this.monitor = monitor;
149	IStatus status = Status.OK_STATUS;	175
150	try {	176	try {
151	aboutToStart(0);
152	monitor.beginTask(QUERYING_REPOSITORY, IProgressMonitor.UNKNOWN);	177	monitor.beginTask(QUERYING_REPOSITORY, IProgressMonitor.UNKNOWN);
		178
		179	aboutToStart(0);
153		180
154	if (monitor.isCanceled()) {	181	if (monitor.isCanceled()) {
155	throw new OperationCanceledException("Search cancelled");	182	throw new OperationCanceledException("Search cancelled");
Lines 157-178 Link Here
157	AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(	184	AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
158	repositoryQuery.getRepositoryKind());	185	repositoryQuery.getRepositoryKind());
159	if (connector != null) {	186	if (connector != null) {
160	status = connector.performQuery(repositoryQuery, repository, monitor, this, false);	187	IStatus status = connector.performQuery(repositoryQuery, repository, monitor, this);
		188	if (!status.isOK()) {
		189	MylarStatusHandler.displayStatus("Search failed", status);
		190	}
161	} else {	191	} else {
162	return new Status(IStatus.ERROR, TasksUiPlugin.PLUGIN_ID, IStatus.OK,	192	return new Status(IStatus.ERROR, TasksUiPlugin.PLUGIN_ID, IStatus.OK,
163	"repository connector could not be found", null);	193	"repository connector could not be found", null);
164	}	194	}
165		195
166	if (!status.isOK()) {	196	return Status.OK_STATUS;
167	throw new CoreException(status);
168	}
169
170	} catch (final CoreException exception) {
171	MylarStatusHandler.displayStatus("Search failed", exception.getStatus());
172	} finally {	197	} finally {
173	done();	198	done();
174	}	199	}
175	return Status.OK_STATUS;	200	}
		201
		202	public void done() {
		203	if (monitor != null && !monitor.isCanceled()) {
		204	// if the operation is cancelled, finish with the data that we
		205	// already have
		206	String matchesString = getFormattedMatchesString(matchCount);
		207	monitor.setTaskName(MessageFormat.format(DONE, new Object[] { matchesString }));
		208	monitor.done();
		209	}
		210
		211	// Cut no longer used references because the collector might be re-used
		212	monitor = null;
		213	}
		214
		215	protected String getFormattedMatchesString(int count) {
		216	if (count == 1) {
		217	return MATCH;
		218	}
		219	Object[] messageFormatArgs = { new Integer(count) };
		220	return MessageFormat.format(MATCHES, messageFormatArgs);
		221	}
		222
		223	public Set<AbstractTask> getTaskHits() {
		224	return taskResults;
176	}	225	}
177		226
178	}	227	}

Lines 138-144 Link Here

(-)src/org/eclipse/mylyn/tasks/ui/search/AbstractRepositoryQueryPage.java (-1 / +1 lines)
138	repository.getKind());	138	repository.getKind());
139	if (connector != null) {	139	if (connector != null) {
140	SearchHitCollector collector = new SearchHitCollector(TasksUiPlugin.getTaskListManager().getTaskList(),	140	SearchHitCollector collector = new SearchHitCollector(TasksUiPlugin.getTaskListManager().getTaskList(),
141	repository, getQuery(), new TaskFactory(repository));	141	repository, getQuery(), new TaskFactory(repository, false, false));
142	NewSearchUI.runQueryInBackground(collector);	142	NewSearchUI.runQueryInBackground(collector);
143	}	143	}
144	return true;	144	return true;





package org.eclipse.mylyn.tasks.ui;

import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
import java.util.Set;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.core.runtime.jobs.IJobChangeEvent;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.jobs.JobChangeAdapter;
import org.eclipse.mylyn.core.MylarStatusHandler;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
import org.eclipse.mylyn.monitor.core.DateUtil;

import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.QueryHitCollector;
import org.eclipse.mylyn.tasks.core.RepositoryStatus;
import org.eclipse.mylyn.tasks.core.TaskList;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.ui.PlatformUI;

/**
 * @author Mik Kersten
 * @author Rob Elves
 * @author Steffen Pingel
 */
class SynchronizeQueryJob extends Job {

	private final AbstractRepositoryConnector connector;

	private static final String JOB_LABEL = "Synchronizing queries";

	private final AbstractRepositoryConnector connector;

	private final TaskRepository repository;

	private final Set<AbstractRepositoryQuery> queries;

	private final TaskList taskList;

	private boolean synchronizeChangedTasks;

	private boolean forced = false;

	private HashSet<AbstractTask> tasksToBeSynchronized = new HashSet<AbstractTask>();

	public SynchronizeQueryJob(AbstractRepositoryConnector connector, TaskRepository repository,
			Set<AbstractRepositoryQuery> queries, TaskList taskList) {
		super(JOB_LABEL + ": " + connector.getRepositoryType());

		this.connector = connector;
		this.repository = repository;
		this.queries = queries;
		this.taskList = taskList;
		this.repositories = new HashSet<TaskRepository>();
		// TODO: remove once architecture established
		// this.synchronizationManager = synchronizationManager;
	}

	public void setSynchronizeChangedTasks(boolean synchronizeChangedTasks) {
		this.synchronizeChangedTasks = synchronizeChangedTasks;
	}

	/**
	 * Returns true, if synchronization was triggered manually and not by an automatic background job.
	 * automatic background job.
	 */
	public boolean isForced() {
		return forced;
	}

	/**
	 * Indicates a manual synchronization (User initiated). If set to true, a dialog will be displayed in case of
	 * errors. Any tasks with missing data will be retrieved.
	 * will be retrieved.
	 */
	public void setForced(boolean forced) {
		this.forced = forced;


	@Override
	protected IStatus run(IProgressMonitor monitor) {
		try {
			monitor.beginTask(JOB_LABEL, queries.size() + 1);

			Set<AbstractTask> allTasks = Collections.unmodifiableSet(taskList.getRepositoryTasks(repository.getUrl()));
		for (AbstractRepositoryQuery repositoryQuery : queries) {
//			taskList.notifyContainerUpdated(repositoryQuery);
			repositoryQuery.setStatus(null);

			monitor.setTaskName("Synchronizing: " + repositoryQuery.getSummary());
			setProperty(IProgressConstants.ICON_PROPERTY, TasksUiImages.REPOSITORY_SYNCHRONIZE);
			TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(
					repositoryQuery.getRepositoryKind(), repositoryQuery.getRepositoryUrl());
			if (repository == null) {
				repositoryQuery.setStatus(RepositoryStatus.createNotFoundError(repositoryQuery.getRepositoryUrl(),
						TasksUiPlugin.PLUGIN_ID));
			} else {

				QueryHitCollector collector = new QueryHitCollector(taskList, new TaskFactory(repository));
				SubProgressMonitor collectorMonitor = new SubProgressMonitor(monitor, 1);
				collector.setProgressMonitor(collectorMonitor);
				final IStatus resultingStatus = connector.performQuery(repositoryQuery, repository, collectorMonitor,
						collector, forced);

				if (resultingStatus.getSeverity() == IStatus.CANCEL) {
					// do nothing
				} else if (resultingStatus.isOK()) {

					if (collector.getTaskHits().size() >= QueryHitCollector.MAX_HITS) {
						MylarStatusHandler.log(
								QueryHitCollector.MAX_HITS_REACHED + "\n" + repositoryQuery.getSummary(), this);
					}

			// check if the repository has changed at all and have the connector mark tasks that need synchronization 
			try {
				boolean hasChangedOrNew = connector.updateNeedsSynchronization(repository, allTasks,
						new SubProgressMonitor(monitor, 1));
				if (!hasChangedOrNew && !forced) {
					for (AbstractRepositoryQuery repositoryQuery : queries) {
						repositoryQuery.setStatus(null);
						repositoryQuery.setCurrentlySynchronizing(false);
						taskList.notifyContainersUpdated(queries);
					}
					return Status.OK_STATUS;
				}
			} catch (CoreException e) {
				// there is no good way of informing the user at this point, just log the error
				MylarStatusHandler.log(e.getStatus());
			}

			// synchronize queries
			for (AbstractRepositoryQuery repositoryQuery : queries) {
				repositoryQuery.setStatus(null);
				taskList.notifyContainersUpdated(queries);

				synchronizeQuery(repositoryQuery, new SubProgressMonitor(monitor, 1));

				repositoryQuery.setCurrentlySynchronizing(false);
				taskList.notifyContainersUpdated(queries);
			}

			// for background synchronizations all changed tasks are synchronized including the ones that are not part of a query
			if (forced) {
				for (AbstractTask task : allTasks) {
					if (task.getNeedsSynchronization()) {
						tasksToBeSynchronized.add(task);
					}
				}
			}

			// synchronize tasks that were marked by the connector
			if (!tasksToBeSynchronized.isEmpty()) {
				TasksUiPlugin.getSynchronizationManager().synchronize(connector, tasksToBeSynchronized, forced,
						new JobChangeAdapter() {
							@Override
							public void done(IJobChangeEvent event) {
								if (!Platform.isRunning() || TasksUiPlugin.getRepositoryManager() == null) {
									return;
								}
								TasksUiPlugin.getRepositoryManager().setSyncTime(repository,
										connector.getSynchronizationTimestamp(repository, tasksToBeSynchronized),
										TasksUiPlugin.getDefault().getRepositoriesFilePath());
							}
						});
					}
				}
			}

			// HACK: force entire Task List to refresh in case containers need to
			// appear or disappear
			// FIXME taskList.notifyContainersUpdated(null);

			return Status.OK_STATUS;
		} finally {
			monitor.done();
		}
	}

	private void synchronizeQuery(AbstractRepositoryQuery repositoryQuery, IProgressMonitor monitor) {
		monitor.setTaskName("Synchronizing: " + repositoryQuery.getSummary());
		setProperty(IProgressConstants.ICON_PROPERTY, TasksUiImages.REPOSITORY_SYNCHRONIZE);

		QueryHitCollector collector = new QueryHitCollector(taskList, new TaskFactory(repository));

		final IStatus resultingStatus = connector.performQuery(repositoryQuery, repository, monitor, collector);
		if (resultingStatus.getSeverity() == IStatus.CANCEL) {
			// do nothing
		} else if (resultingStatus.isOK()) {
			if (collector.getTaskHits().size() >= QueryHitCollector.MAX_HITS) {
				MylarStatusHandler.log(QueryHitCollector.MAX_HITS_REACHED + "\n" + repositoryQuery.getSummary(), this);
			}

			repositoryQuery.clear();
		// appear or disappear
		taskList.notifyContainersUpdated(null);

			for (AbstractTask hit : collector.getTaskHits()) {
				taskList.addTask(hit, repositoryQuery);
				if (synchronizeChangedTasks && hit.getNeedsSynchronization()) {
					tasksToBeSynchronized.add(hit);
				}
			}

			repositoryQuery.setLastRefreshTimeStamp(DateUtil.getFormattedDate(new Date(), "MMM d, H:mm:ss"));
		} else {
			repositoryQuery.setStatus(resultingStatus);
			if (isForced()) {
				PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
					public void run() {
						MylarStatusHandler.displayStatus("Query Synchronization Failed", resultingStatus);
					}
				});
			}
		}
	}

}

Lines 139-146 Link Here

(-)src/org/eclipse/mylyn/tasks/ui/SynchronizeTaskJob.java (-2 / +4 lines)
139	Date oldDueDate = repositoryTask.getDueDate();	139	Date oldDueDate = repositoryTask.getDueDate();
140		140
141		141
142	TaskFactory factory = new TaskFactory(repository);	142	TaskFactory factory = new TaskFactory(repository, true, forced);
143	repositoryTask = factory.createTask(downloadedTaskData, true, forced, new SubProgressMonitor(monitor, 1));	143	repositoryTask = factory.createTask(downloadedTaskData, new SubProgressMonitor(monitor, 1));
144		144
145	// TasksUiPlugin.getSynchronizationManager().saveIncoming(repositoryTask, downloadedTaskData, forced);	145	// TasksUiPlugin.getSynchronizationManager().saveIncoming(repositoryTask, downloadedTaskData, forced);
146	// connector.updateTaskFromTaskData(repository, repositoryTask, downloadedTaskData);	146	// connector.updateTaskFromTaskData(repository, repositoryTask, downloadedTaskData);
Lines 176-180 Link Here
176	} else {	176	} else {
177	connector.updateTaskFromRepository(repository, repositoryTask, monitor);	177	connector.updateTaskFromRepository(repository, repositoryTask, monitor);
178	}	178	}
		179
		180	repositoryTask.setNeedsSynchronization(false);
179	}	181	}
180	}	182	}




import java.util.HashSet;
import java.util.Set;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.IJobChangeEvent;
import org.eclipse.core.runtime.jobs.IJobChangeListener;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.jobs.JobChangeAdapter;
import org.eclipse.mylyn.core.MylarStatusHandler;
import org.eclipse.mylyn.internal.tasks.core.TaskDataManager;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;

	 */
	public final Job synchronize(AbstractRepositoryConnector connector, final AbstractRepositoryQuery repositoryQuery,
			IJobChangeListener listener, boolean forceSync) {
		TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(
				repositoryQuery.getRepositoryKind(), repositoryQuery.getRepositoryUrl());
		return synchronize(connector, repository, Collections.singleton(repositoryQuery), listener, Job.LONG, 0, forceSync);
	}

	public final Job synchronize(AbstractRepositoryConnector connector, TaskRepository repository,
			final Set<AbstractRepositoryQuery> repositoryQueries, final IJobChangeListener listener, int priority,
			long delay, boolean userForcedSync) {
		TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
		final SynchronizeQueryJob job = new SynchronizeQueryJob(this, connector, repositoryQueries, taskList);
		job.setSynchChangedTasks(syncChangedTasks);
		job.setForced(userForcedSync);
		for (AbstractRepositoryQuery repositoryQuery : repositoryQueries) {
			repositoryQuery.setCurrentlySynchronizing(true);
			// TasksUiPlugin.getTaskListManager().getTaskList().notifyContainerUpdated(repositoryQuery);
		}

		final SynchronizeQueryJob job = new SynchronizeQueryJob(connector, repository, repositoryQueries, taskList);
		job.setSynchronizeChangedTasks(true);
		job.setForced(userForcedSync);
		if (listener != null) {
			job.addJobChangeListener(listener);
		}

	 * TaskRepository.syncTime.
	 */
	public final void synchronizeChanged(final AbstractRepositoryConnector connector, final TaskRepository repository) {
		final SynchronizeChangedTasksJob synchronizeChangedTasksJob = new SynchronizeChangedTasksJob(connector, repository);
		synchronizeChangedTasksJob.setSystem(true);
		synchronizeChangedTasksJob.setRule(new RepositoryMutexRule(repository));
		if (!forceSyncExecForTesting) {
			synchronizeChangedTasksJob.schedule();
		} else {
			PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() {
				public void run() {
					synchronizeChangedTasksJob.run(new NullProgressMonitor());
				}
			});
				});
			}
		}
	}

	private class SynchronizeChangedTasksJob extends Job {

		private AbstractRepositoryConnector connector;

		private TaskRepository repository;

		private Set<AbstractTask> changedTasks;

		public SynchronizeChangedTasksJob(AbstractRepositoryConnector connector, TaskRepository repository) {
			super("Get Changed Tasks");
			this.connector = connector;
			this.repository = repository;
		}

		@Override
		public IStatus run(IProgressMonitor monitor) {
			TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
			Set<AbstractTask> repositoryTasks = Collections.unmodifiableSet(taskList
					.getRepositoryTasks(repository.getUrl()));

			try {
				changedTasks = connector.getChangedSinceLastSync(repository, repositoryTasks, monitor);

				if (changedTasks == null || changedTasks.size() == 0) {
					return Status.OK_STATUS;
				}

				synchronize(connector, changedTasks, false, new JobChangeAdapter() {

					@Override
					public void done(IJobChangeEvent event) {
						if (!Platform.isRunning() || TasksUiPlugin.getRepositoryManager() == null) {
							return;
						}
						TasksUiPlugin.getRepositoryManager().setSyncTime(repository,
								connector.getLastSyncTimestamp(repository, changedTasks),
								TasksUiPlugin.getDefault().getRepositoriesFilePath());
					}
				});

			} catch (final CoreException e) {
				// ignore, indicates working offline
				// error reported in ui (tooltip and warning icon)
			}
			return Status.OK_STATUS;
		};
	};

	/**
	 * @param repositoryTask
	 *            task that changed




 */
public class TaskFactory implements ITaskFactory {

	private final AbstractRepositoryConnector connector;

	private final RepositorySynchronizationManager synchManager;

	private final TaskRepository repository;

	private final TaskList taskList;

	//private TaskDataManager dataManager;

	private final ITaskDataHandler dataHandler;

	private final boolean updateTasklist;

	private final boolean forced;

	public TaskFactory(TaskRepository repository, boolean updateTasklist, boolean forced) {
		this.repository = repository;
		this.updateTasklist = updateTasklist;
		this.forced = forced;
		connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(repository.getKind());
		synchManager = TasksUiPlugin.getSynchronizationManager();
		taskList = TasksUiPlugin.getTaskListManager().getTaskList();
		//dataManager = TasksUiPlugin.getDefault().getTaskDataManager();
		dataHandler = connector.getTaskDataHandler();

	}

	public TaskFactory(TaskRepository repository) {
		this(repository, true, false);
	}
	
	/**
	 * @param updateTasklist -
	 *            synchronize task with the provided taskData

	 *            user requested synchronization
	 * @throws CoreException
	 */
	public AbstractTask createTask(RepositoryTaskData taskData, IProgressMonitor monitor) throws CoreException {
			IProgressMonitor monitor) throws CoreException {
		AbstractTask repositoryTask = taskList.getTask(taskData.getRepositoryUrl(), taskData.getId());
		if (repositoryTask == null) {






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

import java.util.Collections;
import java.util.List;
import java.util.Set;

import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.core.runtime.jobs.IJobChangeEvent;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.jobs.JobChangeAdapter;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
import org.eclipse.mylyn.tasks.core.TaskList;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.ui.RepositorySynchronizationManager;
import org.eclipse.mylyn.tasks.ui.TaskListManager;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;


	}

	@Override
	public IStatus run(final IProgressMonitor monitor) {
		try {
			if (monitor == null) {
				monitor = new NullProgressMonitor();
			}

			taskList = taskListManager.getTaskList();
			if (repositories == null) {
				repositories = TasksUiPlugin.getRepositoryManager().getAllRepositories();

					updateJob.schedule();
				}

				RepositorySynchronizationManager synchronizationManager = TasksUiPlugin.getSynchronizationManager();
				Set<AbstractRepositoryQuery> queries = taskList.getRepositoryQueries(repository.getUrl());
				synchronizationManager.synchronize(connector, repository, queries, null,
						Job.DECORATE, 0, false);
				
							@Override
							public void done(IJobChangeEvent event) {
								TasksUiPlugin.getSynchronizationManager().synchronizeChanged(connector, repository);
							}
						};
						TasksUiPlugin.getSynchronizationManager().synchronize(connector, queries, jobAdapter,
								Job.DECORATE, 0, false, false);
					}
				} else {
					TasksUiPlugin.getSynchronizationManager().synchronizeChanged(connector, repository);
				}
				monitor.worked(1);
			}
		} finally {




import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.TaskCategory;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.ui.RepositorySynchronizationManager;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IViewActionDelegate;

				} else if (obj instanceof TaskCategory) {
					TaskCategory cat = (TaskCategory) obj;
					for (AbstractTask task : cat.getChildren()) {
						AbstractRepositoryConnector client = TasksUiPlugin.getRepositoryManager()
								.getRepositoryConnector(((AbstractTask) task).getRepositoryKind());
						addTaskToSync(client, (AbstractTask) task);
							addTaskToSync(client, (AbstractTask) task);
						}
					}
				} else if (obj instanceof AbstractTask) {
					AbstractTask repositoryTask = (AbstractTask) obj;

				}
			}

			RepositorySynchronizationManager syncManager = TasksUiPlugin.getSynchronizationManager();
			if (!queriesToSyncMap.isEmpty()) {
				
				// determine which repositories to synch changed tasks for
				HashMap<TaskRepository, Set<AbstractRepositoryQuery>> repositoriesToSync = new HashMap<TaskRepository, Set<AbstractRepositoryQuery>>();
				for (AbstractRepositoryConnector connector : queriesToSyncMap.keySet()) {
					List<AbstractRepositoryQuery> queriesToSync = queriesToSyncMap.get(connector);
					if(queriesToSync==null || queriesToSync.isEmpty()) {
						continue;
					}
					
					for (AbstractRepositoryQuery query : queriesToSync) {
						TaskRepository repos = TasksUiPlugin.getRepositoryManager().getRepository(query.getRepositoryKind(), query.getRepositoryUrl());
						Set<AbstractRepositoryQuery> queries = repositoriesToSync.get(repos);
						if(queries == null) {
							queries = new HashSet<AbstractRepositoryQuery>();
							repositoriesToSync.put(repos, queries);
						}
						queries.add(query);
					}
				}
				
				for (Map.Entry<TaskRepository, Set<AbstractRepositoryQuery>> entry : repositoriesToSync.entrySet()) {
					TaskRepository repository = entry.getKey();
					AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager()
							.getRepositoryConnector(repository.getKind());
					Set<AbstractRepositoryQuery> queries = entry.getValue();
					syncManager.synchronize(connector, repository, queries, null, Job.LONG, 0L, true);
				}
					//XXX enable?
//					for (TaskRepository taskRepository : repositoriesToSync.get(connector.getRepositoryType())) {
//						TasksUiPlugin.getSynchronizationManager().synchronizeChanged(connector, taskRepository);
//					}
				}				
			}
			if (!tasksToSyncMap.isEmpty()) {
				for (AbstractRepositoryConnector connector : tasksToSyncMap.keySet()) {
					List<AbstractTask> tasksToSync = tasksToSyncMap.get(connector);
					if (tasksToSync != null && tasksToSync.size() > 0) {
						syncManager.synchronize(connector, new HashSet<AbstractTask>(tasksToSync), true, null);
					}
				}
			}




/*******************************************************************************
 * Copyright (c) 2004 - 2006 Mylar committers 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
 *******************************************************************************/

package org.eclipse.mylyn.tasks.ui;

import java.util.Iterator;
import java.util.Set;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.mylyn.core.MylarStatusHandler;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.TaskList;
import org.eclipse.mylyn.tasks.core.TaskRepository;

public class SynchronizeChangedTasksJob extends Job {

	private final AbstractRepositoryConnector connector;

	private final TaskRepository repository;

	private boolean forced;

	public SynchronizeChangedTasksJob(AbstractRepositoryConnector connector, TaskRepository repository) {
		super("Get Changed Tasks");
		
		this.connector = connector;
		this.repository = repository;
	}

	/**
	 * Returns true, if synchronization was triggered manually and not by an automatic background job.
	 */
	public boolean isForced() {
		return forced;
	}

	/**
	 * Indicates a manual synchronization (User initiated). If set to true, a dialog will be displayed in case of
	 * errors. Any tasks with missing data will be retrieved.
	 */
	public void setForced(boolean forced) {
		this.forced = forced;
	}

	@Override
	public IStatus run(IProgressMonitor monitor) {
		try {
			monitor.beginTask("Synchronizing changed tasks", IProgressMonitor.UNKNOWN);
			
			TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
			Set<AbstractTask> tasks = taskList.getRepositoryTasks(repository.getUrl());

			boolean changed = connector.updateNeedsSynchronization(repository, tasks, new SubProgressMonitor(monitor, 1));
			if (!changed) {
				return Status.OK_STATUS;
			}
			
			for (Iterator<AbstractTask> it = tasks.iterator(); it.hasNext();) {
				if (!it.next().getNeedsSynchronization()) {
					it.remove();
				}
			}

			if (!tasks.isEmpty()) {
				return Status.OK_STATUS;
			}

			TasksUiPlugin.getSynchronizationManager().synchronize(connector, tasks, forced, null);
		} catch (final CoreException e) {
			MylarStatusHandler.log(e.getStatus());
		} finally {
			monitor.done();
		}
		
		return Status.OK_STATUS;
	};
	
}

Lines 78-84 Link Here

(-)src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java (-1 / +1 lines)
78	String queryUrl = repository.getUrl() + ITracClient.QUERY_URL + search.toUrl();	78	String queryUrl = repository.getUrl() + ITracClient.QUERY_URL + search.toUrl();
79	TracRepositoryQuery query = new TracRepositoryQuery(repository.getUrl(), queryUrl, "description");	79	TracRepositoryQuery query = new TracRepositoryQuery(repository.getUrl(), queryUrl, "description");
80	SearchHitCollector collector = new SearchHitCollector(TasksUiPlugin.getTaskListManager()	80	SearchHitCollector collector = new SearchHitCollector(TasksUiPlugin.getTaskListManager()
81	.getTaskList(), repository, query, new TaskFactory(repository));	81	.getTaskList(), repository, query, new TaskFactory(repository, false, false));
82		82
83	collector.run(new NullProgressMonitor());	83	collector.run(new NullProgressMonitor());
84	for (AbstractTask task : collector.getTaskHits()) {	84	for (AbstractTask task : collector.getTaskHits()) {

Lines 217-223 Link Here

(-)src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java (-1 / +1 lines)
217	public void accept(AbstractTask hit) {	217	public void accept(AbstractTask hit) {
218	result.add(hit);	218	result.add(hit);
219	}};	219	}};
220	IStatus queryStatus = connector.performQuery(query, repository, new NullProgressMonitor(), hitCollector, false);	220	IStatus queryStatus = connector.performQuery(query, repository, new NullProgressMonitor(), hitCollector);
221		221
222	assertTrue(queryStatus.isOK());	222	assertTrue(queryStatus.isOK());
223	assertEquals(3, result.size());	223	assertEquals(3, result.size());





	public void testGetChangedSinceLastSyncWeb096() throws Exception {
		init(TracTestConstants.TEST_TRAC_096_URL, Version.TRAC_0_9);
		TracTask task = (TracTask) connector.createTaskFromExistingId(repository, data.offlineHandlerTicketId + "",
				new NullProgressMonitor());

		Set<AbstractTask> tasks = new HashSet<AbstractTask>();
		tasks.add(task);

		assertEquals(null, repository.getSyncTimeStamp());
		boolean changed = connector.updateNeedsSynchronization(repository, tasks, new NullProgressMonitor());
		assertEquals(true, changed);
		assertEquals(null, repository.getSyncTimeStamp());
		assertFalse(task.getNeedsSynchronization());

		int time = (int) (System.currentTimeMillis() / 1000) + 1;
		repository.setSyncTimeStamp(time + "");
		changed = connector.updateNeedsSynchronization(repository, tasks, new NullProgressMonitor());
		assertEquals(true, changed);
		assertFalse(task.getNeedsSynchronization());
	}

	public void testGetChangedSinceLastSyncXmlRpc010() throws Exception {

	}

	private void getChangedSinceLastSync() throws Exception {
		TracTask task = (TracTask) connector.createTaskFromExistingId(repository, data.offlineHandlerTicketId + "",
				new NullProgressMonitor());
		TasksUiPlugin.getSynchronizationManager().synchronize(connector, task, true, null);
		RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(
				task.getHandleIdentifier());

		int lastModified = Integer.parseInt(taskData.getLastModified());

		Set<AbstractTask> tasks = new HashSet<AbstractTask>();
		tasks.add(task);

		assertEquals(null, repository.getSyncTimeStamp());
		boolean changed = connector.updateNeedsSynchronization(repository, tasks, new NullProgressMonitor());
		assertTrue(changed);
		assertTrue(task.getNeedsSynchronization());

		// always returns the ticket because time comparison mode is >=
		task.setNeedsSynchronization(false);
		repository.setSyncTimeStamp(lastModified + "");
		changed = connector.updateNeedsSynchronization(repository, tasks, new NullProgressMonitor());
		assertTrue(changed);
		assertTrue(task.getNeedsSynchronization());

		task.setNeedsSynchronization(false);
		repository.setSyncTimeStamp((lastModified + 1) + "");
		changed = connector.updateNeedsSynchronization(repository, tasks, new NullProgressMonitor());
		assertTrue(changed);
		assertFalse(task.getNeedsSynchronization());

		// change ticket making sure it gets a new change time
		Thread.sleep(1000);
		ITracClient client = connector.getClientManager().getRepository(repository);

		}
		client.updateTicket(ticket, "comment");

		task.setNeedsSynchronization(false);
		repository.setSyncTimeStamp((lastModified + 1) + "");
		changed = connector.updateNeedsSynchronization(repository, tasks, new NullProgressMonitor());
		assertTrue(changed);
		assertTrue(task.getNeedsSynchronization());
	}

	public void testNonNumericTaskId() {
		try {
			connector.getTaskDataHandler().getTaskData(repository, "abc", new NullProgressMonitor());

		} catch (CoreException e) {
		}
	}
	

}

Lines 49-55 Link Here

(-)src/org/eclipse/mylyn/internal/trac/ui/editor/NewTracTaskEditor.java (-1 / +1 lines)
49	TracRepositoryQuery query = new TracRepositoryQuery(repository.getUrl(), sb.toString(), "<Duplicate Search>");	49	TracRepositoryQuery query = new TracRepositoryQuery(repository.getUrl(), sb.toString(), "<Duplicate Search>");
50		50
51	SearchHitCollector collector = new SearchHitCollector(TasksUiPlugin.getTaskListManager().getTaskList(),	51	SearchHitCollector collector = new SearchHitCollector(TasksUiPlugin.getTaskListManager().getTaskList(),
52	repository, query, new TaskFactory(repository));	52	repository, query, new TaskFactory(repository, false, false));
53	return collector;	53	return collector;
54	}	54	}
55		55




			}
			Issue jiraIssue = getJiraIssue(server, taskId, repository.getUrl());
			if (jiraIssue != null) {
				return createTaskData(repository, server, jiraIssue, null);
			}
			throw new CoreException(new org.eclipse.core.runtime.Status(IStatus.ERROR, JiraCorePlugin.ID, IStatus.OK,
					"JIRA ticket not found: " + taskId, null));

		}
	}

	protected RepositoryTaskData createTaskData(TaskRepository repository, JiraClient server, Issue jiraIssue, RepositoryTaskData oldTaskData)
			throws JiraException {
		RepositoryTaskData data = new RepositoryTaskData(attributeFactory, JiraUiPlugin.REPOSITORY_KIND, repository
				.getUrl(), jiraIssue.getId());
		initializeTaskData(data, server, jiraIssue.getProject());
		updateTaskData(data, jiraIssue, server, oldTaskData);
		addOperations(data, jiraIssue, server, oldTaskData);
		return data;
	}


		return data.getAttribute(key);
	}

	private void updateTaskData(RepositoryTaskData data, Issue jiraIssue, JiraClient server, RepositoryTaskData oldTaskData) throws JiraException {
		String parentKey = jiraIssue.getParentKey();
		if (parentKey != null) {
			data.setAttributeValue(JiraAttributeFactory.ATTRIBUTE_ISSUE_PARENT_KEY, parentKey);


		// TODO move into server configuration and populate lazily
		HashSet<String> editableKeys = new HashSet<String>();
		if (oldTaskData != null) {
			// avoid server round-trips
			for (RepositoryTaskAttribute attribute : oldTaskData.getAttributes()) {
				if (!attribute.isReadOnly()) {
					editableKeys.add(attribute.getID());
					// System.err.println(" " + attribute.getID() + " : " +
					// attribute.getName());
					editableKeys.add(attributeFactory.mapCommonAttributeKey(attribute.getID()));
				}
			}			
		} else {
			try {
				RepositoryTaskAttribute[] editableAttributes = server.getEditableAttributes(jiraIssue.getKey());
				if (editableAttributes != null) {
					// System.err.println(data.getTaskKey());
					for (RepositoryTaskAttribute attribute : editableAttributes) {
						// System.err.println(" " + attribute.getID() + " : " +
						// attribute.getName());
						editableKeys.add(attributeFactory.mapCommonAttributeKey(attribute.getID()));
					}
				}
			} catch (JiraInsufficientPermissionException ex) {
				// ignore
			}
		} catch (JiraInsufficientPermissionException ex) {
			// ignore
		}

		for (RepositoryTaskAttribute attribute : data.getAttributes()) {

		}
	}

	public void addOperations(RepositoryTaskData data, Issue issue, JiraClient server, RepositoryTaskData oldTaskData) throws JiraException {
		// avoid server round-trips
		if (oldTaskData != null) {
			for (RepositoryOperation operation : oldTaskData.getOperations()) {
				data.addOperation(operation);
			}
			return;
		}

		Status status = issue.getStatus();
		
		RepositoryOperation leaveOperation = new RepositoryOperation(LEAVE_OPERATION, "Leave as "
				+ issue.getStatus().getName());
		leaveOperation.setChecked(true);




import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
import java.util.List;

import org.eclipse.mylyn.internal.jira.core.model.filter.RelativeDateRangeFilter.RangeType;
import org.eclipse.mylyn.internal.jira.core.service.JiraClient;
import org.eclipse.mylyn.internal.jira.core.service.JiraException;
import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil;
import org.eclipse.mylyn.tasks.core.AbstractAttributeFactory;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.IAttachmentHandler;
import org.eclipse.mylyn.tasks.core.ITaskCollector;
import org.eclipse.mylyn.tasks.core.ITaskDataHandler;
import org.eclipse.mylyn.tasks.core.QueryHitCollector;
import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute;
import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel;
import org.eclipse.mylyn.tasks.ui.TaskFactory;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;

/**


	@Override
	public IStatus performQuery(AbstractRepositoryQuery repositoryQuery, TaskRepository repository,
			IProgressMonitor monitor, ITaskCollector resultCollector) {
		JiraClient client = JiraClientFacade.getDefault().getJiraClient(repository);

		Query filter;

		try {
			int n = 0;
			for (Issue issue : issues) {
				if (monitor.isCanceled())
					return Status.CANCEL_STATUS;

				monitor.subTask(++n + "/" + issues.size() + " " + issue.getKey() + " " + issue.getSummary());
				String handle = RepositoryTaskHandleUtil.getHandle(repository.getUrl(), issue.getId());
				RepositoryTaskData oldTaskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(handle);
				resultCollector.accept(offlineHandler.createTaskData(repository, client, issue, oldTaskData));
			}
			return Status.OK_STATUS;
		} catch (JiraException e) {

		}
	}

	@Override
	public boolean updateNeedsSynchronization(TaskRepository repository, Set<AbstractTask> tasks,
			IProgressMonitor monitor) throws CoreException {
		String dateString = repository.getSyncTimeStamp();
		Date lastSyncDate = convertDate(dateString);
		if (lastSyncDate == null) {

			}
		}
		if (lastSyncDate == null) {
			for (AbstractTask task : tasks) {
				task.setNeedsSynchronization(true);
			}
			return true;
		}

		long mil = lastSyncDate.getTime();
		long now = Calendar.getInstance().getTimeInMillis();
		if (now - mil <= 0) {
			return false;
		}
		long minutes = -1 * ((now - mil) / (1000 * 60));
		if (minutes == 0) {
			return false;
		}

		FilterDefinition changedFilter = new FilterDefinition("Changed Tasks");
		changedFilter.setUpdatedDateFilter(new RelativeDateRangeFilter(RangeType.MINUTE, minutes));
		changedFilter.setOrdering(new Order[] { new Order(Order.Field.UPDATED, false) });

		final List<Issue> issues = new ArrayList<Issue>();
		// unlimited maxHits can create crazy amounts of traffic
		JiraIssueCollector collector = new JiraIssueCollector(new NullProgressMonitor(), issues, 500);
		JiraClient client = JiraClientFacade.getDefault().getJiraClient(repository);

		// TODO: Need some way to further scope this query

		List<Issue> issues = new ArrayList<Issue>();
		JiraClient client = JiraClientFacade.getDefault().getJiraClient(repository);
		// unlimited maxHits can create crazy amounts of traffic
		JiraIssueCollector issueCollector = new JiraIssueCollector(new NullProgressMonitor(), issues, 500);
		try {
			client.search(changedFilter, issueCollector);
			// TODO: remove, added to re-open connection, bug 164543
			// jiraServer.getServerInfo();
			// Will get ALL issues that have changed since lastSyncDate
			client.search(changedFilter, collector);
		} catch (JiraException e) {
			throw new CoreException(JiraCorePlugin.toStatus(repository, e));
		}

			if (issues.isEmpty()) {
				return false; // no hits
			// String handle =
			// AbstractTask.getHandle(repository.getUrl(),
			// issue.getId());
			AbstractTask task = TasksUiPlugin.getTaskListManager().getTaskList().getTask(repository.getUrl(), issue.getId());
			if (task instanceof AbstractTask) {
				changedTasks.add((AbstractTask) task);
			}

			int n = 0;
			TaskFactory factory = new TaskFactory(repository);
			for (Issue issue : issues) {
				AbstractTask task = TasksUiPlugin.getTaskListManager().getTaskList().getTask(repository.getUrl(),
						issue.getId());
				if (!tasks.contains(task)) {
					continue;
				}

				monitor.subTask(++n + "/" + issues.size() + " " + issue.getKey() + " " + issue.getSummary());
				String handle = RepositoryTaskHandleUtil.getHandle(repository.getUrl(), issue.getId());
				RepositoryTaskData oldTaskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(handle);
				RepositoryTaskData taskData = offlineHandler.createTaskData(repository, client, issue, oldTaskData);
				factory.createTask(taskData, new NullProgressMonitor());

				if (issue.getUpdated() != null && issue.getUpdated().after(lastSyncDate)) {
					lastSyncDate = issue.getUpdated();
				}
			}
		}

			repository.setSyncTimeStamp( // 
			new SimpleDateFormat(JiraAttributeFactory.JIRA_DATE_FORMAT, Locale.US).format(lastSyncDate));

			return true;
		} catch (JiraException e) {
			throw new CoreException(JiraCorePlugin.toStatus(repository, e));
		}
	}

	private Date convertDate(String dateString) {

	}

	@Override
	public String getSynchronizationTimestamp(TaskRepository repository, Set<AbstractTask> changedTasks) {
		// the timestamp is updated in updateNeedsSynchronization()
		return repository.getSyncTimeStamp();
	}


			jiraTask.setTaskUrl(getTaskUrl(repository.getUrl(), repositoryTask.getTaskKey()));

			JiraClient client = JiraClientFacade.getDefault().getJiraClient(repository);
			jiraTask.setPriority(getMylarPriority(client, taskData.getAttributeValue(RepositoryTaskAttribute.PRIORITY)).toString());
					.toString());
			for (org.eclipse.mylyn.internal.jira.core.model.Status status : client.getStatuses()) {
				if (status.getName().equals(taskData.getAttributeValue(RepositoryTaskAttribute.STATUS))) {
					if (isCompleted(status)) {

Lines 36-42 Link Here

(-)src/org/eclipse/mylyn/internal/jira/ui/editor/NewJiraTaskEditor.java (-1 / +1 lines)
36	JiraCustomQuery query = new JiraCustomQuery(repository.getUrl(), filter, repository.getCharacterEncoding());	36	JiraCustomQuery query = new JiraCustomQuery(repository.getUrl(), filter, repository.getCharacterEncoding());
37		37
38	SearchHitCollector collector = new SearchHitCollector(TasksUiPlugin.getTaskListManager().getTaskList(),	38	SearchHitCollector collector = new SearchHitCollector(TasksUiPlugin.getTaskListManager().getTaskList(),
39	repository, query, new TaskFactory(repository));	39	repository, query, new TaskFactory(repository, false, false));
40	return collector;	40	return collector;
41	}	41	}

Return to bug 191575

Lines 290-297 Link Here

(-)src/org/eclipse/mylyn/tasks/core/TaskRepository.java (-7 / +19 lines)
290		290
291	@Override	291	@Override
292	public boolean equals(Object object) {	292	public boolean equals(Object object) {
293	if (object instanceof TaskRepository && getUrl() != null) {	293	if (object instanceof TaskRepository) {
294	return getUrl().equals(((TaskRepository) object).getUrl());	294	TaskRepository repository = (TaskRepository) object;
		295	if (getUrl() == null) {
		296	if (repository.getUrl() != null) {
		297	return false;
		298	}
		299	} else {
		300	if(!getUrl().equals(repository.getUrl())) {
		301	return false;
		302	}
		303	}
		304	if (getKind() == null) {
		305	return repository.getKind() == null;
		306	} else {
		307	return getKind().equals(repository.getKind());
		308	}
		309
295	} else {	310	} else {
296	return super.equals(object);	311	return super.equals(object);
297	}	312	}
Lines 299-309 Link Here
299		314
300	@Override	315	@Override
301	public int hashCode() {	316	public int hashCode() {
302	if (getUrl() != null) {	317	int res = getUrl()==null ? 1 : getUrl().hashCode();
303	return getUrl().hashCode();	318	return res * 31 + (getKind()==null ? 1 : getKind().hashCode());
304	} else {
305	return super.hashCode();
306	}
307	}	319	}
308		320
309	@Override	321	@Override

Lines 171-177 Link Here

(-)src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java (-9 / +15 lines)
171	* IQueryHitCollector that collects the hits found	171	* IQueryHitCollector that collects the hits found
172	*/	172	*/
173	public abstract IStatus performQuery(AbstractRepositoryQuery query, TaskRepository repository,	173	public abstract IStatus performQuery(AbstractRepositoryQuery query, TaskRepository repository,
174	IProgressMonitor monitor, QueryHitCollector resultCollector, boolean forced);	174	IProgressMonitor monitor, ITaskCollector resultCollector);
175		175
176	/**	176	/**
177	* The connector's summary i.e. "JIRA (supports 3.3.1 and later)"	177	* The connector's summary i.e. "JIRA (supports 3.3.1 and later)"
Lines 250-267 Link Here
250	}	250	}
251		251
252	/**	252	/**
253	* Of <code>tasks</code> provided, return all that have changed since last	253	* Of <code>tasks</code> provided, return all that have changed since last synchronization of
254	* synchronization of <code>repository</code>	254	* <code>repository</code>.
255	*	255	*
256	* All errors should be thrown as <code>CoreException</code> for the	256	* Tasks that need to be synchronized (i.e. task data updated) should be passed to
257	* framework to handle, since background synchronizations fail silently when	257	* <code>collector.accept(Task)</code> method, or if repository connector can update task data, it can use
258	* disconnected.	258	* <code>collector.accept(RepositoryTaskData)</code> call.
259	*	259	*
260	* TODO: Add progress monitor as parameter	260	* All errors should be thrown as <code>CoreException</code> for the framework to handle, since background
		261	* synchronizations fail silently when disconnected.
		262	* @param tasks TODO
		263	*
		264	* @return null if there was no tasks changed in the repository, otherwise collection of updated tasks (within
		265	* <code>tasks</code> collection), so empty collection means that there are some other tasks changed
261	*	266	*
262	* @throws CoreException	267	* @throws CoreException
263	*/	268	*/
264	public abstract Set<AbstractTask> getChangedSinceLastSync(TaskRepository repository,	269	public abstract boolean updateNeedsSynchronization(TaskRepository repository,
265	Set<AbstractTask> tasks, IProgressMonitor monitor) throws CoreException;	270	Set<AbstractTask> tasks, IProgressMonitor monitor) throws CoreException;
266		271
267	/**	272	/**
Lines 392-398 Link Here
392	* synchronization timestamp. Override to return actual timestamp from	397	* synchronization timestamp. Override to return actual timestamp from
393	* repository.	398	* repository.
394	*/	399	*/
395	public String getLastSyncTimestamp(TaskRepository repository, Set<AbstractTask> changedTasks) {	400	public String getSynchronizationTimestamp(TaskRepository repository, Set<AbstractTask> changedTasks) {
396	Date mostRecent = new Date(0);	401	Date mostRecent = new Date(0);
397	String mostRecentTimeStamp = repository.getSyncTimeStamp();	402	String mostRecentTimeStamp = repository.getSyncTimeStamp();
398	for (AbstractTask task : changedTasks) {	403	for (AbstractTask task : changedTasks) {
Lines 432-435 Link Here
432	this.taskDataManager = taskDataManager;	437	this.taskDataManager = taskDataManager;
433	}	438	}
434		439
		440
435	}	441	}

Lines 386-394 Link Here

(-)src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java (-7 / +10 lines)
386	TasksUiPlugin.getRepositoryManager().setSyncTime(repository, task5.getLastSyncDateStamp(),	386	TasksUiPlugin.getRepositoryManager().setSyncTime(repository, task5.getLastSyncDateStamp(),
387	TasksUiPlugin.getDefault().getRepositoriesFilePath());	387	TasksUiPlugin.getDefault().getRepositoriesFilePath());
388		388
389	Set<AbstractTask> changedTasks = connector.getChangedSinceLastSync(repository, tasks, new NullProgressMonitor());	389	boolean changed = connector.updateNeedsSynchronization(repository, tasks, new NullProgressMonitor());
		390	assertTrue(changed);
390	// Always last known changed returned	391	// Always last known changed returned
391	assertEquals(1, changedTasks.size());	392	assertFalse(task4.getNeedsSynchronization());
		393	assertTrue(task5.getNeedsSynchronization());
392		394
393	String priority4 = null;	395	String priority4 = null;
394	if (task4.getPriority().equals("P1")) {	396	if (task4.getPriority().equals("P1")) {
Lines 414-427 Link Here
414	submit(task4, taskData4);	416	submit(task4, taskData4);
415	submit(task5, taskData5);	417	submit(task5, taskData5);
416		418
417	changedTasks = connector.getChangedSinceLastSync(repository, tasks, new NullProgressMonitor());	419	changed = connector.updateNeedsSynchronization(repository, tasks, new NullProgressMonitor());
418		420
419	assertEquals("Changed reports expected ", 2, changedTasks.size());	421	assertTrue(task4.getNeedsSynchronization());
420	assertTrue(tasks.containsAll(changedTasks));	422	assertTrue(task5.getNeedsSynchronization());
421		423
422	TasksUiPlugin.getSynchronizationManager().synchronize(connector, changedTasks, true, null);	424	TasksUiPlugin.getSynchronizationManager().synchronize(connector, tasks, true, null);
423		425
424	for (AbstractTask task : changedTasks) {	426
		427	for (AbstractTask task : tasks) {
425	if (task.getTaskId() == "4") {	428	if (task.getTaskId() == "4") {
426	assertEquals(priority4, task4.getPriority());	429	assertEquals(priority4, task4.getPriority());
427	}	430	}

Lines 10-140 Link Here

(-)src/org/eclipse/mylyn/tasks/core/QueryHitCollector.java (-87 / +20 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.mylyn.tasks.core;	11	package org.eclipse.mylyn.tasks.core;
12		12
13	import java.text.MessageFormat;
14	import java.util.HashSet;	13	import java.util.HashSet;
15	import java.util.Set;	14	import java.util.Set;
16		15
17	import org.eclipse.core.runtime.CoreException;	16	import org.eclipse.core.runtime.CoreException;
18	import org.eclipse.core.runtime.IProgressMonitor;
19	import org.eclipse.core.runtime.NullProgressMonitor;	17	import org.eclipse.core.runtime.NullProgressMonitor;
20	import org.eclipse.core.runtime.SubProgressMonitor;
21		18
22	/**	19	/**
23	* Collects QueryHits resulting from repository search	20	* Collects QueryHits resulting from repository search
24	*	21	*
25	* @author Shawn Minto	22	* @author Shawn Minto
26	* @author Rob Elves (generalized from bugzilla)	23	* @author Rob Elves (generalized from bugzilla)
		24	* @author Steffen Pingel
27	*/	25	*/
28	public class QueryHitCollector {	26	public class QueryHitCollector implements ITaskCollector {
29		27
30	public static final int MAX_HITS = 5000;	28	public static final int MAX_HITS = 5000;
31		29
32	public static final String MAX_HITS_REACHED = "Max allowed number of hits returned exceeded. Some hits may not be displayed. Please narrow query scope.";	30	public static final String MAX_HITS_REACHED = "Max allowed number of hits returned exceeded. Some hits may not be displayed. Please narrow query scope.";
33		31
34	protected Set<AbstractTask> taskResults = new HashSet<AbstractTask>();	32	private final Set<AbstractTask> taskResults = new HashSet<AbstractTask>();
35		33
36	/** The progress monitor for the search operation */	34	private final TaskList taskList;
37	private IProgressMonitor monitor = new NullProgressMonitor();
38		35
39	/** The number of matches found */	36	private final ITaskFactory taskFactory;
40	private int matchCount;
41
42	/** The string to display to the user while querying */
43	private static final String STARTING = "querying the server";
44
45	/** The string to display to the user when we have 1 match */
46	private static final String MATCH = "1 match";
47
48	/** The string to display to the user when we have multiple or no matches */
49	private static final String MATCHES = "{0} matches";
50
51	/** The string to display to the user when the query is done */
52	private static final String DONE = "done";
53
54	protected TaskList taskList;
55
56	protected ITaskFactory taskFactory;
57		37
58	public QueryHitCollector(TaskList tasklist, ITaskFactory taskFactory) {	38	public QueryHitCollector(TaskList tasklist, ITaskFactory taskFactory) {
59	this.taskList = tasklist;	39	this.taskList = tasklist;
60	this.taskFactory = taskFactory;	40	this.taskFactory = taskFactory;
61	}	41	}
62		42
63	public void aboutToStart(int startMatchCount) throws CoreException {
64	taskResults.clear();
65	matchCount = startMatchCount;
66	monitor.setTaskName(STARTING);
67	}
68
69	public void accept(AbstractTask task) {	43	public void accept(AbstractTask task) {
70		44	if (task == null) {
71	if (!getProgressMonitor().isCanceled()) {	45	throw new IllegalArgumentException();
72	getProgressMonitor().subTask(getFormattedMatchesString(matchCount));
73	getProgressMonitor().worked(1);
74	}	46	}
75		47
76	if (task == null)	48	AbstractTask existingTask = taskList.getTask(task.getHandleIdentifier());
77	return;	49	if (existingTask == null) {
78		50	task.setNeedsSynchronization(true);
79	AbstractTask hitTask = taskList.getTask(task.getHandleIdentifier());	51	} else {
80	if (hitTask == null) {	52	// preserve meta attributes of existing task
81	hitTask = task;	53	task.setLastSyncDateStamp(existingTask.getLastSyncDateStamp());
82	// task is new, add to tasklist	54	task.setNeedsSynchronization(existingTask.getNeedsSynchronization());
83	taskList.addTask(hitTask);
84	}	55	}
85	taskResults.add((AbstractTask) hitTask);	56
86	matchCount++;	57	taskResults.add((AbstractTask) task);
87	}	58	}
88		59
89	public void accept(RepositoryTaskData taskData) throws CoreException {	60	public void accept(RepositoryTaskData taskData) throws CoreException {
90	if (taskData == null)	61	if (taskData == null) {
91	return;	62	throw new IllegalArgumentException();
92
93	if (!getProgressMonitor().isCanceled()) {
94	getProgressMonitor().subTask(getFormattedMatchesString(matchCount));
95	getProgressMonitor().worked(1);
96	}	63	}
97		64
98	AbstractTask task = taskFactory.createTask(taskData, true, false, new SubProgressMonitor(monitor, 1));	65	AbstractTask task = taskFactory.createTask(taskData, new NullProgressMonitor());
99	taskResults.add(task);	66	taskResults.add(task);
100	matchCount++;
101	}
102
103	public void done() {
104	if (monitor != null && !monitor.isCanceled()) {
105	// if the operation is cancelled, finish with the data that we
106	// already have
107	String matchesString = getFormattedMatchesString(matchCount);
108	monitor.setTaskName(MessageFormat.format(DONE, new Object[] { matchesString }));
109	monitor.done();
110	}
111
112	// Cut no longer used references because the collector might be re-used
113	monitor = null;
114	}
115
116	protected String getFormattedMatchesString(int count) {
117	if (count == 1) {
118	return MATCH;
119	}
120	Object[] messageFormatArgs = { new Integer(count) };
121	return MessageFormat.format(MATCHES, messageFormatArgs);
122	}
123
124	public IProgressMonitor getProgressMonitor() {
125	return monitor;
126	}
127
128	public void setProgressMonitor(IProgressMonitor monitor) {
129	this.monitor = monitor;
130	}	67	}
131		68
132	public Set<AbstractTask> getTaskHits() {	69	public Set<AbstractTask> getTaskHits() {
133	return taskResults;	70	return taskResults;
134	}	71	}
135		72
136	public void clear() {
137	taskResults.clear();
138	}
139
140	}	73	}

Lines 11-17 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/core/LocalRepositoryConnector.java (-6 / +6 lines)
11		11
12	package org.eclipse.mylyn.internal.tasks.core;	12	package org.eclipse.mylyn.internal.tasks.core;
13		13
14	import java.util.Collections;	14
15	import java.util.Set;	15	import java.util.Set;
16		16
17	import org.eclipse.core.runtime.CoreException;	17	import org.eclipse.core.runtime.CoreException;
Lines 21-28 Link Here
21	import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;	21	import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
22	import org.eclipse.mylyn.tasks.core.AbstractTask;	22	import org.eclipse.mylyn.tasks.core.AbstractTask;
23	import org.eclipse.mylyn.tasks.core.IAttachmentHandler;	23	import org.eclipse.mylyn.tasks.core.IAttachmentHandler;
		24	import org.eclipse.mylyn.tasks.core.ITaskCollector;
24	import org.eclipse.mylyn.tasks.core.ITaskDataHandler;	25	import org.eclipse.mylyn.tasks.core.ITaskDataHandler;
25	import org.eclipse.mylyn.tasks.core.QueryHitCollector;
26	import org.eclipse.mylyn.tasks.core.RepositoryTaskData;	26	import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
27	import org.eclipse.mylyn.tasks.core.TaskRepository;	27	import org.eclipse.mylyn.tasks.core.TaskRepository;
28		28
Lines 63-71 Link Here
63	}	63	}
64		64
65	@Override	65	@Override
66	public Set<AbstractTask> getChangedSinceLastSync(TaskRepository repository,	66	public boolean updateNeedsSynchronization(TaskRepository repository,
67	Set<AbstractTask> tasks, IProgressMonitor monitor) throws CoreException {	67	Set<AbstractTask> tasks, IProgressMonitor monitor) {
68	return Collections.emptySet();	68	return false;
69	}	69	}
70		70
71	@Override	71	@Override
Lines 104-110 Link Here
104		104
105	@Override	105	@Override
106	public IStatus performQuery(AbstractRepositoryQuery query, TaskRepository repository, IProgressMonitor monitor,	106	public IStatus performQuery(AbstractRepositoryQuery query, TaskRepository repository, IProgressMonitor monitor,
107	QueryHitCollector resultCollector, boolean forced) {	107	ITaskCollector resultCollector) {
108	// ignore	108	// ignore
109	return null;	109	return null;
110	}	110	}

Added Link Here

(-)src/org/eclipse/mylyn/tasks/core/ITaskCollector.java (+22 lines)
1	/*******************************************************************************
2	* Copyright (c) 2004 - 2006 University Of British Columbia 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	* University Of British Columbia - initial API and implementation
10	*******************************************************************************/
11
12	package org.eclipse.mylyn.tasks.core;
13
14	import org.eclipse.core.runtime.CoreException;
15
16	public interface ITaskCollector {
17
18	void accept(AbstractTask task);
19
20	void accept(RepositoryTaskData taskData) throws CoreException;
21
22	}

Lines 136-142 Link Here

(-)src/org/eclipse/mylyn/jira/tests/JiraFilterTest.java (-4 / +4 lines)
136		136
137	QueryHitCollector hitCollector = new QueryHitCollector(taskList, new TaskFactory(repository));	137	QueryHitCollector hitCollector = new QueryHitCollector(taskList, new TaskFactory(repository));
138		138
139	connector.performQuery(query, repository, new NullProgressMonitor(), hitCollector, false);	139	connector.performQuery(query, repository, new NullProgressMonitor(), hitCollector);
140	assertEquals(1, hitCollector.getTaskHits().size());	140	assertEquals(1, hitCollector.getTaskHits().size());
141	assertEquals(issue.getSummary(), hitCollector.getTaskHits().iterator().next().getSummary());	141	assertEquals(issue.getSummary(), hitCollector.getTaskHits().iterator().next().getSummary());
142	//assertEquals(PriorityLevel.P1.toString(), hitCollector.getTaskDataHits().iterator().next().getPriority());	142	//assertEquals(PriorityLevel.P1.toString(), hitCollector.getTaskDataHits().iterator().next().getPriority());
Lines 164-176 Link Here
164		164
165	JiraCustomQuery query = new JiraCustomQuery(repository.getUrl(), filter, repository.getCharacterEncoding());	165	JiraCustomQuery query = new JiraCustomQuery(repository.getUrl(), filter, repository.getCharacterEncoding());
166	QueryHitCollector hitCollector = new QueryHitCollector(taskList, new TaskFactory(repository));	166	QueryHitCollector hitCollector = new QueryHitCollector(taskList, new TaskFactory(repository));
167	connector.performQuery(query, repository, new NullProgressMonitor(), hitCollector, false);	167	connector.performQuery(query, repository, new NullProgressMonitor(), hitCollector);
168	assertEquals(1, hitCollector.getTaskHits().size());	168	assertEquals(1, hitCollector.getTaskHits().size());
169	assertEquals(issue2.getSummary(), hitCollector.getTaskHits().iterator().next().getSummary());	169	assertEquals(issue2.getSummary(), hitCollector.getTaskHits().iterator().next().getSummary());
170		170
171	hitCollector.clear();	171	hitCollector = new QueryHitCollector(taskList, new TaskFactory(repository));
172	JiraClientFacade.getDefault().clearClientsAndConfigurationData();	172	JiraClientFacade.getDefault().clearClientsAndConfigurationData();
173	connector.performQuery(query, repository, new NullProgressMonitor(), hitCollector, false);	173	connector.performQuery(query, repository, new NullProgressMonitor(), hitCollector);
174	assertEquals(1, hitCollector.getTaskHits().size());	174	assertEquals(1, hitCollector.getTaskHits().size());
175	assertEquals(issue2.getSummary(), hitCollector.getTaskHits().iterator().next().getSummary());	175	assertEquals(issue2.getSummary(), hitCollector.getTaskHits().iterator().next().getSummary());
176	}	176	}

Lines 22-29 Link Here

(-)src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java (-5 / +6 lines)
22	import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;	22	import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
23	import org.eclipse.mylyn.tasks.core.AbstractTask;	23	import org.eclipse.mylyn.tasks.core.AbstractTask;
24	import org.eclipse.mylyn.tasks.core.IAttachmentHandler;	24	import org.eclipse.mylyn.tasks.core.IAttachmentHandler;
		25	import org.eclipse.mylyn.tasks.core.ITaskCollector;
25	import org.eclipse.mylyn.tasks.core.ITaskDataHandler;	26	import org.eclipse.mylyn.tasks.core.ITaskDataHandler;
26	import org.eclipse.mylyn.tasks.core.QueryHitCollector;
27	import org.eclipse.mylyn.tasks.core.RepositoryTaskData;	27	import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
28	import org.eclipse.mylyn.tasks.core.TaskRepository;	28	import org.eclipse.mylyn.tasks.core.TaskRepository;
29		29
Lines 133-141 Link Here
133	}	133	}
134		134
135	@Override	135	@Override
136	public Set<AbstractTask> getChangedSinceLastSync(TaskRepository repository,	136	public boolean updateNeedsSynchronization(TaskRepository repository,
137	Set<AbstractTask> tasks, IProgressMonitor monitor) throws CoreException {	137	Set<AbstractTask> tasks, IProgressMonitor monitor) {
138	return Collections.emptySet();	138	// ignore
		139	return false;
139	}	140	}
140		141
141	@Override	142	@Override
Lines 153-159 Link Here
153		154
154	@Override	155	@Override
155	public IStatus performQuery(AbstractRepositoryQuery query, TaskRepository repository, IProgressMonitor monitor,	156	public IStatus performQuery(AbstractRepositoryQuery query, TaskRepository repository, IProgressMonitor monitor,
156	QueryHitCollector resultCollector, boolean forced) {	157	ITaskCollector resultCollector) {
157	// ignore	158	// ignore
158	return null;	159	return null;
159	}	160	}

Lines 21-27 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java (-49 / +42 lines)
21	import java.util.Iterator;	21	import java.util.Iterator;
22	import java.util.List;	22	import java.util.List;
23	import java.util.Locale;	23	import java.util.Locale;
24	import java.util.Map;
25	import java.util.Set;	24	import java.util.Set;
26		25
27	import org.eclipse.core.runtime.CoreException;	26	import org.eclipse.core.runtime.CoreException;
Lines 34-39 Link Here
34	import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;	33	import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
35	import org.eclipse.mylyn.tasks.core.AbstractTask;	34	import org.eclipse.mylyn.tasks.core.AbstractTask;
36	import org.eclipse.mylyn.tasks.core.IAttachmentHandler;	35	import org.eclipse.mylyn.tasks.core.IAttachmentHandler;
		36	import org.eclipse.mylyn.tasks.core.ITaskCollector;
37	import org.eclipse.mylyn.tasks.core.ITaskDataHandler;	37	import org.eclipse.mylyn.tasks.core.ITaskDataHandler;
38	import org.eclipse.mylyn.tasks.core.ITaskFactory;	38	import org.eclipse.mylyn.tasks.core.ITaskFactory;
39	import org.eclipse.mylyn.tasks.core.QueryHitCollector;	39	import org.eclipse.mylyn.tasks.core.QueryHitCollector;
Lines 223-249 Link Here
223		223
224		224
225	@Override	225	@Override
226	public Set<AbstractTask> getChangedSinceLastSync(TaskRepository repository,	226	public boolean updateNeedsSynchronization(TaskRepository repository,
227	Set<AbstractTask> tasks, IProgressMonitor monitor) throws CoreException {	227	Set<AbstractTask> tasks, IProgressMonitor monitor) throws CoreException {
228	try {	228	try {
229	Set<AbstractTask> changedTasks = new HashSet<AbstractTask>();	229	monitor.beginTask("Running query", IProgressMonitor.UNKNOWN);
230		230
231	if (repository.getSyncTimeStamp() == null) {	231	if (repository.getSyncTimeStamp() == null) {
232	return tasks;	232	for (AbstractTask task : tasks) {
		233	task.setNeedsSynchronization(true);
		234	}
		235	return true;
233	}	236	}
234		237
235	String dateString = repository.getSyncTimeStamp();	238	String dateString = repository.getSyncTimeStamp();
236	if (dateString == null) {	239	if (dateString == null) {
237	dateString = "";	240	dateString = "";
238	}	241	}
239	String urlQueryBase;
240	String urlQueryString;
241		242
242	urlQueryBase = repository.getUrl() + CHANGED_BUGS_CGI_QUERY	243	String urlQueryBase = repository.getUrl() + CHANGED_BUGS_CGI_QUERY
243	+ URLEncoder.encode(dateString, repository.getCharacterEncoding()) + CHANGED_BUGS_CGI_ENDDATE;	244	+ URLEncoder.encode(dateString, repository.getCharacterEncoding()) + CHANGED_BUGS_CGI_ENDDATE;
244		245
245	urlQueryString = urlQueryBase + BUG_ID;	246	String urlQueryString = urlQueryBase + BUG_ID;
246		247
		248	// Need to replace this with query that would return list of tasks since last sync
		249	// the trouble is that bugzilla only have 1 hour granularity for "changed since" query
		250	// so, we can't say that no tasks has changed in repository
		251
		252	Set<AbstractTask> changedTasks = new HashSet<AbstractTask>();
247	int queryCounter = -1;	253	int queryCounter = -1;
248	Iterator<AbstractTask> itr = tasks.iterator();	254	Iterator<AbstractTask> itr = tasks.iterator();
249	while (itr.hasNext()) {	255	while (itr.hasNext()) {
Lines 255-273 Link Here
255	queryForChanged(repository, changedTasks, urlQueryString);	261	queryForChanged(repository, changedTasks, urlQueryString);
256	queryCounter = 0;	262	queryCounter = 0;
257	urlQueryString = urlQueryBase + BUG_ID;	263	urlQueryString = urlQueryBase + BUG_ID;
258	urlQueryString += newurlQueryString;	264	}
259	} else if (!itr.hasNext()) {	265	urlQueryString += newurlQueryString;
260	urlQueryString += newurlQueryString;	266	if (!itr.hasNext()) {
261	queryForChanged(repository, changedTasks, urlQueryString);	267	queryForChanged(repository, changedTasks, urlQueryString);
262	} else {
263	urlQueryString += newurlQueryString;
264	}	268	}
265	}	269	}
266	return changedTasks;	270
		271	for (AbstractTask task : changedTasks) {
		272	task.setNeedsSynchronization(true);
		273	}
		274
		275	// FIXME check if new tasks were added
		276	//return changedTasks.isEmpty();
		277	return true;
267	} catch (UnsupportedEncodingException e) {	278	} catch (UnsupportedEncodingException e) {
		279	// XXX throw CoreException instead?
268	MylarStatusHandler.fail(e, "Repository configured with unsupported encoding: "	280	MylarStatusHandler.fail(e, "Repository configured with unsupported encoding: "
269	+ repository.getCharacterEncoding() + "\n\n Unable to determine changed tasks.", true);	281	+ repository.getCharacterEncoding() + "\n\n Unable to determine changed tasks.", true);
270	return tasks;	282	return false;
271	}	283	}
272	}	284	}
273		285
Lines 275-281 Link Here
275	String urlQueryString) throws UnsupportedEncodingException, CoreException {	287	String urlQueryString) throws UnsupportedEncodingException, CoreException {
276	QueryHitCollector collector = new QueryHitCollector(taskList, new ITaskFactory() {	288	QueryHitCollector collector = new QueryHitCollector(taskList, new ITaskFactory() {
277		289
278	public AbstractTask createTask(RepositoryTaskData taskData, boolean synchData, boolean forced, IProgressMonitor monitor) {	290	public AbstractTask createTask(RepositoryTaskData taskData, IProgressMonitor monitor) {
279	// do not construct actual task objects here as query shouldn't result in new tasks	291	// do not construct actual task objects here as query shouldn't result in new tasks
280	return taskList.getTask(taskData.getRepositoryUrl(), taskData.getId());	292	return taskList.getTask(taskData.getRepositoryUrl(), taskData.getId());
281	}	293	}
Lines 283-289 Link Here
283		295
284	BugzillaRepositoryQuery query = new BugzillaRepositoryQuery(repository.getUrl(), urlQueryString, "");	296	BugzillaRepositoryQuery query = new BugzillaRepositoryQuery(repository.getUrl(), urlQueryString, "");
285		297
286	performQuery(query, repository, new NullProgressMonitor(), collector, false);	298	performQuery(query, repository, new NullProgressMonitor(), collector);
287		299
288	for (AbstractTask taskHit : collector.getTaskHits()) {	300	for (AbstractTask taskHit : collector.getTaskHits()) {
289	// String handle =	301	// String handle =
Lines 332-380 Link Here
332		344
333	@Override	345	@Override
334	public IStatus performQuery(final AbstractRepositoryQuery query, TaskRepository repository,	346	public IStatus performQuery(final AbstractRepositoryQuery query, TaskRepository repository,
335	IProgressMonitor monitor, QueryHitCollector resultCollector, boolean forced) {	347	IProgressMonitor monitor, ITaskCollector resultCollector) {
336	IStatus queryStatus = Status.OK_STATUS;
337	try {	348	try {
		349	monitor.beginTask("Running query", IProgressMonitor.UNKNOWN);
338	BugzillaClient client = getClientManager().getClient(repository);	350	BugzillaClient client = getClientManager().getClient(repository);
339	resultCollector.clear();	351	boolean hitsReceived = client.getSearchHits(query, resultCollector);
340	Set<String> ids = client.getSearchHits(query);	352	if (!hitsReceived) {
341	if (ids.size() == 0) {
342	// XXX: HACK in case of ip change bugzilla can return 0 hits	353	// XXX: HACK in case of ip change bugzilla can return 0 hits
343	// due to invalid authorization token, forcing relogin fixes	354	// due to invalid authorization token, forcing relogin fixes
344	client.logout();	355	client.logout();
345	ids = client.getSearchHits(query);	356	client.getSearchHits(query, resultCollector);
346	}
347
348	if (!forced) {
349	// Only retrieve data for hits we don't already have
350	for (AbstractTask existingTask : query.getChildren()) {
351	AbstractTask repositoryTask = (AbstractTask) existingTask;
352	if (ids.contains(repositoryTask.getTaskId())) {
353	resultCollector.accept(repositoryTask);
354	ids.remove(repositoryTask.getTaskId());
355	}
356	}
357	}
358
359	Map<String, RepositoryTaskData> hits = client.getTaskData(ids);
360	for (RepositoryTaskData data : hits.values()) {
361	if (data != null) {
362	taskDataHandler.configureTaskData(repository, data);
363	resultCollector.accept(data);
364	}
365	}	357	}
366		358
		359	return Status.OK_STATUS;
367	} catch (UnrecognizedReponseException e) {	360	} catch (UnrecognizedReponseException e) {
368	queryStatus = new Status(IStatus.ERROR, BugzillaCorePlugin.PLUGIN_ID, Status.INFO,	361	return new Status(IStatus.ERROR, BugzillaCorePlugin.PLUGIN_ID, Status.INFO,
369	"Unrecognized response from server", e);	362	"Unrecognized response from server", e);
370	} catch (IOException e) {	363	} catch (IOException e) {
371	queryStatus = new Status(IStatus.ERROR, BugzillaCorePlugin.PLUGIN_ID, Status.ERROR,	364	return new Status(IStatus.ERROR, BugzillaCorePlugin.PLUGIN_ID, Status.ERROR,
372	"Check repository configuration: " + e.getMessage(), e);	365	"Check repository configuration: " + e.getMessage(), e);
373	} catch (CoreException e) {	366	} catch (CoreException e) {
374	queryStatus = e.getStatus();	367	return e.getStatus();
		368	} finally {
		369	monitor.done();
375	}	370	}
376	return queryStatus;
377
378	}	371	}
379		372
380	@Override	373	@Override

Lines 53-58 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java (-53 / +48 lines)
53	import org.eclipse.mylyn.internal.bugzilla.core.history.BugzillaTaskHistoryParser;	53	import org.eclipse.mylyn.internal.bugzilla.core.history.BugzillaTaskHistoryParser;
54	import org.eclipse.mylyn.internal.bugzilla.core.history.TaskHistory;	54	import org.eclipse.mylyn.internal.bugzilla.core.history.TaskHistory;
55	import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;	55	import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
		56	import org.eclipse.mylyn.tasks.core.ITaskCollector;
56	import org.eclipse.mylyn.tasks.core.ITaskAttachment;	57	import org.eclipse.mylyn.tasks.core.ITaskAttachment;
57	import org.eclipse.mylyn.tasks.core.QueryHitCollector;	58	import org.eclipse.mylyn.tasks.core.QueryHitCollector;
58	import org.eclipse.mylyn.tasks.core.RepositoryOperation;	59	import org.eclipse.mylyn.tasks.core.RepositoryOperation;
Lines 436-488 Link Here
436	// }	437	// }
437	// }	438	// }
438		439
439	// public void getSearchHits(AbstractRepositoryQuery query, QueryHitCollector	440	public boolean getSearchHits(AbstractRepositoryQuery query, ITaskCollector
440	// collector, TaskList taskList)	441	collector)
441	// throws IOException, CoreException {	442	throws IOException, CoreException {
442	// GetMethod method = null;
443	// try {
444	// String queryUrl = query.getUrl();
445	// // Test that we don't specify content type twice.
446	// // Should only be specified here (not in passed in url if possible)
447	// if (!queryUrl.contains("ctype=rdf")) {
448	// queryUrl = queryUrl.concat(IBugzillaConstants.CONTENT_TYPE_RDF);
449	// }
450	//
451	// method = getConnect(queryUrl);
452	// if (method.getResponseHeader("Content-Type") != null) {
453	// Header responseTypeHeader = method.getResponseHeader("Content-Type");
454	// for (String type : VALID_CONFIG_CONTENT_TYPES) {
455	// if (responseTypeHeader.getValue().toLowerCase(Locale.ENGLISH).contains(type))
456	// {
457	// RepositoryQueryResultsFactory queryFactory = new
458	// RepositoryQueryResultsFactory(method
459	// .getResponseBodyAsStream(), characterEncoding);
460	// queryFactory.performQuery(taskList, repositoryUrl.toString(), collector,
461	// QueryHitCollector.MAX_HITS);
462	//
463	//
464	//
465	//
466	// //getTaskData(queryFactory.get)
467	// // pass t
468	//
469	// return;
470	// }
471	// }
472	// }
473	// parseHtmlError(new BufferedReader(
474	// new InputStreamReader(method.getResponseBodyAsStream(), characterEncoding)));
475	// } finally {
476	// if (method != null) {
477	// method.releaseConnection();
478	// }
479	// }
480	// }
481
482	/**
483	* Returns ids of bugs that match given query
484	*/
485	public Set<String> getSearchHits(AbstractRepositoryQuery query) throws IOException, CoreException {
486	GetMethod method = null;	443	GetMethod method = null;
487	try {	444	try {
488	String queryUrl = query.getUrl();	445	String queryUrl = query.getUrl();
Lines 496-507 Link Here
496	if (method.getResponseHeader("Content-Type") != null) {	453	if (method.getResponseHeader("Content-Type") != null) {
497	Header responseTypeHeader = method.getResponseHeader("Content-Type");	454	Header responseTypeHeader = method.getResponseHeader("Content-Type");
498	for (String type : VALID_CONFIG_CONTENT_TYPES) {	455	for (String type : VALID_CONFIG_CONTENT_TYPES) {
499	if (responseTypeHeader.getValue().toLowerCase(Locale.ENGLISH).contains(type)) {	456	if (responseTypeHeader.getValue().toLowerCase(Locale.ENGLISH).contains(type))
500	RepositoryQueryResultsFactory queryFactory = new RepositoryQueryResultsFactory(method	457	{
		458	RepositoryQueryResultsFactory queryFactory = new
		459	RepositoryQueryResultsFactory(method
501	.getResponseBodyAsStream(), characterEncoding);	460	.getResponseBodyAsStream(), characterEncoding);
502	queryFactory.performQuery(repositoryUrl.toString(), QueryHitCollector.MAX_HITS);	461	queryFactory.performQuery(repositoryUrl.toString(), collector,
503		462	QueryHitCollector.MAX_HITS);
504	return queryFactory.getHits();	463	return !queryFactory.getHits().isEmpty();
505	}	464	}
506	}	465	}
507	}	466	}
Lines 512-520 Link Here
512	method.releaseConnection();	471	method.releaseConnection();
513	}	472	}
514	}	473	}
515	return new HashSet<String>();	474	return false;
516	}	475	}
517		476
		477	// /**
		478	// * Returns ids of bugs that match given query
		479	// */
		480	// public Set<String> getSearchHits(AbstractRepositoryQuery query) throws IOException, CoreException {
		481	// GetMethod method = null;
		482	// try {
		483	// String queryUrl = query.getUrl();
		484	// // Test that we don't specify content type twice.
		485	// // Should only be specified here (not in passed in url if possible)
		486	// if (!queryUrl.contains("ctype=rdf")) {
		487	// queryUrl = queryUrl.concat(IBugzillaConstants.CONTENT_TYPE_RDF);
		488	// }
		489	//
		490	// method = getConnect(queryUrl);
		491	// if (method.getResponseHeader("Content-Type") != null) {
		492	// Header responseTypeHeader = method.getResponseHeader("Content-Type");
		493	// for (String type : VALID_CONFIG_CONTENT_TYPES) {
		494	// if (responseTypeHeader.getValue().toLowerCase(Locale.ENGLISH).contains(type)) {
		495	// RepositoryQueryResultsFactory queryFactory = new RepositoryQueryResultsFactory(method
		496	// .getResponseBodyAsStream(), characterEncoding);
		497	// queryFactory.performQuery(repositoryUrl.toString(), QueryHitCollector.MAX_HITS);
		498	//
		499	// return queryFactory.getHits();
		500	// }
		501	// }
		502	// }
		503	// parseHtmlError(new BufferedReader(
		504	// new InputStreamReader(method.getResponseBodyAsStream(), characterEncoding)));
		505	// } finally {
		506	// if (method != null) {
		507	// method.releaseConnection();
		508	// }
		509	// }
		510	// return new HashSet<String>();
		511	// }
		512
518	public static void setupExistingBugAttributes(String serverUrl, RepositoryTaskData existingReport) {	513	public static void setupExistingBugAttributes(String serverUrl, RepositoryTaskData existingReport) {
519	// ordered list of elements as they appear in UI	514	// ordered list of elements as they appear in UI
520	// and additional elements that may not appear in the incoming xml	515	// and additional elements that may not appear in the incoming xml

Lines 13-21 Link Here

(-)src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java (-22 / +24 lines)
13		13
14	import java.io.File;	14	import java.io.File;
15	import java.util.ArrayList;	15	import java.util.ArrayList;
16	import java.util.Collections;
17	import java.util.Date;	16	import java.util.Date;
18	import java.util.HashSet;
19	import java.util.List;	17	import java.util.List;
20	import java.util.Set;	18	import java.util.Set;
21		19
Lines 33-40 Link Here
33	import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;	31	import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
34	import org.eclipse.mylyn.tasks.core.AbstractTask;	32	import org.eclipse.mylyn.tasks.core.AbstractTask;
35	import org.eclipse.mylyn.tasks.core.IAttachmentHandler;	33	import org.eclipse.mylyn.tasks.core.IAttachmentHandler;
		34	import org.eclipse.mylyn.tasks.core.ITaskCollector;
36	import org.eclipse.mylyn.tasks.core.ITaskDataHandler;	35	import org.eclipse.mylyn.tasks.core.ITaskDataHandler;
37	import org.eclipse.mylyn.tasks.core.QueryHitCollector;
38	import org.eclipse.mylyn.tasks.core.RepositoryOperation;	36	import org.eclipse.mylyn.tasks.core.RepositoryOperation;
39	import org.eclipse.mylyn.tasks.core.RepositoryStatus;	37	import org.eclipse.mylyn.tasks.core.RepositoryStatus;
40	import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute;	38	import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute;
Lines 126-132 Link Here
126		124
127	@Override	125	@Override
128	public IStatus performQuery(AbstractRepositoryQuery query, TaskRepository repository, IProgressMonitor monitor,	126	public IStatus performQuery(AbstractRepositoryQuery query, TaskRepository repository, IProgressMonitor monitor,
129	QueryHitCollector resultCollector, boolean force) {	127	ITaskCollector resultCollector) {
130		128
131	final List<TracTicket> tickets = new ArrayList<TracTicket>();	129	final List<TracTicket> tickets = new ArrayList<TracTicket>();
132		130
Lines 150-164 Link Here
150	}	148	}
151		149
152	@Override	150	@Override
153	public Set<AbstractTask> getChangedSinceLastSync(TaskRepository repository,	151	public boolean updateNeedsSynchronization(TaskRepository repository,
154	Set<AbstractTask> tasks, IProgressMonitor monitor) throws CoreException {	152	Set<AbstractTask> tasks, IProgressMonitor monitor) throws CoreException {
155	if (repository.getSyncTimeStamp() == null) {
156	return tasks;
157	}
158
159	if (!TracRepositoryConnector.hasChangedSince(repository)) {	153	if (!TracRepositoryConnector.hasChangedSince(repository)) {
160	// return an empty list to avoid causing all tasks to synchronized	154	// always run the queries for web mode
161	return Collections.emptySet();	155	return true;
		156	}
		157
		158	if (repository.getSyncTimeStamp() == null) {
		159	for (AbstractTask task : tasks) {
		160	task.setNeedsSynchronization(true);
		161	}
		162	return true;
162	}	163	}
163		164
164	Date since = new Date(0);	165	Date since = new Date(0);
Lines 167-190 Link Here
167	} catch (NumberFormatException e) {	168	} catch (NumberFormatException e) {
168	}	169	}
169		170
170	ITracClient client;
171	try {	171	try {
172	client = getClientManager().getRepository(repository);	172	ITracClient client = getClientManager().getRepository(repository);
173	Set<Integer> ids = client.getChangedTickets(since);	173	Set<Integer> ids = client.getChangedTickets(since);
		174	if (ids.isEmpty()) {
		175	// repository is unchanged
		176	return false;
		177	}
174		178
175	Set<AbstractTask> result = new HashSet<AbstractTask>();	179	for (AbstractTask task : tasks) {
176	if (!ids.isEmpty()) {	180	Integer id = getTicketId(task.getTaskId());
177	for (AbstractTask task : tasks) {	181	if (ids.contains(id)) {
178	Integer id = getTicketId(task.getTaskId());	182	task.setNeedsSynchronization(true);
179	if (ids.contains(id)) {
180	result.add(task);
181	}
182	}	183	}
183	}	184	}
184	return result;	185
		186	return true;
185	} catch (Exception e) {	187	} catch (Exception e) {
186	throw new CoreException(new Status(IStatus.ERROR, TracCorePlugin.PLUGIN_ID, IStatus.OK,	188	throw new CoreException(new Status(IStatus.ERROR, TracCorePlugin.PLUGIN_ID, IStatus.OK,
187	"could not determine changed tasks", e));	189	"Could not determine changed tasks", e));
188	}	190	}
189	}	191	}
190		192

Lines 29-35 Link Here

(-)src/org/eclipse/mylyn/internal/sandbox/bridge/bugs/BugzillaSearchEngine.java (-5 / +4 lines)
29	import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;	29	import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
30	import org.eclipse.mylyn.internal.bugzilla.ui.BugzillaUiPlugin;	30	import org.eclipse.mylyn.internal.bugzilla.ui.BugzillaUiPlugin;
31	import org.eclipse.mylyn.internal.tasks.ui.util.WebBrowserDialog;	31	import org.eclipse.mylyn.internal.tasks.ui.util.WebBrowserDialog;
32	import org.eclipse.mylyn.tasks.core.QueryHitCollector;
33	import org.eclipse.mylyn.tasks.core.TaskRepository;	32	import org.eclipse.mylyn.tasks.core.TaskRepository;
34	import org.eclipse.mylyn.tasks.core.UnrecognizedReponseException;	33	import org.eclipse.mylyn.tasks.core.UnrecognizedReponseException;
35	import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;	34	import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
Lines 87-93 Link Here
87	* @param collector -	86	* @param collector -
88	* The collector for the results to go into	87	* The collector for the results to go into
89	*/	88	*/
90	public IStatus search(QueryHitCollector collector) throws LoginException {	89	public IStatus search(ProgressQueryHitCollector collector) throws LoginException {
91	return this.search(collector, 0, IBugzillaConstants.RETURN_ALL_HITS);	90	return this.search(collector, 0, IBugzillaConstants.RETURN_ALL_HITS);
92	}	91	}
93		92
Lines 99-105 Link Here
99	* @param startMatches -	98	* @param startMatches -
100	* The number of matches to start with for the progress monitor	99	* The number of matches to start with for the progress monitor
101	*/	100	*/
102	public IStatus search(QueryHitCollector collector, int startMatches) throws LoginException {	101	public IStatus search(ProgressQueryHitCollector collector, int startMatches) throws LoginException {
103	return this.search(collector, startMatches, BugzillaUiPlugin.getDefault().getMaxResults());	102	return this.search(collector, startMatches, BugzillaUiPlugin.getDefault().getMaxResults());
104	}	103	}
105		104
Lines 115-121 Link Here
115	* the maximum number of matches to return or	114	* the maximum number of matches to return or
116	* IBugzillaConstants.RETURN_ALL_HITS for unlimited	115	* IBugzillaConstants.RETURN_ALL_HITS for unlimited
117	*/	116	*/
118	public IStatus search(QueryHitCollector collector, int startMatches, int maxHits) throws LoginException {	117	public IStatus search(ProgressQueryHitCollector collector, int startMatches, int maxHits) throws LoginException {
119	IProgressMonitor monitor = collector.getProgressMonitor();	118	IProgressMonitor monitor = collector.getProgressMonitor();
120	IStatus status = null;	119	IStatus status = null;
121	boolean possibleBadLogin = false;	120	boolean possibleBadLogin = false;
Lines 136-142 Link Here
136	.getRepositoryManager().getRepositoryConnector(BugzillaCorePlugin.REPOSITORY_KIND);	135	.getRepositoryManager().getRepositoryConnector(BugzillaCorePlugin.REPOSITORY_KIND);
137		136
138	BugzillaClient client = bugzillaConnector.getClientManager().getClient(repository);	137	BugzillaClient client = bugzillaConnector.getClientManager().getClient(repository);
139	client.getSearchHits(query);	138	client.getSearchHits(query, collector);
140		139
141	} catch (CoreException e) {	140	} catch (CoreException e) {
142	status = new MultiStatus(BugzillaUiPlugin.PLUGIN_ID, IStatus.ERROR,	141	status = new MultiStatus(BugzillaUiPlugin.PLUGIN_ID, IStatus.ERROR,

Added Link Here

(-)src/org/eclipse/mylyn/internal/sandbox/bridge/bugs/ProgressQueryHitCollector.java (+137 lines)
1	/*******************************************************************************
2	* Copyright (c) 2004 - 2006 Mylar committers 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
9	package org.eclipse.mylyn.internal.sandbox.bridge.bugs;
10
11	import java.text.MessageFormat;
12	import java.util.HashSet;
13	import java.util.Set;
14
15	import org.eclipse.core.runtime.CoreException;
16	import org.eclipse.core.runtime.IProgressMonitor;
17	import org.eclipse.core.runtime.NullProgressMonitor;
18	import org.eclipse.core.runtime.SubProgressMonitor;
19	import org.eclipse.mylyn.tasks.core.AbstractTask;
20	import org.eclipse.mylyn.tasks.core.ITaskCollector;
21	import org.eclipse.mylyn.tasks.core.ITaskFactory;
22	import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
23	import org.eclipse.mylyn.tasks.core.TaskList;
24
25	public class ProgressQueryHitCollector implements ITaskCollector {
26
27	public static final int MAX_HITS = 5000;
28
29	public static final String MAX_HITS_REACHED = "Max allowed number of hits returned exceeded. Some hits may not be displayed. Please narrow query scope.";
30
31	protected Set<AbstractTask> taskResults = new HashSet<AbstractTask>();
32
33	/** The progress monitor for the search operation */
34	private IProgressMonitor monitor = new NullProgressMonitor();
35
36	/** The number of matches found */
37	private int matchCount;
38
39	/** The string to display to the user while querying */
40	private static final String STARTING = "querying the server";
41
42	/** The string to display to the user when we have 1 match */
43	private static final String MATCH = "1 match";
44
45	/** The string to display to the user when we have multiple or no matches */
46	private static final String MATCHES = "{0} matches";
47
48	/** The string to display to the user when the query is done */
49	private static final String DONE = "done";
50
51	protected TaskList taskList;
52
53	protected ITaskFactory taskFactory;
54
55	public ProgressQueryHitCollector(TaskList tasklist, ITaskFactory taskFactory) {
56	this.taskList = tasklist;
57	this.taskFactory = taskFactory;
58	}
59
60	public void aboutToStart(int startMatchCount) throws CoreException {
61	taskResults.clear();
62	matchCount = startMatchCount;
63	monitor.setTaskName(STARTING);
64	}
65
66	public void accept(AbstractTask task) {
67
68	if (!getProgressMonitor().isCanceled()) {
69	getProgressMonitor().subTask(getFormattedMatchesString(matchCount));
70	getProgressMonitor().worked(1);
71	}
72
73	if (task == null)
74	return;
75
76	AbstractTask hitTask = taskList.getTask(task.getHandleIdentifier());
77	if (hitTask == null) {
78	hitTask = task;
79	// task is new, add to tasklist
80	taskList.addTask(hitTask);
81	}
82	taskResults.add((AbstractTask) hitTask);
83	matchCount++;
84	}
85
86	public void accept(RepositoryTaskData taskData) throws CoreException {
87	if (taskData == null)
88	return;
89
90	if (!getProgressMonitor().isCanceled()) {
91	getProgressMonitor().subTask(getFormattedMatchesString(matchCount));
92	getProgressMonitor().worked(1);
93	}
94
95	AbstractTask task = taskFactory.createTask(taskData, new SubProgressMonitor(monitor, 1));
96	taskResults.add(task);
97	matchCount++;
98	}
99
100	public void done() {
101	if (monitor != null && !monitor.isCanceled()) {
102	// if the operation is cancelled, finish with the data that we
103	// already have
104	String matchesString = getFormattedMatchesString(matchCount);
105	monitor.setTaskName(MessageFormat.format(DONE, new Object[] { matchesString }));
106	monitor.done();
107	}
108
109	// Cut no longer used references because the collector might be re-used
110	monitor = null;
111	}
112
113	protected String getFormattedMatchesString(int count) {
114	if (count == 1) {
115	return MATCH;
116	}
117	Object[] messageFormatArgs = { new Integer(count) };
118	return MessageFormat.format(MATCHES, messageFormatArgs);
119	}
120
121	public IProgressMonitor getProgressMonitor() {
122	return monitor;
123	}
124
125	public void setProgressMonitor(IProgressMonitor monitor) {
126	this.monitor = monitor;
127	}
128
129	public Set<AbstractTask> getTaskHits() {
130	return taskResults;
131	}
132
133	public void clear() {
134	taskResults.clear();
135	}
136
137	}

Lines 11-25 Link Here

(-)src/org/eclipse/mylyn/tasks/ui/SynchronizeQueryJob.java (-74 / +109 lines)
11		11
12	package org.eclipse.mylyn.tasks.ui;	12	package org.eclipse.mylyn.tasks.ui;
13		13
		14	import java.util.Collections;
14	import java.util.Date;	15	import java.util.Date;
15	import java.util.HashSet;	16	import java.util.HashSet;
16	import java.util.Set;	17	import java.util.Set;
17		18
		19	import org.eclipse.core.runtime.CoreException;
18	import org.eclipse.core.runtime.IProgressMonitor;	20	import org.eclipse.core.runtime.IProgressMonitor;
19	import org.eclipse.core.runtime.IStatus;	21	import org.eclipse.core.runtime.IStatus;
		22	import org.eclipse.core.runtime.Platform;
20	import org.eclipse.core.runtime.Status;	23	import org.eclipse.core.runtime.Status;
21	import org.eclipse.core.runtime.SubProgressMonitor;	24	import org.eclipse.core.runtime.SubProgressMonitor;
		25	import org.eclipse.core.runtime.jobs.IJobChangeEvent;
22	import org.eclipse.core.runtime.jobs.Job;	26	import org.eclipse.core.runtime.jobs.Job;
		27	import org.eclipse.core.runtime.jobs.JobChangeAdapter;
23	import org.eclipse.mylyn.core.MylarStatusHandler;	28	import org.eclipse.mylyn.core.MylarStatusHandler;
24	import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;	29	import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
25	import org.eclipse.mylyn.monitor.core.DateUtil;	30	import org.eclipse.mylyn.monitor.core.DateUtil;
Lines 27-33 Link Here
27	import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;	32	import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
28	import org.eclipse.mylyn.tasks.core.AbstractTask;	33	import org.eclipse.mylyn.tasks.core.AbstractTask;
29	import org.eclipse.mylyn.tasks.core.QueryHitCollector;	34	import org.eclipse.mylyn.tasks.core.QueryHitCollector;
30	import org.eclipse.mylyn.tasks.core.RepositoryStatus;
31	import org.eclipse.mylyn.tasks.core.TaskList;	35	import org.eclipse.mylyn.tasks.core.TaskList;
32	import org.eclipse.mylyn.tasks.core.TaskRepository;	36	import org.eclipse.mylyn.tasks.core.TaskRepository;
33	import org.eclipse.ui.PlatformUI;	37	import org.eclipse.ui.PlatformUI;
Lines 36-87 Link Here
36	/**	40	/**
37	* @author Mik Kersten	41	* @author Mik Kersten
38	* @author Rob Elves	42	* @author Rob Elves
		43	* @author Steffen Pingel
39	*/	44	*/
40	class SynchronizeQueryJob extends Job {	45	class SynchronizeQueryJob extends Job {
41		46
42	private final AbstractRepositoryConnector connector;
43
44	private static final String JOB_LABEL = "Synchronizing queries";	47	private static final String JOB_LABEL = "Synchronizing queries";
45		48
46	private Set<AbstractRepositoryQuery> queries;	49	private final AbstractRepositoryConnector connector;
47		50
48	private Set<TaskRepository> repositories;	51	private final TaskRepository repository;
49		52
50	private boolean synchChangedTasks;	53	private final Set<AbstractRepositoryQuery> queries;
51		54
52	private TaskList taskList;	55	private final TaskList taskList;
53		56
54	// private RepositorySynchronizationManager synchronizationManager;	57	private boolean synchronizeChangedTasks;
55		58
56	private boolean forced = false;	59	private boolean forced = false;
57		60
58	public SynchronizeQueryJob(RepositorySynchronizationManager synchronizationManager,	61	private HashSet<AbstractTask> tasksToBeSynchronized = new HashSet<AbstractTask>();
59	AbstractRepositoryConnector connector, Set<AbstractRepositoryQuery> queries, TaskList taskList) {	62
		63	public SynchronizeQueryJob(AbstractRepositoryConnector connector, TaskRepository repository,
		64	Set<AbstractRepositoryQuery> queries, TaskList taskList) {
60	super(JOB_LABEL + ": " + connector.getRepositoryType());	65	super(JOB_LABEL + ": " + connector.getRepositoryType());
		66
61	this.connector = connector;	67	this.connector = connector;
		68	this.repository = repository;
62	this.queries = queries;	69	this.queries = queries;
63	this.taskList = taskList;	70	this.taskList = taskList;
64	this.repositories = new HashSet<TaskRepository>();
65	// TODO: remove once architecture established
66	// this.synchronizationManager = synchronizationManager;
67	}	71	}
68		72
69	public void setSynchChangedTasks(boolean syncChangedTasks) {	73	public void setSynchronizeChangedTasks(boolean synchronizeChangedTasks) {
70	this.synchChangedTasks = syncChangedTasks;	74	this.synchronizeChangedTasks = synchronizeChangedTasks;
71	}	75	}
72		76
73	/**	77	/**
74	* Returns true, if synchronization was triggered manually and not by an	78	* Returns true, if synchronization was triggered manually and not by an automatic background job.
75	* automatic background job.
76	*/	79	*/
77	public boolean isForced() {	80	public boolean isForced() {
78	return forced;	81	return forced;
79	}	82	}
80		83
81	/**	84	/**
82	* Indicates a manual synchronization (User initiated). If set to true, a	85	* Indicates a manual synchronization (User initiated). If set to true, a dialog will be displayed in case of
83	* dialog will be displayed in case of errors. Any tasks with missing data	86	* errors. Any tasks with missing data will be retrieved.
84	* will be retrieved.
85	*/	87	*/
86	public void setForced(boolean forced) {	88	public void setForced(boolean forced) {
87	this.forced = forced;	89	this.forced = forced;
Lines 89-163 Link Here
89		91
90	@Override	92	@Override
91	protected IStatus run(IProgressMonitor monitor) {	93	protected IStatus run(IProgressMonitor monitor) {
92	monitor.beginTask(JOB_LABEL, queries.size());	94	try {
		95	monitor.beginTask(JOB_LABEL, queries.size() + 1);
93		96
94	taskList.notifyContainersUpdated(queries);	97	Set<AbstractTask> allTasks = Collections.unmodifiableSet(taskList.getRepositoryTasks(repository.getUrl()));
95	for (AbstractRepositoryQuery repositoryQuery : queries) {
96	// taskList.notifyContainerUpdated(repositoryQuery);
97	repositoryQuery.setStatus(null);
98
99	monitor.setTaskName("Synchronizing: " + repositoryQuery.getSummary());
100	setProperty(IProgressConstants.ICON_PROPERTY, TasksUiImages.REPOSITORY_SYNCHRONIZE);
101	TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(
102	repositoryQuery.getRepositoryKind(), repositoryQuery.getRepositoryUrl());
103	if (repository == null) {
104	repositoryQuery.setStatus(RepositoryStatus.createNotFoundError(repositoryQuery.getRepositoryUrl(),
105	TasksUiPlugin.PLUGIN_ID));
106	} else {
107
108	QueryHitCollector collector = new QueryHitCollector(taskList, new TaskFactory(repository));
109	SubProgressMonitor collectorMonitor = new SubProgressMonitor(monitor, 1);
110	collector.setProgressMonitor(collectorMonitor);
111	final IStatus resultingStatus = connector.performQuery(repositoryQuery, repository, collectorMonitor,
112	collector, forced);
113
114	if (resultingStatus.getSeverity() == IStatus.CANCEL) {
115	// do nothing
116	} else if (resultingStatus.isOK()) {
117
118	if (collector.getTaskHits().size() >= QueryHitCollector.MAX_HITS) {
119	MylarStatusHandler.log(
120	QueryHitCollector.MAX_HITS_REACHED + "\n" + repositoryQuery.getSummary(), this);
121	}
122		98
123	repositoryQuery.clear();	99	// check if the repository has changed at all and have the connector mark tasks that need synchronization
124	for (AbstractTask hit : collector.getTaskHits()) {	100	try {
125	taskList.addTask(hit, repositoryQuery);	101	boolean hasChangedOrNew = connector.updateNeedsSynchronization(repository, allTasks,
		102	new SubProgressMonitor(monitor, 1));
		103	if (!hasChangedOrNew && !forced) {
		104	for (AbstractRepositoryQuery repositoryQuery : queries) {
		105	repositoryQuery.setStatus(null);
		106	repositoryQuery.setCurrentlySynchronizing(false);
		107	taskList.notifyContainersUpdated(queries);
126	}	108	}
		109	return Status.OK_STATUS;
		110	}
		111	} catch (CoreException e) {
		112	// there is no good way of informing the user at this point, just log the error
		113	MylarStatusHandler.log(e.getStatus());
		114	}
		115
		116	// synchronize queries
		117	for (AbstractRepositoryQuery repositoryQuery : queries) {
		118	repositoryQuery.setStatus(null);
		119	taskList.notifyContainersUpdated(queries);
		120
		121	synchronizeQuery(repositoryQuery, new SubProgressMonitor(monitor, 1));
		122
		123	repositoryQuery.setCurrentlySynchronizing(false);
		124	taskList.notifyContainersUpdated(queries);
		125	}
127		126
128	if (synchChangedTasks) {	127	// for background synchronizations all changed tasks are synchronized including the ones that are not part of a query
129	repositories.add(repository);	128	if (forced) {
		129	for (AbstractTask task : allTasks) {
		130	if (task.getNeedsSynchronization()) {
		131	tasksToBeSynchronized.add(task);
130	}	132	}
		133	}
		134	}
131		135
132	repositoryQuery.setLastRefreshTimeStamp(DateUtil.getFormattedDate(new Date(), "MMM d, H:mm:ss"));	136	// synchronize tasks that were marked by the connector
133	} else {	137	if (!tasksToBeSynchronized.isEmpty()) {
134	repositoryQuery.setStatus(resultingStatus);	138	TasksUiPlugin.getSynchronizationManager().synchronize(connector, tasksToBeSynchronized, forced,
135	if (isForced()) {	139	new JobChangeAdapter() {
136	PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {	140	@Override
137	public void run() {	141	public void done(IJobChangeEvent event) {
138	MylarStatusHandler.displayStatus("Query Synchronization Failed", resultingStatus);	142	if (!Platform.isRunning() \|\| TasksUiPlugin.getRepositoryManager() == null) {
		143	return;
		144	}
		145	TasksUiPlugin.getRepositoryManager().setSyncTime(repository,
		146	connector.getSynchronizationTimestamp(repository, tasksToBeSynchronized),
		147	TasksUiPlugin.getDefault().getRepositoriesFilePath());
139	}	148	}
140	});	149	});
141	}
142	}
143	}	150	}
144		151
145	repositoryQuery.setCurrentlySynchronizing(false);	152	// HACK: force entire Task List to refresh in case containers need to
146	taskList.notifyContainersUpdated(queries);	153	// appear or disappear
147	// taskList.notifyContainerUpdated(repositoryQuery);	154	// FIXME taskList.notifyContainersUpdated(null);
		155
		156	return Status.OK_STATUS;
		157	} finally {
		158	monitor.done();
148	}	159	}
		160	}
149		161
150	for (TaskRepository repository : repositories) {	162	private void synchronizeQuery(AbstractRepositoryQuery repositoryQuery, IProgressMonitor monitor) {
151	TasksUiPlugin.getSynchronizationManager().synchronizeChanged(connector, repository);	163	monitor.setTaskName("Synchronizing: " + repositoryQuery.getSummary());
152	}	164	setProperty(IProgressConstants.ICON_PROPERTY, TasksUiImages.REPOSITORY_SYNCHRONIZE);
		165
		166	QueryHitCollector collector = new QueryHitCollector(taskList, new TaskFactory(repository));
		167
		168	final IStatus resultingStatus = connector.performQuery(repositoryQuery, repository, monitor, collector);
		169	if (resultingStatus.getSeverity() == IStatus.CANCEL) {
		170	// do nothing
		171	} else if (resultingStatus.isOK()) {
		172	if (collector.getTaskHits().size() >= QueryHitCollector.MAX_HITS) {
		173	MylarStatusHandler.log(QueryHitCollector.MAX_HITS_REACHED + "\n" + repositoryQuery.getSummary(), this);
		174	}
153		175
154	// HACK: force entire Task List to refresh in case containers need to	176	repositoryQuery.clear();
155	// appear or disappear
156	taskList.notifyContainersUpdated(null);
157		177
158	monitor.done();	178	for (AbstractTask hit : collector.getTaskHits()) {
		179	taskList.addTask(hit, repositoryQuery);
		180	if (synchronizeChangedTasks && hit.getNeedsSynchronization()) {
		181	tasksToBeSynchronized.add(hit);
		182	}
		183	}
159		184
160	return Status.OK_STATUS;	185	repositoryQuery.setLastRefreshTimeStamp(DateUtil.getFormattedDate(new Date(), "MMM d, H:mm:ss"));
		186	} else {
		187	repositoryQuery.setStatus(resultingStatus);
		188	if (isForced()) {
		189	PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
		190	public void run() {
		191	MylarStatusHandler.displayStatus("Query Synchronization Failed", resultingStatus);
		192	}
		193	});
		194	}
		195	}
161	}	196	}
162		197
163	}	198	}

Lines 12-28 Link Here

(-)src/org/eclipse/mylyn/tasks/ui/RepositorySynchronizationManager.java (-76 / +20 lines)
12	import java.util.HashSet;	12	import java.util.HashSet;
13	import java.util.Set;	13	import java.util.Set;
14		14
15	import org.eclipse.core.runtime.CoreException;
16	import org.eclipse.core.runtime.IProgressMonitor;
17	import org.eclipse.core.runtime.IStatus;
18	import org.eclipse.core.runtime.NullProgressMonitor;	15	import org.eclipse.core.runtime.NullProgressMonitor;
19	import org.eclipse.core.runtime.Platform;
20	import org.eclipse.core.runtime.Status;
21	import org.eclipse.core.runtime.jobs.IJobChangeEvent;
22	import org.eclipse.core.runtime.jobs.IJobChangeListener;	16	import org.eclipse.core.runtime.jobs.IJobChangeListener;
23	import org.eclipse.core.runtime.jobs.ISchedulingRule;	17	import org.eclipse.core.runtime.jobs.ISchedulingRule;
24	import org.eclipse.core.runtime.jobs.Job;	18	import org.eclipse.core.runtime.jobs.Job;
25	import org.eclipse.core.runtime.jobs.JobChangeAdapter;
26	import org.eclipse.mylyn.core.MylarStatusHandler;	19	import org.eclipse.mylyn.core.MylarStatusHandler;
27	import org.eclipse.mylyn.internal.tasks.core.TaskDataManager;	20	import org.eclipse.mylyn.internal.tasks.core.TaskDataManager;
28	import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;	21	import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
Lines 103-124 Link Here
103	*/	96	*/
104	public final Job synchronize(AbstractRepositoryConnector connector, final AbstractRepositoryQuery repositoryQuery,	97	public final Job synchronize(AbstractRepositoryConnector connector, final AbstractRepositoryQuery repositoryQuery,
105	IJobChangeListener listener, boolean forceSync) {	98	IJobChangeListener listener, boolean forceSync) {
106	HashSet<AbstractRepositoryQuery> items = new HashSet<AbstractRepositoryQuery>();	99	TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(
107	items.add(repositoryQuery);	100	repositoryQuery.getRepositoryKind(), repositoryQuery.getRepositoryUrl());
108	return synchronize(connector, items, listener, Job.LONG, 0, true, forceSync);	101	return synchronize(connector, repository, Collections.singleton(repositoryQuery), listener, Job.LONG, 0, forceSync);
109	}	102	}
110		103
111	public final Job synchronize(AbstractRepositoryConnector connector,	104	public final Job synchronize(AbstractRepositoryConnector connector, TaskRepository repository,
112	final Set<AbstractRepositoryQuery> repositoryQueries, final IJobChangeListener listener, int priority,	105	final Set<AbstractRepositoryQuery> repositoryQueries, final IJobChangeListener listener, int priority,
113	long delay, boolean syncChangedTasks, boolean userForcedSync) {	106	long delay, boolean userForcedSync) {
114	TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();	107	TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
115	final SynchronizeQueryJob job = new SynchronizeQueryJob(this, connector, repositoryQueries, taskList);
116	job.setSynchChangedTasks(syncChangedTasks);
117	job.setForced(userForcedSync);
118	for (AbstractRepositoryQuery repositoryQuery : repositoryQueries) {	108	for (AbstractRepositoryQuery repositoryQuery : repositoryQueries) {
119	repositoryQuery.setCurrentlySynchronizing(true);	109	repositoryQuery.setCurrentlySynchronizing(true);
120	// TasksUiPlugin.getTaskListManager().getTaskList().notifyContainerUpdated(repositoryQuery);	110	// TasksUiPlugin.getTaskListManager().getTaskList().notifyContainerUpdated(repositoryQuery);
121	}	111	}
		112
		113	final SynchronizeQueryJob job = new SynchronizeQueryJob(connector, repository, repositoryQueries, taskList);
		114	job.setSynchronizeChangedTasks(true);
		115	job.setForced(userForcedSync);
122	if (listener != null) {	116	if (listener != null) {
123	job.addJobChangeListener(listener);	117	job.addJobChangeListener(listener);
124	}	118	}
Lines 145-214 Link Here
145	* TaskRepository.syncTime.	139	* TaskRepository.syncTime.
146	*/	140	*/
147	public final void synchronizeChanged(final AbstractRepositoryConnector connector, final TaskRepository repository) {	141	public final void synchronizeChanged(final AbstractRepositoryConnector connector, final TaskRepository repository) {
148	if (connector.getTaskDataHandler() != null) {	142	final SynchronizeChangedTasksJob synchronizeChangedTasksJob = new SynchronizeChangedTasksJob(connector, repository);
149	final SynchronizeChangedTasksJob getChangedTasksJob = new SynchronizeChangedTasksJob(connector, repository);	143	synchronizeChangedTasksJob.setSystem(true);
150	getChangedTasksJob.setSystem(true);	144	synchronizeChangedTasksJob.setRule(new RepositoryMutexRule(repository));
151	getChangedTasksJob.setRule(new RepositoryMutexRule(repository));	145	if (!forceSyncExecForTesting) {
152	if (!forceSyncExecForTesting) {	146	synchronizeChangedTasksJob.schedule();
153	getChangedTasksJob.schedule();	147	} else {
154	} else {	148	PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() {
155	PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() {	149	public void run() {
156	public void run() {	150	synchronizeChangedTasksJob.run(new NullProgressMonitor());
157	getChangedTasksJob.run(new NullProgressMonitor());	151	}
158	}	152	});
159	});
160	}
161	}	153	}
162	}	154	}
163		155
164	private class SynchronizeChangedTasksJob extends Job {
165
166	private AbstractRepositoryConnector connector;
167
168	private TaskRepository repository;
169
170	private Set<AbstractTask> changedTasks;
171
172	public SynchronizeChangedTasksJob(AbstractRepositoryConnector connector, TaskRepository repository) {
173	super("Get Changed Tasks");
174	this.connector = connector;
175	this.repository = repository;
176	}
177
178	@Override
179	public IStatus run(IProgressMonitor monitor) {
180	TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
181	Set<AbstractTask> repositoryTasks = Collections.unmodifiableSet(taskList
182	.getRepositoryTasks(repository.getUrl()));
183
184	try {
185	changedTasks = connector.getChangedSinceLastSync(repository, repositoryTasks, monitor);
186
187	if (changedTasks == null \|\| changedTasks.size() == 0) {
188	return Status.OK_STATUS;
189	}
190
191	synchronize(connector, changedTasks, false, new JobChangeAdapter() {
192
193	@Override
194	public void done(IJobChangeEvent event) {
195	if (!Platform.isRunning() \|\| TasksUiPlugin.getRepositoryManager() == null) {
196	return;
197	}
198	TasksUiPlugin.getRepositoryManager().setSyncTime(repository,
199	connector.getLastSyncTimestamp(repository, changedTasks),
200	TasksUiPlugin.getDefault().getRepositoriesFilePath());
201	}
202	});
203
204	} catch (final CoreException e) {
205	// ignore, indicates working offline
206	// error reported in ui (tooltip and warning icon)
207	}
208	return Status.OK_STATUS;
209	};
210	};
211
212	/**	156	/**
213	* @param repositoryTask	157	* @param repositoryTask
214	* task that changed	158	* task that changed

Lines 26-53 Link Here

(-)src/org/eclipse/mylyn/tasks/ui/TaskFactory.java (-9 / +17 lines)
26	*/	26	*/
27	public class TaskFactory implements ITaskFactory {	27	public class TaskFactory implements ITaskFactory {
28		28
29	private AbstractRepositoryConnector connector;	29	private final AbstractRepositoryConnector connector;
30		30
31	private RepositorySynchronizationManager synchManager;	31	private final RepositorySynchronizationManager synchManager;
32		32
33	private TaskRepository repository;	33	private final TaskRepository repository;
34		34
35	private TaskList taskList;	35	private final TaskList taskList;
36		36
37	//private TaskDataManager dataManager;	37	//private TaskDataManager dataManager;
38		38
39	private ITaskDataHandler dataHandler;	39	private final ITaskDataHandler dataHandler;
40		40
41	public TaskFactory(TaskRepository repository) {	41	private final boolean updateTasklist;
		42
		43	private final boolean forced;
		44
		45	public TaskFactory(TaskRepository repository, boolean updateTasklist, boolean forced) {
42	this.repository = repository;	46	this.repository = repository;
		47	this.updateTasklist = updateTasklist;
		48	this.forced = forced;
43	connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(repository.getKind());	49	connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(repository.getKind());
44	synchManager = TasksUiPlugin.getSynchronizationManager();	50	synchManager = TasksUiPlugin.getSynchronizationManager();
45	taskList = TasksUiPlugin.getTaskListManager().getTaskList();	51	taskList = TasksUiPlugin.getTaskListManager().getTaskList();
46	//dataManager = TasksUiPlugin.getDefault().getTaskDataManager();	52	//dataManager = TasksUiPlugin.getDefault().getTaskDataManager();
47	dataHandler = connector.getTaskDataHandler();	53	dataHandler = connector.getTaskDataHandler();
48
49	}	54	}
50		55
		56	public TaskFactory(TaskRepository repository) {
		57	this(repository, true, false);
		58	}
		59
51	/**	60	/**
52	* @param updateTasklist -	61	* @param updateTasklist -
53	* synchronize task with the provided taskData	62	* synchronize task with the provided taskData
Lines 55-62 Link Here
55	* user requested synchronization	64	* user requested synchronization
56	* @throws CoreException	65	* @throws CoreException
57	*/	66	*/
58	public AbstractTask createTask(RepositoryTaskData taskData, boolean updateTasklist, boolean forced,	67	public AbstractTask createTask(RepositoryTaskData taskData, IProgressMonitor monitor) throws CoreException {
59	IProgressMonitor monitor) throws CoreException {
60	AbstractTask repositoryTask = taskList.getTask(taskData.getRepositoryUrl(), taskData.getId());	68	AbstractTask repositoryTask = taskList.getTask(taskData.getRepositoryUrl(), taskData.getId());
61	if (repositoryTask == null) {	69	if (repositoryTask == null) {
62		70

Lines 79-97 Link Here

(-)src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java (-22 / +34 lines)
79		79
80	public void testGetChangedSinceLastSyncWeb096() throws Exception {	80	public void testGetChangedSinceLastSyncWeb096() throws Exception {
81	init(TracTestConstants.TEST_TRAC_096_URL, Version.TRAC_0_9);	81	init(TracTestConstants.TEST_TRAC_096_URL, Version.TRAC_0_9);
82	TracTask task = (TracTask) connector.createTaskFromExistingId(repository, data.offlineHandlerTicketId + "", new NullProgressMonitor());	82	TracTask task = (TracTask) connector.createTaskFromExistingId(repository, data.offlineHandlerTicketId + "",
		83	new NullProgressMonitor());
83		84
84	Set<AbstractTask> tasks = new HashSet<AbstractTask>();	85	Set<AbstractTask> tasks = new HashSet<AbstractTask>();
85	tasks.add(task);	86	tasks.add(task);
86		87
87	assertEquals(null, repository.getSyncTimeStamp());	88	assertEquals(null, repository.getSyncTimeStamp());
88	Set<AbstractTask> result = connector.getChangedSinceLastSync(repository, tasks, new NullProgressMonitor());	89	boolean changed = connector.updateNeedsSynchronization(repository, tasks, new NullProgressMonitor());
89	assertEquals(tasks, result);	90	assertEquals(true, changed);
90	assertEquals(null, repository.getSyncTimeStamp());	91	assertEquals(null, repository.getSyncTimeStamp());
91		92	assertFalse(task.getNeedsSynchronization());
92	int time = (int)(System.currentTimeMillis() / 1000) + 1;	93
		94	int time = (int) (System.currentTimeMillis() / 1000) + 1;
93	repository.setSyncTimeStamp(time + "");	95	repository.setSyncTimeStamp(time + "");
94	assertEquals(tasks, result);	96	changed = connector.updateNeedsSynchronization(repository, tasks, new NullProgressMonitor());
		97	assertEquals(true, changed);
		98	assertFalse(task.getNeedsSynchronization());
95	}	99	}
96		100
97	public void testGetChangedSinceLastSyncXmlRpc010() throws Exception {	101	public void testGetChangedSinceLastSyncXmlRpc010() throws Exception {
Lines 105-132 Link Here
105	}	109	}
106		110
107	private void getChangedSinceLastSync() throws Exception {	111	private void getChangedSinceLastSync() throws Exception {
108	TracTask task = (TracTask) connector.createTaskFromExistingId(repository, data.offlineHandlerTicketId + "", new NullProgressMonitor());	112	TracTask task = (TracTask) connector.createTaskFromExistingId(repository, data.offlineHandlerTicketId + "",
		113	new NullProgressMonitor());
109	TasksUiPlugin.getSynchronizationManager().synchronize(connector, task, true, null);	114	TasksUiPlugin.getSynchronizationManager().synchronize(connector, task, true, null);
110	RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getHandleIdentifier());	115	RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(
111		116	task.getHandleIdentifier());
		117
112	int lastModified = Integer.parseInt(taskData.getLastModified());	118	int lastModified = Integer.parseInt(taskData.getLastModified());
113		119
114	Set<AbstractTask> tasks = new HashSet<AbstractTask>();	120	Set<AbstractTask> tasks = new HashSet<AbstractTask>();
115	tasks.add(task);	121	tasks.add(task);
116		122
117	assertEquals(null, repository.getSyncTimeStamp());	123	assertEquals(null, repository.getSyncTimeStamp());
118	Set<AbstractTask> result = connector.getChangedSinceLastSync(repository, tasks, new NullProgressMonitor());	124	boolean changed = connector.updateNeedsSynchronization(repository, tasks, new NullProgressMonitor());
119	assertEquals(tasks, result);	125	assertTrue(changed);
		126	assertTrue(task.getNeedsSynchronization());
120		127
121	// always returns the ticket because time comparison mode is >=	128	// always returns the ticket because time comparison mode is >=
		129	task.setNeedsSynchronization(false);
122	repository.setSyncTimeStamp(lastModified + "");	130	repository.setSyncTimeStamp(lastModified + "");
123	result = connector.getChangedSinceLastSync(repository, tasks, new NullProgressMonitor());	131	changed = connector.updateNeedsSynchronization(repository, tasks, new NullProgressMonitor());
124	assertEquals(tasks, result);	132	assertTrue(changed);
		133	assertTrue(task.getNeedsSynchronization());
125		134
		135	task.setNeedsSynchronization(false);
126	repository.setSyncTimeStamp((lastModified + 1) + "");	136	repository.setSyncTimeStamp((lastModified + 1) + "");
127	result = connector.getChangedSinceLastSync(repository, tasks, new NullProgressMonitor());	137	changed = connector.updateNeedsSynchronization(repository, tasks, new NullProgressMonitor());
128	assertTrue(result.isEmpty());	138	assertTrue(changed);
129		139	assertFalse(task.getNeedsSynchronization());
		140
130	// change ticket making sure it gets a new change time	141	// change ticket making sure it gets a new change time
131	Thread.sleep(1000);	142	Thread.sleep(1000);
132	ITracClient client = connector.getClientManager().getRepository(repository);	143	ITracClient client = connector.getClientManager().getRepository(repository);
Lines 138-148 Link Here
138	}	149	}
139	client.updateTicket(ticket, "comment");	150	client.updateTicket(ticket, "comment");
140		151
		152	task.setNeedsSynchronization(false);
141	repository.setSyncTimeStamp((lastModified + 1) + "");	153	repository.setSyncTimeStamp((lastModified + 1) + "");
142	result = connector.getChangedSinceLastSync(repository, tasks, new NullProgressMonitor());	154	changed = connector.updateNeedsSynchronization(repository, tasks, new NullProgressMonitor());
143	assertEquals(tasks, result);	155	assertTrue(changed);
		156	assertTrue(task.getNeedsSynchronization());
144	}	157	}
145		158
146	public void testNonNumericTaskId() {	159	public void testNonNumericTaskId() {
147	try {	160	try {
148	connector.getTaskDataHandler().getTaskData(repository, "abc", new NullProgressMonitor());	161	connector.getTaskDataHandler().getTaskData(repository, "abc", new NullProgressMonitor());
Lines 150-155 Link Here
150	} catch (CoreException e) {	163	} catch (CoreException e) {
151	}	164	}
152	}	165	}
153
154		166
155	}	167	}

Lines 81-87 Link Here

(-)src/org/eclipse/mylyn/internal/jira/ui/JiraTaskDataHandler.java (-17 / +34 lines)
81	}	81	}
82	Issue jiraIssue = getJiraIssue(server, taskId, repository.getUrl());	82	Issue jiraIssue = getJiraIssue(server, taskId, repository.getUrl());
83	if (jiraIssue != null) {	83	if (jiraIssue != null) {
84	return createTaskData(repository, server, jiraIssue);	84	return createTaskData(repository, server, jiraIssue, null);
85	}	85	}
86	throw new CoreException(new org.eclipse.core.runtime.Status(IStatus.ERROR, JiraCorePlugin.ID, IStatus.OK,	86	throw new CoreException(new org.eclipse.core.runtime.Status(IStatus.ERROR, JiraCorePlugin.ID, IStatus.OK,
87	"JIRA ticket not found: " + taskId, null));	87	"JIRA ticket not found: " + taskId, null));
Lines 91-103 Link Here
91	}	91	}
92	}	92	}
93		93
94	protected RepositoryTaskData createTaskData(TaskRepository repository, JiraClient server, Issue jiraIssue)	94	protected RepositoryTaskData createTaskData(TaskRepository repository, JiraClient server, Issue jiraIssue, RepositoryTaskData oldTaskData)
95	throws JiraException {	95	throws JiraException {
96	RepositoryTaskData data = new RepositoryTaskData(attributeFactory, JiraUiPlugin.REPOSITORY_KIND, repository	96	RepositoryTaskData data = new RepositoryTaskData(attributeFactory, JiraUiPlugin.REPOSITORY_KIND, repository
97	.getUrl(), jiraIssue.getId());	97	.getUrl(), jiraIssue.getId());
98	initializeTaskData(data, server, jiraIssue.getProject());	98	initializeTaskData(data, server, jiraIssue.getProject());
99	updateTaskData(data, jiraIssue, server);	99	updateTaskData(data, jiraIssue, server, oldTaskData);
100	addOperations(data, jiraIssue, server);	100	addOperations(data, jiraIssue, server, oldTaskData);
101	return data;	101	return data;
102	}	102	}
103		103
Lines 169-175 Link Here
169	return data.getAttribute(key);	169	return data.getAttribute(key);
170	}	170	}
171		171
172	public void updateTaskData(RepositoryTaskData data, Issue jiraIssue, JiraClient server) throws JiraException {	172	private void updateTaskData(RepositoryTaskData data, Issue jiraIssue, JiraClient server, RepositoryTaskData oldTaskData) throws JiraException {
173	String parentKey = jiraIssue.getParentKey();	173	String parentKey = jiraIssue.getParentKey();
174	if (parentKey != null) {	174	if (parentKey != null) {
175	data.setAttributeValue(JiraAttributeFactory.ATTRIBUTE_ISSUE_PARENT_KEY, parentKey);	175	data.setAttributeValue(JiraAttributeFactory.ATTRIBUTE_ISSUE_PARENT_KEY, parentKey);
Lines 330-347 Link Here
330		330
331	// TODO move into server configuration and populate lazily	331	// TODO move into server configuration and populate lazily
332	HashSet<String> editableKeys = new HashSet<String>();	332	HashSet<String> editableKeys = new HashSet<String>();
333	try {	333	if (oldTaskData != null) {
334	RepositoryTaskAttribute[] editableAttributes = server.getEditableAttributes(jiraIssue.getKey());	334	// avoid server round-trips
335	if (editableAttributes != null) {	335	for (RepositoryTaskAttribute attribute : oldTaskData.getAttributes()) {
336	// System.err.println(data.getTaskKey());	336	if (!attribute.isReadOnly()) {
337	for (RepositoryTaskAttribute attribute : editableAttributes) {	337	editableKeys.add(attribute.getID());
338	// System.err.println(" " + attribute.getID() + " : " +
339	// attribute.getName());
340	editableKeys.add(attributeFactory.mapCommonAttributeKey(attribute.getID()));
341	}	338	}
		339	}
		340	} else {
		341	try {
		342	RepositoryTaskAttribute[] editableAttributes = server.getEditableAttributes(jiraIssue.getKey());
		343	if (editableAttributes != null) {
		344	// System.err.println(data.getTaskKey());
		345	for (RepositoryTaskAttribute attribute : editableAttributes) {
		346	// System.err.println(" " + attribute.getID() + " : " +
		347	// attribute.getName());
		348	editableKeys.add(attributeFactory.mapCommonAttributeKey(attribute.getID()));
		349	}
		350	}
		351	} catch (JiraInsufficientPermissionException ex) {
		352	// ignore
342	}	353	}
343	} catch (JiraInsufficientPermissionException ex) {
344	// ignore
345	}	354	}
346		355
347	for (RepositoryTaskAttribute attribute : data.getAttributes()) {	356	for (RepositoryTaskAttribute attribute : data.getAttributes()) {
Lines 419-427 Link Here
419	}	428	}
420	}	429	}
421		430
422	public void addOperations(RepositoryTaskData data, Issue issue, JiraClient server) throws JiraException {	431	public void addOperations(RepositoryTaskData data, Issue issue, JiraClient server, RepositoryTaskData oldTaskData) throws JiraException {
423	Status status = issue.getStatus();	432	// avoid server round-trips
		433	if (oldTaskData != null) {
		434	for (RepositoryOperation operation : oldTaskData.getOperations()) {
		435	data.addOperation(operation);
		436	}
		437	return;
		438	}
424		439
		440	Status status = issue.getStatus();
		441
425	RepositoryOperation leaveOperation = new RepositoryOperation(LEAVE_OPERATION, "Leave as "	442	RepositoryOperation leaveOperation = new RepositoryOperation(LEAVE_OPERATION, "Leave as "
426	+ issue.getStatus().getName());	443	+ issue.getStatus().getName());
427	leaveOperation.setChecked(true);	444	leaveOperation.setChecked(true);

Lines 15-21 Link Here

(-)src/org/eclipse/mylyn/internal/jira/ui/JiraRepositoryConnector.java (-43 / +53 lines)
15	import java.text.SimpleDateFormat;	15	import java.text.SimpleDateFormat;
16	import java.util.ArrayList;	16	import java.util.ArrayList;
17	import java.util.Calendar;	17	import java.util.Calendar;
18	import java.util.Collections;
19	import java.util.Date;	18	import java.util.Date;
20	import java.util.HashSet;	19	import java.util.HashSet;
21	import java.util.List;	20	import java.util.List;
Lines 41-57 Link Here
41	import org.eclipse.mylyn.internal.jira.core.model.filter.RelativeDateRangeFilter.RangeType;	40	import org.eclipse.mylyn.internal.jira.core.model.filter.RelativeDateRangeFilter.RangeType;
42	import org.eclipse.mylyn.internal.jira.core.service.JiraClient;	41	import org.eclipse.mylyn.internal.jira.core.service.JiraClient;
43	import org.eclipse.mylyn.internal.jira.core.service.JiraException;	42	import org.eclipse.mylyn.internal.jira.core.service.JiraException;
		43	import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil;
44	import org.eclipse.mylyn.tasks.core.AbstractAttributeFactory;	44	import org.eclipse.mylyn.tasks.core.AbstractAttributeFactory;
45	import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;	45	import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
46	import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;	46	import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
47	import org.eclipse.mylyn.tasks.core.AbstractTask;	47	import org.eclipse.mylyn.tasks.core.AbstractTask;
48	import org.eclipse.mylyn.tasks.core.IAttachmentHandler;	48	import org.eclipse.mylyn.tasks.core.IAttachmentHandler;
		49	import org.eclipse.mylyn.tasks.core.ITaskCollector;
49	import org.eclipse.mylyn.tasks.core.ITaskDataHandler;	50	import org.eclipse.mylyn.tasks.core.ITaskDataHandler;
50	import org.eclipse.mylyn.tasks.core.QueryHitCollector;	51	import org.eclipse.mylyn.tasks.core.QueryHitCollector;
51	import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute;	52	import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute;
52	import org.eclipse.mylyn.tasks.core.RepositoryTaskData;	53	import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
53	import org.eclipse.mylyn.tasks.core.TaskRepository;	54	import org.eclipse.mylyn.tasks.core.TaskRepository;
54	import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel;	55	import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel;
		56	import org.eclipse.mylyn.tasks.ui.TaskFactory;
55	import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;	57	import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
56		58
57	/**	59	/**
Lines 109-115 Link Here
109		111
110	@Override	112	@Override
111	public IStatus performQuery(AbstractRepositoryQuery repositoryQuery, TaskRepository repository,	113	public IStatus performQuery(AbstractRepositoryQuery repositoryQuery, TaskRepository repository,
112	IProgressMonitor monitor, QueryHitCollector resultCollector, boolean forced) {	114	IProgressMonitor monitor, ITaskCollector resultCollector) {
113	JiraClient client = JiraClientFacade.getDefault().getJiraClient(repository);	115	JiraClient client = JiraClientFacade.getDefault().getJiraClient(repository);
114		116
115	Query filter;	117	Query filter;
Lines 143-152 Link Here
143	try {	145	try {
144	int n = 0;	146	int n = 0;
145	for (Issue issue : issues) {	147	for (Issue issue : issues) {
146	if(monitor.isCanceled()) return Status.CANCEL_STATUS;	148	if (monitor.isCanceled())
		149	return Status.CANCEL_STATUS;
147		150
148	monitor.subTask(n++ + "/" + issues.size() +" " + issue.getKey() + " " + issue.getSummary());	151	monitor.subTask(++n + "/" + issues.size() + " " + issue.getKey() + " " + issue.getSummary());
149	resultCollector.accept(offlineHandler.createTaskData(repository, client, issue));	152	String handle = RepositoryTaskHandleUtil.getHandle(repository.getUrl(), issue.getId());
		153	RepositoryTaskData oldTaskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(handle);
		154	resultCollector.accept(offlineHandler.createTaskData(repository, client, issue, oldTaskData));
150	}	155	}
151	return Status.OK_STATUS;	156	return Status.OK_STATUS;
152	} catch (JiraException e) {	157	} catch (JiraException e) {
Lines 156-164 Link Here
156	}	161	}
157	}	162	}
158		163
159	public Set<AbstractTask> getChangedSinceLastSync(TaskRepository repository,	164	@Override
160	Set<AbstractTask> tasks, IProgressMonitor monitor) throws CoreException {	165	public boolean updateNeedsSynchronization(TaskRepository repository, Set<AbstractTask> tasks,
161		166	IProgressMonitor monitor) throws CoreException {
162	String dateString = repository.getSyncTimeStamp();	167	String dateString = repository.getSyncTimeStamp();
163	Date lastSyncDate = convertDate(dateString);	168	Date lastSyncDate = convertDate(dateString);
164	if (lastSyncDate == null) {	169	if (lastSyncDate == null) {
Lines 170-228 Link Here
170	}	175	}
171	}	176	}
172	if (lastSyncDate == null) {	177	if (lastSyncDate == null) {
173	return tasks;	178	for (AbstractTask task : tasks) {
		179	task.setNeedsSynchronization(true);
		180	}
		181	return true;
174	}	182	}
175		183
176	long mil = lastSyncDate.getTime();	184	long mil = lastSyncDate.getTime();
177	long now = Calendar.getInstance().getTimeInMillis();	185	long now = Calendar.getInstance().getTimeInMillis();
178	if (now - mil <= 0) {	186	if (now - mil <= 0) {
179	return Collections.emptySet();	187	return false;
180	}	188	}
181	long minutes = -1 * ((now - mil) / (1000 * 60));	189	long minutes = -1 * ((now - mil) / (1000 * 60));
182	if (minutes == 0) {	190	if (minutes == 0) {
183	return Collections.emptySet();	191	return false;
184	}	192	}
185		193
186	FilterDefinition changedFilter = new FilterDefinition("Changed Tasks");	194	FilterDefinition changedFilter = new FilterDefinition("Changed Tasks");
187	changedFilter.setUpdatedDateFilter(new RelativeDateRangeFilter(RangeType.MINUTE, minutes));	195	changedFilter.setUpdatedDateFilter(new RelativeDateRangeFilter(RangeType.MINUTE, minutes));
188	changedFilter.setOrdering(new Order[] { new Order(Order.Field.UPDATED, false) });	196	changedFilter.setOrdering(new Order[] { new Order(Order.Field.UPDATED, false) });
189
190	final List<Issue> issues = new ArrayList<Issue>();
191	// unlimited maxHits can create crazy amounts of traffic
192	JiraIssueCollector collector = new JiraIssueCollector(new NullProgressMonitor(), issues, 500);
193	JiraClient client = JiraClientFacade.getDefault().getJiraClient(repository);
194
195	// TODO: Need some way to further scope this query	197	// TODO: Need some way to further scope this query
196		198
		199	List<Issue> issues = new ArrayList<Issue>();
		200	JiraClient client = JiraClientFacade.getDefault().getJiraClient(repository);
		201	// unlimited maxHits can create crazy amounts of traffic
		202	JiraIssueCollector issueCollector = new JiraIssueCollector(new NullProgressMonitor(), issues, 500);
197	try {	203	try {
198	// XXX: disabled work around	204	client.search(changedFilter, issueCollector);
199	// TODO: remove, added to re-open connection, bug 164543
200	// jiraServer.getServerInfo();
201	// Will get ALL issues that have changed since lastSyncDate
202	client.search(changedFilter, collector);
203	} catch (JiraException e) {
204	throw new CoreException(JiraCorePlugin.toStatus(repository, e));
205	}
206		205
207	Set<AbstractTask> changedTasks = new HashSet<AbstractTask>();	206	if (issues.isEmpty()) {
208	for (Issue issue : issues) {	207	return false; // no hits
209	// String handle =
210	// AbstractTask.getHandle(repository.getUrl(),
211	// issue.getId());
212	AbstractTask task = TasksUiPlugin.getTaskListManager().getTaskList().getTask(repository.getUrl(), issue.getId());
213	if (task instanceof AbstractTask) {
214	changedTasks.add((AbstractTask) task);
215	}	208	}
216		209
217	if (issue.getUpdated() != null && issue.getUpdated().after(lastSyncDate)) {	210	int n = 0;
218	lastSyncDate = issue.getUpdated();	211	TaskFactory factory = new TaskFactory(repository);
		212	for (Issue issue : issues) {
		213	AbstractTask task = TasksUiPlugin.getTaskListManager().getTaskList().getTask(repository.getUrl(),
		214	issue.getId());
		215	if (!tasks.contains(task)) {
		216	continue;
		217	}
		218
		219	monitor.subTask(++n + "/" + issues.size() + " " + issue.getKey() + " " + issue.getSummary());
		220	String handle = RepositoryTaskHandleUtil.getHandle(repository.getUrl(), issue.getId());
		221	RepositoryTaskData oldTaskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(handle);
		222	RepositoryTaskData taskData = offlineHandler.createTaskData(repository, client, issue, oldTaskData);
		223	factory.createTask(taskData, new NullProgressMonitor());
		224
		225	if (issue.getUpdated() != null && issue.getUpdated().after(lastSyncDate)) {
		226	lastSyncDate = issue.getUpdated();
		227	}
219	}	228	}
220	}
221		229
222	repository.setSyncTimeStamp( //	230	repository.setSyncTimeStamp( //
223	new SimpleDateFormat(JiraAttributeFactory.JIRA_DATE_FORMAT, Locale.US).format(lastSyncDate));	231	new SimpleDateFormat(JiraAttributeFactory.JIRA_DATE_FORMAT, Locale.US).format(lastSyncDate));
224		232
225	return changedTasks;	233	return true;
		234	} catch (JiraException e) {
		235	throw new CoreException(JiraCorePlugin.toStatus(repository, e));
		236	}
226	}	237	}
227		238
228	private Date convertDate(String dateString) {	239	private Date convertDate(String dateString) {
Lines 238-245 Link Here
238	}	249	}
239		250
240	@Override	251	@Override
241	public String getLastSyncTimestamp(TaskRepository repository, Set<AbstractTask> changedTasks) {	252	public String getSynchronizationTimestamp(TaskRepository repository, Set<AbstractTask> changedTasks) {
242	// XXX to late for JIRA to calcualate the timestamp: bug 176934	253	// the timestamp is updated in updateNeedsSynchronization()
243	return repository.getSyncTimeStamp();	254	return repository.getSyncTimeStamp();
244	}	255	}
245		256
Lines 372-379 Link Here
372	jiraTask.setTaskUrl(getTaskUrl(repository.getUrl(), repositoryTask.getTaskKey()));	383	jiraTask.setTaskUrl(getTaskUrl(repository.getUrl(), repositoryTask.getTaskKey()));
373		384
374	JiraClient client = JiraClientFacade.getDefault().getJiraClient(repository);	385	JiraClient client = JiraClientFacade.getDefault().getJiraClient(repository);
375	jiraTask.setPriority(getMylarPriority(client, taskData.getAttributeValue(RepositoryTaskAttribute.PRIORITY))	386	jiraTask.setPriority(getMylarPriority(client, taskData.getAttributeValue(RepositoryTaskAttribute.PRIORITY)).toString());
376	.toString());
377	for (org.eclipse.mylyn.internal.jira.core.model.Status status : client.getStatuses()) {	387	for (org.eclipse.mylyn.internal.jira.core.model.Status status : client.getStatuses()) {
378	if (status.getName().equals(taskData.getAttributeValue(RepositoryTaskAttribute.STATUS))) {	388	if (status.getName().equals(taskData.getAttributeValue(RepositoryTaskAttribute.STATUS))) {
379	if (isCompleted(status)) {	389	if (isCompleted(status)) {