From fd7508ea690c6afc945cbf9c3b2f11a1bab2438c Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 19 Apr 2018 19:32:22 +0200 Subject: [PATCH] Improve FS --- .../src/org/argeo/cms/e4/files/NodeFsBrowserView.java | 3 ++- .../src/org/argeo/eclipse/ui/fs/FsTableViewer.java | 8 +++++++- .../src/org/argeo/eclipse/ui/fs/NioFileLabelProvider.java | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) 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 378e4b510..5b79aaf02 100644 --- 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 47258f718..3476739bc 100644 --- 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 e2ea90596..d8cb1d83b 100644 --- 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"; } -- 2.30.2