Attachment 197054 Details for Bug 338478 – suggested change

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

[patch] suggested change

clipboard.txt (text/plain), 3.47 KB, created by Steffen Pingel

on 2011-05-31 20:27:12 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Steffen Pingel

Created: 2011-05-31 20:27:12 EDT

Size: 3.47 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.git.ui
>Index: src/org/eclipse/mylyn/internal/git/ui/connector/GitConnectorUi.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.versions/org.eclipse.mylyn.git.ui/src/org/eclipse/mylyn/internal/git/ui/connector/GitConnectorUi.java,v
>retrieving revision 1.2
>diff -u -r1.2 GitConnectorUi.java
>--- src/org/eclipse/mylyn/internal/git/ui/connector/GitConnectorUi.java	16 May 2011 23:34:29 -0000	1.2
>+++ src/org/eclipse/mylyn/internal/git/ui/connector/GitConnectorUi.java	1 Jun 2011 00:26:28 -0000
>@@ -14,10 +14,6 @@
> 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;
>@@ -37,8 +33,7 @@
> 	public static final String ID_PLUGIN = "org.eclipse.mylyn.git.ui"; //$NON-NLS-1$
> 
> 	@Override
>-	public ChangeSet getChangeSet(ScmRepository repo, IResource resource, IProgressMonitor monitor)
>-			throws CoreException {
>+	public ChangeSet getChangeSet(ScmRepository repository, IResource resource) {
> 		Assert.isNotNull(resource);
> 
> 		final IProject project = resource.getProject();
>@@ -50,9 +45,7 @@
> 
> 		// Check if the provider is for Git
> 		if (!GitProvider.class.getName().equals(scmConnector.getProviderId())) {
>-			throw new CoreException(new Status(IStatus.ERROR, ID_PLUGIN, "No Git connector: "
>-					+ scmConnector.getProviderId()) {
>-			});
>+			throw new RuntimeException("No Git connector: " + scmConnector.getProviderId());
> 		}
> 
> 		final GetChangeSetDialog dialog = new GetChangeSetDialog(null, project);
>#P org.eclipse.mylyn.versions.ui
>Index: src/org/eclipse/mylyn/versions/ui/spi/ScmConnectorUi.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.versions/org.eclipse.mylyn.versions.ui/src/org/eclipse/mylyn/versions/ui/spi/ScmConnectorUi.java,v
>retrieving revision 1.1
>diff -u -r1.1 ScmConnectorUi.java
>--- src/org/eclipse/mylyn/versions/ui/spi/ScmConnectorUi.java	11 May 2011 14:29:07 -0000	1.1
>+++ src/org/eclipse/mylyn/versions/ui/spi/ScmConnectorUi.java	1 Jun 2011 00:26:29 -0000
>@@ -12,8 +12,6 @@
> 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;
> 
>@@ -28,16 +26,12 @@
> 	 * given resource provided. This method is suitable to open a UI Wizard, the selection is expected to be driven by
> 	 * the user.
> 	 * 
>-	 * @param repo
>+	 * @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 repo, IResource resource, IProgressMonitor monitor)
>-			throws CoreException;
>+	public abstract ChangeSet getChangeSet(ScmRepository repository, IResource resource);
> 
> }

Actions: View | Diff

Attachments on bug 338478: 197054