NEW - bug 335394: [patch] errors with TaskAttachments without url

https://bugs.eclipse.org/bugs/show_bug.cgi?id=335394

5 files changed, 75 insertions, 12 deletions

diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AllTasksTests.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AllTasksTests.java
index 783c595fb..516822fa9 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AllTasksTests.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AllTasksTests.java
@@ -26,6 +26,7 @@ import org.eclipse.mylyn.tasks.tests.ui.TaskHyperlinkDetectorTest;
 import org.eclipse.mylyn.tasks.tests.ui.TaskListSynchronizationSchedulerTest;
 import org.eclipse.mylyn.tasks.tests.ui.TaskListViewTest;
 import org.eclipse.mylyn.tasks.tests.ui.TaskRelationHyperlinkDetectorTest;
+import org.eclipse.mylyn.tasks.tests.ui.editor.AttachmentTableLabelProviderTest;
 import org.eclipse.mylyn.tasks.tests.ui.editor.EditorUtilTest;
 import org.eclipse.mylyn.tasks.tests.ui.editor.PlanningPartTest;
 import org.eclipse.mylyn.tasks.tests.ui.editor.RepositoryCompletionProcessorTest;
@@ -108,6 +109,7 @@ public class AllTasksTests {
 		//suite.addTestSuite(ServiceMessageManagerTest.class);
 		suite.addTestSuite(TaskMigratorTest.class);
 		suite.addTestSuite(TaskListViewTest.class);
+		suite.addTestSuite(AttachmentTableLabelProviderTest.class);
 		// XXX long running tests, put back?
 		//suite.addTestSuite(QueryExportImportTest.class);
 		//suite.addTestSuite(BackgroundSaveTest.class);
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTestUtil.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTestUtil.java
index 0103422c4..a35099888 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTestUtil.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTestUtil.java
@@ -20,6 +20,7 @@ import junit.framework.Assert;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.mylyn.internal.tasks.core.RepositoryQuery;
+import org.eclipse.mylyn.internal.tasks.core.TaskAttachment;
 import org.eclipse.mylyn.internal.tasks.core.TaskTask;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
@@ -136,4 +137,8 @@ public class TaskTestUtil {
 		return createTaskData(createMockRepository(), taskId);
 	}
 
+	public static TaskAttachment createMockTaskAttachment(String taskId) {
+		return new TaskAttachment(createMockRepository(), createMockTask(taskId), createMockTaskData(taskId).getRoot());
+	}
+
 }
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ui/editor/AttachmentTableLabelProviderTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ui/editor/AttachmentTableLabelProviderTest.java
new file mode 100644
index 000000000..5226c6e24
--- /dev/null
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ui/editor/AttachmentTableLabelProviderTest.java
@@ -0,0 +1,46 @@
+/*******************************************************************************

+ * Copyright (c) 2011 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.tasks.tests.ui.editor;

+

+import junit.framework.TestCase;

+

+import org.eclipse.mylyn.internal.tasks.core.TaskAttachment;

+import org.eclipse.mylyn.internal.tasks.ui.editors.AttachmentTableLabelProvider;

+import org.eclipse.mylyn.tasks.tests.TaskTestUtil;

+

+/**

+ * @author Thomas Ehrnhoefer

+ * @author Steffen Pingel

+ */

+public class AttachmentTableLabelProviderTest extends TestCase {

+

+	public void testGetAttachmentId() {

+		TaskAttachment attachment = TaskTestUtil.createMockTaskAttachment("1");

+		AttachmentTableLabelProvider labelProvider = new AttachmentTableLabelProvider(null, null);

+

+		attachment.setUrl(null);

+		assertEquals("", labelProvider.getColumnText(attachment, 5));

+

+		attachment.setUrl("");

+		assertEquals("", labelProvider.getColumnText(attachment, 5));

+

+		attachment.setUrl("http://testi.ng");

+		assertEquals("", labelProvider.getColumnText(attachment, 5));

+

+		attachment.setUrl("http://testi.ng/?some=parameter");

+		assertEquals("", labelProvider.getColumnText(attachment, 5));

+

+		attachment.setUrl("http://testi.ng/?id=myid");

+		assertEquals("myid", labelProvider.getColumnText(attachment, 5));

+	}

+

+}

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AttachmentTableLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AttachmentTableLabelProvider.java
index 3166a74e2..261cc4bd2 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AttachmentTableLabelProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AttachmentTableLabelProvider.java
@@ -41,8 +41,6 @@ public class AttachmentTableLabelProvider extends ColumnLabelProvider {
 
 	private final AttachmentSizeFormatter sizeFormatter = AttachmentSizeFormatter.getInstance();
 
-	private final IThemeManager themeManager = PlatformUI.getWorkbench().getThemeManager();
-
 	private static final String[] IMAGE_EXTENSIONS = { "jpg", "gif", "png", "tiff", "tif", "bmp" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
 
 	private final TaskDataModel model;
@@ -130,12 +128,13 @@ public class AttachmentTableLabelProvider extends ColumnLabelProvider {
 
 	static String getAttachmentId(ITaskAttachment attachment) {
 		String a = attachment.getUrl();
-		int i = a.indexOf("?id="); //$NON-NLS-1$
-		if (i != -1) {
-			return a.substring(i + 4);
-		} else {
-			return ""; //$NON-NLS-1$
+		if (a != null) {
+			int i = a.indexOf("?id="); //$NON-NLS-1$
+			if (i != -1) {
+				return a.substring(i + 4);
+			}
 		}
+		return ""; //$NON-NLS-1$
 	}
 
 	@Override
@@ -163,6 +162,7 @@ public class AttachmentTableLabelProvider extends ColumnLabelProvider {
 	public Color getForeground(Object element) {
 		ITaskAttachment att = (ITaskAttachment) element;
 		if (att.isDeprecated()) {
+			IThemeManager themeManager = PlatformUI.getWorkbench().getThemeManager();
 			return themeManager.getCurrentTheme().getColorRegistry().get(CommonThemes.COLOR_COMPLETED);
 		}
 		return super.getForeground(element);
@@ -217,12 +217,13 @@ public class AttachmentTableLabelProvider extends ColumnLabelProvider {
 
 	@Override
 	public Color getBackground(Object element) {
-		ITaskAttachment attachment = (ITaskAttachment) element;
-		if (model.hasIncomingChanges(attachment.getTaskAttribute())) {
-			return attributeEditorToolkit.getColorIncoming();
-		} else {
-			return null;
+		if (model != null && attributeEditorToolkit != null) {
+			ITaskAttachment attachment = (ITaskAttachment) element;
+			if (model.hasIncomingChanges(attachment.getTaskAttribute())) {
+				return attributeEditorToolkit.getColorIncoming();
+			}
 		}
+		return null;
 	}
 
 }
\ No newline at end of file
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiMenus.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiMenus.java
index d309b3f02..4e2535851 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiMenus.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiMenus.java
@@ -41,6 +41,15 @@ public class TasksUiMenus {
 					clip.dispose();
 				}
 			}
+
+			@Override
+			public boolean isEnabled() {
+				ITaskAttachment attachment = AttachmentUtil.getSelectedAttachment();
+				if (attachment != null) {
+					return attachment.getUrl() != null;
+				}
+				return super.isEnabled();
+			}
 		};
 
 		final Action copyToClipAction = new Action(Messages.TasksUiMenus_Copy_Contents) {