Improve FS

diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/files/NodeFsBrowserView.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/files/NodeFsBrowserView.java
index 378e4b51036767568ac0aa6327ed6a5210a3e585..5b79aaf0260d430727a4a6e3acf0144ccd6ef691 100644 (file)
--- a/org.argeo.cms.e4/src/org/argeo/cms/e4/files/NodeFsBrowserView.java
+++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/files/NodeFsBrowserView.java
@@ -27,6 +27,7 @@ import javax.inject.Inject;
 import org.argeo.cms.CmsException;
 import org.argeo.eclipse.ui.fs.AdvancedFsBrowser;
 import org.argeo.eclipse.ui.fs.SimpleFsBrowser;
+import org.argeo.node.NodeUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 
@@ -46,7 +47,7 @@ public class NodeFsBrowserView {
                        FileSystem fileSystem = nodeFileSystemProvider.getFileSystem(uri);
                        if (fileSystem == null)
                                fileSystem = nodeFileSystemProvider.newFileSystem(uri, null);
-                       Path nodePath = fileSystem.getPath("/");
+                       Path nodePath = fileSystem.getPath("~");
 
                        Path localPath = Paths.get(System.getProperty("user.home"));
 

diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/FsTableViewer.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/FsTableViewer.java
index 47258f718df314c5d02e4e4638046cd4a0ef490e..3476739bcbd2e24fdc0a95607e23f2fb47418eb6 100644 (file)
--- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/FsTableViewer.java
+++ b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/FsTableViewer.java
@@ -78,7 +78,13 @@ public class FsTableViewer extends TableViewer {
                        this.setItemCount(0);
                        return;
                }
-               boolean isRoot = dir.getRoot().equals(dir);
+               boolean isRoot;
+               try {
+                       isRoot = dir.getRoot().equals(dir);
+               } catch (Exception e) {
+                       // FIXME Workaround for JCR root node access
+                       isRoot = dir.toString().equals("/");
+               }
                final Object[] res;
                if (isRoot)
                        res = rows;

diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/NioFileLabelProvider.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/NioFileLabelProvider.java
index e2ea90596a33b0ade3abfcd0aa8acf2a449eab71..d8cb1d83befd08062fb9964be3c068b9de36ca5d 100644 (file)
--- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/NioFileLabelProvider.java
+++ b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/NioFileLabelProvider.java
@@ -24,7 +24,8 @@ public class NioFileLabelProvider extends ColumnLabelProvider {
                                case FsUiConstants.PROPERTY_SIZE:
                                        return "-";
                                case FsUiConstants.PROPERTY_LAST_MODIFIED:
-                                       return Files.getLastModifiedTime(((ParentDir) element).getPath()).toString();
+                                       return "-";
+                               // return Files.getLastModifiedTime(((ParentDir) element).getPath()).toString();
                                case FsUiConstants.PROPERTY_TYPE:
                                        return "Folder";
                                }