Attachment #197054 for bug #338478

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

View | Details | Raw Unified | Return to bug 338478
Collapse All | Expand All




import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.egit.core.GitProvider;
import org.eclipse.jface.window.Window;
import org.eclipse.mylyn.internal.git.ui.GetChangeSetDialog;

	public static final String ID_PLUGIN = "org.eclipse.mylyn.git.ui"; //$NON-NLS-1$

	@Override
	public ChangeSet getChangeSet(ScmRepository repository, IResource resource) {
			throws CoreException {
		Assert.isNotNull(resource);

		final IProject project = resource.getProject();


		// Check if the provider is for Git
		if (!GitProvider.class.getName().equals(scmConnector.getProviderId())) {
			throw new RuntimeException("No Git connector: " + scmConnector.getProviderId());
					+ scmConnector.getProviderId()) {
			});
		}

		final GetChangeSetDialog dialog = new GetChangeSetDialog(null, project);




package org.eclipse.mylyn.versions.ui.spi;

import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.mylyn.versions.core.ChangeSet;
import org.eclipse.mylyn.versions.core.ScmRepository;


	 * given resource provided. This method is suitable to open a UI Wizard, the selection is expected to be driven by
	 * the user.
	 * 
	 * @param repository
	 *            - Associated repository
	 * @param resource
	 *            - work space resource e.g. project used to narrow down the change set options presented to the user
	 * @param monitor
	 *            - used to monitor the progress of an activity
	 * @return ChnageSet - user selection
	 * @throws CoreException
	 */
	public abstract ChangeSet getChangeSet(ScmRepository repository, IResource resource);
			throws CoreException;

}

Return to bug 338478

Lines 14-23 Link Here

(-)src/org/eclipse/mylyn/internal/git/ui/connector/GitConnectorUi.java (-9 / +2 lines)
14	import org.eclipse.core.resources.IProject;	14	import org.eclipse.core.resources.IProject;
15	import org.eclipse.core.resources.IResource;	15	import org.eclipse.core.resources.IResource;
16	import org.eclipse.core.runtime.Assert;	16	import org.eclipse.core.runtime.Assert;
17	import org.eclipse.core.runtime.CoreException;
18	import org.eclipse.core.runtime.IProgressMonitor;
19	import org.eclipse.core.runtime.IStatus;
20	import org.eclipse.core.runtime.Status;
21	import org.eclipse.egit.core.GitProvider;	17	import org.eclipse.egit.core.GitProvider;
22	import org.eclipse.jface.window.Window;	18	import org.eclipse.jface.window.Window;
23	import org.eclipse.mylyn.internal.git.ui.GetChangeSetDialog;	19	import org.eclipse.mylyn.internal.git.ui.GetChangeSetDialog;
Lines 37-44 Link Here
37	public static final String ID_PLUGIN = "org.eclipse.mylyn.git.ui"; //$NON-NLS-1$	33	public static final String ID_PLUGIN = "org.eclipse.mylyn.git.ui"; //$NON-NLS-1$
38		34
39	@Override	35	@Override
40	public ChangeSet getChangeSet(ScmRepository repo, IResource resource, IProgressMonitor monitor)	36	public ChangeSet getChangeSet(ScmRepository repository, IResource resource) {
41	throws CoreException {
42	Assert.isNotNull(resource);	37	Assert.isNotNull(resource);
43		38
44	final IProject project = resource.getProject();	39	final IProject project = resource.getProject();
Lines 50-58 Link Here
50		45
51	// Check if the provider is for Git	46	// Check if the provider is for Git
52	if (!GitProvider.class.getName().equals(scmConnector.getProviderId())) {	47	if (!GitProvider.class.getName().equals(scmConnector.getProviderId())) {
53	throw new CoreException(new Status(IStatus.ERROR, ID_PLUGIN, "No Git connector: "	48	throw new RuntimeException("No Git connector: " + scmConnector.getProviderId());
54	+ scmConnector.getProviderId()) {
55	});
56	}	49	}
57		50
58	final GetChangeSetDialog dialog = new GetChangeSetDialog(null, project);	51	final GetChangeSetDialog dialog = new GetChangeSetDialog(null, project);

Lines 12-19 Link Here

(-)src/org/eclipse/mylyn/versions/ui/spi/ScmConnectorUi.java (-8 / +2 lines)
12	package org.eclipse.mylyn.versions.ui.spi;	12	package org.eclipse.mylyn.versions.ui.spi;
13		13
14	import org.eclipse.core.resources.IResource;	14	import org.eclipse.core.resources.IResource;
15	import org.eclipse.core.runtime.CoreException;
16	import org.eclipse.core.runtime.IProgressMonitor;
17	import org.eclipse.mylyn.versions.core.ChangeSet;	15	import org.eclipse.mylyn.versions.core.ChangeSet;
18	import org.eclipse.mylyn.versions.core.ScmRepository;	16	import org.eclipse.mylyn.versions.core.ScmRepository;
19		17
Lines 28-43 Link Here
28	* given resource provided. This method is suitable to open a UI Wizard, the selection is expected to be driven by	26	* given resource provided. This method is suitable to open a UI Wizard, the selection is expected to be driven by
29	* the user.	27	* the user.
30	*	28	*
31	* @param repo	29	* @param repository
32	* - Associated repository	30	* - Associated repository
33	* @param resource	31	* @param resource
34	* - work space resource e.g. project used to narrow down the change set options presented to the user	32	* - work space resource e.g. project used to narrow down the change set options presented to the user
35	* @param monitor
36	* - used to monitor the progress of an activity
37	* @return ChnageSet - user selection	33	* @return ChnageSet - user selection
38	* @throws CoreException
39	*/	34	*/
40	public abstract ChangeSet getChangeSet(ScmRepository repo, IResource resource, IProgressMonitor monitor)	35	public abstract ChangeSet getChangeSet(ScmRepository repository, IResource resource);
41	throws CoreException;
42		36
43	}	37	}