X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.eclipse.ui%2Fsrc%2Forg%2Fargeo%2Feclipse%2Fui%2Ffs%2FFileIconNameLabelProvider.java;h=d3fc1c9039c63288d6de6615053ca7c0680c520a;hb=a1e5c8447beec2b896b0a03e38a4c17608a4b85d;hp=777d57567c97ac6708207ca4c2714f6dc0b02a92;hpb=e78d5435d12c2df2100838e090ae6d045a980f8d;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/FileIconNameLabelProvider.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/FileIconNameLabelProvider.java
index 777d57567..d3fc1c903 100644
--- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/FileIconNameLabelProvider.java
+++ b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/FileIconNameLabelProvider.java
@@ -7,6 +7,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.swt.graphics.Image;
 
+/** Basic label provider with icon for NIO file viewers */
 public class FileIconNameLabelProvider extends ColumnLabelProvider {
 	private static final long serialVersionUID = 8187902187946523148L;
 
@@ -15,8 +16,8 @@ public class FileIconNameLabelProvider extends ColumnLabelProvider {
 
 	public FileIconNameLabelProvider() {
 		// if (!PlatformUI.isWorkbenchRunning()) {
-		folderIcon = ImageDescriptor.createFromFile(getClass(), "fldr_obj.gif").createImage();
-		fileIcon = ImageDescriptor.createFromFile(getClass(), "file_obj.gif").createImage();
+		folderIcon = ImageDescriptor.createFromFile(getClass(), "folder.png").createImage();
+		fileIcon = ImageDescriptor.createFromFile(getClass(), "file.png").createImage();
 		// }
 	}
 
@@ -38,6 +39,8 @@ public class FileIconNameLabelProvider extends ColumnLabelProvider {
 				return "[No name]";
 			else
 				return name.toString();
+		} else if (element instanceof ParentDir) {
+			return "..";
 		}
 		return null;
 	}
@@ -57,7 +60,25 @@ public class FileIconNameLabelProvider extends ColumnLabelProvider {
 			// else
 			// return
 			// PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FILE);
+		} else if (element instanceof ParentDir) {
+			return folderIcon;
 		}
 		return null;
 	}
+
+	@Override
+	public String getToolTipText(Object element) {
+		if (element instanceof Path) {
+			Path curr = ((Path) element);
+			Path name = curr.getFileName();
+			if (name == null)
+				return "[No name]";
+			else
+				return name.toAbsolutePath().toString();
+		} else if (element instanceof ParentDir) {
+			return ((ParentDir) element).getPath().toAbsolutePath().toString();
+		}
+		return null;
+	}
+
 }
\ No newline at end of file