Attachment #54525 for bug #165581

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

Lines 26-32 Link Here

(-)src/org/eclipse/mylar/tasks/core/AbstractRepositoryConnector.java (-8 / +16 lines)
26		26
27	/**	27	/**
28	* Operations on a task repository	28	* Operations on a task repository
29	*	29	*
30	* @author Mik Kersten	30	* @author Mik Kersten
31	* @author Rob Elves	31	* @author Rob Elves
32	*/	32	*/
Lines 45-51 Link Here
45	protected TaskList taskList;	45	protected TaskList taskList;
46		46
47	public void init(TaskList taskList) {	47	public void init(TaskList taskList) {
48	this.taskList = taskList;	48	this.taskList = taskList;
49	}	49	}
50		50
51	/**	51	/**
Lines 58-65 Link Here
58	*/	58	*/
59	public abstract IOfflineTaskHandler getOfflineTaskHandler();	59	public abstract IOfflineTaskHandler getOfflineTaskHandler();
60		60
61	public abstract String getRepositoryUrlFromTaskUrl(String url);	61	public abstract String getRepositoryUrlFromTaskUrl(String taskFullUrl);
62		62
		63	public abstract String getTaskIdFromTaskUrl(String taskFullUrl);
		64
		65	public abstract String getTaskWebUrl(String repositoryUrl, String taskId);
		66
63	public abstract boolean canCreateTaskFromKey(TaskRepository repository);	67	public abstract boolean canCreateTaskFromKey(TaskRepository repository);
64		68
65	public abstract boolean canCreateNewTask(TaskRepository repository);	69	public abstract boolean canCreateNewTask(TaskRepository repository);
Lines 78-84 Link Here
78		82
79	/**	83	/**
80	* Implementors must execute query synchronously.	84	* Implementors must execute query synchronously.
81	*	85	*
82	* @param query	86	* @param query
83	* @param repository	87	* @param repository
84	* TODO	88	* TODO
Lines 128-134 Link Here
128	* Implementors of this repositoryOperations must perform it locally without	132	* Implementors of this repositoryOperations must perform it locally without
129	* going to the server since it is used for frequent repositoryOperations	133	* going to the server since it is used for frequent repositoryOperations
130	* such as decoration.	134	* such as decoration.
131	*	135	*
132	* @return an empty set if no contexts	136	* @return an empty set if no contexts
133	*/	137	*/
134	public final Set<RepositoryAttachment> getContextAttachments(TaskRepository repository, AbstractRepositoryTask task) {	138	public final Set<RepositoryAttachment> getContextAttachments(TaskRepository repository, AbstractRepositoryTask task) {
Lines 155-161 Link Here
155		159
156	/**	160	/**
157	* Attaches the associated context to <code>task</code>.	161	* Attaches the associated context to <code>task</code>.
158	*	162	*
159	* @return false, if operation is not supported by repository	163	* @return false, if operation is not supported by repository
160	*/	164	*/
161	public final boolean attachContext(TaskRepository repository, AbstractRepositoryTask task, String longComment) throws CoreException {	165	public final boolean attachContext(TaskRepository repository, AbstractRepositoryTask task, String longComment) throws CoreException {
Lines 185-191 Link Here
185	/**	189	/**
186	* Retrieves a context stored in <code>attachment</code> from	190	* Retrieves a context stored in <code>attachment</code> from
187	* <code>task</code>.	191	* <code>task</code>.
188	*	192	*
189	* @return false, if operation is not supported by repository	193	* @return false, if operation is not supported by repository
190	*/	194	*/
191	public final boolean retrieveContext(TaskRepository repository, AbstractRepositoryTask task,	195	public final boolean retrieveContext(TaskRepository repository, AbstractRepositoryTask task,
Lines 216-221 Link Here
216	return templates;	220	return templates;
217	}	221	}
218		222
		223	public void removeTemplate(RepositoryTemplate template) {
		224	this.templates.remove(template);
		225	}
		226
219	/** returns null if template not found */	227	/** returns null if template not found */
220	public RepositoryTemplate getTemplate(String label) {	228	public RepositoryTemplate getTemplate(String label) {
221	for (RepositoryTemplate template : getTemplates()) {	229	for (RepositoryTemplate template : getTemplates()) {
Lines 233-239 Link Here
233	/**	241	/**
234	* Reset and update the repository attributes from the server (e.g.	242	* Reset and update the repository attributes from the server (e.g.
235	* products, components)	243	* products, components)
236	*	244	*
237	* TODO: remove?	245	* TODO: remove?
238	*/	246	*/
239	public abstract void updateAttributes(TaskRepository repository, IProgressMonitor monitor) throws CoreException;	247	public abstract void updateAttributes(TaskRepository repository, IProgressMonitor monitor) throws CoreException;

Lines 81-88 Link Here

(-)src/org/eclipse/mylar/tasks/tests/connector/MockRepositoryConnector.java (+11 lines)
81	// ignore	81	// ignore
82	return null;	82	return null;
83	}	83	}
		84
		85	@Override
		86	public String getTaskIdFromTaskUrl(String url) {
		87	// ignore
		88	return null;
		89	}
84		90
85	@Override	91	@Override
		92	public String getTaskWebUrl(String repositoryUrl, String taskId) {
		93	return null;
		94	}
		95
		96	@Override
86	public List<String> getSupportedVersions() {	97	public List<String> getSupportedVersions() {
87	// ignore	98	// ignore
88	return null;	99	return null;





import junit.framework.TestCase;

import org.eclipse.mylar.internal.team.LinkedTaskInfoAdapterFactory;

/**
 * @author Mik Kersten


	public void test07LegacyMatching() {
		String label = "Progress on: 123: foo \nhttps://bugs.eclipse.org";
		String id = LinkedTaskInfoAdapterFactory.getTaskIdFromLegacy07Label(label);
		assertEquals("123", id);
	}
	
	public void testUrlMatching() {
		String label = "bla bla\nhttp://foo.bar-123 bla bla";
		String id = LinkedTaskInfoAdapterFactory.getUrlFromComment(label);
		assertEquals("http://foo.bar-123", id);
	}
	

Lines 2-8 Link Here

(-).classpath (-1 / +1 lines)
2	<classpath>	2	<classpath>
3	<classpathentry exported="true" kind="lib" path="lib/ws-commons-util-1.0.1.jar" sourcepath="lib/ws-commons-util-1.0.1-sources.jar"/>	3	<classpathentry exported="true" kind="lib" path="lib/ws-commons-util-1.0.1.jar" sourcepath="lib/ws-commons-util-1.0.1-sources.jar"/>
4	<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.3.jar"/>	4	<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.3.jar"/>
5	<classpathentry exported="true" kind="lib" path="lib/commons-httpclient-3.0.jar"/>	5	<classpathentry exported="true" kind="lib" path="lib/commons-httpclient-3.0.jar" sourcepath="lib/commons-httpclient-3.0-src.zip"/>
6	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>	6	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
7	<classpathentry kind="src" path="src"/>	7	<classpathentry kind="src" path="src"/>
8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">




	public String getRepositoryUrlFromTaskUrl(String url) {
		if (url == null) {
			return null;
		} else {
			int index = url.indexOf(IBugzillaConstants.URL_GET_SHOW_BUG);
			if (index != -1) {
				return url.substring(0, index);
			} else {
				return null;
			}
		}
		int index = url.indexOf(IBugzillaConstants.URL_GET_SHOW_BUG);
		return index == -1 ? null : url.substring(0, index);
	}

	@Override
	public String getTaskIdFromTaskUrl(String url) {
		if (url == null) {
			return null;
		}
		int index = url.indexOf(IBugzillaConstants.URL_GET_SHOW_BUG);
		return index == -1 ? null : url.substring(index + IBugzillaConstants.URL_GET_SHOW_BUG.length());
	}
	
	@Override
	public String getTaskWebUrl(String repositoryUrl, String taskId) {
		return repositoryUrl + IBugzillaConstants.URL_GET_SHOW_BUG + taskId;
	}

	// @Override

Lines 149-162 Link Here

(-)src/org/eclipse/mylar/internal/tasks/web/WebRepositoryConnector.java (-6 / +34 lines)
149		149
150	@Override	150	@Override
151	public String getRepositoryUrlFromTaskUrl(String url) {	151	public String getRepositoryUrlFromTaskUrl(String url) {
		152	if (url == null) {
		153	return null;
		154	}
		155
152	// lookup repository using task prefix url	156	// lookup repository using task prefix url
153	TaskRepositoryManager repositoryManager = TasksUiPlugin.getRepositoryManager();	157	TaskRepositoryManager repositoryManager = TasksUiPlugin.getRepositoryManager();
154	for (TaskRepository repository : repositoryManager.getAllRepositories()) {	158	for (TaskRepository repository : repositoryManager.getRepositories(getRepositoryType())) {
155	if (getRepositoryType().equals(repository.getKind())) {	159	String start = evaluateParams(repository.getProperty(PROPERTY_TASK_URL), repository);
156	String start = evaluateParams(repository.getProperty(PROPERTY_TASK_URL), repository);	160	if (start != null && url.startsWith(start)) {
157	if (start != null && url.startsWith(start)) {	161	return repository.getUrl();
158	return repository.getUrl();
159	}
160	}	162	}
161	}	163	}
162		164
Lines 173-179 Link Here
173	}	175	}
174	}	176	}
175	}	177	}
		178	return null;
		179	}
		180
		181	@Override
		182	public String getTaskIdFromTaskUrl(String url) {
		183	if (url == null) {
		184	return null;
		185	}
176		186
		187	TaskRepositoryManager repositoryManager = TasksUiPlugin.getRepositoryManager();
		188	for (TaskRepository repository : repositoryManager.getRepositories(getRepositoryType())) {
		189	String start = evaluateParams(repository.getProperty(PROPERTY_TASK_URL), repository);
		190	if (start != null && url.startsWith(start)) {
		191	return url.substring(start.length());
		192	}
		193	}
		194	return null;
		195	}
		196
		197	@Override
		198	public String getTaskWebUrl(String repositoryUrl, String taskId) {
		199	TaskRepositoryManager repositoryManager = TasksUiPlugin.getRepositoryManager();
		200	TaskRepository repository = repositoryManager.getRepository(getRepositoryType(), repositoryUrl);
		201	if (repository != null) {
		202	String prefix = evaluateParams(repository.getProperty(PROPERTY_TASK_URL), repository);
		203	return prefix + taskId;
		204	}
177	return null;	205	return null;
178	}	206	}
179		207




import org.eclipse.mylar.tasks.core.Task;
import org.eclipse.mylar.tasks.core.TaskCategory;
import org.eclipse.mylar.tasks.core.TaskRepository;
import org.eclipse.mylar.tasks.core.TaskRepositoryManager;
import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;
import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
import org.eclipse.swt.graphics.Image;

		} else {
			AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(repository.getKind());
			if (connectorUi != null) {
				opened = connectorUi.openRemoteTask(repository.getUrl(), taskId);
				opened = true;
			}
		}
		return opened;
	}

	/**
	 * Either pass in a repositoryUrl and taskId, or fullUrl, or all of them
	 */
	public static boolean openRepositoryTask(String repositoryUrl, String taskId, String fullUrl) {
		TaskRepositoryManager repositoryManager = TasksUiPlugin.getRepositoryManager();
		AbstractRepositoryConnector connector = repositoryManager.getConnectorForRepositoryTaskUrl(fullUrl);
		if (taskId == null && connector != null) {
			taskId = connector.getTaskIdFromTaskUrl(fullUrl);
		}
		if (repositoryUrl == null && connector != null) {
			repositoryUrl = connector.getRepositoryUrlFromTaskUrl(fullUrl);
		}

		ITask task = null;
		if (taskId != null) {
			String handle = AbstractRepositoryTask.getHandle(repositoryUrl, taskId);
			task = TasksUiPlugin.getTaskListManager().getTaskList().getTask(handle);
		}
		if (task == null && fullUrl != null) {
			// search by fullUrl
			for (ITask currTask : TasksUiPlugin.getTaskListManager().getTaskList().getAllTasks()) {
				if (currTask instanceof AbstractRepositoryTask) {
					String currUrl = ((AbstractRepositoryTask) currTask).getUrl();
					if (fullUrl.equals(currUrl)) {
						task = currTask;
						break;
					}

			}
		}

		boolean opened = false;
		if (task != null) {
			TaskUiUtil.refreshAndOpenTaskListElement(task);
			opened = true;
		} else if (connector != null) {
			AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager()
					.getConnectorForRepositoryTaskUrl(fullUrl);
			AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(connector.getRepositoryType());
			if (connectorUi != null) {
			if (connector != null) {
				opened = connectorUi.openRemoteTask(repositoryUrl, taskId);
			}
		}
		if (!opened && fullUrl != null) {
			TaskUiUtil.openUrl(fullUrl);
			opened = true;
		}




import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.mylar.context.core.MylarStatusHandler;
import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
import org.eclipse.mylar.internal.tasks.ui.wizards.AbstractRepositorySettingsPage;
import org.eclipse.mylar.internal.tasks.ui.wizards.CommonAddExistingTaskWizard;
import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector;
import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery;
import org.eclipse.mylar.tasks.core.TaskRepository;
import org.eclipse.mylar.tasks.core.TaskRepositoryManager;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;



	/**
	 * Only override if task should be opened by a custom editor, default
	 * behavior is to open with browser.
	 * 
	 * @return true if the task was successfully opened
	 */
	public boolean openRemoteTask(String repositoryUrl, String idString) {
		TaskRepositoryManager repositoryManager = TasksUiPlugin.getRepositoryManager();
		AbstractRepositoryConnector connector = repositoryManager.getRepositoryConnector(getRepositoryType());
		TaskUiUtil.openUrl(connector.getTaskWebUrl(repositoryUrl, idString));

		return true;
		// MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
		// TasksUiPlugin.TITLE_DIALOG, "Not supported by connector: " +
		// this.getClass().getSimpleName());
	}
}

Lines 198-207 Link Here

(-)src/org/eclipse/mylar/internal/jira/core/JiraRepositoryConnector.java (-3 / +14 lines)
198	return null;	198	return null;
199	}	199	}
200	int index = url.indexOf(DELIM_URL);	200	int index = url.indexOf(DELIM_URL);
201	if (index != -1) {	201	return index == -1 ? null : url.substring(0, index);
202	return url.substring(0, index);	202	}
		203
		204	@Override
		205	public String getTaskIdFromTaskUrl(String url) {
		206	if (url == null) {
		207	return null;
203	}	208	}
204	return null;	209	int index = url.indexOf(DELIM_URL);
		210	return index == -1 ? null : url.substring(index + DELIM_URL.length());
		211	}
		212
		213	@Override
		214	public String getTaskWebUrl(String repositoryUrl, String taskId) {
		215	return repositoryUrl + DELIM_URL + taskId;
205	}	216	}
206		217
207	public static void updateTaskDetails(String repositoryUrl, JiraTask task, Issue issue, boolean notifyOfChange) {	218	public static void updateTaskDetails(String repositoryUrl, JiraTask task, Issue issue, boolean notifyOfChange) {

Lines 53-60 Link Here

(-)src/org/eclipse/mylar/internal/jira/core/JiraServerFacade.java (-2 / +5 lines)
53	String serverHostname = getServerHost(repository);	53	String serverHostname = getServerHost(repository);
54	JiraServer server = serverManager.getServer(serverHostname);	54	JiraServer server = serverManager.getServer(serverHostname);
55	if (server == null) {	55	if (server == null) {
56	server = serverManager.createServer(serverHostname, repository.getUrl(), false,	56	String userName = repository.getUserName();
57	repository.getUserName(), repository.getPassword());	57	String password = repository.getPassword();
		58	server = serverManager.createServer(serverHostname, repository.getUrl(), false, //
		59	userName == null ? "" : userName, //
		60	password == null ? "" : password);
58	serverManager.addServer(server);	61	serverManager.addServer(server);
59	}	62	}
60	return server;	63	return server;





package org.eclipse.mylar.internal.team.ui.actions;

import org.eclipse.compare.structuremergeviewer.IDiffElement;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.mylar.internal.tasks.ui.TaskListImages;
import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
import org.eclipse.mylar.internal.team.ILinkedTaskInfo;
import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector;
import org.eclipse.mylar.tasks.core.AbstractRepositoryTask;
import org.eclipse.mylar.tasks.core.ITask;
import org.eclipse.mylar.tasks.core.TaskRepository;
import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;
import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
import org.eclipse.mylar.team.MylarTeamPlugin;
import org.eclipse.team.core.history.IFileRevision;
import org.eclipse.team.core.variants.IResourceVariant;
import org.eclipse.team.internal.ccvs.core.client.listeners.LogEntry;
import org.eclipse.team.internal.ccvs.core.mapping.CVSCheckedInChangeSet;
import org.eclipse.team.internal.ccvs.core.resources.RemoteResource;
import org.eclipse.team.internal.core.subscribers.DiffChangeSet;
import org.eclipse.team.internal.ui.synchronize.ChangeSetDiffNode;
import org.eclipse.team.internal.ui.synchronize.SynchronizeModelElement;
import org.eclipse.ui.IViewActionDelegate;
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.internal.ObjectPluginAction;

/**
 * @author Mik Kersten
 * @author Eugene Kuleshov
 */
public class OpenCorrespondingTaskAction extends Action implements IViewActionDelegate {

    private static final String LABEL = "Open Corresponding Task";

    private ISelection selection;

//    private static final String PREFIX_HTTP = "http://";

//    private static final String PREFIX_HTTPS = "https://";

    public OpenCorrespondingTaskAction() {
        setText(LABEL);
        setToolTipText(LABEL);
        setImageDescriptor(TaskListImages.TASK_REPOSITORY);
    }

    public void init(IViewPart view) {
        // ignore
    }

    @Override
    public void run() {
        if (selection instanceof StructuredSelection) {
            run((StructuredSelection) selection);
        }
    }

    public void run(IAction action) {
        if (action instanceof ObjectPluginAction) {
            ObjectPluginAction objectAction = (ObjectPluginAction) action;
            if (objectAction.getSelection() instanceof StructuredSelection) {
                StructuredSelection selection = (StructuredSelection) objectAction.getSelection();
                run(selection);
            }
        }
    }

    private void run(StructuredSelection selection) {
        Object element = selection.getFirstElement();
        
        ILinkedTaskInfo info = null;
		if (element instanceof IAdaptable) {
			info = (ILinkedTaskInfo) ((IAdaptable) element).getAdapter(ILinkedTaskInfo.class);
		}
		if (info == null) {
			info = (ILinkedTaskInfo) Platform.getAdapterManager().getAdapter(element, ILinkedTaskInfo.class);
	public void run(IAction action) {
		if (action instanceof ObjectPluginAction) {
			ObjectPluginAction objectAction = (ObjectPluginAction) action;
			if (objectAction.getSelection() instanceof StructuredSelection) {
				StructuredSelection selection = (StructuredSelection) objectAction.getSelection();
				run(selection);
			}
		}
		
		if (info != null) {
			if(info.getTask()!=null) {
				// TODO Which one to use?
				// TaskUiUtil.openEditor(info.getTask(), false);
				TaskUiUtil.refreshAndOpenTaskListElement(info.getTask());
				return;
			ChangeSetDiffNode diffNode = (ChangeSetDiffNode) element;
			if (diffNode.getSet() instanceof ContextChangeSet) {
				ITask task = ((ContextChangeSet) diffNode.getSet()).getTask();
				TaskUiUtil.openEditor(task, false);
				opened = true;
			} 
		} else if (element instanceof ContextChangeSet) {
			ITask task = ((ContextChangeSet) element).getTask();
			if (task != null) {
				TaskUiUtil.openEditor(task, false);
				opened = true;
			}
			if(info.getRepositoryUrl()!=null && info.getTaskId()!=null) {
				TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(info.getRepositoryUrl());
				if(repository!=null) {
					if(TaskUiUtil.openRepositoryTask(repository, info.getTaskId())) {
						return;
					}
			if (comment != null) {
				String id = MylarTeamPlugin.getDefault().getCommitTemplateManager()
						.getTaskIdFromCommentOrLabel(comment);
				if (id == null) {
					id = getTaskIdFromLegacy07Label(comment);
				}
			}
			if(info.getTaskFullUrl()!=null) {
				TaskUiUtil.openUrl(info.getTaskFullUrl());
				return;
			}
		}
		
		// XXX show open remote task dialog  
		
		return;
/*        
        if (element instanceof ChangeSetDiffNode) {
            ChangeSetDiffNode diffNode = (ChangeSetDiffNode) element;
            ChangeSet set = diffNode.getSet();
            if (set instanceof ContextChangeSet) {
                ITask task = ((ContextChangeSet) set).getTask();
                TaskUiUtil.openEditor(task, false);
                return;
            } else {
                if(set.getClass().getName().startsWith("org.tigris")) {
                    if(openIssueFromSubclipseChangeset(diffNode, set)) {
                        return;
                    }
                }
            }
        } else if (element instanceof ContextChangeSet) {
            ITask task = ((ContextChangeSet) element).getTask();
            if (task != null) {
                TaskUiUtil.openEditor(task, false);
                return;
            }
        }

        String comment = getCommentFromSelection(element);
        if (comment != null) {
            String id = MylarTeamPlugin.getDefault().getCommitTemplateManager()
                    .getTaskIdFromCommentOrLabel(comment);
            if (id == null) {
                id = getTaskIdFromLegacy07Label(comment);
            }

            boolean opened = false;
            if (id != null) {
				IProject project = findCorrespondingProject(element);
				if (project != null) {
					TaskRepository repository = TasksUiPlugin.getDefault().getRepositoryForResource(project, false);
					if (repository != null) {
						opened = TaskUiUtil.openRepositoryTask(repository, id);
						if (connectorUi != null && id != null) {
							opened = TaskUiUtil.openRepositoryTask(repository, id);
						}
					}
				}
			}

            // try opening via URL if present
            if (!opened) {
                String fullUrl = getUrlFromComment(comment);

                String repositoryUrl = null;
                if (fullUrl != null) {
                    AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager()
                            .getConnectorForRepositoryTaskUrl(fullUrl);
                    if (connector != null) {
                        repositoryUrl = connector.getRepositoryUrlFromTaskUrl(fullUrl);
                    }
                } else {
                    // WTF?! opening a random task?
                	ITask task = TasksUiPlugin.getTaskListManager().getTaskList().getActiveTask();
                    if (task instanceof AbstractRepositoryTask) {
                        repositoryUrl = ((AbstractRepositoryTask) task).getRepositoryUrl();
                    } else if (TasksUiPlugin.getRepositoryManager().getAllRepositories().size() == 1) {
                        repositoryUrl = TasksUiPlugin.getRepositoryManager().getAllRepositories().get(0).getUrl();
                    }
                }

                if ((repositoryUrl != null && id != null) || fullUrl != null) {
					opened = TaskUiUtil.openRepositoryTask(repositoryUrl, id, fullUrl);
					if (!opened && fullUrl != null) {
						TaskUiUtil.openUrl(fullUrl);
					}
				}
            }
        }
*/        
    }

/*
    private boolean openIssueFromSubclipseChangeset(ChangeSetDiffNode diff, ChangeSet set) {
			return ((CVSCheckedInChangeSet) element).getComment();
		} else if (element instanceof ChangeSetDiffNode) {
			return ((ChangeSetDiffNode) element).getName();
		} else if (element instanceof LogEntry) {
			return ((LogEntry) element).getComment();
		} else if (element instanceof IFileRevision) {
			return ((IFileRevision) element).getComment();
		}
		return null;
	}

	private IProject findCorrespondingProject(Object element) {
		if (element instanceof DiffChangeSet) {
			IResource[] resources = ((DiffChangeSet) element).getResources();
			if (resources.length > 0) {
				// TODO: only checks first resource
				return resources[0].getProject();
			}
		} else if (element instanceof SynchronizeModelElement) {
			SynchronizeModelElement modelElement = (SynchronizeModelElement)element;
			IResource resource = modelElement.getResource();
			if (resource != null) {
				return resource.getProject();
			} else {
				IDiffElement[] elements = modelElement.getChildren();
				if (elements.length > 0) {
					// TODO: only checks first diff
					if (elements[0] instanceof SynchronizeModelElement) {
						return ((SynchronizeModelElement)elements[0]).getResource().getProject();
					}
				}
			}
		} else if (element instanceof IAdaptable) {
			// TODO: there must be a better way to get at the local resource
			IResourceVariant resourceVariant = (IResourceVariant) ((IAdaptable) element)
					.getAdapter(IResourceVariant.class);
			if (resourceVariant != null && resourceVariant instanceof RemoteResource) {
				RemoteResource remoteResource = (RemoteResource) resourceVariant;
				String path = remoteResource.getRepositoryRelativePath();
				IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
				return root.getProject(new Path(path).removeFirstSegments(1).uptoSegment(1).toString());
			}
		} else {
			
		}
		return null;
	}

        SynchronizeModelElement diffContainer = (SynchronizeModelElement) diff.getChildren()[0];
		int httpIndex = comment.indexOf(PREFIX_HTTP);
		int httpsIndex = comment.indexOf(PREFIX_HTTPS);
		int idStart = -1;
		if (httpIndex != -1) {
			idStart = httpIndex;
		} else if (httpsIndex != -1) {
			idStart = httpsIndex;
		}
		if (idStart != -1) {
			int idEnd = comment.indexOf(' ', idStart);
			if (idEnd == -1) {
				return comment.substring(idStart);
			} else if (idEnd != -1 && idStart < idEnd) {
				return comment.substring(idStart, idEnd);
			}
		}
		return null;
	}

        IResource res = diffContainer.getResource();

        SyncInfoModelElement melement = (SyncInfoModelElement) diffContainer.getChildren()[0];

        // Specific to Subclipse
        SVNStatusSyncInfo info = (SVNStatusSyncInfo) melement.getSyncInfo();

        ISVNRemoteResource remoteResource = (ISVNRemoteResource) info.getRemote();
        SVNRevision rev = remoteResource.getLastChangedRevision();

		String comment;
		try {
			ISVNLogMessage[] messages = remoteResource.getLogMessages(rev, rev, SVNRevision.START, false, false, 1);
			comment = messages[0].getMessage();
		} catch (TeamException ex) {
			comment = diff.getSet().getComment();
		}
            
		ProjectProperties props = null;
		try {
			props = ProjectProperties.getProjectProperties(res);
		} catch (TeamException ex) {
			// ignore?
		}
		String[] urls = null;
		if(props!=null) {
			urls = props.getLinkList(comment).getUrls();
		}
		if (urls == null || urls.length == 0) {
			urls = ProjectProperties.getUrls(comment).getUrls();
		}
		if (urls != null && urls.length > 0) {
			String taskUrl = urls[0];
			TaskUiUtil.openRepositoryTask(null, null, taskUrl);
			return true;
		}
		return false;
    }

    private String getCommentFromSelection(Object element) {
        if (element instanceof DiffChangeSet) {
            return ((CVSCheckedInChangeSet) element).getComment();
        } else if (element instanceof ChangeSetDiffNode) {
            return ((ChangeSetDiffNode) element).getName();
        } else if (element instanceof LogEntry) {
            return ((LogEntry) element).getComment();
        } else if (element instanceof IFileRevision) {
            return ((IFileRevision) element).getComment();
        }
        return null;
    }

    private IProject findCorrespondingProject(Object element) {
        if (element instanceof DiffChangeSet) {
            IResource[] resources = ((DiffChangeSet) element).getResources();
            if (resources.length > 0) {
                // TODO: only checks first resource
                return resources[0].getProject();
            }
        } else if (element instanceof SynchronizeModelElement) {
            SynchronizeModelElement modelElement = (SynchronizeModelElement)element;
            IResource resource = modelElement.getResource();
            if (resource != null) {
                return resource.getProject();
            } else {
                IDiffElement[] elements = modelElement.getChildren();
                if (elements.length > 0) {
                    // TODO: only checks first diff
                    if (elements[0] instanceof SynchronizeModelElement) {
                        return ((SynchronizeModelElement)elements[0]).getResource().getProject();
                    }
                }
            }
        } else if (element instanceof IAdaptable) {
            // TODO: there must be a better way to get at the local resource
            IResourceVariant resourceVariant = (IResourceVariant) ((IAdaptable) element)
                    .getAdapter(IResourceVariant.class);
            if (resourceVariant != null && resourceVariant instanceof RemoteResource) {
                RemoteResource remoteResource = (RemoteResource) resourceVariant;
                String path = remoteResource.getRepositoryRelativePath();
                IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
                return root.getProject(new Path(path).removeFirstSegments(1).uptoSegment(1).toString());
            }
        } else {

        }
        return null;
    }

    public static String getUrlFromComment(String comment) {
        int httpIndex = comment.indexOf(PREFIX_HTTP);
        int httpsIndex = comment.indexOf(PREFIX_HTTPS);
        int idStart = -1;
        if (httpIndex != -1) {
            idStart = httpIndex;
        } else if (httpsIndex != -1) {
            idStart = httpsIndex;
        }
        if (idStart != -1) {
            int idEnd = comment.indexOf(' ', idStart);
            if (idEnd == -1) {
                return comment.substring(idStart);
            } else if (idEnd != -1 && idStart < idEnd) {
                return comment.substring(idStart, idEnd);
            }
        }
        return null;
    }

    public static String getTaskIdFromLegacy07Label(String comment) {
        String PREFIX_DELIM = ":";
        String PREFIX_START_1 = "Progress on:";
        String PREFIX_START_2 = "Completed:";
        String usedPrefix = PREFIX_START_1;
        int firstDelimIndex = comment.indexOf(PREFIX_START_1);
        if (firstDelimIndex == -1) {
            firstDelimIndex = comment.indexOf(PREFIX_START_2);
            usedPrefix = PREFIX_START_2;
        }
        if (firstDelimIndex != -1) {
            int idStart = firstDelimIndex + usedPrefix.length();
            int idEnd = comment.indexOf(PREFIX_DELIM, firstDelimIndex + usedPrefix.length());// comment.indexOf(PREFIX_DELIM);
            if (idEnd != -1 && idStart < idEnd) {
                String id = comment.substring(idStart, idEnd);
                if (id != null) {
                    return id.trim();
                }
            } else {
                return comment.substring(0, firstDelimIndex);
            }
        }
        return null;
    }
*/

//	private Object findParent(ISynchronizeModelElement element) {
//		if (element instanceof ChangeSetDiffNode) {

//		}
//		return null;
//	}
	


    public void selectionChanged(IAction action, ISelection selection) {
        this.selection = selection;
    }

}

Lines 13-18 Link Here

(-)src/org/eclipse/mylar/team/MylarTeamPlugin.java (+5 lines)
13		13
14	import org.eclipse.mylar.context.core.MylarStatusHandler;	14	import org.eclipse.mylar.context.core.MylarStatusHandler;
15	import org.eclipse.mylar.internal.team.ContextChangeSetManager;	15	import org.eclipse.mylar.internal.team.ContextChangeSetManager;
		16	import org.eclipse.mylar.internal.team.LinkedTaskInfoAdapterFactory;
16	import org.eclipse.mylar.internal.team.template.CommitTemplateManager;	17	import org.eclipse.mylar.internal.team.template.CommitTemplateManager;
17	import org.eclipse.ui.IStartup;	18	import org.eclipse.ui.IStartup;
18	import org.eclipse.ui.PlatformUI;	19	import org.eclipse.ui.PlatformUI;
Lines 60-65 Link Here
60	}	61	}
61	}	62	}
62	});	63	});
		64
		65	LinkedTaskInfoAdapterFactory.registerAdapters();
63	}	66	}
64		67
65	public void earlyStartup() {	68	public void earlyStartup() {
Lines 71-76 Link Here
71	INSTANCE = null;	74	INSTANCE = null;
72	super.stop(context);	75	super.stop(context);
73	changeSetManager.disable();	76	changeSetManager.disable();
		77
		78	LinkedTaskInfoAdapterFactory.unregisterAdapters();
74	}	79	}
75		80
76	private void initPreferenceDefaults() {	81	private void initPreferenceDefaults() {




	           tooltip="Open Corresponding Task"> 
	  		</action> 
	    </objectContribution>
		
		<!-- Subclipse History view -->
		<objectContribution
            objectClass="org.tigris.subversion.subclipse.core.history.LogEntry"
            id="org.eclipse.mylar.ui.team.synchronize.open.report">
         <action
	           class="org.eclipse.mylar.internal.team.ui.actions.OpenCorrespondingTaskAction"
	           enablesFor="1" 
	           icon="icons/elcl16/task-repository.gif"
	           id="org.eclipse.mylar.ui.team.synchronize.contribution.open.report"
	           label="Open Corresponding Task"
	           menubarPath="mylar"
	           tooltip="Open Corresponding Task">
	  		</action> 
	    </objectContribution>
	    
	    <!--
		<objectContribution
            objectClass="org.eclipse.team.internal.ui.synchronize.ChangeSetDiffNode"




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

package org.eclipse.mylar.internal.team;

import org.eclipse.mylar.tasks.core.ITask;

/**
 * Task information linked to artifacts from version control integration 
 * 
 * TODO move to mylar core?
 * 
 * @author Eugene Kuleshov
 */
public interface ILinkedTaskInfo {

	String getTaskId();

	String getTaskFullUrl();

	String getRepositoryUrl();
	
	ITask getTask();
	
}




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

package org.eclipse.mylar.internal.team;

import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector;
import org.eclipse.mylar.tasks.core.AbstractRepositoryTask;
import org.eclipse.mylar.tasks.core.ITask;
import org.eclipse.mylar.tasks.core.TaskRepository;
import org.eclipse.mylar.tasks.core.TaskRepositoryManager;
import org.eclipse.mylar.tasks.ui.TasksUiPlugin;

/**
 * Default implementation of {@link ILinkedTaskInfo}
 * 
 * @author Eugene Kuleshov
 */
public class LinkedTaskInfo implements ILinkedTaskInfo {

	private String taskId;

	private String taskFullUrl;

	private String repositoryUrl;

	private ITask task;

	public LinkedTaskInfo(ITask task) {
		init(task, //
				AbstractRepositoryTask.getRepositoryUrl(task.getHandleIdentifier()), //
				AbstractRepositoryTask.getTaskId(task.getHandleIdentifier()), //
				task.getUrl());
	}

	public LinkedTaskInfo(String taskFullUrl) {
		init(null, null, null, taskFullUrl);
	}

	public LinkedTaskInfo(String repositoryUrl, String taskId, String taskFullUrl) {
		init(null, repositoryUrl, taskId, taskFullUrl);
	}

	private void init(ITask task, String repositoryUrl, String taskId, String taskFullUrl) {
		// TODO should this even be here?

		TaskRepositoryManager repositoryManager = TasksUiPlugin.getRepositoryManager();
		AbstractRepositoryConnector connector = repositoryManager.getConnectorForRepositoryTaskUrl(taskFullUrl);
		if (connector == null && repositoryUrl != null) {
			TaskRepository repository = repositoryManager.getRepository(repositoryUrl);
			if (repository != null) {
				connector = repositoryManager.getRepositoryConnector(repository.getKind());
			}
		}

		if (repositoryUrl == null && connector != null) {
			repositoryUrl = connector.getRepositoryUrlFromTaskUrl(taskFullUrl);
		}

		if (taskId == null && connector != null) {
			taskId = connector.getTaskIdFromTaskUrl(taskFullUrl);
		}

		if (taskFullUrl == null && repositoryUrl != null && taskId != null && connector != null) {
			taskFullUrl = connector.getTaskWebUrl(repositoryUrl, taskId);
		}
		
		if (task == null) {
			if (taskId != null && repositoryUrl != null) {
				String handle = AbstractRepositoryTask.getHandle(repositoryUrl, taskId);
				task = TasksUiPlugin.getTaskListManager().getTaskList().getTask(handle);
			}
			if (task == null && taskFullUrl != null) {
				// search by fullUrl
				for (ITask currTask : TasksUiPlugin.getTaskListManager().getTaskList().getAllTasks()) {
					if (currTask instanceof AbstractRepositoryTask) {
						String currUrl = ((AbstractRepositoryTask) currTask).getUrl();
						if (taskFullUrl.equals(currUrl)) {
							task = currTask;
							break;
						}
					}
				}
			}
		}

		if (taskFullUrl == null && task != null) {
			taskFullUrl = task.getUrl();
		}

		this.task = task;
		this.repositoryUrl = repositoryUrl;
		this.taskId = taskId;
		this.taskFullUrl = taskFullUrl;
	}

	public String getRepositoryUrl() {
		return repositoryUrl;
	}

	public ITask getTask() {
		return task;
	}

	public String getTaskFullUrl() {
		return taskFullUrl;
	}

	public String getTaskId() {
		return taskId;
	}

}




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

package org.eclipse.mylar.internal.team;

import org.eclipse.compare.structuremergeviewer.DiffNode;
import org.eclipse.compare.structuremergeviewer.IDiffElement;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.core.runtime.Platform;
import org.eclipse.mylar.internal.team.template.CommitTemplateManager;
import org.eclipse.mylar.tasks.core.TaskRepository;
import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
import org.eclipse.mylar.team.MylarTeamPlugin;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.core.history.IFileRevision;
import org.eclipse.team.core.variants.IResourceVariant;
import org.eclipse.team.internal.ccvs.core.CVSException;
import org.eclipse.team.internal.ccvs.core.ICVSResource;
import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
import org.eclipse.team.internal.ccvs.core.resources.RemoteResource;
import org.eclipse.team.internal.core.subscribers.ChangeSet;
import org.eclipse.team.internal.core.subscribers.DiffChangeSet;
import org.eclipse.team.internal.ui.synchronize.ChangeSetDiffNode;
import org.eclipse.team.internal.ui.synchronize.SyncInfoModelElement;
import org.eclipse.team.internal.ui.synchronize.SynchronizeModelElement;
import org.tigris.subversion.subclipse.core.ISVNRemoteResource;
import org.tigris.subversion.subclipse.core.sync.SVNStatusSyncInfo;
import org.tigris.subversion.subclipse.ui.settings.ProjectProperties;
import org.tigris.subversion.svnclientadapter.ISVNLogMessage;
import org.tigris.subversion.svnclientadapter.SVNRevision;


/**
 * Adapter factory used to create adapters for <code>LinkedTaskInfo</code> 
 * 
 * @author Eugene Kuleshov
 */
public class LinkedTaskInfoAdapterFactory implements IAdapterFactory {

	private static final Class[] ADAPTER_TYPES = new Class[] { ILinkedTaskInfo.class };

	private static IAdapterFactory FACTORY = new LinkedTaskInfoAdapterFactory();

	private static final String PREFIX_HTTP = "http://";

    private static final String PREFIX_HTTPS = "https://";

	
	public static void registerAdapters() {
		IAdapterManager adapterManager = Platform.getAdapterManager();

		// Mylar
		adapterManager.registerAdapters(FACTORY, ContextChangeSet.class);

		// Team public
		adapterManager.registerAdapters(FACTORY, IFileRevision.class);
		adapterManager.registerAdapters(FACTORY, DiffNode.class);

		// Team internal
		adapterManager.registerAdapters(FACTORY, DiffChangeSet.class); // CVSCheckedInChangeSet ???
		adapterManager.registerAdapters(FACTORY, ChangeSetDiffNode.class);
		adapterManager.registerAdapters(FACTORY, SynchronizeModelElement.class);
		
		// Team CVS internal; is it used? Maybe CVS History view in Eclipse 3.1?
		adapterManager.registerAdapters(FACTORY, org.eclipse.team.internal.ccvs.core.client.listeners.LogEntry.class);
		
		// Subclipse. need to do something when Subclibse is not installed		
		adapterManager.registerAdapters(FACTORY, org.tigris.subversion.subclipse.core.history.LogEntry.class);  
	}
	
	public static void unregisterAdapters() {
		Platform.getAdapterManager().unregisterAdapters(FACTORY); 
	}
    
	
	private LinkedTaskInfoAdapterFactory() {
	}
	
	public Object getAdapter(Object object, Class adapterType) {
		if(!ILinkedTaskInfo.class.equals(adapterType)) {
			return null;
		}
			
		if(object instanceof ChangeSetDiffNode) {
			return adaptChangeSetDiffNode(object);
		}
		
		if(object instanceof DiffNode) {
			return getAdapter(((DiffNode) object).getParent(), adapterType);
		}
		
		if(object instanceof org.tigris.subversion.subclipse.core.history.LogEntry) {
			return adaptSubclipseLogEntry(object);
		}
		
		// TODO add other adapted types

/*		
        if (object instanceof DiffChangeSet) {
            return ((CVSCheckedInChangeSet) object).getComment();
        } else if (object instanceof ChangeSetDiffNode) {
            return ((ChangeSetDiffNode) object).getName();
        } else if (object instanceof LogEntry) {
            return ((LogEntry) object).getComment();
        } else if (object instanceof IFileRevision) {
            return ((IFileRevision) object).getComment();
        }
*/		
		
		return adaptFromComment(object);
	}

	public Class[] getAdapterList() {
		return ADAPTER_TYPES;
	}

	private ILinkedTaskInfo adaptChangeSetDiffNode(Object object) {
        ChangeSetDiffNode diffNode = (ChangeSetDiffNode) object;
        ChangeSet set = diffNode.getSet();
        if (set instanceof ContextChangeSet) {
            return new LinkedTaskInfo(((ContextChangeSet) set).getTask());
        } else if(set.getClass().getName().startsWith("org.tigris")) {
            return adaptSubclipseChangeset(diffNode, set);
        }

        return adaptFromComment(object);
	}

	private ILinkedTaskInfo adaptSubclipseChangeset(ChangeSetDiffNode diff, ChangeSet set) {
        SynchronizeModelElement diffContainer = (SynchronizeModelElement) diff.getChildren()[0];

        IResource res = diffContainer.getResource();

        SyncInfoModelElement melement = (SyncInfoModelElement) diffContainer.getChildren()[0];

        // Specific to Subclipse
        SVNStatusSyncInfo info = (SVNStatusSyncInfo) melement.getSyncInfo();

        ISVNRemoteResource remoteResource = (ISVNRemoteResource) info.getRemote();
        SVNRevision rev = remoteResource.getLastChangedRevision();

		String comment;
		try {
			ISVNLogMessage[] messages = remoteResource.getLogMessages(rev, rev, SVNRevision.START, false, false, 1);
			comment = messages[0].getMessage();
		} catch (TeamException ex) {
			comment = diff.getSet().getComment();
		}
		return adaptFromComment(diff, res, comment);
	}

	private ILinkedTaskInfo adaptSubclipseLogEntry(Object object) {
		org.tigris.subversion.subclipse.core.history.LogEntry logEntry = 
			(org.tigris.subversion.subclipse.core.history.LogEntry) object;

		String comment = logEntry.getComment();
		IResource res = logEntry.getResource().getResource();
		
		return adaptFromComment(object, res, comment);
	}

	private ILinkedTaskInfo adaptFromComment(Object object, IResource res, String comment) {
		ProjectProperties props = null;
		try {
			props = ProjectProperties.getProjectProperties(res);
		} catch (TeamException ex) {
			// ignore?
		}
		String[] urls = null;
		if(props!=null) {
			urls = props.getLinkList(comment).getUrls();
		}
		if (urls == null || urls.length == 0) {
			urls = ProjectProperties.getUrls(comment).getUrls();
		}
		if (urls != null && urls.length > 0) {
			return new LinkedTaskInfo(urls[0]);
		}
		return adaptFromComment(object);
	}

	private ILinkedTaskInfo adaptFromComment(Object object) {
		String comment = getCommentFromElement(object);
		
		CommitTemplateManager commitTemplateManager = MylarTeamPlugin.getDefault().getCommitTemplateManager();
		String taskId = commitTemplateManager.getTaskIdFromCommentOrLabel(comment);
		if (taskId == null) {
			taskId = getTaskIdFromLegacy07Label(comment);
		}

		IProject project = findCorrespondingProject(object);
		if (project != null) {
			TaskRepository repository = TasksUiPlugin.getDefault().getRepositoryForResource(project, false);
			if (repository != null && taskId!=null) {
				return new LinkedTaskInfo(repository.getUrl(), taskId, null);
			}
		}
		
		String fullTaskUrl = getUrlFromComment(comment);
        if(fullTaskUrl!=null) {
        	return new LinkedTaskInfo(fullTaskUrl);
        }
        
        return null;
	}
	
    private String getCommentFromElement(Object element) {
        if (element instanceof DiffChangeSet) {
            return ((DiffChangeSet) element).getComment();
        } else if (element instanceof ChangeSetDiffNode) {
            return ((ChangeSetDiffNode) element).getName();
        } else if (element instanceof IFileRevision) {
        	return ((IFileRevision) element).getComment();
        } else if (element instanceof org.eclipse.team.internal.ccvs.core.client.listeners.LogEntry) {
            return ((org.eclipse.team.internal.ccvs.core.client.listeners.LogEntry) element).getComment();
        } else if (element instanceof org.tigris.subversion.subclipse.core.history.LogEntry) {
            return ((org.tigris.subversion.subclipse.core.history.LogEntry) element).getComment();
        }
        return null;
    }
	
	
	//

    public static String getUrlFromComment(String comment) {
        int httpIndex = comment.indexOf(PREFIX_HTTP);
        int httpsIndex = comment.indexOf(PREFIX_HTTPS);
        int idStart = -1;
        if (httpIndex != -1) {
            idStart = httpIndex;
        } else if (httpsIndex != -1) {
            idStart = httpsIndex;
        }
        if (idStart != -1) {
            int idEnd = comment.indexOf(' ', idStart);
            if (idEnd == -1) {
                return comment.substring(idStart);
            } else if (idEnd != -1 && idStart < idEnd) {
                return comment.substring(idStart, idEnd);
            }
        }
        return null;
    }

    public static String getTaskIdFromLegacy07Label(String comment) {
        String PREFIX_DELIM = ":";
        String PREFIX_START_1 = "Progress on:";
        String PREFIX_START_2 = "Completed:";
        String usedPrefix = PREFIX_START_1;
        int firstDelimIndex = comment.indexOf(PREFIX_START_1);
        if (firstDelimIndex == -1) {
            firstDelimIndex = comment.indexOf(PREFIX_START_2);
            usedPrefix = PREFIX_START_2;
        }
        if (firstDelimIndex != -1) {
            int idStart = firstDelimIndex + usedPrefix.length();
            int idEnd = comment.indexOf(PREFIX_DELIM, firstDelimIndex + usedPrefix.length());// comment.indexOf(PREFIX_DELIM);
            if (idEnd != -1 && idStart < idEnd) {
                String id = comment.substring(idStart, idEnd);
                if (id != null) {
                    return id.trim();
                }
            } else {
                return comment.substring(0, firstDelimIndex);
            }
        }
        return null;
    }
	
    private static IProject findCorrespondingProject(Object element) {
        if (element instanceof DiffChangeSet) {
            IResource[] resources = ((DiffChangeSet) element).getResources();
            if (resources.length > 0) {
                // TODO: only checks first resource
                return resources[0].getProject();
            }
        } else if (element instanceof SynchronizeModelElement) {
            SynchronizeModelElement modelElement = (SynchronizeModelElement)element;
            IResource resource = modelElement.getResource();
            if (resource != null) {
                return resource.getProject();
            } else {
                IDiffElement[] elements = modelElement.getChildren();
                if (elements.length > 0) {
                    // TODO: only checks first diff
                    if (elements[0] instanceof SynchronizeModelElement) {
                        return ((SynchronizeModelElement)elements[0]).getResource().getProject();
                    }
                }
            }
        } else if (element instanceof IAdaptable) {
        	IAdaptable adaptable = (IAdaptable) element;
			IResourceVariant resourceVariant = (IResourceVariant) adaptable.getAdapter(IResourceVariant.class);
            if (resourceVariant != null && resourceVariant instanceof RemoteResource) {
            	RemoteResource remoteResource = (RemoteResource) resourceVariant;
            	// TODO is there a better way then iterating trough all projects?
                String path = remoteResource.getRepositoryRelativePath();
                for (IProject project : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
                	if(project.isAccessible()) {
                		ICVSResource cvsResource = CVSWorkspaceRoot.getCVSFolderFor(project);
                		try {
							if(cvsResource!=null && path.startsWith(cvsResource.getRepositoryRelativePath())) {
								return project;
							}
						} catch (CVSException ex) {
							// ignore
						}
                	}
                }
                
                return null;
            }
        } else {
        	// TODO
        	
        }
        return null;
    }
    
}




		if (url == null) {
			return null;
		}
		int index = url.lastIndexOf(ITracClient.TICKET_URL);
		return index == -1 ? null : url.substring(0, index);
	}

	public String getTaskIdFromTaskUrl(String url) {
		if (url == null) {
			return null;
		}
		int index = url.lastIndexOf(ITracClient.TICKET_URL);
		return index == -1 ? null : url.substring(index + ITracClient.TICKET_URL.length());
	}

	@Override
	public String getTaskWebUrl(String repositoryUrl, String taskId) {
		return repositoryUrl + ITracClient.TICKET_URL + taskId;
	}

	
	@Override
	public List<String> getSupportedVersions() {
		if (supportedVersions == null) {

Return to bug 165581

Lines 13-19 Link Here

(-)src/org/eclipse/mylar/ide/tests/OpenCorrespondingTaskActionTest.java (-3 / +3 lines)
13		13
14	import junit.framework.TestCase;	14	import junit.framework.TestCase;
15		15
16	import org.eclipse.mylar.internal.team.ui.actions.OpenCorrespondingTaskAction;	16	import org.eclipse.mylar.internal.team.LinkedTaskInfoAdapterFactory;
17		17
18	/**	18	/**
19	* @author Mik Kersten	19	* @author Mik Kersten
Lines 34-46 Link Here
34		34
35	public void test07LegacyMatching() {	35	public void test07LegacyMatching() {
36	String label = "Progress on: 123: foo \nhttps://bugs.eclipse.org";	36	String label = "Progress on: 123: foo \nhttps://bugs.eclipse.org";
37	String id = OpenCorrespondingTaskAction.getTaskIdFromLegacy07Label(label);	37	String id = LinkedTaskInfoAdapterFactory.getTaskIdFromLegacy07Label(label);
38	assertEquals("123", id);	38	assertEquals("123", id);
39	}	39	}
40		40
41	public void testUrlMatching() {	41	public void testUrlMatching() {
42	String label = "bla bla\nhttp://foo.bar-123 bla bla";	42	String label = "bla bla\nhttp://foo.bar-123 bla bla";
43	String id = OpenCorrespondingTaskAction.getUrlFromComment(label);	43	String id = LinkedTaskInfoAdapterFactory.getUrlFromComment(label);
44	assertEquals("http://foo.bar-123", id);	44	assertEquals("http://foo.bar-123", id);
45	}	45	}
46		46

Lines 193-206 Link Here

(-)src/org/eclipse/mylar/internal/bugzilla/core/BugzillaRepositoryConnector.java (-7 / +16 lines)
193	public String getRepositoryUrlFromTaskUrl(String url) {	193	public String getRepositoryUrlFromTaskUrl(String url) {
194	if (url == null) {	194	if (url == null) {
195	return null;	195	return null;
196	} else {
197	int index = url.indexOf(IBugzillaConstants.URL_GET_SHOW_BUG);
198	if (index != -1) {
199	return url.substring(0, index);
200	} else {
201	return null;
202	}
203	}	196	}
		197	int index = url.indexOf(IBugzillaConstants.URL_GET_SHOW_BUG);
		198	return index == -1 ? null : url.substring(0, index);
		199	}
		200
		201	@Override
		202	public String getTaskIdFromTaskUrl(String url) {
		203	if (url == null) {
		204	return null;
		205	}
		206	int index = url.indexOf(IBugzillaConstants.URL_GET_SHOW_BUG);
		207	return index == -1 ? null : url.substring(index + IBugzillaConstants.URL_GET_SHOW_BUG.length());
		208	}
		209
		210	@Override
		211	public String getTaskWebUrl(String repositoryUrl, String taskId) {
		212	return repositoryUrl + IBugzillaConstants.URL_GET_SHOW_BUG + taskId;
204	}	213	}
205		214
206	// @Override	215	// @Override

Lines 39-44 Link Here

(-)src/org/eclipse/mylar/internal/tasks/ui/TaskUiUtil.java (-13 / +19 lines)
39	import org.eclipse.mylar.tasks.core.Task;	39	import org.eclipse.mylar.tasks.core.Task;
40	import org.eclipse.mylar.tasks.core.TaskCategory;	40	import org.eclipse.mylar.tasks.core.TaskCategory;
41	import org.eclipse.mylar.tasks.core.TaskRepository;	41	import org.eclipse.mylar.tasks.core.TaskRepository;
		42	import org.eclipse.mylar.tasks.core.TaskRepositoryManager;
42	import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;	43	import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;
43	import org.eclipse.mylar.tasks.ui.TasksUiPlugin;	44	import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
44	import org.eclipse.swt.graphics.Image;	45	import org.eclipse.swt.graphics.Image;
Lines 110-138 Link Here
110	} else {	111	} else {
111	AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(repository.getKind());	112	AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(repository.getKind());
112	if (connectorUi != null) {	113	if (connectorUi != null) {
113	connectorUi.openRemoteTask(repository.getUrl(), taskId);	114	opened = connectorUi.openRemoteTask(repository.getUrl(), taskId);
114	opened = true;
115	}	115	}
116	}	116	}
117	return opened;	117	return opened;
118	}	118	}
119		119
120	/**	120	/**
121	* Either pass in a repository and id, or fullUrl, or all of them	121	* Either pass in a repositoryUrl and taskId, or fullUrl, or all of them
122	*/	122	*/
123	public static boolean openRepositoryTask(String repositoryUrl, String taskId, String fullUrl) {	123	public static boolean openRepositoryTask(String repositoryUrl, String taskId, String fullUrl) {
124	boolean opened = false;	124	TaskRepositoryManager repositoryManager = TasksUiPlugin.getRepositoryManager();
		125	AbstractRepositoryConnector connector = repositoryManager.getConnectorForRepositoryTaskUrl(fullUrl);
		126	if (taskId == null && connector != null) {
		127	taskId = connector.getTaskIdFromTaskUrl(fullUrl);
		128	}
		129	if (repositoryUrl == null && connector != null) {
		130	repositoryUrl = connector.getRepositoryUrlFromTaskUrl(fullUrl);
		131	}
		132
125	ITask task = null;	133	ITask task = null;
126	if (taskId != null) {	134	if (taskId != null) {
127	String handle = AbstractRepositoryTask.getHandle(repositoryUrl, taskId);	135	String handle = AbstractRepositoryTask.getHandle(repositoryUrl, taskId);
128	task = TasksUiPlugin.getTaskListManager().getTaskList().getTask(handle);	136	task = TasksUiPlugin.getTaskListManager().getTaskList().getTask(handle);
129	}	137	}
130	if (task == null) {	138	if (task == null && fullUrl != null) {
131	// search for it	139	// search by fullUrl
132	for (ITask currTask : TasksUiPlugin.getTaskListManager().getTaskList().getAllTasks()) {	140	for (ITask currTask : TasksUiPlugin.getTaskListManager().getTaskList().getAllTasks()) {
133	if (currTask instanceof AbstractRepositoryTask) {	141	if (currTask instanceof AbstractRepositoryTask) {
134	String currUrl = ((AbstractRepositoryTask) currTask).getUrl();	142	String currUrl = ((AbstractRepositoryTask) currTask).getUrl();
135	if (currUrl != null && !currUrl.equals("") && currUrl.equals(fullUrl)) {	143	if (fullUrl.equals(currUrl)) {
136	task = currTask;	144	task = currTask;
137	break;	145	break;
138	}	146	}
Lines 140-158 Link Here
140	}	148	}
141	}	149	}
142		150
		151	boolean opened = false;
143	if (task != null) {	152	if (task != null) {
144	TaskUiUtil.refreshAndOpenTaskListElement(task);	153	TaskUiUtil.refreshAndOpenTaskListElement(task);
145	opened = true;	154	opened = true;
146	} else {	155	} else if (connector != null) {
147	AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager()
148	.getConnectorForRepositoryTaskUrl(fullUrl);
149	AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(connector.getRepositoryType());	156	AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(connector.getRepositoryType());
150		157	if (connectorUi != null) {
151	if (connector != null) {
152	opened = connectorUi.openRemoteTask(repositoryUrl, taskId);	158	opened = connectorUi.openRemoteTask(repositoryUrl, taskId);
153	}	159	}
154	}	160	}
155	if (!opened) {	161	if (!opened && fullUrl != null) {
156	TaskUiUtil.openUrl(fullUrl);	162	TaskUiUtil.openUrl(fullUrl);
157	opened = true;	163	opened = true;
158	}	164	}

Lines 14-23 Link Here

(-)src/org/eclipse/mylar/tasks/ui/AbstractRepositoryConnectorUi.java (-5 / +13 lines)
14	import org.eclipse.jface.wizard.WizardDialog;	14	import org.eclipse.jface.wizard.WizardDialog;
15	import org.eclipse.jface.wizard.WizardPage;	15	import org.eclipse.jface.wizard.WizardPage;
16	import org.eclipse.mylar.context.core.MylarStatusHandler;	16	import org.eclipse.mylar.context.core.MylarStatusHandler;
		17	import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
17	import org.eclipse.mylar.internal.tasks.ui.wizards.AbstractRepositorySettingsPage;	18	import org.eclipse.mylar.internal.tasks.ui.wizards.AbstractRepositorySettingsPage;
18	import org.eclipse.mylar.internal.tasks.ui.wizards.CommonAddExistingTaskWizard;	19	import org.eclipse.mylar.internal.tasks.ui.wizards.CommonAddExistingTaskWizard;
		20	import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector;
19	import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery;	21	import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery;
20	import org.eclipse.mylar.tasks.core.TaskRepository;	22	import org.eclipse.mylar.tasks.core.TaskRepository;
		23	import org.eclipse.mylar.tasks.core.TaskRepositoryManager;
21	import org.eclipse.swt.widgets.Shell;	24	import org.eclipse.swt.widgets.Shell;
22	import org.eclipse.ui.PlatformUI;	25	import org.eclipse.ui.PlatformUI;
23		26
Lines 82-94 Link Here
82		85
83	/**	86	/**
84	* Only override if task should be opened by a custom editor, default	87	* Only override if task should be opened by a custom editor, default
85	* beahvior is to open with browser.	88	* behavior is to open with browser.
86	*	89	*
87	* @return true if the task was successfully opened	90	* @return true if the task was successfully opened
88	*/	91	*/
89	public boolean openRemoteTask(String repositoryUrl, String idString) {	92	public boolean openRemoteTask(String repositoryUrl, String idString) {
90	return false;	93	TaskRepositoryManager repositoryManager = TasksUiPlugin.getRepositoryManager();
91	// MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),	94	AbstractRepositoryConnector connector = repositoryManager.getRepositoryConnector(getRepositoryType());
92	// TasksUiPlugin.TITLE_DIALOG, "Not supported by connector: " + this.getClass().getSimpleName());	95	TaskUiUtil.openUrl(connector.getTaskWebUrl(repositoryUrl, idString));
		96
		97	return true;
		98	// MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
		99	// TasksUiPlugin.TITLE_DIALOG, "Not supported by connector: " +
		100	// this.getClass().getSimpleName());
93	}	101	}
94	}	102	}

Lines 11-253 Link Here

(-)src/org/eclipse/mylar/internal/team/ui/actions/OpenCorrespondingTaskAction.java (-200 / +267 lines)
11		11
12	package org.eclipse.mylar.internal.team.ui.actions;	12	package org.eclipse.mylar.internal.team.ui.actions;
13		13
14	import org.eclipse.compare.structuremergeviewer.IDiffElement;
15	import org.eclipse.core.resources.IProject;
16	import org.eclipse.core.resources.IResource;
17	import org.eclipse.core.resources.IWorkspaceRoot;
18	import org.eclipse.core.resources.ResourcesPlugin;
19	import org.eclipse.core.runtime.IAdaptable;	14	import org.eclipse.core.runtime.IAdaptable;
20	import org.eclipse.core.runtime.Path;	15	import org.eclipse.core.runtime.Platform;
21	import org.eclipse.jface.action.Action;	16	import org.eclipse.jface.action.Action;
22	import org.eclipse.jface.action.IAction;	17	import org.eclipse.jface.action.IAction;
23	import org.eclipse.jface.viewers.ISelection;	18	import org.eclipse.jface.viewers.ISelection;
24	import org.eclipse.jface.viewers.StructuredSelection;	19	import org.eclipse.jface.viewers.StructuredSelection;
25	import org.eclipse.mylar.internal.tasks.ui.TaskListImages;	20	import org.eclipse.mylar.internal.tasks.ui.TaskListImages;
26	import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;	21	import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
27	import org.eclipse.mylar.internal.team.ContextChangeSet;	22	import org.eclipse.mylar.internal.team.ILinkedTaskInfo;
28	import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector;
29	import org.eclipse.mylar.tasks.core.AbstractRepositoryTask;
30	import org.eclipse.mylar.tasks.core.ITask;
31	import org.eclipse.mylar.tasks.core.TaskRepository;	23	import org.eclipse.mylar.tasks.core.TaskRepository;
32	import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;
33	import org.eclipse.mylar.tasks.ui.TasksUiPlugin;	24	import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
34	import org.eclipse.mylar.team.MylarTeamPlugin;
35	import org.eclipse.team.core.history.IFileRevision;
36	import org.eclipse.team.core.variants.IResourceVariant;
37	import org.eclipse.team.internal.ccvs.core.client.listeners.LogEntry;
38	import org.eclipse.team.internal.ccvs.core.mapping.CVSCheckedInChangeSet;
39	import org.eclipse.team.internal.ccvs.core.resources.RemoteResource;
40	import org.eclipse.team.internal.core.subscribers.DiffChangeSet;
41	import org.eclipse.team.internal.ui.synchronize.ChangeSetDiffNode;
42	import org.eclipse.team.internal.ui.synchronize.SynchronizeModelElement;
43	import org.eclipse.ui.IViewActionDelegate;	25	import org.eclipse.ui.IViewActionDelegate;
44	import org.eclipse.ui.IViewPart;	26	import org.eclipse.ui.IViewPart;
45	import org.eclipse.ui.internal.ObjectPluginAction;	27	import org.eclipse.ui.internal.ObjectPluginAction;
46		28
47	/**	29	/**
48	* @author Mik Kersten	30	* @author Mik Kersten
		31	* @author Eugene Kuleshov
49	*/	32	*/
50	public class OpenCorrespondingTaskAction extends Action implements IViewActionDelegate {	33	public class OpenCorrespondingTaskAction extends Action implements IViewActionDelegate {
51		34
52	private static final String LABEL = "Open Corresponding Task";	35	private static final String LABEL = "Open Corresponding Task";
53		36
54	private ISelection selection;	37	private ISelection selection;
55		38
56	private static final String PREFIX_HTTP = "http://";	39	// private static final String PREFIX_HTTP = "http://";
57		40
58	private static final String PREFIX_HTTPS = "https://";	41	// private static final String PREFIX_HTTPS = "https://";
59		42
60	public OpenCorrespondingTaskAction() {	43	public OpenCorrespondingTaskAction() {
61	setText(LABEL);	44	setText(LABEL);
62	setToolTipText(LABEL);	45	setToolTipText(LABEL);
63	setImageDescriptor(TaskListImages.TASK_REPOSITORY);	46	setImageDescriptor(TaskListImages.TASK_REPOSITORY);
64	}	47	}
65		48
66	public void init(IViewPart view) {	49	public void init(IViewPart view) {
67	// ignore	50	// ignore
68	}	51	}
69		52
70	@Override	53	@Override
71	public void run() {	54	public void run() {
72	if (selection instanceof StructuredSelection) {	55	if (selection instanceof StructuredSelection) {
73	run((StructuredSelection) selection);	56	run((StructuredSelection) selection);
		57	}
		58	}
		59
		60	public void run(IAction action) {
		61	if (action instanceof ObjectPluginAction) {
		62	ObjectPluginAction objectAction = (ObjectPluginAction) action;
		63	if (objectAction.getSelection() instanceof StructuredSelection) {
		64	StructuredSelection selection = (StructuredSelection) objectAction.getSelection();
		65	run(selection);
		66	}
		67	}
		68	}
		69
		70	private void run(StructuredSelection selection) {
		71	Object element = selection.getFirstElement();
		72
		73	ILinkedTaskInfo info = null;
		74	if (element instanceof IAdaptable) {
		75	info = (ILinkedTaskInfo) ((IAdaptable) element).getAdapter(ILinkedTaskInfo.class);
74	}	76	}
75	}	77	if (info == null) {
76		78	info = (ILinkedTaskInfo) Platform.getAdapterManager().getAdapter(element, ILinkedTaskInfo.class);
77	public void run(IAction action) {
78	if (action instanceof ObjectPluginAction) {
79	ObjectPluginAction objectAction = (ObjectPluginAction) action;
80	if (objectAction.getSelection() instanceof StructuredSelection) {
81	StructuredSelection selection = (StructuredSelection) objectAction.getSelection();
82	run(selection);
83	}
84	}	79	}
85	}	80
86		81	if (info != null) {
87	private void run(StructuredSelection selection) {	82	if(info.getTask()!=null) {
88	Object element = selection.getFirstElement();	83	// TODO Which one to use?
89	boolean opened = false;	84	// TaskUiUtil.openEditor(info.getTask(), false);
90		85	TaskUiUtil.refreshAndOpenTaskListElement(info.getTask());
91	if (element instanceof ChangeSetDiffNode) {	86	return;
92	ChangeSetDiffNode diffNode = (ChangeSetDiffNode) element;
93	if (diffNode.getSet() instanceof ContextChangeSet) {
94	ITask task = ((ContextChangeSet) diffNode.getSet()).getTask();
95	TaskUiUtil.openEditor(task, false);
96	opened = true;
97	}
98	} else if (element instanceof ContextChangeSet) {
99	ITask task = ((ContextChangeSet) element).getTask();
100	if (task != null) {
101	TaskUiUtil.openEditor(task, false);
102	opened = true;
103	}	87	}
104	}	88	if(info.getRepositoryUrl()!=null && info.getTaskId()!=null) {
105		89	TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(info.getRepositoryUrl());
106	if (!opened) {	90	if(repository!=null) {
107	IProject project = findCorrespondingProject(element);	91	if(TaskUiUtil.openRepositoryTask(repository, info.getTaskId())) {
108	String comment = getCommentFromSelection(element);	92	return;
109		93	}
110	if (comment != null) {
111	String id = MylarTeamPlugin.getDefault().getCommitTemplateManager()
112	.getTaskIdFromCommentOrLabel(comment);
113	if (id == null) {
114	id = getTaskIdFromLegacy07Label(comment);
115	}	94	}
116		95	}
		96	if(info.getTaskFullUrl()!=null) {
		97	TaskUiUtil.openUrl(info.getTaskFullUrl());
		98	return;
		99	}
		100	}
		101
		102	// XXX show open remote task dialog
		103
		104	return;
		105	/*
		106	if (element instanceof ChangeSetDiffNode) {
		107	ChangeSetDiffNode diffNode = (ChangeSetDiffNode) element;
		108	ChangeSet set = diffNode.getSet();
		109	if (set instanceof ContextChangeSet) {
		110	ITask task = ((ContextChangeSet) set).getTask();
		111	TaskUiUtil.openEditor(task, false);
		112	return;
		113	} else {
		114	if(set.getClass().getName().startsWith("org.tigris")) {
		115	if(openIssueFromSubclipseChangeset(diffNode, set)) {
		116	return;
		117	}
		118	}
		119	}
		120	} else if (element instanceof ContextChangeSet) {
		121	ITask task = ((ContextChangeSet) element).getTask();
		122	if (task != null) {
		123	TaskUiUtil.openEditor(task, false);
		124	return;
		125	}
		126	}
		127
		128	String comment = getCommentFromSelection(element);
		129	if (comment != null) {
		130	String id = MylarTeamPlugin.getDefault().getCommitTemplateManager()
		131	.getTaskIdFromCommentOrLabel(comment);
		132	if (id == null) {
		133	id = getTaskIdFromLegacy07Label(comment);
		134	}
		135
		136	boolean opened = false;
		137	if (id != null) {
		138	IProject project = findCorrespondingProject(element);
117	if (project != null) {	139	if (project != null) {
118	TaskRepository repository = TasksUiPlugin.getDefault().getRepositoryForResource(project, false);	140	TaskRepository repository = TasksUiPlugin.getDefault().getRepositoryForResource(project, false);
119	if (repository != null) {	141	if (repository != null) {
120	AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(repository.getKind());	142	opened = TaskUiUtil.openRepositoryTask(repository, id);
121	if (connectorUi != null && id != null) {
122	opened = TaskUiUtil.openRepositoryTask(repository, id);
123	}
124	}	143	}
125	}	144	}
		145	}
126		146
127	// try opening via URL if present	147	// try opening via URL if present
128	if (!opened) {	148	if (!opened) {
129	String fullUrl = getUrlFromComment(comment);	149	String fullUrl = getUrlFromComment(comment);
130		150
131	String repositoryUrl = null;	151	String repositoryUrl = null;
132	if (fullUrl != null) {	152	if (fullUrl != null) {
133	AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager()	153	AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager()
134	.getConnectorForRepositoryTaskUrl(fullUrl);	154	.getConnectorForRepositoryTaskUrl(fullUrl);
135	if (connector != null) {	155	if (connector != null) {
136	repositoryUrl = connector.getRepositoryUrlFromTaskUrl(fullUrl);	156	repositoryUrl = connector.getRepositoryUrlFromTaskUrl(fullUrl);
137	}	157	}
138	} else {	158	} else {
139	ITask task = TasksUiPlugin.getTaskListManager().getTaskList().getActiveTask();	159	// WTF?! opening a random task?
140	if (task instanceof AbstractRepositoryTask) {	160	ITask task = TasksUiPlugin.getTaskListManager().getTaskList().getActiveTask();
141	repositoryUrl = ((AbstractRepositoryTask) task).getRepositoryUrl();	161	if (task instanceof AbstractRepositoryTask) {
142	} else if (TasksUiPlugin.getRepositoryManager().getAllRepositories().size() == 1) {	162	repositoryUrl = ((AbstractRepositoryTask) task).getRepositoryUrl();
143	repositoryUrl = TasksUiPlugin.getRepositoryManager().getAllRepositories().get(0).getUrl();	163	} else if (TasksUiPlugin.getRepositoryManager().getAllRepositories().size() == 1) {
144	}	164	repositoryUrl = TasksUiPlugin.getRepositoryManager().getAllRepositories().get(0).getUrl();
145	}	165	}
		166	}
146		167
		168	if ((repositoryUrl != null && id != null) \|\| fullUrl != null) {
147	opened = TaskUiUtil.openRepositoryTask(repositoryUrl, id, fullUrl);	169	opened = TaskUiUtil.openRepositoryTask(repositoryUrl, id, fullUrl);
148	if (!opened) {	170	if (!opened && fullUrl != null) {
149	TaskUiUtil.openUrl(fullUrl);	171	TaskUiUtil.openUrl(fullUrl);
150	}	172	}
151	}	173	}
152	}	174	}
153	}	175	}
154	}	176	*/
		177	}
155		178
156	private String getCommentFromSelection(Object element) {	179	/*
157	if (element instanceof DiffChangeSet) {	180	private boolean openIssueFromSubclipseChangeset(ChangeSetDiffNode diff, ChangeSet set) {
158	return ((CVSCheckedInChangeSet) element).getComment();
159	} else if (element instanceof ChangeSetDiffNode) {
160	return ((ChangeSetDiffNode) element).getName();
161	} else if (element instanceof LogEntry) {
162	return ((LogEntry) element).getComment();
163	} else if (element instanceof IFileRevision) {
164	return ((IFileRevision) element).getComment();
165	}
166	return null;
167	}
168
169	private IProject findCorrespondingProject(Object element) {
170	if (element instanceof DiffChangeSet) {
171	IResource[] resources = ((DiffChangeSet) element).getResources();
172	if (resources.length > 0) {
173	// TODO: only checks first resource
174	return resources[0].getProject();
175	}
176	} else if (element instanceof SynchronizeModelElement) {
177	SynchronizeModelElement modelElement = (SynchronizeModelElement)element;
178	IResource resource = modelElement.getResource();
179	if (resource != null) {
180	return resource.getProject();
181	} else {
182	IDiffElement[] elements = modelElement.getChildren();
183	if (elements.length > 0) {
184	// TODO: only checks first diff
185	if (elements[0] instanceof SynchronizeModelElement) {
186	return ((SynchronizeModelElement)elements[0]).getResource().getProject();
187	}
188	}
189	}
190	} else if (element instanceof IAdaptable) {
191	// TODO: there must be a better way to get at the local resource
192	IResourceVariant resourceVariant = (IResourceVariant) ((IAdaptable) element)
193	.getAdapter(IResourceVariant.class);
194	if (resourceVariant != null && resourceVariant instanceof RemoteResource) {
195	RemoteResource remoteResource = (RemoteResource) resourceVariant;
196	String path = remoteResource.getRepositoryRelativePath();
197	IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
198	return root.getProject(new Path(path).removeFirstSegments(1).uptoSegment(1).toString());
199	}
200	} else {
201
202	}
203	return null;
204	}
205		181
206	public static String getUrlFromComment(String comment) {	182	SynchronizeModelElement diffContainer = (SynchronizeModelElement) diff.getChildren()[0];
207	int httpIndex = comment.indexOf(PREFIX_HTTP);
208	int httpsIndex = comment.indexOf(PREFIX_HTTPS);
209	int idStart = -1;
210	if (httpIndex != -1) {
211	idStart = httpIndex;
212	} else if (httpsIndex != -1) {
213	idStart = httpsIndex;
214	}
215	if (idStart != -1) {
216	int idEnd = comment.indexOf(' ', idStart);
217	if (idEnd == -1) {
218	return comment.substring(idStart);
219	} else if (idEnd != -1 && idStart < idEnd) {
220	return comment.substring(idStart, idEnd);
221	}
222	}
223	return null;
224	}
225		183
226	public static String getTaskIdFromLegacy07Label(String comment) {	184	IResource res = diffContainer.getResource();
227	String PREFIX_DELIM = ":";	185
228	String PREFIX_START_1 = "Progress on:";	186	SyncInfoModelElement melement = (SyncInfoModelElement) diffContainer.getChildren()[0];
229	String PREFIX_START_2 = "Completed:";	187
230	String usedPrefix = PREFIX_START_1;	188	// Specific to Subclipse
231	int firstDelimIndex = comment.indexOf(PREFIX_START_1);	189	SVNStatusSyncInfo info = (SVNStatusSyncInfo) melement.getSyncInfo();
232	if (firstDelimIndex == -1) {	190
233	firstDelimIndex = comment.indexOf(PREFIX_START_2);	191	ISVNRemoteResource remoteResource = (ISVNRemoteResource) info.getRemote();
234	usedPrefix = PREFIX_START_2;	192	SVNRevision rev = remoteResource.getLastChangedRevision();
235	}	193
236	if (firstDelimIndex != -1) {	194	String comment;
237	int idStart = firstDelimIndex + usedPrefix.length();	195	try {
238	int idEnd = comment.indexOf(PREFIX_DELIM, firstDelimIndex + usedPrefix.length());// comment.indexOf(PREFIX_DELIM);	196	ISVNLogMessage[] messages = remoteResource.getLogMessages(rev, rev, SVNRevision.START, false, false, 1);
239	if (idEnd != -1 && idStart < idEnd) {	197	comment = messages[0].getMessage();
240	String id = comment.substring(idStart, idEnd);	198	} catch (TeamException ex) {
241	if (id != null) {	199	comment = diff.getSet().getComment();
242	return id.trim();	200	}
243	}	201
244	} else {	202	ProjectProperties props = null;
245	return comment.substring(0, firstDelimIndex);	203	try {
246	}	204	props = ProjectProperties.getProjectProperties(res);
		205	} catch (TeamException ex) {
		206	// ignore?
		207	}
		208	String[] urls = null;
		209	if(props!=null) {
		210	urls = props.getLinkList(comment).getUrls();
247	}	211	}
248	return null;	212	if (urls == null \|\| urls.length == 0) {
249	}	213	urls = ProjectProperties.getUrls(comment).getUrls();
250		214	}
		215	if (urls != null && urls.length > 0) {
		216	String taskUrl = urls[0];
		217	TaskUiUtil.openRepositoryTask(null, null, taskUrl);
		218	return true;
		219	}
		220	return false;
		221	}
		222
		223	private String getCommentFromSelection(Object element) {
		224	if (element instanceof DiffChangeSet) {
		225	return ((CVSCheckedInChangeSet) element).getComment();
		226	} else if (element instanceof ChangeSetDiffNode) {
		227	return ((ChangeSetDiffNode) element).getName();
		228	} else if (element instanceof LogEntry) {
		229	return ((LogEntry) element).getComment();
		230	} else if (element instanceof IFileRevision) {
		231	return ((IFileRevision) element).getComment();
		232	}
		233	return null;
		234	}
		235
		236	private IProject findCorrespondingProject(Object element) {
		237	if (element instanceof DiffChangeSet) {
		238	IResource[] resources = ((DiffChangeSet) element).getResources();
		239	if (resources.length > 0) {
		240	// TODO: only checks first resource
		241	return resources[0].getProject();
		242	}
		243	} else if (element instanceof SynchronizeModelElement) {
		244	SynchronizeModelElement modelElement = (SynchronizeModelElement)element;
		245	IResource resource = modelElement.getResource();
		246	if (resource != null) {
		247	return resource.getProject();
		248	} else {
		249	IDiffElement[] elements = modelElement.getChildren();
		250	if (elements.length > 0) {
		251	// TODO: only checks first diff
		252	if (elements[0] instanceof SynchronizeModelElement) {
		253	return ((SynchronizeModelElement)elements[0]).getResource().getProject();
		254	}
		255	}
		256	}
		257	} else if (element instanceof IAdaptable) {
		258	// TODO: there must be a better way to get at the local resource
		259	IResourceVariant resourceVariant = (IResourceVariant) ((IAdaptable) element)
		260	.getAdapter(IResourceVariant.class);
		261	if (resourceVariant != null && resourceVariant instanceof RemoteResource) {
		262	RemoteResource remoteResource = (RemoteResource) resourceVariant;
		263	String path = remoteResource.getRepositoryRelativePath();
		264	IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
		265	return root.getProject(new Path(path).removeFirstSegments(1).uptoSegment(1).toString());
		266	}
		267	} else {
		268
		269	}
		270	return null;
		271	}
		272
		273	public static String getUrlFromComment(String comment) {
		274	int httpIndex = comment.indexOf(PREFIX_HTTP);
		275	int httpsIndex = comment.indexOf(PREFIX_HTTPS);
		276	int idStart = -1;
		277	if (httpIndex != -1) {
		278	idStart = httpIndex;
279	} else if (httpsIndex != -1) {
280	idStart = httpsIndex;
281	}
282	if (idStart != -1) {
283	int idEnd = comment.indexOf(' ', idStart);
284	if (idEnd == -1) {
285	return comment.substring(idStart);
286	} else if (idEnd != -1 && idStart < idEnd) {
287	return comment.substring(idStart, idEnd);
288	}
289	}
290	return null;
291	}
292
293	public static String getTaskIdFromLegacy07Label(String comment) {
294	String PREFIX_DELIM = ":";
295	String PREFIX_START_1 = "Progress on:";
296	String PREFIX_START_2 = "Completed:";
297	String usedPrefix = PREFIX_START_1;
298	int firstDelimIndex = comment.indexOf(PREFIX_START_1);
299	if (firstDelimIndex == -1) {
300	firstDelimIndex = comment.indexOf(PREFIX_START_2);
301	usedPrefix = PREFIX_START_2;
302	}
303	if (firstDelimIndex != -1) {
304	int idStart = firstDelimIndex + usedPrefix.length();
305	int idEnd = comment.indexOf(PREFIX_DELIM, firstDelimIndex + usedPrefix.length());// comment.indexOf(PREFIX_DELIM);
306	if (idEnd != -1 && idStart < idEnd) {
307	String id = comment.substring(idStart, idEnd);
308	if (id != null) {
309	return id.trim();
310	}
311	} else {
312	return comment.substring(0, firstDelimIndex);
313	}
314	}
315	return null;
316	}
317	*/
251		318
252	// private Object findParent(ISynchronizeModelElement element) {	319	// private Object findParent(ISynchronizeModelElement element) {
253	// if (element instanceof ChangeSetDiffNode) {	320	// if (element instanceof ChangeSetDiffNode) {
Lines 257-266 Link Here
257	// }	324	// }
258	// return null;	325	// return null;
259	// }	326	// }
260
261		327
262	public void selectionChanged(IAction action, ISelection selection) {	328
263	this.selection = selection;	329	public void selectionChanged(IAction action, ISelection selection) {
264	}	330	this.selection = selection;
		331	}
265		332
266	}	333	}

Lines 68-73 Link Here

(-)plugin.xml (+16 lines)
68	tooltip="Open Corresponding Task">	68	tooltip="Open Corresponding Task">
69	</action>	69	</action>
70	</objectContribution>	70	</objectContribution>
		71
		72	<!-- Subclipse History view -->
		73	<objectContribution
		74	objectClass="org.tigris.subversion.subclipse.core.history.LogEntry"
		75	id="org.eclipse.mylar.ui.team.synchronize.open.report">
		76	<action
		77	class="org.eclipse.mylar.internal.team.ui.actions.OpenCorrespondingTaskAction"
		78	enablesFor="1"
		79	icon="icons/elcl16/task-repository.gif"
		80	id="org.eclipse.mylar.ui.team.synchronize.contribution.open.report"
		81	label="Open Corresponding Task"
		82	menubarPath="mylar"
		83	tooltip="Open Corresponding Task">
		84	</action>
		85	</objectContribution>
		86
71	<!--	87	<!--
72	<objectContribution	88	<objectContribution
73	objectClass="org.eclipse.team.internal.ui.synchronize.ChangeSetDiffNode"	89	objectClass="org.eclipse.team.internal.ui.synchronize.ChangeSetDiffNode"

Added Link Here

(-)src/org/eclipse/mylar/internal/team/ILinkedTaskInfo.java (+33 lines)
1	/*******************************************************************************
2	* Copyright (c) 2004 - 2006 University Of British Columbia and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Eugene Kuleshov - initial API and implementation
10	*******************************************************************************/
11
12	package org.eclipse.mylar.internal.team;
13
14	import org.eclipse.mylar.tasks.core.ITask;
15
16	/**
17	* Task information linked to artifacts from version control integration
18	*
19	* TODO move to mylar core?
20	*
21	* @author Eugene Kuleshov
22	*/
23	public interface ILinkedTaskInfo {
24
25	String getTaskId();
26
27	String getTaskFullUrl();
28
29	String getRepositoryUrl();
30
31	ITask getTask();
32
33	}

Added Link Here

(-)src/org/eclipse/mylar/internal/team/LinkedTaskInfo.java (+120 lines)
1	/*******************************************************************************
2	* Copyright (c) 2004 - 2006 University Of British Columbia and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Eugene Kuleshov - initial API and implementation
10	*******************************************************************************/
11
12	package org.eclipse.mylar.internal.team;
13
14	import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector;
15	import org.eclipse.mylar.tasks.core.AbstractRepositoryTask;
16	import org.eclipse.mylar.tasks.core.ITask;
17	import org.eclipse.mylar.tasks.core.TaskRepository;
18	import org.eclipse.mylar.tasks.core.TaskRepositoryManager;
19	import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
20
21	/**
22	* Default implementation of {@link ILinkedTaskInfo}
23	*
24	* @author Eugene Kuleshov
25	*/
26	public class LinkedTaskInfo implements ILinkedTaskInfo {
27
28	private String taskId;
29
30	private String taskFullUrl;
31
32	private String repositoryUrl;
33
34	private ITask task;
35
36	public LinkedTaskInfo(ITask task) {
37	init(task, //
38	AbstractRepositoryTask.getRepositoryUrl(task.getHandleIdentifier()), //
39	AbstractRepositoryTask.getTaskId(task.getHandleIdentifier()), //
40	task.getUrl());
41	}
42
43	public LinkedTaskInfo(String taskFullUrl) {
44	init(null, null, null, taskFullUrl);
45	}
46
47	public LinkedTaskInfo(String repositoryUrl, String taskId, String taskFullUrl) {
48	init(null, repositoryUrl, taskId, taskFullUrl);
49	}
50
51	private void init(ITask task, String repositoryUrl, String taskId, String taskFullUrl) {
52	// TODO should this even be here?
53
54	TaskRepositoryManager repositoryManager = TasksUiPlugin.getRepositoryManager();
55	AbstractRepositoryConnector connector = repositoryManager.getConnectorForRepositoryTaskUrl(taskFullUrl);
56	if (connector == null && repositoryUrl != null) {
57	TaskRepository repository = repositoryManager.getRepository(repositoryUrl);
58	if (repository != null) {
59	connector = repositoryManager.getRepositoryConnector(repository.getKind());
60	}
61	}
62
63	if (repositoryUrl == null && connector != null) {
64	repositoryUrl = connector.getRepositoryUrlFromTaskUrl(taskFullUrl);
65	}
66
67	if (taskId == null && connector != null) {
68	taskId = connector.getTaskIdFromTaskUrl(taskFullUrl);
69	}
70
71	if (taskFullUrl == null && repositoryUrl != null && taskId != null && connector != null) {
72	taskFullUrl = connector.getTaskWebUrl(repositoryUrl, taskId);
73	}
74
75	if (task == null) {
76	if (taskId != null && repositoryUrl != null) {
77	String handle = AbstractRepositoryTask.getHandle(repositoryUrl, taskId);
78	task = TasksUiPlugin.getTaskListManager().getTaskList().getTask(handle);
79	}
80	if (task == null && taskFullUrl != null) {
81	// search by fullUrl
82	for (ITask currTask : TasksUiPlugin.getTaskListManager().getTaskList().getAllTasks()) {
83	if (currTask instanceof AbstractRepositoryTask) {
84	String currUrl = ((AbstractRepositoryTask) currTask).getUrl();
85	if (taskFullUrl.equals(currUrl)) {
86	task = currTask;
87	break;
88	}
89	}
90	}
91	}
92	}
93
94	if (taskFullUrl == null && task != null) {
95	taskFullUrl = task.getUrl();
96	}
97
98	this.task = task;
99	this.repositoryUrl = repositoryUrl;
100	this.taskId = taskId;
101	this.taskFullUrl = taskFullUrl;
102	}
103
104	public String getRepositoryUrl() {
105	return repositoryUrl;
106	}
107
108	public ITask getTask() {
109	return task;
110	}
111
112	public String getTaskFullUrl() {
113	return taskFullUrl;
114	}
115
116	public String getTaskId() {
117	return taskId;
118	}
119
120	}

Lines 81-90 Link Here

(-)src/org/eclipse/mylar/internal/trac/core/TracRepositoryConnector.java (-2 / +16 lines)
81	if (url == null) {	81	if (url == null) {
82	return null;	82	return null;
83	}	83	}
84	int i = url.lastIndexOf(ITracClient.TICKET_URL);	84	int index = url.lastIndexOf(ITracClient.TICKET_URL);
85	return (i != -1) ? url.substring(0, i) : null;	85	return index == -1 ? null : url.substring(0, index);
86	}	86	}
87		87
		88	public String getTaskIdFromTaskUrl(String url) {
		89	if (url == null) {
		90	return null;
		91	}
		92	int index = url.lastIndexOf(ITracClient.TICKET_URL);
		93	return index == -1 ? null : url.substring(index + ITracClient.TICKET_URL.length());
		94	}
		95
		96	@Override
		97	public String getTaskWebUrl(String repositoryUrl, String taskId) {
		98	return repositoryUrl + ITracClient.TICKET_URL + taskId;
		99	}
		100
		101
88	@Override	102	@Override
89	public List<String> getSupportedVersions() {	103	public List<String> getSupportedVersions() {
90	if (supportedVersions == null) {	104	if (supportedVersions == null) {