Attachment 196935 Details for Bug 315184 – fix

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

[patch] fix

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

on 2011-05-30 18:47:30 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Steffen Pingel

Created: 2011-05-30 18:47:30 EDT

Size: 4.35 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java,v
>retrieving revision 1.39
>diff -u -r1.39 EditRepositoryWizard.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java	8 Jun 2010 23:10:08 -0000	1.39
>+++ src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java	30 May 2011 22:47:16 -0000
>@@ -74,7 +74,7 @@
> 			if (!repository.getConnectorKind().equals(LocalRepositoryConnector.CONNECTOR_KIND)) {
> 				repository.setRepositoryUrl(newUrl);
> 			}
>-			settingsPage.applyTo(repository);
>+			settingsPage.performFinish(repository);
> 			if (oldUrl != null && newUrl != null && !oldUrl.equals(newUrl)) {
> 				TasksUiPlugin.getRepositoryManager().notifyRepositoryUrlChanged(repository, oldUrl);
> 			}
>Index: src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewRepositoryWizard.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewRepositoryWizard.java,v
>retrieving revision 1.26
>diff -u -r1.26 NewRepositoryWizard.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewRepositoryWizard.java	8 Jun 2010 23:10:08 -0000	1.26
>+++ src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewRepositoryWizard.java	30 May 2011 22:47:16 -0000
>@@ -100,7 +100,7 @@
> 	public boolean performFinish() {
> 		if (canFinish()) {
> 			taskRepository = new TaskRepository(connector.getConnectorKind(), settingsPage.getRepositoryUrl());
>-			settingsPage.applyTo(taskRepository);
>+			settingsPage.performFinish(taskRepository);
> 			TasksUi.getRepositoryManager().addRepository(taskRepository);
> 			return true;
> 		}
>Index: src/org/eclipse/mylyn/tasks/ui/wizards/AbstractTaskRepositoryPage.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractTaskRepositoryPage.java,v
>retrieving revision 1.12
>diff -u -r1.12 AbstractTaskRepositoryPage.java
>--- src/org/eclipse/mylyn/tasks/ui/wizards/AbstractTaskRepositoryPage.java	14 Nov 2009 23:58:05 -0000	1.12
>+++ src/org/eclipse/mylyn/tasks/ui/wizards/AbstractTaskRepositoryPage.java	30 May 2011 22:47:16 -0000
>@@ -277,6 +277,17 @@
> 	}
> 
> 	/**
>+	 * {@inheritDoc}
>+	 * <p>
>+	 * Invokes {@link #applyTo(TaskRepository)} by default. Client may override.
>+	 * 
>+	 * @since 3.6
>+	 */
>+	public void performFinish(TaskRepository repository) {
>+		applyTo(repository);
>+	}
>+
>+	/**
> 	 * Returns a status if there is a message to display, otherwise null.
> 	 */
> 	private IStatus computeValidation() {
>Index: src/org/eclipse/mylyn/tasks/ui/wizards/ITaskRepositoryPage.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/ITaskRepositoryPage.java,v
>retrieving revision 1.8
>diff -u -r1.8 ITaskRepositoryPage.java
>--- src/org/eclipse/mylyn/tasks/ui/wizards/ITaskRepositoryPage.java	24 Jul 2009 12:05:47 -0000	1.8
>+++ src/org/eclipse/mylyn/tasks/ui/wizards/ITaskRepositoryPage.java	30 May 2011 22:47:16 -0000
>@@ -22,8 +22,31 @@
>  */
> public interface ITaskRepositoryPage extends IWizardPage {
> 
>+	/**
>+	 * Invoked to commit changes from the wizard page to the <code>repository</code> object.
>+	 * 
>+	 * @since 3.0
>+	 * @param repository
>+	 *            the task repository to persists settings to
>+	 */
> 	public abstract void applyTo(TaskRepository repository);
> 
>+	/**
>+	 * Returns the URL currently entered on the page. This is used by the framework to detect if the URL of the
>+	 * repository has changed which requires a migration job to run.
>+	 * 
>+	 * @since 3.0
>+	 * @return the repository URL that is currently entered
>+	 */
> 	public abstract String getRepositoryUrl();
> 
>+	/**
>+	 * Invoked when the wizard that contains page finishes. This method should commit all entered data to the
>+	 * <code>repository</code> object.
>+	 * 
>+	 * @since 3.6
>+	 * @see #applyTo(TaskRepository)
>+	 */
>+	public abstract void performFinish(TaskRepository repository);
>+
> }
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 315184: 196935 | 196936