Attachment #169740 for bug #263528

Lines 30-35 Link Here

(-)plugin.xml (+3 lines)
30		30
31	<taskListMigrator	31	<taskListMigrator
32	class="org.eclipse.mylyn.internal.bugzilla.ui.tasklist.BugzillaTaskListMigrator"/>	32	class="org.eclipse.mylyn.internal.bugzilla.ui.tasklist.BugzillaTaskListMigrator"/>
		33	<repositoryMigrator
		34	class="org.eclipse.mylyn.internal.bugzilla.ui.tasklist.BugzillaRepositoryMigrator">
		35	</repositoryMigrator>
33	</extension>	36	</extension>
34	<extension	37	<extension
35	point="org.eclipse.mylyn.bugzilla.core.languages">	38	point="org.eclipse.mylyn.bugzilla.core.languages">




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

package org.eclipse.mylyn.internal.bugzilla.ui.tasklist;

import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
import org.eclipse.mylyn.internal.tasks.core.IRepositoryConstants;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryMigrator;
import org.eclipse.mylyn.tasks.core.TaskRepository;

/**
 * @author Robert Elves
 * @since 3.4
 */
public class BugzillaRepositoryMigrator extends AbstractRepositoryMigrator {

	@Override
	public String getConnectorKind() {
		return BugzillaCorePlugin.CONNECTOR_KIND;
	}

	@Override
	public boolean migrateRepository(TaskRepository repository) {
		if (repository.getProperty(IRepositoryConstants.PROPERTY_CATEGORY) == null) {
			repository.setProperty(IRepositoryConstants.PROPERTY_CATEGORY, IRepositoryConstants.CATEGORY_BUGS);
			return true;
		}
		return false;

//		repository.setProperty(IRepositoryConstants.PROPERTY_CATEGORY, IRepositoryConstants.CATEGORY_BUGS);
//		
//		if (repository.getConnectorKind().equals("bugzilla") || repository.getConnectorKind().equals("local")) {
//			if (repository.getRepositoryUrl().contains("bugs.eclipse.org")) {
//				repository.setProperty(IRepositoryConstants.PROPERTY_CATEGORY, IRepositoryConstants.CATEGORY_BUGS);
//			} else {
//				repository.setProperty(IRepositoryConstants.PROPERTY_CATEGORY, IRepositoryConstants.CATEGORY_TASKS);
//			}
//		} else {
//			String category = repository.getProperty(IRepositoryConstants.PROPERTY_CATEGORY);
//			if (category == null) {
//				repository.setProperty(IRepositoryConstants.PROPERTY_CATEGORY, IRepositoryConstants.CATEGORY_OTHER);
//			}
//		}
	}

}

Lines 14-19 Link Here

(-)META-INF/MANIFEST.MF (+1 lines)
14	org.eclipse.mylyn.internal.tasks.core;x-friends:="org.eclipse.mylyn.tasks.ui,org.eclipse.mylyn.tasks.bugs",	14	org.eclipse.mylyn.internal.tasks.core;x-friends:="org.eclipse.mylyn.tasks.ui,org.eclipse.mylyn.tasks.bugs",
15	org.eclipse.mylyn.internal.tasks.core.data;x-friends:="org.eclipse.mylyn.tasks.ui,org.eclipse.mylyn.tasks.bugs",	15	org.eclipse.mylyn.internal.tasks.core.data;x-friends:="org.eclipse.mylyn.tasks.ui,org.eclipse.mylyn.tasks.bugs",
16	org.eclipse.mylyn.internal.tasks.core.externalization;x-friends:="org.eclipse.mylyn.tasks.ui,org.eclipse.mylyn.tasks.bugs",	16	org.eclipse.mylyn.internal.tasks.core.externalization;x-friends:="org.eclipse.mylyn.tasks.ui,org.eclipse.mylyn.tasks.bugs",
		17	org.eclipse.mylyn.internal.tasks.core.notifications;x-friends:="org.eclipse.mylyn.tasks.ui,org.eclipse.mylyn.tasks.bugs",
17	org.eclipse.mylyn.internal.tasks.core.sync;x-friends:="org.eclipse.mylyn.tasks.ui,org.eclipse.mylyn.tasks.bugs",	18	org.eclipse.mylyn.internal.tasks.core.sync;x-friends:="org.eclipse.mylyn.tasks.ui,org.eclipse.mylyn.tasks.bugs",
18	org.eclipse.mylyn.tasks.core,	19	org.eclipse.mylyn.tasks.core,
19	org.eclipse.mylyn.tasks.core.data,	20	org.eclipse.mylyn.tasks.core.data,

Lines 33-38 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/core/TaskRepositoryManager.java (-3 / +67 lines)
33	import org.eclipse.mylyn.commons.core.StatusHandler;	33	import org.eclipse.mylyn.commons.core.StatusHandler;
34	import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryDelta.Type;	34	import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryDelta.Type;
35	import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;	35	import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
		36	import org.eclipse.mylyn.tasks.core.AbstractRepositoryMigrator;
36	import org.eclipse.mylyn.tasks.core.IRepositoryListener;	37	import org.eclipse.mylyn.tasks.core.IRepositoryListener;
37	import org.eclipse.mylyn.tasks.core.IRepositoryManager;	38	import org.eclipse.mylyn.tasks.core.IRepositoryManager;
38	import org.eclipse.mylyn.tasks.core.ITask;	39	import org.eclipse.mylyn.tasks.core.ITask;
Lines 57-62 Link Here
57		58
58	private final Map<String, AbstractRepositoryConnector> repositoryConnectors = new HashMap<String, AbstractRepositoryConnector>();	59	private final Map<String, AbstractRepositoryConnector> repositoryConnectors = new HashMap<String, AbstractRepositoryConnector>();
59		60
		61	// connector kinds to corresponding repositories
60	private final Map<String, Set<TaskRepository>> repositoryMap = new HashMap<String, Set<TaskRepository>>();	62	private final Map<String, Set<TaskRepository>> repositoryMap = new HashMap<String, Set<TaskRepository>>();
61		63
62	private final Set<IRepositoryListener> listeners = new CopyOnWriteArraySet<IRepositoryListener>();	64	private final Set<IRepositoryListener> listeners = new CopyOnWriteArraySet<IRepositoryListener>();
Lines 67-72 Link Here
67		69
68	public static final String PREFIX_LOCAL = "local-"; //$NON-NLS-1$	70	public static final String PREFIX_LOCAL = "local-"; //$NON-NLS-1$
69		71
		72	private static final Map<String, Category> repositoryCategories = new HashMap<String, Category>();
		73
70	private final PropertyChangeListener PROPERTY_CHANGE_LISTENER = new PropertyChangeListener() {	74	private final PropertyChangeListener PROPERTY_CHANGE_LISTENER = new PropertyChangeListener() {
71	public void propertyChange(PropertyChangeEvent evt) {	75	public void propertyChange(PropertyChangeEvent evt) {
72	TaskRepositoryManager.this.notifyRepositorySettingsChanged((TaskRepository) evt.getSource(),	76	TaskRepositoryManager.this.notifyRepositorySettingsChanged((TaskRepository) evt.getSource(),
Lines 76-82 Link Here
76		80
77	private final TaskRepositoriesExternalizer externalizer = new TaskRepositoriesExternalizer();	81	private final TaskRepositoriesExternalizer externalizer = new TaskRepositoriesExternalizer();
78		82
		83	private List<AbstractRepositoryMigrator> migrators;
		84
79	public TaskRepositoryManager() {	85	public TaskRepositoryManager() {
		86	this.migrators = Collections.emptyList();
		87	Category catTasks = new Category(IRepositoryConstants.CATEGORY_TASKS, "Tasks", 0); //$NON-NLS-1$
		88	repositoryCategories.put(catTasks.getId(), catTasks);
		89	Category catBugs = new Category(IRepositoryConstants.CATEGORY_BUGS, "Bugs", 100); //$NON-NLS-1$
		90	repositoryCategories.put(catBugs.getId(), catBugs);
		91	Category catOther = new Category(IRepositoryConstants.CATEGORY_OTHER, "Other", 200); //$NON-NLS-1$
		92	repositoryCategories.put(catOther.getId(), catOther);
80	}	93	}
81		94
82	public synchronized Collection<AbstractRepositoryConnector> getRepositoryConnectors() {	95	public synchronized Collection<AbstractRepositoryConnector> getRepositoryConnectors() {
Lines 118-123 Link Here
118	// TODO 4.0 return false to indicate that remove was unsuccessful	131	// TODO 4.0 return false to indicate that remove was unsuccessful
119	return;	132	return;
120	}	133	}
		134
121	repository.addChangeListener(PROPERTY_CHANGE_LISTENER);	135	repository.addChangeListener(PROPERTY_CHANGE_LISTENER);
122	}	136	}
123		137
Lines 182-187 Link Here
182	return sb.toString();	196	return sb.toString();
183	}	197	}
184		198
		199	public Category getCategory(String id) {
		200	Category category = repositoryCategories.get(IRepositoryConstants.CATEGORY_OTHER);
		201	Category cat = repositoryCategories.get(id);
		202	if (cat != null) {
		203	category = cat;
		204	}
		205	return category;
		206	}
		207
185	public TaskRepository getRepository(String kind, String urlString) {	208	public TaskRepository getRepository(String kind, String urlString) {
186	Assert.isNotNull(kind);	209	Assert.isNotNull(kind);
187	Assert.isNotNull(urlString);	210	Assert.isNotNull(urlString);
Lines 233-243 Link Here
233	return null;	256	return null;
234	}	257	}
235		258
236	public Set<TaskRepository> getRepositories(String kind) {	259	public Set<TaskRepository> getRepositories(String connectorKind) {
237	Assert.isNotNull(kind);	260	Assert.isNotNull(connectorKind);
238	Set<TaskRepository> result;	261	Set<TaskRepository> result;
239	synchronized (this) {	262	synchronized (this) {
240	result = repositoryMap.get(kind);	263	result = repositoryMap.get(connectorKind);
241	}	264	}
242	if (result == null) {	265	if (result == null) {
243	return Collections.emptySet();	266	return Collections.emptySet();
Lines 309-317 Link Here
309	if (removeHttpAuthMigration(repository)) {	332	if (removeHttpAuthMigration(repository)) {
310	migration = true;	333	migration = true;
311	}	334	}
		335	if (applyMigrators(repository)) {
		336	migration = true;
		337	}
312	if (repositoryMap.containsKey(repository.getConnectorKind())) {	338	if (repositoryMap.containsKey(repository.getConnectorKind())) {
313	repositoryMap.get(repository.getConnectorKind()).add(repository);	339	repositoryMap.get(repository.getConnectorKind()).add(repository);
		340
314	repository.addChangeListener(PROPERTY_CHANGE_LISTENER);	341	repository.addChangeListener(PROPERTY_CHANGE_LISTENER);
		342
315	} else {	343	} else {
316	orphanedRepositories.add(repository);	344	orphanedRepositories.add(repository);
317	}	345	}
Lines 323-328 Link Here
323	}	351	}
324	}	352	}
325		353
		354	private boolean applyMigrators(final TaskRepository repository) {
		355	final boolean[] result = new boolean[1];
		356	for (AbstractRepositoryMigrator migrator : migrators) {
		357	if (migrator.getConnectorKind().equals(repository.getConnectorKind())) {
		358
		359	final AbstractRepositoryMigrator finalRepositoryMigrator = migrator;
		360	result[0] = false;
		361	SafeRunner.run(new ISafeRunnable() {
		362
		363	public void handleException(Throwable e) {
		364	StatusHandler.log(new Status(IStatus.WARNING, ITasksCoreConstants.ID_PLUGIN,
		365	"Repository migration failed for repository \"" + repository.getUrl() + "\"", e)); //$NON-NLS-1$ //$NON-NLS-2$
		366	}
		367
		368	public void run() throws Exception {
		369	if (finalRepositoryMigrator.migrateRepository(repository)) {
		370	result[0] = true;
		371	}
		372	}
		373
		374	});
		375	break;
		376	}
		377	}
		378	return result[0];
		379	}
		380
326	@SuppressWarnings("deprecation")	381	@SuppressWarnings("deprecation")
327	private boolean removeHttpAuthMigration(TaskRepository repository) {	382	private boolean removeHttpAuthMigration(TaskRepository repository) {
328	String httpusername = repository.getProperty(TaskRepository.AUTH_HTTP_USERNAME);	383	String httpusername = repository.getProperty(TaskRepository.AUTH_HTTP_USERNAME);
Lines 447-450 Link Here
447	}	502	}
448	}	503	}
449		504
		505	public Category getCategory(TaskRepository repository) {
		506	String categoryId = repository.getProperty(IRepositoryConstants.PROPERTY_CATEGORY);
		507	return getCategory(categoryId);
		508	}
		509
		510	public void initialize(List<AbstractRepositoryMigrator> repositoryMigrators) {
		511	this.migrators = repositoryMigrators;
		512
		513	}
450	}	514	}




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

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

/**
 * @author Robert Elves
 */
public interface IServiceMessageListener {

	public void handleEvent(ServiceMessageEvent event);

}




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

package org.eclipse.mylyn.tasks.core;

/**
 * @author Robert Elves
 * @since 3.4
 */
public abstract class AbstractRepositoryMigrator {

	public abstract String getConnectorKind();

	public boolean migrateRepository(TaskRepository repository) {
		return false;
	}

}




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

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

import java.util.ArrayList;
import java.util.List;

import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;

/**
 * @author Robert Elves
 * @author Steffen Pingel
 */
public class ServiceMessageXmlHandler extends DefaultHandler {

	private static final String TAG_MESSAGE = "ServiceMessage"; //$NON-NLS-1$

	private StringBuilder characters;

	private final List<ServiceMessage> messages = new ArrayList<ServiceMessage>();

	private ServiceMessage message;

	@Override
	public void characters(char[] ch, int start, int length) throws SAXException {
		characters.append(ch, start, length);
	}

	@Override
	public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
		if (TAG_MESSAGE.equals(qName.trim())) {
			message = new ServiceMessage();
		}
		characters = new StringBuilder();
	}

	@Override
	public void endElement(String uri, String localName, String qName) throws SAXException {
		if (message == null) {
			return;
		}
		if (TAG_MESSAGE.equals(qName.trim())) {
			if (message.isValid()) {
				messages.add(message);
			}
		} else {
			String parsedText = characters.toString();
			ServiceMessage.Element element;
			try {
				element = ServiceMessage.Element.valueOf(qName.trim().toUpperCase());
				switch (element) {
				case ID:
					message.setId(parsedText);
					break;
				case DESCRIPTION:
					message.setDescription(parsedText);
					break;
				case TITLE:
					message.setTitle(parsedText);
					break;
				case URL:
					message.setUrl(parsedText);
					break;
				case IMAGE:
					message.setImage(parsedText);
					break;
				case VERSION:
					message.setVersion(parsedText);
					break;
				}
			} catch (IllegalArgumentException e) {
				// ignore unrecognized elements
			}
		}
	}

	public List<ServiceMessage> getMessages() {
		return new ArrayList<ServiceMessage>(messages);
	}

}




/*******************************************************************************
 * Copyright (c) 2004, 2008 Tasktop Technologies.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Tasktop EULA
 * which accompanies this distribution, and is available at
 * http://tasktop.com/legal
 *******************************************************************************/

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

import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;

import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;

import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HostConfiguration;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.methods.GetMethod;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.ISafeRunnable;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.SafeRunner;
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.commons.core.StatusHandler;
import org.eclipse.mylyn.commons.net.WebLocation;
import org.eclipse.mylyn.commons.net.WebUtil;
import org.eclipse.mylyn.internal.tasks.core.ITasksCoreConstants;

/**
 * @author Robert Elves
 * @author Steffen Pingel
 */
public class ServiceMessageManager {

	protected static final long START_DELAY = 30 * 1000;

	protected static final long RECHECK_DELAY = 2 * 60 * 60 * 1000;

	private String serviceMessageUrl;

	private volatile List<ServiceMessage> messages = Collections.emptyList();

	private Job messageCheckJob;

	private final List<IServiceMessageListener> listeners = new CopyOnWriteArrayList<IServiceMessageListener>();

	private String lastModified;

	private String eTag;

	private boolean statusLogged;

	public ServiceMessageManager(String serviceMessageUrl, String lastModified, String eTag) {
		this.serviceMessageUrl = serviceMessageUrl;
		this.lastModified = lastModified;
		this.eTag = eTag;
	}

	public void start() {
		if (messageCheckJob == null) {
			messageCheckJob = new Job("Checking for new service message") { //$NON-NLS-1$
				@Override
				protected IStatus run(IProgressMonitor monitor) {
					updateServiceMessage(monitor);
					return Status.OK_STATUS;
				}

			};
			messageCheckJob.setSystem(true);
			messageCheckJob.setPriority(Job.DECORATE);
			messageCheckJob.addJobChangeListener(new JobChangeAdapter() {
				@Override
				public void done(IJobChangeEvent event) {
					if (messageCheckJob != null) {
						messageCheckJob.schedule(RECHECK_DELAY);
					}
				}
			});
		}
		messageCheckJob.schedule(START_DELAY);
	}

	public void stop() {
		if (messageCheckJob != null) {
			messageCheckJob.cancel();
			messageCheckJob = null;
		}

		final ServiceMessageEvent event = new ServiceMessageEvent(this, ServiceMessageEvent.EVENT_KIND.STOP);

		for (final IServiceMessageListener listener : listeners) {
			SafeRunner.run(new ISafeRunnable() {
				public void run() throws Exception {
					listener.handleEvent(event);
				}

				public void handleException(Throwable e) {
					StatusHandler.log(new Status(IStatus.WARNING, ITasksCoreConstants.ID_PLUGIN, "Listener failed: " //$NON-NLS-1$
							+ listener.getClass(), e));
				}
			});
		}
	}

	public void setServiceMessageUrl(String url) {
		this.serviceMessageUrl = url;
	}

	public void addServiceMessageListener(IServiceMessageListener listener) {
		listeners.add(listener);
	}

	public void removeServiceMessageListener(IServiceMessageListener listener) {
		listeners.remove(listener);
	}

	private void notifyListeners(List<ServiceMessage> messages) {
		this.messages = messages;
		for (final ServiceMessage message : messages) {
			message.setETag(eTag);
			message.setLastModified(lastModified);
		}

		final ServiceMessageEvent event = new ServiceMessageEvent(this, ServiceMessageEvent.EVENT_KIND.MESSAGE_UPDATE,
				messages);

		for (final IServiceMessageListener listener : listeners) {
			SafeRunner.run(new ISafeRunnable() {
				public void run() throws Exception {
					listener.handleEvent(event);
				}

				public void handleException(Throwable e) {
					StatusHandler.log(new Status(IStatus.WARNING, ITasksCoreConstants.ID_PLUGIN, "Listener failed: " //$NON-NLS-1$
							+ listener.getClass(), e));
				}
			});
		}
	}

	public List<ServiceMessage> getServiceMessages() {
		return new ArrayList<ServiceMessage>(this.messages);
	}

	/**
	 * Public for testing
	 */
	public int updateServiceMessage(IProgressMonitor monitor) {
		int status = -1;
		List<ServiceMessage> messages = null;
		try {
			HttpClient httpClient = new HttpClient(WebUtil.getConnectionManager());
			WebUtil.configureHttpClient(httpClient, null);

			WebLocation location = new WebLocation(serviceMessageUrl);
			HostConfiguration hostConfiguration = WebUtil.createHostConfiguration(httpClient, location,
					new SubProgressMonitor(monitor, 1));

			GetMethod method = new GetMethod(serviceMessageUrl);
			method.setRequestHeader("If-Modified-Since", lastModified); //$NON-NLS-1$
			method.setRequestHeader("If-None-Match", eTag); //$NON-NLS-1$

			try {
				status = WebUtil.execute(httpClient, hostConfiguration, method, monitor);
				if (status == HttpStatus.SC_OK && messageCheckJob != null) {
					Header lastModifiedHeader = method.getResponseHeader("Last-Modified"); //$NON-NLS-1$
					if (lastModifiedHeader != null) {
						lastModified = lastModifiedHeader.getValue();
					}
					Header eTagHeader = method.getResponseHeader("ETag"); //$NON-NLS-1$
					if (eTagHeader != null) {
						eTag = eTagHeader.getValue();
					}

					InputStream in = WebUtil.getResponseBodyAsStream(method, monitor);
					try {
						SAXParserFactory factory = SAXParserFactory.newInstance();
						factory.setValidating(false);
						SAXParser parser = factory.newSAXParser();

						ServiceMessageXmlHandler handler = new ServiceMessageXmlHandler();
						parser.parse(in, handler);
						messages = handler.getMessages();
					} finally {
						in.close();
					}
				} else if (status == HttpStatus.SC_NOT_FOUND) {
					// no messages
				} else if (status == HttpStatus.SC_NOT_MODIFIED) {
					// no new messages
				} else {
					if (!statusLogged) {
						statusLogged = true;
						StatusHandler.log(new Status(IStatus.WARNING, ITasksCoreConstants.ID_PLUGIN,
								"Http error retrieving service message: " + HttpStatus.getStatusText(status))); //$NON-NLS-1$
					}
				}
			} finally {
				WebUtil.releaseConnection(method, monitor);
			}
		} catch (Exception e) {
			if (!statusLogged) {
				statusLogged = true;
				StatusHandler.log(new Status(IStatus.WARNING, ITasksCoreConstants.ID_PLUGIN,
						"Http error retrieving service message.", e)); //$NON-NLS-1$
			}
		}

		if (messages != null && messages.size() > 0) {
			notifyListeners(messages);
		}
		return status;
	}

}




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

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

/**
 * @author Robert Elves
 */
public class ServiceMessage {

	public enum Element {
		ID, TITLE, DESCRIPTION, URL, IMAGE, VERSION
	};

	private String id;

	private String title;

	private String description;

	private String url;

	private String image;

	private String version;

	private String eTag;

	private String lastModified;

	public String getId() {
		return id;
	}

	public String getTitle() {
		return title;
	}

	public String getDescription() {
		return description;
	}

	public String getUrl() {
		return url;
	}

	public String getImage() {
		return image;
	}

	public void setETag(String eTag) {
		this.eTag = eTag;
	}

	public void setLastModified(String lastModified) {
		this.lastModified = lastModified;
	}

	public String getETag() {
		return eTag;
	}

	public String getLastModified() {
		return lastModified;
	}

	public String getVersion() {
		return version;
	}

	public void setId(String id) {
		this.id = id;
	}

	public void setTitle(String title) {
		this.title = title;
	}

	public void setDescription(String description) {
		this.description = description;
	}

	public void setUrl(String url) {
		this.url = url;
	}

	public void setImage(String image) {
		this.image = image;
	}

	public void setVersion(String version) {
		this.version = version;
	}

	public boolean isValid() {
		return id != null && title != null && description != null && image != null;
	}

}




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

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

import java.util.ArrayList;
import java.util.Collections;
import java.util.EventObject;
import java.util.List;

/**
 * @author Steffen Pingel
 */
public class ServiceMessageEvent extends EventObject {

	public enum EVENT_KIND {
		MESSAGE_UPDATE, STOP
	};

	private static final long serialVersionUID = 1L;

	private final List<ServiceMessage> messages;

	private final EVENT_KIND eventKind;

	public ServiceMessageEvent(ServiceMessageManager manager, EVENT_KIND kind) {
		this(manager, kind, new ArrayList<ServiceMessage>());
	}

	public ServiceMessageEvent(ServiceMessageManager manager, EVENT_KIND eventKind, List<ServiceMessage> messages) {
		super(manager);
		this.eventKind = eventKind;
		this.messages = Collections.unmodifiableList(new ArrayList<ServiceMessage>(messages));
	}

	public List<ServiceMessage> getMessages() {
		return messages;
	}

	public EVENT_KIND getEventKind() {
		return eventKind;
	}

}

Lines 30-35 Link Here

(-)src/org/eclipse/mylyn/tasks/tests/AllTasksTests.java (+2 lines)
30	import org.eclipse.mylyn.tasks.tests.ui.editor.RepositoryCompletionProcessorTest;	30	import org.eclipse.mylyn.tasks.tests.ui.editor.RepositoryCompletionProcessorTest;
31	import org.eclipse.mylyn.tasks.tests.ui.editor.TaskEditorPartDescriptorTest;	31	import org.eclipse.mylyn.tasks.tests.ui.editor.TaskEditorPartDescriptorTest;
32	import org.eclipse.mylyn.tasks.tests.ui.editor.TaskUrlHyperlinkDetectorTest;	32	import org.eclipse.mylyn.tasks.tests.ui.editor.TaskUrlHyperlinkDetectorTest;
		33	import org.eclipse.mylyn.tasks.tests.util.ServiceMessageManagerTest;
33		34
34	/**	35	/**
35	* @author Mik Kersten	36	* @author Mik Kersten
Lines 102-107 Link Here
102	suite.addTestSuite(PlanningPartTest.class);	103	suite.addTestSuite(PlanningPartTest.class);
103	suite.addTestSuite(RepositoryCompletionProcessorTest.class);	104	suite.addTestSuite(RepositoryCompletionProcessorTest.class);
104	suite.addTestSuite(TaskAttributeDiffTest.class);	105	suite.addTestSuite(TaskAttributeDiffTest.class);
		106	suite.addTestSuite(ServiceMessageManagerTest.class);
105	// XXX long running tests, put back?	107	// XXX long running tests, put back?
106	//suite.addTestSuite(QueryExportImportTest.class);	108	//suite.addTestSuite(QueryExportImportTest.class);
107	//suite.addTestSuite(BackgroundSaveTest.class);	109	//suite.addTestSuite(BackgroundSaveTest.class);




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

package org.eclipse.mylyn.tasks.tests.util;

import java.io.ByteArrayInputStream;
import java.io.InputStream;

import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;

import junit.framework.TestCase;

import org.apache.commons.httpclient.HttpStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.mylyn.internal.tasks.core.notifications.ServiceMessage;
import org.eclipse.mylyn.internal.tasks.core.notifications.ServiceMessageManager;
import org.eclipse.mylyn.internal.tasks.core.notifications.ServiceMessageXmlHandler;

/**
 * @author Robert Elves
 */
public class ServiceMessageManagerTest extends TestCase {

	private static final String MESSAGE_XML_URL = "http://eclipse.org/mylyn/messageTest.xml";

	public void testRetrievingMessage() throws Exception {
		ServiceMessageManager manager = new ServiceMessageManager(MESSAGE_XML_URL, "", "");
		int status = manager.updateServiceMessage(new NullProgressMonitor());
		assertEquals(HttpStatus.SC_OK, status);
		ServiceMessage message = manager.getServiceMessages().get(0);

		assertEquals("1", message.getId());
		assertEquals("140 character description here....", message.getDescription());
		assertEquals("Mylyn 3.4 now available!", message.getTitle());
		assertEquals("http://eclipse.org/mylyn/downloads", message.getUrl());
		assertEquals("Mylyn 3.4 now available!", message.getTitle());
		assertEquals("dialog_messasge_info_image", message.getImage());
	}

	public void testETag() throws Exception {

		ServiceMessageManager manager = new ServiceMessageManager(MESSAGE_XML_URL, "", "");
		int status = manager.updateServiceMessage(new NullProgressMonitor());
		assertEquals(HttpStatus.SC_OK, status);
		ServiceMessage message = manager.getServiceMessages().get(0);

		assertNotNull(message.getLastModified());
		assertNotNull(message.getETag());

		status = manager.updateServiceMessage(new NullProgressMonitor());
		assertEquals(HttpStatus.SC_NOT_MODIFIED, status);
	}

	public void testParsingMessageXml() throws Exception {
		String messageXml = "<ServiceMessage> <id>1</id><description>140 character description here....</description><title>Mylyn 3.4 now available!</title><url>http://eclipse.org/mylyn/downloads</url><image>dialog_messasge_info_image</image></ServiceMessage>";
		InputStream is = new ByteArrayInputStream(messageXml.getBytes("UTF-8"));
		SAXParserFactory factory = SAXParserFactory.newInstance();
		factory.setValidating(false);
		SAXParser parser = factory.newSAXParser();
		ServiceMessageXmlHandler handler = new ServiceMessageXmlHandler();
		parser.parse(is, handler);
		ServiceMessage message = handler.getMessages().get(0);

		assertEquals("1", message.getId());
		assertEquals("140 character description here....", message.getDescription());
		assertEquals("Mylyn 3.4 now available!", message.getTitle());
		assertEquals("http://eclipse.org/mylyn/downloads", message.getUrl());
		assertEquals("Mylyn 3.4 now available!", message.getTitle());
		assertEquals("dialog_messasge_info_image", message.getImage());
	}

}




import org.eclipse.jface.viewers.DecoratingLabelProvider;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.mylyn.commons.core.StatusHandler;
import org.eclipse.mylyn.internal.tasks.core.Category;
import org.eclipse.mylyn.internal.tasks.core.IRepositoryModelListener;
import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryAdapter;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;

import org.eclipse.ui.handlers.IHandlerService;
import org.eclipse.ui.part.ViewPart;
import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
import org.eclipse.ui.themes.IThemeManager;

/**
 * @author Mik Kersten

	@Deprecated
	public static final String ID = ITasksUiConstants.ID_VIEW_REPOSITORIES;

	private TreeViewer viewer;

	private final Action addRepositoryAction = new AddRepositoryAction();


		}
	};

	static class ViewContentProvider implements IStructuredContentProvider {
		public void inputChanged(Viewer v, Object oldInput, Object newInput) {
		}

		public void dispose() {
		}

		public Object[] getElements(Object parent) {
			return TasksUi.getRepositoryManager().getAllRepositories().toArray();
		}
	}

	public TaskRepositoriesView() {
		TasksUi.getRepositoryManager().addListener(REPOSITORY_LISTENER);
		TasksUiPlugin.getDefault().addModelListener(MODEL_LISTENER);


	@Override
	public void createPartControl(Composite parent) {
		viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION);
		viewer.setContentProvider(new TeamRepositoriesContentProvider());
		viewer.setUseHashlookup(true);
		viewer.setLabelProvider(new DecoratingLabelProvider(new TaskRepositoryLabelProvider(),
				PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator()));

		viewer.setSorter(new TaskRepositoriesViewSorter());

//				new ViewerSorter() {
//
//			@Override
//			public int compare(Viewer viewer, Object e1, Object e2) {
//				if (e1 instanceof TaskRepository && e2 instanceof TaskRepository) {
//					TaskRepository t1 = (TaskRepository) e1;
//					TaskRepository t2 = (TaskRepository) e2;
//					return (t1.getKind() + t1.getUrl()).compareTo(t2.getKind() + t2.getUrl());
//				} else {
//					return super.compare(viewer, e1, e2);
//				}
//			}
//		});
		viewer.setInput(getViewSite());
		viewer.addDoubleClickListener(new IDoubleClickListener() {
			public void doubleClick(DoubleClickEvent event) {

			}
		});

		final IThemeManager themeManager = getSite().getWorkbenchWindow().getWorkbench().getThemeManager();
		new GradientDrawer(themeManager, getViewer()) {
			@Override
			protected boolean shouldApplyGradient(org.eclipse.swt.widgets.Event event) {
				return event.item.getData() instanceof Category;
			}
		};

		makeActions();
		hookContextMenu();
		hookGlobalActions();
		contributeToActionBars();
		getViewer().expandAll();
		getSite().setSelectionProvider(getViewer());
	}


	public void refresh() {
		if (viewer != null && !viewer.getControl().isDisposed()) {
			viewer.refresh();
			viewer.expandAll();
		}
	}

	public TreeViewer getViewer() {
		return viewer;
	}

	public class TaskRepositoryListener extends TaskRepositoryAdapter {

		@Override
		public void repositorySettingsChanged(TaskRepository repository) {
			if (PlatformUI.isWorkbenchRunning() && !PlatformUI.getWorkbench().getDisplay().isDisposed()) {
				PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
					public void run() {
						if (!getViewer().getControl().isDisposed()) {
							getViewer().refresh(true);
						}
					}
				});
			}
		}

	}

}

Lines 64-69 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java (-1 / +24 lines)
64	import org.eclipse.mylyn.internal.tasks.core.ITaskListChangeListener;	64	import org.eclipse.mylyn.internal.tasks.core.ITaskListChangeListener;
65	import org.eclipse.mylyn.internal.tasks.core.ITasksCoreConstants;	65	import org.eclipse.mylyn.internal.tasks.core.ITasksCoreConstants;
66	import org.eclipse.mylyn.internal.tasks.core.TaskContainerDelta;	66	import org.eclipse.mylyn.internal.tasks.core.TaskContainerDelta;
		67	import org.eclipse.mylyn.internal.tasks.core.notifications.ServiceMessageEvent;
		68	import org.eclipse.mylyn.internal.tasks.core.notifications.ServiceMessageManager;
		69	import org.eclipse.mylyn.internal.tasks.core.notifications.ServiceMessageEvent.EVENT_KIND;
67	import org.eclipse.mylyn.internal.tasks.ui.AbstractTaskListFilter;	70	import org.eclipse.mylyn.internal.tasks.ui.AbstractTaskListFilter;
68	import org.eclipse.mylyn.internal.tasks.ui.CategorizedPresentation;	71	import org.eclipse.mylyn.internal.tasks.ui.CategorizedPresentation;
69	import org.eclipse.mylyn.internal.tasks.ui.ITasksUiPreferenceConstants;	72	import org.eclipse.mylyn.internal.tasks.ui.ITasksUiPreferenceConstants;
Lines 86-91 Link Here
86	import org.eclipse.mylyn.internal.tasks.ui.actions.TaskListSortAction;	89	import org.eclipse.mylyn.internal.tasks.ui.actions.TaskListSortAction;
87	import org.eclipse.mylyn.internal.tasks.ui.actions.TaskListViewActionGroup;	90	import org.eclipse.mylyn.internal.tasks.ui.actions.TaskListViewActionGroup;
88	import org.eclipse.mylyn.internal.tasks.ui.editors.TaskListChangeAdapter;	91	import org.eclipse.mylyn.internal.tasks.ui.editors.TaskListChangeAdapter;
		92	import org.eclipse.mylyn.internal.tasks.ui.notifications.TaskListServiceMessageControl;
89	import org.eclipse.mylyn.internal.tasks.ui.util.PlatformUtil;	93	import org.eclipse.mylyn.internal.tasks.ui.util.PlatformUtil;
90	import org.eclipse.mylyn.internal.tasks.ui.util.SortCriterion;	94	import org.eclipse.mylyn.internal.tasks.ui.util.SortCriterion;
91	import org.eclipse.mylyn.internal.tasks.ui.util.TaskDragSourceListener;	95	import org.eclipse.mylyn.internal.tasks.ui.util.TaskDragSourceListener;
Lines 131-136 Link Here
131	import org.eclipse.swt.graphics.Image;	135	import org.eclipse.swt.graphics.Image;
132	import org.eclipse.swt.graphics.Point;	136	import org.eclipse.swt.graphics.Point;
133	import org.eclipse.swt.graphics.Rectangle;	137	import org.eclipse.swt.graphics.Rectangle;
		138	import org.eclipse.swt.layout.GridLayout;
134	import org.eclipse.swt.widgets.Composite;	139	import org.eclipse.swt.widgets.Composite;
135	import org.eclipse.swt.widgets.Menu;	140	import org.eclipse.swt.widgets.Menu;
136	import org.eclipse.swt.widgets.Text;	141	import org.eclipse.swt.widgets.Text;
Lines 390-395 Link Here
390		395
391	private CustomTaskListDecorationDrawer customDrawer;	396	private CustomTaskListDecorationDrawer customDrawer;
392		397
		398	private TaskListServiceMessageControl serviceMessageControl;
		399
393	private final IPageListener PAGE_LISTENER = new IPageListener() {	400	private final IPageListener PAGE_LISTENER = new IPageListener() {
394	public void pageActivated(IWorkbenchPage page) {	401	public void pageActivated(IWorkbenchPage page) {
395	filteredTree.indicateActiveTaskWorkingSet();	402	filteredTree.indicateActiveTaskWorkingSet();
Lines 554-559 Link Here
554	@Override	561	@Override
555	public void dispose() {	562	public void dispose() {
556	super.dispose();	563	super.dispose();
		564	TasksUiPlugin.getDefault().getServiceMessageManager().removeServiceMessageListener(serviceMessageControl);
557	TasksUiPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(tasksUiPreferenceListener);	565	TasksUiPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(tasksUiPreferenceListener);
558	TasksUiInternal.getTaskList().removeChangeListener(TASKLIST_CHANGE_LISTENER);	566	TasksUiInternal.getTaskList().removeChangeListener(TASKLIST_CHANGE_LISTENER);
559	TasksUiPlugin.getTaskActivityManager().removeActivityListener(TASK_ACTIVITY_LISTENER);	567	TasksUiPlugin.getTaskActivityManager().removeActivityListener(TASK_ACTIVITY_LISTENER);
Lines 730-735 Link Here
730		738
731	@Override	739	@Override
732	public void createPartControl(Composite parent) {	740	public void createPartControl(Composite parent) {
		741	Composite body = new Composite(parent, SWT.NONE);
		742	GridLayout layout = new GridLayout(1, false);
		743	layout.marginHeight = 0;
		744	layout.marginWidth = 0;
		745	layout.horizontalSpacing = 0;
		746	layout.verticalSpacing = 0;
		747	layout.numColumns = 1;
		748	body.setLayout(layout);
		749
733	IWorkbenchSiteProgressService progress = (IWorkbenchSiteProgressService) getSite().getAdapter(	750	IWorkbenchSiteProgressService progress = (IWorkbenchSiteProgressService) getSite().getAdapter(
734	IWorkbenchSiteProgressService.class);	751	IWorkbenchSiteProgressService.class);
735	if (progress != null) {	752	if (progress != null) {
Lines 743-749 Link Here
743	themeManager = getSite().getWorkbenchWindow().getWorkbench().getThemeManager();	760	themeManager = getSite().getWorkbenchWindow().getWorkbench().getThemeManager();
744	themeManager.addPropertyChangeListener(THEME_CHANGE_LISTENER);	761	themeManager.addPropertyChangeListener(THEME_CHANGE_LISTENER);
745		762
746	filteredTree = new TaskListFilteredTree(parent, SWT.MULTI \| SWT.VERTICAL \| /* SWT.H_SCROLL \| */SWT.V_SCROLL	763	filteredTree = new TaskListFilteredTree(body, SWT.MULTI \| SWT.VERTICAL \| /* SWT.H_SCROLL \| */SWT.V_SCROLL
747	\| SWT.NO_SCROLL \| SWT.FULL_SELECTION, new SubstringPatternFilter(), getViewSite().getWorkbenchWindow());	764	\| SWT.NO_SCROLL \| SWT.FULL_SELECTION, new SubstringPatternFilter(), getViewSite().getWorkbenchWindow());
748		765
749	// need to do initialize tooltip early for native tooltip disablement to take effect	766	// need to do initialize tooltip early for native tooltip disablement to take effect
Lines 923-928 Link Here
923		940
924	TasksUiPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(tasksUiPreferenceListener);	941	TasksUiPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(tasksUiPreferenceListener);
925		942
		943	serviceMessageControl = new TaskListServiceMessageControl(body);
		944	ServiceMessageManager manager = TasksUiPlugin.getDefault().getServiceMessageManager();
		945	serviceMessageControl.handleEvent(new ServiceMessageEvent(manager, EVENT_KIND.MESSAGE_UPDATE,
		946	manager.getServiceMessages()));
		947	TasksUiPlugin.getDefault().getServiceMessageManager().addServiceMessageListener(serviceMessageControl);
		948
926	// Need to do this because the page, which holds the active working set is not around on creation, see bug 203179	949	// Need to do this because the page, which holds the active working set is not around on creation, see bug 203179
927	PlatformUI.getWorkbench().getActiveWorkbenchWindow().addPageListener(PAGE_LISTENER);	950	PlatformUI.getWorkbench().getActiveWorkbenchWindow().addPageListener(PAGE_LISTENER);
928	}	951	}

Lines 63-68 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/preferences/Messages.java (+2 lines)
63		63
64	public static String TasksUiPreferencePage_See_X_for_configuring_Task_List_colors;	64	public static String TasksUiPreferencePage_See_X_for_configuring_Task_List_colors;
65		65
		66	public static String TasksUiPreferencePage_show_service_messages;
		67
66	public static String TasksUiPreferencePage_Show_tooltip_on_hover_Label;	68	public static String TasksUiPreferencePage_Show_tooltip_on_hover_Label;
67		69
68	public static String TasksUiPreferencePage_Specify_the_folder_for_tasks;	70	public static String TasksUiPreferencePage_Specify_the_folder_for_tasks;

Lines 109-114 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksUiPreferencePage.java (-26 / +53 lines)
109		109
110	private Button taskListTooltipEnabledButton;	110	private Button taskListTooltipEnabledButton;
111		111
		112	private Button taskListServiceMessageEnabledButton;
		113
112	public TasksUiPreferencePage() {	114	public TasksUiPreferencePage() {
113	super();	115	super();
114	setPreferenceStore(TasksUiPlugin.getDefault().getPreferenceStore());	116	setPreferenceStore(TasksUiPlugin.getDefault().getPreferenceStore());
Lines 208-223 Link Here
208	getPreferenceStore().setValue(ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED,	210	getPreferenceStore().setValue(ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED,
209	taskListTooltipEnabledButton.getSelection());	211	taskListTooltipEnabledButton.getSelection());
210		212
		213	getPreferenceStore().setValue(ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED,
		214	taskListServiceMessageEnabledButton.getSelection());
		215
211	getPreferenceStore().setValue(ITasksUiPreferenceConstants.WEEK_START_DAY, getWeekStartValue());	216	getPreferenceStore().setValue(ITasksUiPreferenceConstants.WEEK_START_DAY, getWeekStartValue());
212	//getPreferenceStore().setValue(TasksUiPreferenceConstants.PLANNING_STARTHOUR, hourDayStart.getSelection());	217	//getPreferenceStore().setValue(TasksUiPreferenceConstants.PLANNING_STARTHOUR, hourDayStart.getSelection());
213	// getPreferenceStore().setValue(TasksUiPreferenceConstants.PLANNING_ENDHOUR, hourDayEnd.getSelection());	218	// getPreferenceStore().setValue(TasksUiPreferenceConstants.PLANNING_ENDHOUR, hourDayEnd.getSelection());
214	MonitorUiPlugin.getDefault().getPreferenceStore().setValue(ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED,	219	MonitorUiPlugin.getDefault()
215	timeoutEnabledButton.getSelection());	220	.getPreferenceStore()
216	MonitorUiPlugin.getDefault().getPreferenceStore().setValue(ActivityContextManager.ACTIVITY_TIMEOUT,	221	.setValue(ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED, timeoutEnabledButton.getSelection());
217	timeoutMinutes.getSelection() * (60 * 1000));	222	MonitorUiPlugin.getDefault()
218		223	.getPreferenceStore()
219	MonitorUiPlugin.getDefault().getPreferenceStore().setValue(MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED,	224	.setValue(ActivityContextManager.ACTIVITY_TIMEOUT, timeoutMinutes.getSelection() * (60 * 1000));
220	activityTrackingEnabledButton.getSelection());	225
		226	MonitorUiPlugin.getDefault()
		227	.getPreferenceStore()
		228	.setValue(MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED, activityTrackingEnabledButton.getSelection());
221		229
222	String taskDirectory = taskDirectoryText.getText();	230	String taskDirectory = taskDirectoryText.getText();
223	taskDirectory = taskDirectory.replaceAll(BACKSLASH_MULTI, FORWARDSLASH);	231	taskDirectory = taskDirectory.replaceAll(BACKSLASH_MULTI, FORWARDSLASH);
Lines 276-281 Link Here
276	taskListTooltipEnabledButton.setSelection(getPreferenceStore().getBoolean(	284	taskListTooltipEnabledButton.setSelection(getPreferenceStore().getBoolean(
277	ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));	285	ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));
278		286
		287	taskListServiceMessageEnabledButton.setSelection(getPreferenceStore().getBoolean(
		288	ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));
		289
279	weekStartCombo.select(getPreferenceStore().getInt(ITasksUiPreferenceConstants.WEEK_START_DAY) - 1);	290	weekStartCombo.select(getPreferenceStore().getInt(ITasksUiPreferenceConstants.WEEK_START_DAY) - 1);
280	//hourDayStart.setSelection(getPreferenceStore().getInt(TasksUiPreferenceConstants.PLANNING_STARTHOUR));	291	//hourDayStart.setSelection(getPreferenceStore().getInt(TasksUiPreferenceConstants.PLANNING_STARTHOUR));
281	// hourDayEnd.setSelection(getPreferenceStore().getInt(TasksUiPreferenceConstants.PLANNING_ENDHOUR));	292	// hourDayEnd.setSelection(getPreferenceStore().getInt(TasksUiPreferenceConstants.PLANNING_ENDHOUR));
Lines 283-293 Link Here
283	int minutes = MonitorUiPlugin.getDefault().getPreferenceStore().getInt(ActivityContextManager.ACTIVITY_TIMEOUT)	294	int minutes = MonitorUiPlugin.getDefault().getPreferenceStore().getInt(ActivityContextManager.ACTIVITY_TIMEOUT)
284	/ MS_MINUTES;	295	/ MS_MINUTES;
285	timeoutMinutes.setSelection(minutes);	296	timeoutMinutes.setSelection(minutes);
286	timeoutEnabledButton.setSelection(MonitorUiPlugin.getDefault().getPreferenceStore().getBoolean(	297	timeoutEnabledButton.setSelection(MonitorUiPlugin.getDefault()
287	ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED));	298	.getPreferenceStore()
288		299	.getBoolean(ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED));
289	activityTrackingEnabledButton.setSelection(MonitorUiPlugin.getDefault().getPreferenceStore().getBoolean(	300
290	MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED));	301	activityTrackingEnabledButton.setSelection(MonitorUiPlugin.getDefault()
		302	.getPreferenceStore()
		303	.getBoolean(MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED));
291		304
292	return true;	305	return true;
293	}	306	}
Lines 310-315 Link Here
310	taskListTooltipEnabledButton.setSelection(getPreferenceStore().getDefaultBoolean(	323	taskListTooltipEnabledButton.setSelection(getPreferenceStore().getDefaultBoolean(
311	ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));	324	ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));
312		325
		326	taskListServiceMessageEnabledButton.setSelection(getPreferenceStore().getDefaultBoolean(
		327	ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));
		328
313	// synchQueries.setSelection(getPreferenceStore().getDefaultBoolean(	329	// synchQueries.setSelection(getPreferenceStore().getDefaultBoolean(
314	// TaskListPreferenceConstants.REPOSITORY_SYNCH_ON_STARTUP));	330	// TaskListPreferenceConstants.REPOSITORY_SYNCH_ON_STARTUP));
315	enableBackgroundSynch.setSelection(getPreferenceStore().getDefaultBoolean(	331	enableBackgroundSynch.setSelection(getPreferenceStore().getDefaultBoolean(
Lines 322-336 Link Here
322	weekStartCombo.select(getPreferenceStore().getDefaultInt(ITasksUiPreferenceConstants.WEEK_START_DAY) - 1);	338	weekStartCombo.select(getPreferenceStore().getDefaultInt(ITasksUiPreferenceConstants.WEEK_START_DAY) - 1);
323	// hourDayStart.setSelection(getPreferenceStore().getDefaultInt(TasksUiPreferenceConstants.PLANNING_STARTHOUR));	339	// hourDayStart.setSelection(getPreferenceStore().getDefaultInt(TasksUiPreferenceConstants.PLANNING_STARTHOUR));
324	// hourDayEnd.setSelection(getPreferenceStore().getDefaultInt(TasksUiPreferenceConstants.PLANNING_ENDHOUR));	340	// hourDayEnd.setSelection(getPreferenceStore().getDefaultInt(TasksUiPreferenceConstants.PLANNING_ENDHOUR));
325	int activityTimeoutMinutes = MonitorUiPlugin.getDefault().getPreferenceStore().getDefaultInt(	341	int activityTimeoutMinutes = MonitorUiPlugin.getDefault()
326	ActivityContextManager.ACTIVITY_TIMEOUT)	342	.getPreferenceStore()
		343	.getDefaultInt(ActivityContextManager.ACTIVITY_TIMEOUT)
327	/ MS_MINUTES;	344	/ MS_MINUTES;
328	timeoutMinutes.setSelection(activityTimeoutMinutes);	345	timeoutMinutes.setSelection(activityTimeoutMinutes);
329	timeoutEnabledButton.setSelection(MonitorUiPlugin.getDefault().getPreferenceStore().getDefaultBoolean(	346	timeoutEnabledButton.setSelection(MonitorUiPlugin.getDefault()
330	ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED));	347	.getPreferenceStore()
331		348	.getDefaultBoolean(ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED));
332	activityTrackingEnabledButton.setSelection(MonitorUiPlugin.getDefault().getPreferenceStore().getDefaultBoolean(	349
333	MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED));	350	activityTrackingEnabledButton.setSelection(MonitorUiPlugin.getDefault()
		351	.getPreferenceStore()
		352	.getDefaultBoolean(MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED));
334		353
335	updateRefreshGroupEnablements();	354	updateRefreshGroupEnablements();
336	}	355	}
Lines 480-485 Link Here
480	taskListTooltipEnabledButton.setText(Messages.TasksUiPreferencePage_Show_tooltip_on_hover_Label);	499	taskListTooltipEnabledButton.setText(Messages.TasksUiPreferencePage_Show_tooltip_on_hover_Label);
481	taskListTooltipEnabledButton.setSelection(getPreferenceStore().getBoolean(	500	taskListTooltipEnabledButton.setSelection(getPreferenceStore().getBoolean(
482	ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));	501	ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));
		502
		503	taskListServiceMessageEnabledButton = new Button(group, SWT.CHECK);
		504	taskListServiceMessageEnabledButton.setText(Messages.TasksUiPreferencePage_show_service_messages);
		505	taskListServiceMessageEnabledButton.setSelection(getPreferenceStore().getBoolean(
		506	ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));
483	}	507	}
484		508
485	private void createTaskActivityGroup(Composite container) {	509	private void createTaskActivityGroup(Composite container) {
Lines 488-498 Link Here
488	group.setLayout(new GridLayout(3, false));	512	group.setLayout(new GridLayout(3, false));
489	group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));	513	group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
490		514
491	boolean activityTrackingEnabled = MonitorUiPlugin.getDefault().getPreferenceStore().getBoolean(	515	boolean activityTrackingEnabled = MonitorUiPlugin.getDefault()
492	MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED);	516	.getPreferenceStore()
493		517	.getBoolean(MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED);
494	boolean timeoutEnabled = MonitorUiPlugin.getDefault().getPreferenceStore().getBoolean(	518
495	ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED);	519	boolean timeoutEnabled = MonitorUiPlugin.getDefault()
		520	.getPreferenceStore()
		521	.getBoolean(ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED);
496		522
497	activityTrackingEnabledButton = new Button(group, SWT.CHECK);	523	activityTrackingEnabledButton = new Button(group, SWT.CHECK);
498	activityTrackingEnabledButton.setText(Messages.TasksUiPreferencePage_Enable_Time_Tracking);	524	activityTrackingEnabledButton.setText(Messages.TasksUiPreferencePage_Enable_Time_Tracking);
Lines 525-532 Link Here
525	timeoutMinutes.setIncrement(5);	551	timeoutMinutes.setIncrement(5);
526	timeoutMinutes.setMaximum(60);	552	timeoutMinutes.setMaximum(60);
527	timeoutMinutes.setMinimum(1);	553	timeoutMinutes.setMinimum(1);
528	long minutes = MonitorUiPlugin.getDefault().getPreferenceStore().getLong(	554	long minutes = MonitorUiPlugin.getDefault()
529	ActivityContextManager.ACTIVITY_TIMEOUT)	555	.getPreferenceStore()
		556	.getLong(ActivityContextManager.ACTIVITY_TIMEOUT)
530	/ MS_MINUTES;	557	/ MS_MINUTES;
531	timeoutMinutes.setSelection((int) minutes);	558	timeoutMinutes.setSelection((int) minutes);
532	timeoutMinutes.addSelectionListener(new SelectionAdapter() {	559	timeoutMinutes.addSelectionListener(new SelectionAdapter() {

Lines 27-32 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/preferences/messages.properties (+1 lines)
27	TasksUiPreferencePage_Rich_Editor__Recommended_=Rich Editor (Recommended)	27	TasksUiPreferencePage_Rich_Editor__Recommended_=Rich Editor (Recommended)
28	TasksUiPreferencePage_Scheduling=Scheduling	28	TasksUiPreferencePage_Scheduling=Scheduling
29	TasksUiPreferencePage_See_X_for_configuring_Task_List_colors=See <a>''{0}''</a> for configuring Task List colors.	29	TasksUiPreferencePage_See_X_for_configuring_Task_List_colors=See <a>''{0}''</a> for configuring Task List colors.
		30	TasksUiPreferencePage_show_service_messages=Show service messages
30	TasksUiPreferencePage_Show_tooltip_on_hover_Label=Show task overview popups on hover	31	TasksUiPreferencePage_Show_tooltip_on_hover_Label=Show task overview popups on hover
31	TasksUiPreferencePage_Specify_the_folder_for_tasks=Specify the folder for tasks	32	TasksUiPreferencePage_Specify_the_folder_for_tasks=Specify the folder for tasks
32	TasksUiPreferencePage_Stop_time_accumulation_after=Stop time accumulation after	33	TasksUiPreferencePage_Stop_time_accumulation_after=Stop time accumulation after

Lines 52-57 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/ITasksUiPreferenceConstants.java (+10 lines)
52		52
53	public static final String NOTIFICATIONS_ENABLED = "org.eclipse.mylyn.tasks.ui.notifications.enabled"; //$NON-NLS-1$	53	public static final String NOTIFICATIONS_ENABLED = "org.eclipse.mylyn.tasks.ui.notifications.enabled"; //$NON-NLS-1$
54		54
		55	public static final String SERVICE_MESSAGES_ENABLED = "org.eclipse.mylyn.tasks.ui.messages.enabled"; //$NON-NLS-1$
		56
55	public static final String WEEK_START_DAY = "org.eclipse.mylyn.tasks.ui.planning.week.start.day"; //$NON-NLS-1$	57	public static final String WEEK_START_DAY = "org.eclipse.mylyn.tasks.ui.planning.week.start.day"; //$NON-NLS-1$
56		58
57	public static final String PLANNING_ENDHOUR = "org.eclipse.mylyn.tasks.ui.planning.end.hour"; //$NON-NLS-1$	59	public static final String PLANNING_ENDHOUR = "org.eclipse.mylyn.tasks.ui.planning.end.hour"; //$NON-NLS-1$
Lines 87-90 Link Here
87	public static final String PREF_DATA_DIR = "org.eclipse.mylyn.data.dir"; //$NON-NLS-1$	89	public static final String PREF_DATA_DIR = "org.eclipse.mylyn.data.dir"; //$NON-NLS-1$
88		90
89	public static final String DEFAULT_ATTACHMENTS_DIRECTORY = "org.eclipse.mylyn.tasks.ui.attachments.defaultDirectory"; //$NON-NLS-1$	91	public static final String DEFAULT_ATTACHMENTS_DIRECTORY = "org.eclipse.mylyn.tasks.ui.attachments.defaultDirectory"; //$NON-NLS-1$
		92
		93	public static final String SERVICE_MESSAGE_URL = "org.eclipse.mylyn.tasks.ui.servicemessage.url"; //$NON-NLS-1$;
		94
		95	public static final String LAST_SERVICE_MESSAGE_ID = "org.eclipse.mylyn.tasks.ui.servicemessage.id"; //$NON-NLS-1$
		96
		97	public static final String LAST_SERVICE_MESSAGE_ETAG = "org.eclipse.mylyn.tasks.ui.servicemessage.etag"; //$NON-NLS-1$
		98
		99	public static final String LAST_SERVICE_MESSAGE_LAST_MODIFIED = "org.eclipse.mylyn.tasks.ui.servicemessage.lastmodified"; //$NON-NLS-1$
90	}	100	}

Lines 77-82 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java (-1 / +31 lines)
77	import org.eclipse.mylyn.internal.tasks.core.externalization.IExternalizationParticipant;	77	import org.eclipse.mylyn.internal.tasks.core.externalization.IExternalizationParticipant;
78	import org.eclipse.mylyn.internal.tasks.core.externalization.TaskListExternalizationParticipant;	78	import org.eclipse.mylyn.internal.tasks.core.externalization.TaskListExternalizationParticipant;
79	import org.eclipse.mylyn.internal.tasks.core.externalization.TaskListExternalizer;	79	import org.eclipse.mylyn.internal.tasks.core.externalization.TaskListExternalizer;
		80	import org.eclipse.mylyn.internal.tasks.core.notifications.ServiceMessageManager;
80	import org.eclipse.mylyn.internal.tasks.ui.notifications.TaskListNotificationReminder;	81	import org.eclipse.mylyn.internal.tasks.ui.notifications.TaskListNotificationReminder;
81	import org.eclipse.mylyn.internal.tasks.ui.notifications.TaskListNotifier;	82	import org.eclipse.mylyn.internal.tasks.ui.notifications.TaskListNotifier;
82	import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiExtensionReader;	83	import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiExtensionReader;
Lines 149-154 Link Here
149		150
150	private RepositoryTemplateManager repositoryTemplateManager;	151	private RepositoryTemplateManager repositoryTemplateManager;
151		152
		153	private ServiceMessageManager serviceMessageManager;
		154
152	private final Set<AbstractTaskEditorPageFactory> taskEditorPageFactories = new HashSet<AbstractTaskEditorPageFactory>();	155	private final Set<AbstractTaskEditorPageFactory> taskEditorPageFactories = new HashSet<AbstractTaskEditorPageFactory>();
153		156
154	private final TreeSet<AbstractTaskRepositoryLinkProvider> repositoryLinkProviders = new TreeSet<AbstractTaskRepositoryLinkProvider>(	157	private final TreeSet<AbstractTaskRepositoryLinkProvider> repositoryLinkProviders = new TreeSet<AbstractTaskRepositoryLinkProvider>(
Lines 343-348 Link Here
343	\|\| event.getProperty().equals(ITasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_MILISECONDS)) {	346	\|\| event.getProperty().equals(ITasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_MILISECONDS)) {
344	updateSynchronizationScheduler(false);	347	updateSynchronizationScheduler(false);
345	}	348	}
		349
		350	if (event.getProperty().equals(ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED)) {
		351	if (getPreferenceStore().getBoolean(ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED)) {
		352	serviceMessageManager.start();
		353	} else {
		354	serviceMessageManager.stop();
		355	}
		356	}
346	}	357	}
347	};	358	};
348		359
Lines 552-558 Link Here
552		563
553	// NOTE: initializing extensions in start(..) has caused race	564	// NOTE: initializing extensions in start(..) has caused race
554	// conditions previously	565	// conditions previously
555	TasksUiExtensionReader.initStartupExtensions(taskListExternalizer);	566	TasksUiExtensionReader.initStartupExtensions(taskListExternalizer, repositoryManager);
556		567
557	// instantiate taskDataManager	568	// instantiate taskDataManager
558	TaskDataStore taskDataStore = new TaskDataStore(repositoryManager);	569	TaskDataStore taskDataStore = new TaskDataStore(repositoryManager);
Lines 605-610 Link Here
605	// make this available early for clients that are not initialized through tasks ui but need access	616	// make this available early for clients that are not initialized through tasks ui but need access
606	taskListNotificationManager = new TaskListNotificationManager();	617	taskListNotificationManager = new TaskListNotificationManager();
607		618
		619	String lastMod = getPreferenceStore().getString(
		620	ITasksUiPreferenceConstants.LAST_SERVICE_MESSAGE_LAST_MODIFIED);
		621	String etag = getPreferenceStore().getString(ITasksUiPreferenceConstants.LAST_SERVICE_MESSAGE_ETAG);
		622
		623	serviceMessageManager = new ServiceMessageManager(getPreferenceStore().getString(
		624	ITasksUiPreferenceConstants.SERVICE_MESSAGE_URL), lastMod, etag);
		625
		626	if (getPreferenceStore().getBoolean(ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED)) {
		627	serviceMessageManager.start();
		628	}
		629
608	// trigger lazy initialization	630	// trigger lazy initialization
609	new TasksUiInitializationJob().schedule();	631	new TasksUiInitializationJob().schedule();
610	} catch (Exception e) {	632	} catch (Exception e) {
Lines 727-732 Link Here
727	// ContextCorePlugin.getDefault().getPluginPreferences().removePropertyChangeListener(	749	// ContextCorePlugin.getDefault().getPluginPreferences().removePropertyChangeListener(
728	// PREFERENCE_LISTENER);	750	// PREFERENCE_LISTENER);
729	// }	751	// }
		752	serviceMessageManager.stop();
730	taskEditorBloatManager.dispose(PlatformUI.getWorkbench());	753	taskEditorBloatManager.dispose(PlatformUI.getWorkbench());
731	INSTANCE = null;	754	INSTANCE = null;
732	}	755	}
Lines 868-873 Link Here
868	store.setDefault(ITasksUiPreferenceConstants.PREF_DATA_DIR, getDefaultDataDirectory());	891	store.setDefault(ITasksUiPreferenceConstants.PREF_DATA_DIR, getDefaultDataDirectory());
869	store.setDefault(ITasksUiPreferenceConstants.GROUP_SUBTASKS, true);	892	store.setDefault(ITasksUiPreferenceConstants.GROUP_SUBTASKS, true);
870	store.setDefault(ITasksUiPreferenceConstants.NOTIFICATIONS_ENABLED, true);	893	store.setDefault(ITasksUiPreferenceConstants.NOTIFICATIONS_ENABLED, true);
		894	store.setDefault(ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED, true);
871	store.setDefault(ITasksUiPreferenceConstants.FILTER_PRIORITY, PriorityLevel.P5.toString());	895	store.setDefault(ITasksUiPreferenceConstants.FILTER_PRIORITY, PriorityLevel.P5.toString());
872	store.setDefault(ITasksUiPreferenceConstants.EDITOR_TASKS_RICH, true);	896	store.setDefault(ITasksUiPreferenceConstants.EDITOR_TASKS_RICH, true);
873	store.setDefault(ITasksUiPreferenceConstants.EDITOR_CURRENT_LINE_HIGHLIGHT, false);	897	store.setDefault(ITasksUiPreferenceConstants.EDITOR_CURRENT_LINE_HIGHLIGHT, false);
Lines 894-899 Link Here
894		918
895	store.setDefault(ITasksUiPreferenceConstants.AUTO_EXPAND_TASK_LIST, true);	919	store.setDefault(ITasksUiPreferenceConstants.AUTO_EXPAND_TASK_LIST, true);
896	store.setDefault(ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED, true);	920	store.setDefault(ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED, true);
		921
		922	store.setDefault(ITasksUiPreferenceConstants.SERVICE_MESSAGE_URL, "http://eclipse.org/mylyn/message.xml"); //$NON-NLS-1$
897	}	923	}
898		924
899	public static TaskActivityManager getTaskActivityManager() {	925	public static TaskActivityManager getTaskActivityManager() {
Lines 1306-1309 Link Here
1306	}	1332	}
1307	}	1333	}
1308		1334
		1335	public ServiceMessageManager getServiceMessageManager() {
		1336	return serviceMessageManager;
		1337	}
		1338
1309	}	1339	}




            <element ref="connectorCore"/>
            <element ref="connectorUi" minOccurs="0" maxOccurs="1"/>
            <element ref="taskListMigrator" minOccurs="0" maxOccurs="1"/>
            <element ref="repositoryMigrator" minOccurs="0" maxOccurs="1"/>
         </sequence>
         <attribute name="point" type="string" use="required">
            <annotation>

      </complexType>
   </element>

   <element name="repositoryMigrator">
      <annotation>
         <documentation>
            (no description available)
         </documentation>
      </annotation>
      <complexType>
         <attribute name="class" type="string" use="required">
            <annotation>
               <documentation>
                  
               </documentation>
               <appInfo>
                  <meta.attribute kind="java" basedOn="org.eclipse.mylyn.tasks.core.AbstractRepositoryMigrator:"/>
               </appInfo>
            </annotation>
         </attribute>
      </complexType>
   </element>

   <annotation>
      <appInfo>
         <meta.section type="since"/>

Lines 30-35 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java (-23 / +63 lines)
30	import org.eclipse.jface.resource.ImageDescriptor;	30	import org.eclipse.jface.resource.ImageDescriptor;
31	import org.eclipse.mylyn.commons.core.StatusHandler;	31	import org.eclipse.mylyn.commons.core.StatusHandler;
32	import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;	32	import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
		33	import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryManager;
33	import org.eclipse.mylyn.internal.tasks.core.externalization.TaskListExternalizer;	34	import org.eclipse.mylyn.internal.tasks.core.externalization.TaskListExternalizer;
34	import org.eclipse.mylyn.internal.tasks.ui.IDynamicSubMenuContributor;	35	import org.eclipse.mylyn.internal.tasks.ui.IDynamicSubMenuContributor;
35	import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;	36	import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
Lines 37-42 Link Here
37	import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;	38	import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
38	import org.eclipse.mylyn.tasks.core.AbstractDuplicateDetector;	39	import org.eclipse.mylyn.tasks.core.AbstractDuplicateDetector;
39	import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;	40	import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
		41	import org.eclipse.mylyn.tasks.core.AbstractRepositoryMigrator;
40	import org.eclipse.mylyn.tasks.core.AbstractTaskListMigrator;	42	import org.eclipse.mylyn.tasks.core.AbstractTaskListMigrator;
41	import org.eclipse.mylyn.tasks.core.RepositoryTemplate;	43	import org.eclipse.mylyn.tasks.core.RepositoryTemplate;
42	import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi;	44	import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi;
Lines 57-67 Link Here
57		59
58	IConfigurationElement element;	60	IConfigurationElement element;
59		61
60	IConfigurationElement migratorElement;	62	IConfigurationElement taskListMigratorElement;
		63
		64	IConfigurationElement repositoryMigratorElement;
61		65
62	AbstractRepositoryConnector repositoryConnector;	66	AbstractRepositoryConnector repositoryConnector;
63		67
64	AbstractTaskListMigrator migrator;	68	AbstractTaskListMigrator taskListMigrator;
		69
		70	AbstractRepositoryMigrator repositoryMigrator;
65		71
66	private final String id;	72	private final String id;
67		73
Lines 94-111 Link Here
94	}	100	}
95	}	101	}
96		102
97	public IStatus createMigrator() {	103	public IStatus createTaskListMigrator() {
98	Assert.isTrue(migrator == null);	104	Assert.isTrue(taskListMigrator == null);
99	try {	105	try {
100	Object migratorObject = migratorElement.createExecutableExtension(ATTR_CLASS);	106	Object migratorObject = taskListMigratorElement.createExecutableExtension(ATTR_CLASS);
101	if (migratorObject instanceof AbstractTaskListMigrator) {	107	if (migratorObject instanceof AbstractTaskListMigrator) {
102	migrator = (AbstractTaskListMigrator) migratorObject;	108	taskListMigrator = (AbstractTaskListMigrator) migratorObject;
103	return Status.OK_STATUS;	109	return Status.OK_STATUS;
104	} else {	110	} else {
105	return new Status(	111	return new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN,
106	IStatus.ERROR,	112	"Could not load task list migrator: " + migratorObject.getClass().getCanonicalName() //$NON-NLS-1$
107	TasksUiPlugin.ID_PLUGIN,
108	"Could not load task list migrator migrator: " + migratorObject.getClass().getCanonicalName() //$NON-NLS-1$
109	+ " must implement " + AbstractTaskListMigrator.class.getCanonicalName()); //$NON-NLS-1$	113	+ " must implement " + AbstractTaskListMigrator.class.getCanonicalName()); //$NON-NLS-1$
110	}	114	}
111	} catch (Throwable e) {	115	} catch (Throwable e) {
Lines 114-119 Link Here
114	}	118	}
115	}	119	}
116		120
		121	public IStatus createRepositoryMigrator() {
		122	Assert.isTrue(repositoryMigrator == null);
		123	try {
		124	Object migratorObject = repositoryMigratorElement.createExecutableExtension(ATTR_CLASS);
		125	if (migratorObject instanceof AbstractRepositoryMigrator) {
		126	repositoryMigrator = (AbstractRepositoryMigrator) migratorObject;
		127	return Status.OK_STATUS;
		128	} else {
		129	return new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN,
		130	"Could not load repository migrator: " + migratorObject.getClass().getCanonicalName() //$NON-NLS-1$
		131	+ " must implement " + AbstractRepositoryMigrator.class.getCanonicalName()); //$NON-NLS-1$
		132	}
		133	} catch (Throwable e) {
		134	return new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN,
		135	"Could not load repository migrator extension", e); //$NON-NLS-1$
		136	}
		137	}
		138
117	public String getPluginId() {	139	public String getPluginId() {
118	return element.getContributor().getName();	140	return element.getContributor().getName();
119	}	141	}
Lines 158-163 Link Here
158		180
159	public static final String ELMNT_MIGRATOR = "taskListMigrator"; //$NON-NLS-1$	181	public static final String ELMNT_MIGRATOR = "taskListMigrator"; //$NON-NLS-1$
160		182
		183	public static final String ELMNT_REPOSITORY_MIGRATOR = "repositoryMigrator"; //$NON-NLS-1$
		184
161	public static final String ATTR_BRANDING_ICON = "brandingIcon"; //$NON-NLS-1$	185	public static final String ATTR_BRANDING_ICON = "brandingIcon"; //$NON-NLS-1$
162		186
163	public static final String ATTR_OVERLAY_ICON = "overlayIcon"; //$NON-NLS-1$	187	public static final String ATTR_OVERLAY_ICON = "overlayIcon"; //$NON-NLS-1$
Lines 207-218 Link Here
207	*/	231	*/
208	private static Set<String> disabledContributors = new HashSet<String>();	232	private static Set<String> disabledContributors = new HashSet<String>();
209		233
210	public static void initStartupExtensions(TaskListExternalizer taskListExternalizer) {	234	public static void initStartupExtensions(TaskListExternalizer taskListExternalizer,
		235	TaskRepositoryManager repositoryManager) {
211	if (!coreExtensionsRead) {	236	if (!coreExtensionsRead) {
212	IExtensionRegistry registry = Platform.getExtensionRegistry();	237	IExtensionRegistry registry = Platform.getExtensionRegistry();
213		238
214	// NOTE: has to be read first, consider improving	239	// NOTE: has to be read first, consider improving
215	initConnectorCores(taskListExternalizer, registry);	240	initConnectorCores(taskListExternalizer, repositoryManager, registry);
216		241
217	IExtensionPoint templatesExtensionPoint = registry.getExtensionPoint(EXTENSION_TEMPLATES);	242	IExtensionPoint templatesExtensionPoint = registry.getExtensionPoint(EXTENSION_TEMPLATES);
218	IExtension[] templateExtensions = templatesExtensionPoint.getExtensions();	243	IExtension[] templateExtensions = templatesExtensionPoint.getExtensions();
Lines 256-262 Link Here
256	}	281	}
257	}	282	}
258		283
259	private static void initConnectorCores(TaskListExternalizer taskListExternalizer, IExtensionRegistry registry) {	284	private static void initConnectorCores(TaskListExternalizer taskListExternalizer,
		285	TaskRepositoryManager repositoryManager, IExtensionRegistry registry) {
260	List<ConnectorDescriptor> descriptors = new ArrayList<ConnectorDescriptor>();	286	List<ConnectorDescriptor> descriptors = new ArrayList<ConnectorDescriptor>();
261	MultiStatus result = new MultiStatus(TasksUiPlugin.ID_PLUGIN, 0, "Repository connectors failed to load.", null); //$NON-NLS-1$	287	MultiStatus result = new MultiStatus(TasksUiPlugin.ID_PLUGIN, 0, "Repository connectors failed to load.", null); //$NON-NLS-1$
262		288
Lines 267-282 Link Here
267	for (IExtension repositoryExtension : repositoryExtensions) {	293	for (IExtension repositoryExtension : repositoryExtensions) {
268	IConfigurationElement[] elements = repositoryExtension.getConfigurationElements();	294	IConfigurationElement[] elements = repositoryExtension.getConfigurationElements();
269	ConnectorDescriptor descriptor = null;	295	ConnectorDescriptor descriptor = null;
270	IConfigurationElement migratorElement = null;	296	IConfigurationElement tasklistMigratorElement = null;
		297	IConfigurationElement repositoryMigratorElement = null;
271	for (IConfigurationElement element : elements) {	298	for (IConfigurationElement element : elements) {
272	if (element.getName().equals(ELMNT_REPOSITORY_CONNECTOR)) {	299	if (element.getName().equals(ELMNT_REPOSITORY_CONNECTOR)) {
273	descriptor = new ConnectorDescriptor(element);	300	descriptor = new ConnectorDescriptor(element);
274	} else if (element.getName().equals(ELMNT_MIGRATOR)) {	301	} else if (element.getName().equals(ELMNT_MIGRATOR)) {
275	migratorElement = element;	302	tasklistMigratorElement = element;
		303	} else if (element.getName().equals(ELMNT_REPOSITORY_MIGRATOR)) {
		304	repositoryMigratorElement = element;
276	}	305	}
277	}	306	}
278	if (descriptor != null) {	307	if (descriptor != null) {
279	descriptor.migratorElement = migratorElement;	308	descriptor.taskListMigratorElement = tasklistMigratorElement;
		309	descriptor.repositoryMigratorElement = repositoryMigratorElement;
280	descriptors.add(descriptor);	310	descriptors.add(descriptor);
281	if (descriptor.getId() != null) {	311	if (descriptor.getId() != null) {
282	add(descriptorById, descriptor.getId(), descriptor);	312	add(descriptorById, descriptor.getId(), descriptor);
Lines 300-313 Link Here
300	checkForConflicts(descriptors, result, descriptorByConnectorKind);	330	checkForConflicts(descriptors, result, descriptorByConnectorKind);
301		331
302	// register connectors	332	// register connectors
303	List<AbstractTaskListMigrator> migrators = new ArrayList<AbstractTaskListMigrator>();	333	List<AbstractTaskListMigrator> taskListmigrators = new ArrayList<AbstractTaskListMigrator>();
		334	List<AbstractRepositoryMigrator> repositoryMigrators = new ArrayList<AbstractRepositoryMigrator>();
304	for (ConnectorDescriptor descriptor : descriptors) {	335	for (ConnectorDescriptor descriptor : descriptors) {
305	if (descriptor.repositoryConnector != null) {	336	if (descriptor.repositoryConnector != null) {
306	TasksUiPlugin.getRepositoryManager().addRepositoryConnector(descriptor.repositoryConnector);	337	repositoryManager.addRepositoryConnector(descriptor.repositoryConnector);
307	if (descriptor.migratorElement != null) {	338	if (descriptor.taskListMigratorElement != null) {
308	IStatus status = descriptor.createMigrator();	339	IStatus status = descriptor.createTaskListMigrator();
309	if (status.isOK() && descriptor.migrator != null) {	340	if (status.isOK() && descriptor.taskListMigrator != null) {
310	migrators.add(descriptor.migrator);	341	taskListmigrators.add(descriptor.taskListMigrator);
		342	} else {
		343	result.add(status);
		344	}
		345	}
		346	if (descriptor.repositoryMigratorElement != null) {
		347	IStatus status = descriptor.createRepositoryMigrator();
		348	if (status.isOK() && descriptor.repositoryMigrator != null) {
		349	repositoryMigrators.add(descriptor.repositoryMigrator);
311	} else {	350	} else {
312	result.add(status);	351	result.add(status);
313	}	352	}
Lines 319-325 Link Here
319	StatusHandler.log(result);	358	StatusHandler.log(result);
320	}	359	}
321		360
322	taskListExternalizer.initialize(migrators);	361	repositoryManager.initialize(repositoryMigrators);
		362	taskListExternalizer.initialize(taskListmigrators);
323	}	363	}
324		364
325	private static boolean isDisabled(IConfigurationElement element) {	365	private static boolean isDisabled(IConfigurationElement element) {

Lines 1115-1120 Link Here

(-)plugin.xml (+3 lines)
1115	class="org.eclipse.mylyn.internal.tasks.ui.LocalRepositoryConnectorUi"	1115	class="org.eclipse.mylyn.internal.tasks.ui.LocalRepositoryConnectorUi"
1116	name="%LocalRepositoryConnectorUi.name"	1116	name="%LocalRepositoryConnectorUi.name"
1117	overlayIcon="icons/ovr16/overlay-local.gif"/>	1117	overlayIcon="icons/ovr16/overlay-local.gif"/>
		1118	<repositoryMigrator
		1119	class="org.eclipse.mylyn.internal.tasks.ui.LocalRepositoryMigrator">
		1120	</repositoryMigrator>
1118	</extension>	1121	</extension>
1119		1122
1120	<extension point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectorTargets">	1123	<extension point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectorTargets">




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

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

import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
import org.eclipse.mylyn.internal.provisional.commons.ui.CommonThemes;
import org.eclipse.mylyn.internal.provisional.commons.ui.GradientCanvas;
import org.eclipse.mylyn.internal.tasks.core.notifications.IServiceMessageListener;
import org.eclipse.mylyn.internal.tasks.core.notifications.ServiceMessage;
import org.eclipse.mylyn.internal.tasks.core.notifications.ServiceMessageEvent;
import org.eclipse.mylyn.internal.tasks.ui.ITasksUiPreferenceConstants;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
import org.eclipse.osgi.service.resolver.VersionRange;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.FontData;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.forms.FormColors;
import org.eclipse.ui.forms.IFormColors;
import org.eclipse.ui.forms.events.HyperlinkAdapter;
import org.eclipse.ui.forms.events.HyperlinkEvent;
import org.eclipse.ui.forms.events.IHyperlinkListener;
import org.eclipse.ui.forms.widgets.Hyperlink;
import org.eclipse.ui.forms.widgets.ImageHyperlink;
import org.eclipse.ui.forms.widgets.TableWrapData;
import org.eclipse.ui.forms.widgets.TableWrapLayout;
import org.osgi.framework.Version;

/**
 * @author Robert Elves
 * @author Steffen Pingel
 */
public class TaskListServiceMessageControl implements IServiceMessageListener {

	private ImageHyperlink imageHyperlink;

	private Hyperlink titleHyperlink;

	private Label descriptionLabel;

	private GridData headData;

	private final Composite parent;

	private GradientCanvas head;

	private ImageHyperlink closeLink;

	private ServiceMessage currentMessage;

	private String messageUrl;

	public TaskListServiceMessageControl(Composite parent) {
		this.parent = parent;
	}

	private void setTitleImage(Image image) {
		imageHyperlink.setImage(image);
	}

	private void setTitle(String title) {
		titleHyperlink.setText(title);
	}

	private void setDescription(String description) {
		descriptionLabel.setText(description);
	}

	private void addHyperlinkListener(IHyperlinkListener listener) {
		titleHyperlink.addHyperlinkListener(listener);
		imageHyperlink.addHyperlinkListener(listener);
	}

	protected void setMessageUrl(String url) {
		messageUrl = url;
	}

	public Control createControl(Composite parent) {
		FormColors colors = TasksUiPlugin.getDefault().getFormColors(parent.getDisplay());
		head = new GradientCanvas(parent, SWT.NONE);
		GridLayout headLayout = new GridLayout();
		headLayout.marginHeight = 0;
		headLayout.marginWidth = 0;
		headLayout.horizontalSpacing = 0;
		headLayout.verticalSpacing = 0;
		headLayout.numColumns = 1;
		head.setLayout(headLayout);
		headData = new GridData(SWT.FILL, SWT.TOP, true, false);
		head.setLayoutData(headData);

		Color top = colors.getColor(IFormColors.H_GRADIENT_END);
		Color bot = colors.getColor(IFormColors.H_GRADIENT_START);
		head.setBackgroundGradient(new Color[] { bot, top }, new int[] { 100 }, true);
		head.setSeparatorVisible(true);
		head.setSeparatorAlignment(SWT.TOP);

		head.putColor(IFormColors.H_BOTTOM_KEYLINE1, colors.getColor(IFormColors.H_BOTTOM_KEYLINE1));
		head.putColor(IFormColors.H_BOTTOM_KEYLINE2, colors.getColor(IFormColors.H_BOTTOM_KEYLINE2));
		head.putColor(IFormColors.H_HOVER_LIGHT, colors.getColor(IFormColors.H_HOVER_LIGHT));
		head.putColor(IFormColors.H_HOVER_FULL, colors.getColor(IFormColors.H_HOVER_FULL));
		head.putColor(IFormColors.TB_TOGGLE, colors.getColor(IFormColors.TB_TOGGLE));
		head.putColor(IFormColors.TB_TOGGLE_HOVER, colors.getColor(IFormColors.TB_TOGGLE_HOVER));

		TableWrapLayout layout = new TableWrapLayout();
		layout.numColumns = 3;
		head.setLayout(layout);

		imageHyperlink = new ImageHyperlink(head, SWT.NONE);

		titleHyperlink = new Hyperlink(head, SWT.NONE);

		setHeaderFontSizeAndStyle(titleHyperlink);

		addHyperlinkListener(new HyperlinkAdapter() {
			@Override
			public void linkActivated(HyperlinkEvent e) {
				if (messageUrl != null) {
					TasksUiUtil.openUrl(messageUrl);
				}

			}
		});

		closeLink = new ImageHyperlink(head, SWT.NONE);
		closeLink.setImage(CommonImages.getImage(CommonImages.NOTIFICATION_CLOSE));
		TableWrapData data = new TableWrapData();
		data.align = TableWrapData.RIGHT;
		closeLink.setLayoutData(data);
		closeLink.addHyperlinkListener(new HyperlinkAdapter() {
			@Override
			public void linkActivated(HyperlinkEvent e) {
				closeMessage();
			}

			@Override
			public void linkEntered(HyperlinkEvent e) {
				closeLink.setImage(CommonImages.getImage(CommonImages.NOTIFICATION_CLOSE_HOVER));
			}

			@Override
			public void linkExited(HyperlinkEvent e) {
				closeLink.setImage(CommonImages.getImage(CommonImages.NOTIFICATION_CLOSE));
			}
		});

		// spacer
		new Label(head, SWT.NONE).setText(" "); //$NON-NLS-1$

		descriptionLabel = new Label(head, SWT.WRAP);
		data = new TableWrapData();
		data.colspan = 2;
		descriptionLabel.setLayoutData(data);
		return head;
	}

	private void closeMessage() {
		if (currentMessage != null) {
			TasksUiPlugin.getDefault().getPreferenceStore().setValue(
					ITasksUiPreferenceConstants.LAST_SERVICE_MESSAGE_ID, currentMessage.getId());
		}
		head.dispose();
		parent.layout(true);
	}

	// From EditorUtil
	private static Font setHeaderFontSizeAndStyle(Control text) {
		float sizeFactor = 1.2f;
		Font initialFont = text.getFont();
		FontData[] fontData = initialFont.getFontData();
		for (FontData element : fontData) {
			element.setHeight((int) (element.getHeight() * sizeFactor));
			element.setStyle(element.getStyle() | SWT.BOLD);
		}
		final Font textFont = new Font(text.getDisplay(), fontData);
		text.setFont(textFont);
		text.addDisposeListener(new DisposeListener() {
			public void widgetDisposed(DisposeEvent e) {
				textFont.dispose();
			}
		});
		Color color = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry().get(
				CommonThemes.COLOR_COMPLETED);
		text.setForeground(color);
		return textFont;
	}

	public void handleEvent(final ServiceMessageEvent event) {
		switch (event.getEventKind()) {
		case MESSAGE_UPDATE:
			IPreferenceStore preferenceStore = TasksUiPlugin.getDefault().getPreferenceStore();
			String lastMessageId = preferenceStore.getString(ITasksUiPreferenceConstants.LAST_SERVICE_MESSAGE_ID);
			for (final ServiceMessage message : event.getMessages()) {
				if (!message.isValid() || message.getId().equals("-1")) { //$NON-NLS-1$
					continue;
				}

				if (!lastMessageId.equals(message.getId()) && isForCurrentVersion(message)) {
					Display.getDefault().asyncExec(new Runnable() {
						public void run() {
							setMessage(message);
						}
					});
				}
			}
			break;
		case STOP:
			head.dispose();
			parent.layout(true);
			break;
		}
	}

	private boolean isForCurrentVersion(ServiceMessage message) {
		if (message.getVersion() == null) {
			return true;
		}

		try {
			VersionRange version = new VersionRange(message.getVersion());
			String versionString = (String) TasksUiPlugin.getDefault().getBundle().getHeaders().get("Bundle-Version"); //$NON-NLS-1$
			return version.isIncluded(new Version(versionString));
		} catch (IllegalArgumentException e) {
			// invalid version range
			return false;
		}
	}

	protected void setMessage(ServiceMessage message) {
		if (message != null) {
			createControl(parent);
			IPreferenceStore preferenceStore = TasksUiPlugin.getDefault().getPreferenceStore();
			preferenceStore.setValue(ITasksUiPreferenceConstants.LAST_SERVICE_MESSAGE_ETAG, message.getETag());
			preferenceStore.setValue(ITasksUiPreferenceConstants.LAST_SERVICE_MESSAGE_LAST_MODIFIED,
					message.getLastModified());

			this.currentMessage = message;

			setTitle(message.getTitle());
			setDescription(message.getDescription());
			setTitleImage(Dialog.getImage(message.getImage()));
			if (message.getUrl() != null) {
				setMessageUrl(message.getUrl());
			}
			parent.layout(true);
		}
	}

}




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

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

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

import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.mylyn.internal.tasks.core.Category;
import org.eclipse.mylyn.internal.tasks.core.IRepositoryConstants;
import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryManager;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.ui.TasksUi;

/**
 * @author Robert Elves
 */
public class TeamRepositoriesContentProvider implements ITreeContentProvider {

	private final TaskRepositoryManager manager;

	public TeamRepositoriesContentProvider() {
		manager = ((TaskRepositoryManager) TasksUi.getRepositoryManager());
	}

	public void inputChanged(Viewer v, Object oldInput, Object newInput) {
	}

	public void dispose() {
	}

	public Object[] getElements(Object parent) {

		Set<Object> objects = new HashSet<Object>();
		//objects.addAll(TasksUi.getRepositoryManager().getAllRepositories());

		objects.add(manager.getCategory(IRepositoryConstants.CATEGORY_TASKS));
		objects.add(manager.getCategory(IRepositoryConstants.CATEGORY_BUGS));
		objects.add(manager.getCategory(IRepositoryConstants.CATEGORY_OTHER));

		return objects.toArray();
	}

	public Object[] getChildren(Object parentElement) {
		if (parentElement instanceof Category) {
			Set<Object> objects = new HashSet<Object>();
			for (TaskRepository repository : TasksUi.getRepositoryManager().getAllRepositories()) {
				Category cat = manager.getCategory(repository);
				if (cat.equals(parentElement)) {
					objects.add(repository);
				}
//				String categoryId = repository.getProperty(IRepositoryConstants.PROPERTY_CATEGORY);
//				if (categoryId != null && ((Category) parentElement).getId().equals(categoryId)) {
//					objects.add(repository);
//				}
			}
			return objects.toArray();
		}
		return new Object[0];
	}

	public Object getParent(Object element) {
		return null;
	}

	public boolean hasChildren(Object element) {
		return element instanceof Category;
	}
}




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

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

import org.eclipse.mylyn.internal.tasks.core.IRepositoryConstants;
import org.eclipse.mylyn.internal.tasks.core.LocalRepositoryConnector;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryMigrator;
import org.eclipse.mylyn.tasks.core.TaskRepository;

/**
 * @author Robert Elves
 * @since 3.4
 */
public class LocalRepositoryMigrator extends AbstractRepositoryMigrator {

	@Override
	public String getConnectorKind() {
		return LocalRepositoryConnector.CONNECTOR_KIND;
	}

	@Override
	public boolean migrateRepository(TaskRepository repository) {
		if (repository.getProperty(IRepositoryConstants.PROPERTY_CATEGORY) == null) {
			repository.setProperty(IRepositoryConstants.PROPERTY_CATEGORY, IRepositoryConstants.CATEGORY_TASKS);
			return true;
		}
		return false;
	}

}

Return to bug 263528

Added Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryMigrator.java (+54 lines)
1	/*******************************************************************************
2	* Copyright (c) 2004, 2008 Tasktop Technologies and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Tasktop Technologies - initial API and implementation
10	*******************************************************************************/
11
12	package org.eclipse.mylyn.internal.bugzilla.ui.tasklist;
13
14	import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
15	import org.eclipse.mylyn.internal.tasks.core.IRepositoryConstants;
16	import org.eclipse.mylyn.tasks.core.AbstractRepositoryMigrator;
17	import org.eclipse.mylyn.tasks.core.TaskRepository;
18
19	/**
20	* @author Robert Elves
21	* @since 3.4
22	*/
23	public class BugzillaRepositoryMigrator extends AbstractRepositoryMigrator {
24
25	@Override
26	public String getConnectorKind() {
27	return BugzillaCorePlugin.CONNECTOR_KIND;
28	}
29
30	@Override
31	public boolean migrateRepository(TaskRepository repository) {
32	if (repository.getProperty(IRepositoryConstants.PROPERTY_CATEGORY) == null) {
33	repository.setProperty(IRepositoryConstants.PROPERTY_CATEGORY, IRepositoryConstants.CATEGORY_BUGS);
34	return true;
35	}
36	return false;
37
38	// repository.setProperty(IRepositoryConstants.PROPERTY_CATEGORY, IRepositoryConstants.CATEGORY_BUGS);
39	//
40	// if (repository.getConnectorKind().equals("bugzilla") \|\| repository.getConnectorKind().equals("local")) {
41	// if (repository.getRepositoryUrl().contains("bugs.eclipse.org")) {
42	// repository.setProperty(IRepositoryConstants.PROPERTY_CATEGORY, IRepositoryConstants.CATEGORY_BUGS);
43	// } else {
44	// repository.setProperty(IRepositoryConstants.PROPERTY_CATEGORY, IRepositoryConstants.CATEGORY_TASKS);
45	// }
46	// } else {
47	// String category = repository.getProperty(IRepositoryConstants.PROPERTY_CATEGORY);
48	// if (category == null) {
49	// repository.setProperty(IRepositoryConstants.PROPERTY_CATEGORY, IRepositoryConstants.CATEGORY_OTHER);
50	// }
51	// }
52	}
53
54	}

Added Link Here

(-)src/org/eclipse/mylyn/internal/tasks/core/notifications/IServiceMessageListener.java (+21 lines)
1	/*******************************************************************************
2	* Copyright (c) 2010 Tasktop Technologies and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Tasktop Technologies - initial API and implementation
10	*******************************************************************************/
11
12	package org.eclipse.mylyn.internal.tasks.core.notifications;
13
14	/**
15	* @author Robert Elves
16	*/
17	public interface IServiceMessageListener {
18
19	public void handleEvent(ServiceMessageEvent event);
20
21	}

Added Link Here

(-)src/org/eclipse/mylyn/tasks/core/AbstractRepositoryMigrator.java (+26 lines)
1	/*******************************************************************************
2	* Copyright (c) 2004, 2008 Tasktop Technologies and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Tasktop Technologies - initial API and implementation
10	*******************************************************************************/
11
12	package org.eclipse.mylyn.tasks.core;
13
14	/**
15	* @author Robert Elves
16	* @since 3.4
17	*/
18	public abstract class AbstractRepositoryMigrator {
19
20	public abstract String getConnectorKind();
21
22	public boolean migrateRepository(TaskRepository repository) {
23	return false;
24	}
25
26	}

Added Link Here

(-)src/org/eclipse/mylyn/tasks/tests/util/ServiceMessageManagerTest.java (+81 lines)
1	/*******************************************************************************
2	* Copyright (c) 2010 Tasktop Technologies and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Tasktop Technologies - initial API and implementation
10	*******************************************************************************/
11
12	package org.eclipse.mylyn.tasks.tests.util;
13
14	import java.io.ByteArrayInputStream;
15	import java.io.InputStream;
16
17	import javax.xml.parsers.SAXParser;
18	import javax.xml.parsers.SAXParserFactory;
19
20	import junit.framework.TestCase;
21
22	import org.apache.commons.httpclient.HttpStatus;
23	import org.eclipse.core.runtime.NullProgressMonitor;
24	import org.eclipse.mylyn.internal.tasks.core.notifications.ServiceMessage;
25	import org.eclipse.mylyn.internal.tasks.core.notifications.ServiceMessageManager;
26	import org.eclipse.mylyn.internal.tasks.core.notifications.ServiceMessageXmlHandler;
27
28	/**
29	* @author Robert Elves
30	*/
31	public class ServiceMessageManagerTest extends TestCase {
32
33	private static final String MESSAGE_XML_URL = "http://eclipse.org/mylyn/messageTest.xml";
34
35	public void testRetrievingMessage() throws Exception {
36	ServiceMessageManager manager = new ServiceMessageManager(MESSAGE_XML_URL, "", "");
37	int status = manager.updateServiceMessage(new NullProgressMonitor());
38	assertEquals(HttpStatus.SC_OK, status);
39	ServiceMessage message = manager.getServiceMessages().get(0);
40
41	assertEquals("1", message.getId());
42	assertEquals("140 character description here....", message.getDescription());
43	assertEquals("Mylyn 3.4 now available!", message.getTitle());
44	assertEquals("http://eclipse.org/mylyn/downloads", message.getUrl());
45	assertEquals("Mylyn 3.4 now available!", message.getTitle());
46	assertEquals("dialog_messasge_info_image", message.getImage());
47	}
48
49	public void testETag() throws Exception {
50
51	ServiceMessageManager manager = new ServiceMessageManager(MESSAGE_XML_URL, "", "");
52	int status = manager.updateServiceMessage(new NullProgressMonitor());
53	assertEquals(HttpStatus.SC_OK, status);
54	ServiceMessage message = manager.getServiceMessages().get(0);
55
56	assertNotNull(message.getLastModified());
57	assertNotNull(message.getETag());
58
59	status = manager.updateServiceMessage(new NullProgressMonitor());
60	assertEquals(HttpStatus.SC_NOT_MODIFIED, status);
61	}
62
63	public void testParsingMessageXml() throws Exception {
64	String messageXml = "<ServiceMessage> <id>1</id><description>140 character description here....</description><title>Mylyn 3.4 now available!</title><url>http://eclipse.org/mylyn/downloads</url><image>dialog_messasge_info_image</image></ServiceMessage>";
65	InputStream is = new ByteArrayInputStream(messageXml.getBytes("UTF-8"));
66	SAXParserFactory factory = SAXParserFactory.newInstance();
67	factory.setValidating(false);
68	SAXParser parser = factory.newSAXParser();
69	ServiceMessageXmlHandler handler = new ServiceMessageXmlHandler();
70	parser.parse(is, handler);
71	ServiceMessage message = handler.getMessages().get(0);
72
73	assertEquals("1", message.getId());
74	assertEquals("140 character description here....", message.getDescription());
75	assertEquals("Mylyn 3.4 now available!", message.getTitle());
76	assertEquals("http://eclipse.org/mylyn/downloads", message.getUrl());
77	assertEquals("Mylyn 3.4 now available!", message.getTitle());
78	assertEquals("dialog_messasge_info_image", message.getImage());
79	}
80
81	}

Lines 22-31 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesView.java (-52 / +17 lines)
22	import org.eclipse.jface.viewers.DecoratingLabelProvider;	22	import org.eclipse.jface.viewers.DecoratingLabelProvider;
23	import org.eclipse.jface.viewers.DoubleClickEvent;	23	import org.eclipse.jface.viewers.DoubleClickEvent;
24	import org.eclipse.jface.viewers.IDoubleClickListener;	24	import org.eclipse.jface.viewers.IDoubleClickListener;
25	import org.eclipse.jface.viewers.IStructuredContentProvider;	25	import org.eclipse.jface.viewers.TreeViewer;
26	import org.eclipse.jface.viewers.TableViewer;
27	import org.eclipse.jface.viewers.Viewer;
28	import org.eclipse.mylyn.commons.core.StatusHandler;	26	import org.eclipse.mylyn.commons.core.StatusHandler;
		27	import org.eclipse.mylyn.internal.tasks.core.Category;
29	import org.eclipse.mylyn.internal.tasks.core.IRepositoryModelListener;	28	import org.eclipse.mylyn.internal.tasks.core.IRepositoryModelListener;
30	import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryAdapter;	29	import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryAdapter;
31	import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;	30	import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
Lines 50-55 Link Here
50	import org.eclipse.ui.handlers.IHandlerService;	49	import org.eclipse.ui.handlers.IHandlerService;
51	import org.eclipse.ui.part.ViewPart;	50	import org.eclipse.ui.part.ViewPart;
52	import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;	51	import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
		52	import org.eclipse.ui.themes.IThemeManager;
53		53
54	/**	54	/**
55	* @author Mik Kersten	55	* @author Mik Kersten
Lines 62-68 Link Here
62	@Deprecated	62	@Deprecated
63	public static final String ID = ITasksUiConstants.ID_VIEW_REPOSITORIES;	63	public static final String ID = ITasksUiConstants.ID_VIEW_REPOSITORIES;
64		64
65	private TableViewer viewer;	65	private TreeViewer viewer;
66		66
67	private final Action addRepositoryAction = new AddRepositoryAction();	67	private final Action addRepositoryAction = new AddRepositoryAction();
68		68
Lines 121-138 Link Here
121	}	121	}
122	};	122	};
123		123
124	static class ViewContentProvider implements IStructuredContentProvider {
125	public void inputChanged(Viewer v, Object oldInput, Object newInput) {
126	}
127
128	public void dispose() {
129	}
130
131	public Object[] getElements(Object parent) {
132	return TasksUi.getRepositoryManager().getAllRepositories().toArray();
133	}
134	}
135
136	public TaskRepositoriesView() {	124	public TaskRepositoriesView() {
137	TasksUi.getRepositoryManager().addListener(REPOSITORY_LISTENER);	125	TasksUi.getRepositoryManager().addListener(REPOSITORY_LISTENER);
138	TasksUiPlugin.getDefault().addModelListener(MODEL_LISTENER);	126	TasksUiPlugin.getDefault().addModelListener(MODEL_LISTENER);
Lines 172-198 Link Here
172		160
173	@Override	161	@Override
174	public void createPartControl(Composite parent) {	162	public void createPartControl(Composite parent) {
175	viewer = new TableViewer(parent, SWT.MULTI \| SWT.H_SCROLL \| SWT.V_SCROLL \| SWT.FULL_SELECTION);	163	viewer = new TreeViewer(parent, SWT.MULTI \| SWT.H_SCROLL \| SWT.V_SCROLL \| SWT.FULL_SELECTION);
176	viewer.setContentProvider(new ViewContentProvider());	164	viewer.setContentProvider(new TeamRepositoriesContentProvider());
177	viewer.setUseHashlookup(true);	165	viewer.setUseHashlookup(true);
178	viewer.setLabelProvider(new DecoratingLabelProvider(new TaskRepositoryLabelProvider(),	166	viewer.setLabelProvider(new DecoratingLabelProvider(new TaskRepositoryLabelProvider(),
179	PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator()));	167	PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator()));
180		168
181	viewer.setSorter(new TaskRepositoriesSorter());	169	viewer.setSorter(new TaskRepositoriesViewSorter());
182		170
183	// new ViewerSorter() {
184	//
185	// @Override
186	// public int compare(Viewer viewer, Object e1, Object e2) {
187	// if (e1 instanceof TaskRepository && e2 instanceof TaskRepository) {
188	// TaskRepository t1 = (TaskRepository) e1;
189	// TaskRepository t2 = (TaskRepository) e2;
190	// return (t1.getKind() + t1.getUrl()).compareTo(t2.getKind() + t2.getUrl());
191	// } else {
192	// return super.compare(viewer, e1, e2);
193	// }
194	// }
195	// });
196	viewer.setInput(getViewSite());	171	viewer.setInput(getViewSite());
197	viewer.addDoubleClickListener(new IDoubleClickListener() {	172	viewer.addDoubleClickListener(new IDoubleClickListener() {
198	public void doubleClick(DoubleClickEvent event) {	173	public void doubleClick(DoubleClickEvent event) {
Lines 208-220 Link Here
208	}	183	}
209	});	184	});
210		185
211	// FIXME remove listener when view is disposed	186	final IThemeManager themeManager = getSite().getWorkbenchWindow().getWorkbench().getThemeManager();
212	TasksUi.getRepositoryManager().addListener(new TaskRepositoryListener());	187	new GradientDrawer(themeManager, getViewer()) {
		188	@Override
		189	protected boolean shouldApplyGradient(org.eclipse.swt.widgets.Event event) {
		190	return event.item.getData() instanceof Category;
		191	}
		192	};
213		193
214	makeActions();	194	makeActions();
215	hookContextMenu();	195	hookContextMenu();
216	hookGlobalActions();	196	hookGlobalActions();
217	contributeToActionBars();	197	contributeToActionBars();
		198	getViewer().expandAll();
218	getSite().setSelectionProvider(getViewer());	199	getSite().setSelectionProvider(getViewer());
219	}	200	}
220		201
Lines 288-315 Link Here
288	public void refresh() {	269	public void refresh() {
289	if (viewer != null && !viewer.getControl().isDisposed()) {	270	if (viewer != null && !viewer.getControl().isDisposed()) {
290	viewer.refresh();	271	viewer.refresh();
		272	viewer.expandAll();
291	}	273	}
292	}	274	}
293		275
294	public TableViewer getViewer() {	276	public TreeViewer getViewer() {
295	return viewer;	277	return viewer;
296	}	278	}
297		279
298	public class TaskRepositoryListener extends TaskRepositoryAdapter {
299
300	@Override
301	public void repositorySettingsChanged(TaskRepository repository) {
302	if (PlatformUI.isWorkbenchRunning() && !PlatformUI.getWorkbench().getDisplay().isDisposed()) {
303	PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
304	public void run() {
305	if (!getViewer().getControl().isDisposed()) {
306	getViewer().refresh(true);
307	}
308	}
309	});
310	}
311	}
312
313	}
314
315	}	280	}

Lines 24-29 Link Here

(-)schema/repositories.exsd (+21 lines)
24	<element ref="connectorCore"/>	24	<element ref="connectorCore"/>
25	<element ref="connectorUi" minOccurs="0" maxOccurs="1"/>	25	<element ref="connectorUi" minOccurs="0" maxOccurs="1"/>
26	<element ref="taskListMigrator" minOccurs="0" maxOccurs="1"/>	26	<element ref="taskListMigrator" minOccurs="0" maxOccurs="1"/>
		27	<element ref="repositoryMigrator" minOccurs="0" maxOccurs="1"/>
27	</sequence>	28	</sequence>
28	<attribute name="point" type="string" use="required">	29	<attribute name="point" type="string" use="required">
29	<annotation>	30	<annotation>
Lines 169-174 Link Here
169	</complexType>	170	</complexType>
170	</element>	171	</element>
171		172
		173	<element name="repositoryMigrator">
		174	<annotation>
		175	<documentation>
		176	(no description available)
		177	</documentation>
		178	</annotation>
		179	<complexType>
		180	<attribute name="class" type="string" use="required">
		181	<annotation>
		182	<documentation>
		183
		184	</documentation>
		185	<appInfo>
		186	<meta.attribute kind="java" basedOn="org.eclipse.mylyn.tasks.core.AbstractRepositoryMigrator:"/>
		187	</appInfo>
		188	</annotation>
		189	</attribute>
		190	</complexType>
		191	</element>
		192
172	<annotation>	193	<annotation>
173	<appInfo>	194	<appInfo>
174	<meta.section type="since"/>	195	<meta.section type="since"/>