Attachment 186035 Details for Bug 332074 – in progress patch

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

[patch] in progress patch

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

on 2011-01-04 13:33:45 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Steffen Pingel

Created: 2011-01-04 13:33:45 EST

Size: 8.49 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.tasks.core
>Index: src/org/eclipse/mylyn/tasks/core/RepositoryTemplate.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryTemplate.java,v
>retrieving revision 1.15
>diff -u -r1.15 RepositoryTemplate.java
>--- src/org/eclipse/mylyn/tasks/core/RepositoryTemplate.java	18 Oct 2010 23:36:42 -0000	1.15
>+++ src/org/eclipse/mylyn/tasks/core/RepositoryTemplate.java	4 Jan 2011 18:33:26 -0000
>@@ -74,4 +74,34 @@
> 	public Map<String, String> getAttributes() {
> 		return this.genericAttributes;
> 	}
>+
>+	@Override
>+	public String toString() {
>+		StringBuilder builder = new StringBuilder();
>+		builder.append("RepositoryTemplate [repositoryUrl="); //$NON-NLS-1$
>+		builder.append(repositoryUrl);
>+		builder.append(", label="); //$NON-NLS-1$
>+		builder.append(label);
>+		builder.append(", addAutomatically="); //$NON-NLS-1$
>+		builder.append(addAutomatically);
>+		builder.append(", anonymous="); //$NON-NLS-1$
>+		builder.append(anonymous);
>+		builder.append(", characterEncoding="); //$NON-NLS-1$
>+		builder.append(characterEncoding);
>+		builder.append(", genericAttributes="); //$NON-NLS-1$
>+		builder.append(genericAttributes);
>+		builder.append(", newAccountUrl="); //$NON-NLS-1$
>+		builder.append(newAccountUrl);
>+		builder.append(", newTaskUrl="); //$NON-NLS-1$
>+		builder.append(newTaskUrl);
>+		builder.append(", taskPrefixUrl="); //$NON-NLS-1$
>+		builder.append(taskPrefixUrl);
>+		builder.append(", taskQueryUrl="); //$NON-NLS-1$
>+		builder.append(taskQueryUrl);
>+		builder.append(", version="); //$NON-NLS-1$
>+		builder.append(version);
>+		builder.append("]"); //$NON-NLS-1$
>+		return builder.toString();
>+	}
>+
> }
>#P org.eclipse.mylyn.tasks.tests
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.tests/plugin.xml,v
>retrieving revision 1.22
>diff -u -r1.22 plugin.xml
>--- plugin.xml	11 Aug 2009 17:55:04 -0000	1.22
>+++ plugin.xml	4 Jan 2011 18:33:27 -0000
>@@ -13,8 +13,6 @@
> <plugin>
> 
>    <extension
>-         id="org.eclipse.mylyn.jira.repository"
>-         name="JIRA Repository"
>          point="org.eclipse.mylyn.tasks.ui.repositories">
>       <connectorCore
>             class="org.eclipse.mylyn.tasks.tests.connector.MockRepositoryConnector"
>@@ -26,6 +24,28 @@
>             name="Mock Repository Connector UI">
>       </connectorUi>
>    </extension>
>+   <extension
>+         point="org.eclipse.mylyn.tasks.core.templates">
>+      <repository
>+            addAutomatically="false"
>+            anonymous="true"
>+            characterEncoding="encoding"
>+            label="Mock Repository Template"
>+            repositoryKind="mock"
>+            urlNewAccount="http://mock.test/template/newAccount"
>+            urlNewTask="http://mock.test/template/newTask"
>+            urlRepository="http://mock.test/template"
>+            urlTask="http://mock.test/template/task"
>+            urlTaskQuery="http://mock.test/template/query"
>+            version="1.0">
>+         <attribute
>+               name="genericAttribute"
>+               value="genericValue">
>+         </attribute>
>+      </repository>
>+   </extension>
>+   
>+   
>    
>    <extension
>          point="org.eclipse.core.runtime.contentTypes">
>Index: src/org/eclipse/mylyn/tasks/tests/RepositoryTemplateManagerTest.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTemplateManagerTest.java,v
>retrieving revision 1.5
>diff -u -r1.5 RepositoryTemplateManagerTest.java
>--- src/org/eclipse/mylyn/tasks/tests/RepositoryTemplateManagerTest.java	18 Oct 2010 23:36:42 -0000	1.5
>+++ src/org/eclipse/mylyn/tasks/tests/RepositoryTemplateManagerTest.java	4 Jan 2011 18:33:27 -0000
>@@ -11,6 +11,10 @@
> 
> package org.eclipse.mylyn.tasks.tests;
> 
>+import java.util.HashMap;
>+import java.util.Map;
>+import java.util.Set;
>+
> import junit.framework.TestCase;
> 
> import org.eclipse.mylyn.internal.tasks.core.RepositoryTemplateManager;
>@@ -50,4 +54,13 @@
> 		assertEquals(MockRepositoryConnector.REPOSITORY_URL, template.repositoryUrl);
> 	}
> 
>+	public void testGenericAttributes() {
>+		Set<RepositoryTemplate> templates = manager.getTemplates("mock");
>+		assertEquals("Expected 1 template, got: " + templates.toString(), 1, templates.size());
>+		RepositoryTemplate template = templates.iterator().next();
>+		Map<String, String> expected = new HashMap<String, String>();
>+		assertEquals("Mock Repository Template", template.label);
>+		expected.put("genericAttribute", "genericValue");
>+		assertEquals(expected, template.getAttributes());
>+	}
> }
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java,v
>retrieving revision 1.77
>diff -u -r1.77 TasksUiExtensionReader.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java	8 Jun 2010 23:10:09 -0000	1.77
>+++ src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java	4 Jan 2011 18:33:27 -0000
>@@ -30,6 +30,7 @@
> import org.eclipse.jface.resource.ImageDescriptor;
> import org.eclipse.mylyn.commons.core.StatusHandler;
> import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
>+import org.eclipse.mylyn.internal.tasks.core.RepositoryTemplateManager;
> import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryManager;
> import org.eclipse.mylyn.internal.tasks.core.externalization.TaskListExternalizer;
> import org.eclipse.mylyn.internal.tasks.ui.IDynamicSubMenuContributor;
>@@ -239,18 +240,7 @@
> 			// NOTE: has to be read first, consider improving
> 			initConnectorCores(taskListExternalizer, repositoryManager, registry);
> 
>-			IExtensionPoint templatesExtensionPoint = registry.getExtensionPoint(EXTENSION_TEMPLATES);
>-			IExtension[] templateExtensions = templatesExtensionPoint.getExtensions();
>-			for (IExtension templateExtension : templateExtensions) {
>-				IConfigurationElement[] elements = templateExtension.getConfigurationElements();
>-				for (IConfigurationElement element : elements) {
>-					if (!isDisabled(element)) {
>-						if (element.getName().equals(EXTENSION_TMPL_REPOSITORY)) {
>-							readRepositoryTemplate(element);
>-						}
>-					}
>-				}
>-			}
>+			readRepositoryTemplates(registry, TasksUiPlugin.getRepositoryTemplateManager());
> 
> 			IExtensionPoint presentationsExtensionPoint = registry.getExtensionPoint(EXTENSION_PRESENTATIONS);
> 			IExtension[] presentations = presentationsExtensionPoint.getExtensions();
>@@ -281,6 +271,24 @@
> 		}
> 	}
> 
>+	/*
>+	 * Public for testing.
>+	 */
>+	public static void readRepositoryTemplates(IExtensionRegistry registry, RepositoryTemplateManager manager) {
>+		IExtensionPoint templatesExtensionPoint = registry.getExtensionPoint(EXTENSION_TEMPLATES);
>+		IExtension[] templateExtensions = templatesExtensionPoint.getExtensions();
>+		for (IExtension templateExtension : templateExtensions) {
>+			IConfigurationElement[] elements = templateExtension.getConfigurationElements();
>+			for (IConfigurationElement element : elements) {
>+				if (!isDisabled(element)) {
>+					if (element.getName().equals(EXTENSION_TMPL_REPOSITORY)) {
>+						readRepositoryTemplate(element, manager);
>+					}
>+				}
>+			}
>+		}
>+	}
>+
> 	private static void initConnectorCores(TaskListExternalizer taskListExternalizer,
> 			TaskRepositoryManager repositoryManager, IExtensionRegistry registry) {
> 		List<ConnectorDescriptor> descriptors = new ArrayList<ConnectorDescriptor>();
>@@ -576,7 +584,7 @@
> 		}
> 	}
> 
>-	private static void readRepositoryTemplate(IConfigurationElement element) {
>+	private static void readRepositoryTemplate(IConfigurationElement element, RepositoryTemplateManager manager) {
> 		boolean anonymous = false;
> 		boolean addAuto = false;
> 
>@@ -596,7 +604,7 @@
> 				&& TasksUi.getRepositoryManager().getRepositoryConnector(repKind) != null) {
> 			RepositoryTemplate template = new RepositoryTemplate(label, serverUrl, encoding, version, newTaskUrl,
> 					taskPrefix, taskQueryUrl, newAccountUrl, anonymous, addAuto);
>-			TasksUiPlugin.getRepositoryTemplateManager().addTemplate(repKind, template);
>+			manager.addTemplate(repKind, template);
> 
> 			for (IConfigurationElement configElement : element.getChildren()) {
> 				String name = configElement.getAttribute("name"); //$NON-NLS-1$

Actions: View | Diff

Attachments on bug 332074: 186035 | 186036