diff options
2 files changed, 16 insertions, 2 deletions
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 index 7497e955b..60affa198 100644 --- 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 @@ -11,6 +11,7 @@ package org.eclipse.mylyn.tasks.tests.ui.editor; +import org.eclipse.jface.viewers.StyledString; import org.eclipse.mylyn.internal.tasks.core.TaskAttachment; import org.eclipse.mylyn.internal.tasks.ui.editors.AttachmentTableLabelProvider; import org.eclipse.mylyn.tasks.tests.TaskTestUtil; @@ -43,4 +44,15 @@ public class AttachmentTableLabelProviderTest extends TestCase { assertEquals("myid", labelProvider.buildTextFromEventIndex(5, attachment).getString()); } + public void testGetAttachmentDescription() throws Exception { + TaskAttachment attachment = TaskTestUtil.createMockTaskAttachment("1"); + attachment.setDescription(null); + AttachmentTableLabelProvider labelProvider = new AttachmentTableLabelProvider(); + StyledString styledString = labelProvider.buildTextFromEventIndex(1, attachment); + assertEquals("", styledString.getString()); + + attachment.setDescription("test"); + styledString = labelProvider.buildTextFromEventIndex(1, attachment); + assertEquals("test", styledString.getString()); + } } 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 d667a8a41..46cea11a6 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 @@ -131,10 +131,12 @@ public class AttachmentTableLabelProvider extends StyledCellLabelProvider { } break; case 1: - text.append(attachment.getDescription()); + if (attachment.getDescription() != null) { + text.append(attachment.getDescription()); + } break; case 2: - Long length = attachment.getLength(); + long length = attachment.getLength(); if (length < 0) { text.append("-"); //$NON-NLS-1$ } |