Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspingel2011-05-07 23:38:52 +0000
committerspingel2011-05-07 23:38:52 +0000
commit644fb694e2a59798867db525a93071b649f925fe (patch)
tree3faacd0c5f2115c41929ff79115f19d5b021d576 /org.eclipse.mylyn.tasks.ui
parente251a5810d22e99bbf2af15c607974c90557df78 (diff)
downloadorg.eclipse.mylyn.tasks-644fb694e2a59798867db525a93071b649f925fe.tar.gz
org.eclipse.mylyn.tasks-644fb694e2a59798867db525a93071b649f925fe.tar.xz
org.eclipse.mylyn.tasks-644fb694e2a59798867db525a93071b649f925fe.zip
RESOLVED - bug 343892: use content-type icons in attachment table and input
https://bugs.eclipse.org/bugs/show_bug.cgi?id=343892
Diffstat (limited to 'org.eclipse.mylyn.tasks.ui')
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AttachmentFileStorage.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AttachmentTableLabelProvider.java10
2 files changed, 11 insertions, 3 deletions
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AttachmentFileStorage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AttachmentFileStorage.java
index 9a29c517a..2ae4adf15 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AttachmentFileStorage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AttachmentFileStorage.java
@@ -20,6 +20,7 @@ import org.eclipse.core.resources.IStorage;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.PlatformObject;
import org.eclipse.core.runtime.Status;
@@ -47,8 +48,7 @@ public class AttachmentFileStorage extends PlatformObject implements IStorage {
}
public IPath getFullPath() {
- // ignore
- return null;
+ return Path.fromOSString(file.getAbsolutePath());
}
public String getName() {
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 e9df06fbb..ee3cc7890 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
@@ -13,6 +13,9 @@
package org.eclipse.mylyn.internal.tasks.ui.editors;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.resource.LocalResourceManager;
+import org.eclipse.jface.resource.ResourceManager;
import org.eclipse.jface.viewers.ColumnLabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.ViewerCell;
@@ -47,6 +50,8 @@ public class AttachmentTableLabelProvider extends ColumnLabelProvider {
private final AttributeEditorToolkit attributeEditorToolkit;
+ private final ResourceManager resourceManager = new LocalResourceManager(JFaceResources.getResources());
+
public AttachmentTableLabelProvider(TaskDataModel model, AttributeEditorToolkit attributeEditorToolkit) {
this.model = model;
this.attributeEditorToolkit = attributeEditorToolkit;
@@ -71,6 +76,9 @@ public class AttachmentTableLabelProvider extends ColumnLabelProvider {
}
}
}
+ return (Image) resourceManager.get(PlatformUI.getWorkbench()
+ .getEditorRegistry()
+ .getImageDescriptor(filename));
}
return WorkbenchImages.getImage(ISharedImages.IMG_OBJ_FILE);
}
@@ -145,7 +153,7 @@ public class AttachmentTableLabelProvider extends ColumnLabelProvider {
@Override
public void dispose() {
- // ignore
+ resourceManager.dispose();
}
@Override

Back to the top