Attachment 126413 Details for Bug 244553 – updated patch

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

[patch] updated patch

patch244553.txt (text/plain), 15.98 KB, created by Frank Becker

on 2009-02-22 15:33:38 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Becker

Created: 2009-02-22 15:33:38 EST

Size: 15.98 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.tasks.core
>Index: src/org/eclipse/mylyn/tasks/core/TaskRepository.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepository.java,v
>retrieving revision 1.78
>diff -u -r1.78 TaskRepository.java
>--- src/org/eclipse/mylyn/tasks/core/TaskRepository.java	16 Jan 2009 05:40:22 -0000	1.78
>+++ src/org/eclipse/mylyn/tasks/core/TaskRepository.java	22 Feb 2009 20:31:23 -0000
>@@ -141,6 +141,11 @@
> 
> 	public static final String OFFLINE = "org.eclipse.mylyn.tasklist.repositories.offline"; //$NON-NLS-1$
> 
>+	/**
>+	 * @since 3.1
>+	 */
>+	public static final String DEFAULT = "org.eclipse.mylyn.tasklist.repositories.default"; //$NON-NLS-1$
>+
> 	// HACK: Lock used to work around race condition in
> 	// Platform.add/get/flushAuthorizationInfo()
> 	private static final Object LOCK = new Object();
>@@ -833,4 +838,18 @@
> 		setProperty(TaskRepository.PROXY_USEDEFAULT, String.valueOf(useDefaultProxy));
> 	}
> 
>+	/**
>+	 * @since 3.1
>+	 */
>+	public boolean isDefault() {
>+		return getProperty(DEFAULT) != null && "true".equals(getProperty(DEFAULT)); //$NON-NLS-1$
>+	}
>+
>+	/**
>+	 * @since 3.1
>+	 */
>+	public void setDefault(boolean defaultValue) {
>+		properties.put(DEFAULT, String.valueOf(defaultValue));
>+	}
>+
> }
>Index: src/org/eclipse/mylyn/internal/tasks/core/TaskRepositoryManager.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskRepositoryManager.java,v
>retrieving revision 1.23
>diff -u -r1.23 TaskRepositoryManager.java
>--- src/org/eclipse/mylyn/internal/tasks/core/TaskRepositoryManager.java	20 Feb 2009 00:10:24 -0000	1.23
>+++ src/org/eclipse/mylyn/internal/tasks/core/TaskRepositoryManager.java	22 Feb 2009 20:31:23 -0000
>@@ -410,4 +410,42 @@
> 		}
> 	}
> 
>+	/**
>+	 * Set the given Repository as the default Repository
>+	 * 
>+	 * @param newrepository
>+	 *            the new Default Repository can be null
>+	 * @since 3.1
>+	 */
>+	public void setDefaultRepository(TaskRepository newrepository) {
>+		Collection<Set<TaskRepository>> values = repositoryMap.values();
>+		for (Set<TaskRepository> set : values) {
>+			for (TaskRepository taskRepository : set) {
>+				if (taskRepository.isDefault()) {
>+					taskRepository.setDefault(false);
>+				}
>+			}
>+		}
>+		if (newrepository != null) {
>+			newrepository.setDefault(true);
>+		}
>+	}
>+
>+	/**
>+	 * Get the Default Repository
>+	 * 
>+	 * @return The Default Repository
>+	 * @since 3.1
>+	 */
>+	public TaskRepository getDefaultRepository() {
>+		Collection<Set<TaskRepository>> values = repositoryMap.values();
>+		for (Set<TaskRepository> set : values) {
>+			for (TaskRepository taskRepository : set) {
>+				if (taskRepository.isDefault()) {
>+					return taskRepository;
>+				}
>+			}
>+		}
>+		return null;
>+	}
> }
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/internal/tasks/ui/views/Messages.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/Messages.java,v
>retrieving revision 1.4
>diff -u -r1.4 Messages.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/views/Messages.java	28 Jan 2009 02:48:57 -0000	1.4
>+++ src/org/eclipse/mylyn/internal/tasks/ui/views/Messages.java	22 Feb 2009 20:31:27 -0000
>@@ -25,6 +25,8 @@
> 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
> 	}
> 
>+	public static String DefaultRepositoryAction_Default;
>+
> 	public static String DisconnectRepositoryAction_Disconnected;
> 
> 	public static String PriorityDropDownAction_Filter_Priority_Lower_Than;
>Index: src/org/eclipse/mylyn/internal/tasks/ui/views/messages.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/messages.properties,v
>retrieving revision 1.4
>diff -u -r1.4 messages.properties
>--- src/org/eclipse/mylyn/internal/tasks/ui/views/messages.properties	28 Jan 2009 02:48:57 -0000	1.4
>+++ src/org/eclipse/mylyn/internal/tasks/ui/views/messages.properties	22 Feb 2009 20:31:27 -0000
>@@ -1,3 +1,4 @@
>+DefaultRepositoryAction_Default=Default Repository
> DisconnectRepositoryAction_Disconnected=Disconnected
> 
> PriorityDropDownAction_Filter_Priority_Lower_Than=Filter Priority Lower Than
>Index: src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesView.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesView.java,v
>retrieving revision 1.38
>diff -u -r1.38 TaskRepositoriesView.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesView.java	4 Jan 2009 16:21:54 -0000	1.38
>+++ src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesView.java	22 Feb 2009 20:31:27 -0000
>@@ -30,6 +30,7 @@
> import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryAdapter;
> import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
> import org.eclipse.mylyn.internal.tasks.ui.actions.AddRepositoryAction;
>+import org.eclipse.mylyn.internal.tasks.ui.actions.DefaultRepositoryAction;
> import org.eclipse.mylyn.internal.tasks.ui.actions.DeleteTaskRepositoryAction;
> import org.eclipse.mylyn.internal.tasks.ui.actions.DisconnectRepositoryAction;
> import org.eclipse.mylyn.tasks.core.IRepositoryListener;
>@@ -67,6 +68,8 @@
> 
> 	private DisconnectRepositoryAction offlineAction;
> 
>+	private DefaultRepositoryAction defaultRepositoryAction;
>+
> 	private void asyncExec(Runnable runnable) {
> 		if (Display.getCurrent() != null) {
> 			runnable.run();
>@@ -229,6 +232,9 @@
> 
> 		offlineAction = new DisconnectRepositoryAction();
> 		viewer.addSelectionChangedListener(offlineAction);
>+
>+		defaultRepositoryAction = new DefaultRepositoryAction();
>+		viewer.addSelectionChangedListener(defaultRepositoryAction);
> 	}
> 
> 	private void hookContextMenu() {
>@@ -261,6 +267,7 @@
> 		manager.add(resetConfigurationAction);
> 		manager.add(new Separator());
> 		manager.add(offlineAction);
>+		manager.add(defaultRepositoryAction);
> 		manager.add(new Separator("repository")); //$NON-NLS-1$
> 		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
> 		manager.add(new Separator());
>Index: src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoryLabelProvider.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoryLabelProvider.java,v
>retrieving revision 1.24
>diff -u -r1.24 TaskRepositoryLabelProvider.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoryLabelProvider.java	13 Jan 2009 07:07:36 -0000	1.24
>+++ src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoryLabelProvider.java	22 Feb 2009 20:31:27 -0000
>@@ -15,6 +15,7 @@
> import org.eclipse.jface.viewers.ILabelProviderListener;
> import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
> import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
>+import org.eclipse.mylyn.internal.tasks.ui.actions.DefaultRepositoryAction;
> import org.eclipse.mylyn.internal.tasks.ui.actions.DisconnectRepositoryAction;
> import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
> import org.eclipse.mylyn.tasks.core.TaskRepository;
>@@ -61,6 +62,9 @@
> 			TaskRepository repository = (TaskRepository) object;
> 			StringBuilder label = new StringBuilder();
> 			label.append(repository.getRepositoryLabel());
>+			if (repository.isDefault()) {
>+				label.append(" [" + DefaultRepositoryAction.LABEL + "]"); //$NON-NLS-1$ //$NON-NLS-2$
>+			}
> 			if (repository.isOffline()) {
> 				label.append(" [" + DisconnectRepositoryAction.LABEL + "]"); //$NON-NLS-1$ //$NON-NLS-2$
> 			}
>Index: src/org/eclipse/mylyn/internal/tasks/ui/actions/NewTaskAction.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewTaskAction.java,v
>retrieving revision 1.22
>diff -u -r1.22 NewTaskAction.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/actions/NewTaskAction.java	20 Feb 2009 23:41:22 -0000	1.22
>+++ src/org/eclipse/mylyn/internal/tasks/ui/actions/NewTaskAction.java	22 Feb 2009 20:31:27 -0000
>@@ -78,7 +78,10 @@
> 	public void run() {
> 		Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
> 		if (shell != null && !shell.isDisposed()) {
>-			if (localTask) {
>+			TaskRepository defaultRepository = TasksUiPlugin.getRepositoryManager().getDefaultRepository();
>+			if (defaultRepository != null) {
>+				TasksUiUtil.openNewTaskEditor(shell, null, defaultRepository);
>+			} else if (localTask) {
> 				TasksUiUtil.openNewLocalTaskEditor(shell, null);
> 			} else {
> 				if (skipRepositoryPage) {
>Index: src/org/eclipse/mylyn/internal/tasks/ui/wizards/Messages.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/Messages.java,v
>retrieving revision 1.10
>diff -u -r1.10 Messages.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/wizards/Messages.java	17 Feb 2009 02:19:37 -0000	1.10
>+++ src/org/eclipse/mylyn/internal/tasks/ui/wizards/Messages.java	22 Feb 2009 20:31:28 -0000
>@@ -179,6 +179,8 @@
> 
> 	public static String AbstractRepositorySettingsPage_Disconnected;
> 
>+	public static String AbstractRepositorySettingsPage_Default_Repository;
>+
> 	public static String AbstractRepositorySettingsPage_Enable_http_authentication;
> 
> 	public static String AbstractRepositorySettingsPage_Enable_proxy_authentication;
>Index: src/org/eclipse/mylyn/internal/tasks/ui/wizards/messages.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/messages.properties,v
>retrieving revision 1.10
>diff -u -r1.10 messages.properties
>--- src/org/eclipse/mylyn/internal/tasks/ui/wizards/messages.properties	17 Feb 2009 02:19:37 -0000	1.10
>+++ src/org/eclipse/mylyn/internal/tasks/ui/wizards/messages.properties	22 Feb 2009 20:31:28 -0000
>@@ -90,6 +90,7 @@
> AbstractRepositorySettingsPage_Create_new_account=Create new account
> AbstractRepositorySettingsPage_Default__=Default (
> AbstractRepositorySettingsPage_Disconnected=Disconnected
>+AbstractRepositorySettingsPage_Default_Repository=Default Repository
> AbstractRepositorySettingsPage_Enable_http_authentication=Enable Http Authentication
> AbstractRepositorySettingsPage_Enable_proxy_authentication=Enable Proxy Authentication
> AbstractRepositorySettingsPage_Enter_a_valid_server_url=Enter a valid server url
>Index: src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java,v
>retrieving revision 1.69
>diff -u -r1.69 AbstractRepositorySettingsPage.java
>--- src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java	20 Feb 2009 18:56:16 -0000	1.69
>+++ src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java	22 Feb 2009 20:31:28 -0000
>@@ -201,6 +201,8 @@
> 
> 	private Button disconnectedButton;
> 
>+	private Button setDefaultButton;
>+
> 	/**
> 	 * @since 3.0
> 	 */
>@@ -288,8 +290,11 @@
> 			}
> 		});
> 
>-		GridDataFactory.fillDefaults().hint(300, SWT.DEFAULT).grab(true, false).span(2, SWT.DEFAULT).applyTo(
>+		GridDataFactory.fillDefaults().hint(300, SWT.DEFAULT).grab(true, false).span(1, SWT.DEFAULT).applyTo(
> 				serverUrlCombo);
>+		setDefaultButton = new Button(compositeContainer, SWT.CHECK);
>+		setDefaultButton.setText(Messages.AbstractRepositorySettingsPage_Default_Repository);
>+		setDefaultButton.setSelection(repository != null ? repository.isDefault() : false);
> 
> 		repositoryLabelEditor = new StringFieldEditor("", LABEL_REPOSITORY_LABEL, StringFieldEditor.UNLIMITED, //$NON-NLS-1$
> 				compositeContainer) {
>@@ -336,7 +341,7 @@
> 
> 			@Override
> 			public int getNumberOfControls() {
>-				 // always 2 columns -- if no anonymous checkbox, just leave 3rd column empty
>+				// always 2 columns -- if no anonymous checkbox, just leave 3rd column empty
> 				return 2;
> 			}
> 		};
>@@ -1407,7 +1412,12 @@
> 		}
> 
> 		repository.setOffline(disconnectedButton.getSelection());
>-
>+		TaskRepositoryManager repositoryManager = TasksUiPlugin.getRepositoryManager();
>+		if (setDefaultButton.getSelection()) {
>+			repositoryManager.setDefaultRepository(repository);
>+		} else if (repository.isDefault() && !setDefaultButton.getSelection()) {
>+			repositoryManager.setDefaultRepository(null);
>+		}
> 		super.applyTo(repository);
> 	}
> 
>Index: src/org/eclipse/mylyn/internal/tasks/ui/actions/DefaultRepositoryAction.java
>===================================================================
>RCS file: src/org/eclipse/mylyn/internal/tasks/ui/actions/DefaultRepositoryAction.java
>diff -N src/org/eclipse/mylyn/internal/tasks/ui/actions/DefaultRepositoryAction.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/mylyn/internal/tasks/ui/actions/DefaultRepositoryAction.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,76 @@
>+/*******************************************************************************
>+ * Copyright (c) 2004, 2008 Tasktop Technologies and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     Tasktop Technologies - initial API and implementation
>+ *******************************************************************************/
>+
>+package org.eclipse.mylyn.internal.tasks.ui.actions;
>+
>+import org.eclipse.jface.action.Action;
>+import org.eclipse.jface.action.IAction;
>+import org.eclipse.jface.viewers.ISelection;
>+import org.eclipse.jface.viewers.ISelectionChangedListener;
>+import org.eclipse.jface.viewers.IStructuredSelection;
>+import org.eclipse.jface.viewers.SelectionChangedEvent;
>+import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryManager;
>+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
>+import org.eclipse.mylyn.internal.tasks.ui.views.Messages;
>+import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
>+import org.eclipse.mylyn.tasks.core.TaskRepository;
>+import org.eclipse.mylyn.tasks.ui.TasksUi;
>+
>+/**
>+ * 
>+ * @author "Frank Becker"
>+ * @since 3.1
>+ * 
>+ */
>+public class DefaultRepositoryAction extends Action implements ISelectionChangedListener {
>+	public static final String LABEL = Messages.DefaultRepositoryAction_Default;
>+
>+	private static final String ID = "org.eclipse.mylyn.tasklist.repositories.default"; //$NON-NLS-1$
>+
>+	private TaskRepository repository;
>+
>+	public DefaultRepositoryAction() {
>+		super(LABEL, IAction.AS_CHECK_BOX);
>+		setId(ID);
>+		setEnabled(false);
>+	}
>+
>+	@Override
>+	public void run() {
>+		TaskRepositoryManager repositoryManager = TasksUiPlugin.getRepositoryManager();
>+		repositoryManager.setDefaultRepository(repository);
>+		repositoryManager.notifyRepositorySettingsChanged(repository);
>+	}
>+
>+	public void selectionChanged(IAction action, ISelection selection) {
>+	}
>+
>+	public void selectionChanged(SelectionChangedEvent event) {
>+		ISelection selection = event.getSelection();
>+		if (selection instanceof IStructuredSelection) {
>+			Object selectedObject = ((IStructuredSelection) selection).getFirstElement();
>+			if (selectedObject instanceof TaskRepository) {
>+				AbstractRepositoryConnector connector = TasksUi.getRepositoryManager().getRepositoryConnector(
>+						((TaskRepository) selectedObject).getConnectorKind());
>+				if (connector.isUserManaged()) {
>+					this.repository = (TaskRepository) selectedObject;
>+					setChecked(this.repository.isDefault());
>+					setEnabled(true);
>+					return;
>+				}
>+			}
>+		}
>+		this.repository = null;
>+		setChecked(false);
>+		setEnabled(false);
>+	}
>+
>+}

Actions: View | Diff

Attachments on bug 244553: 126411 | 126412 | 126413 | 126414 | 126415 | 126416