X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Ffs%2FCmsFsBrowser.java;h=4a7e9bd3fb8dc3cc7702af54c4a7aca83e7ffec5;hb=c53fec78daddb69c489686844188036b04e1615a;hp=8aab1ec21277a4afee48c2c8d78d9599e6076dc9;hpb=86451eca4681e2d7202d3d958d506e063c24668d;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/fs/CmsFsBrowser.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/fs/CmsFsBrowser.java
index 8aab1ec21..4a7e9bd3f 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/fs/CmsFsBrowser.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/fs/CmsFsBrowser.java
@@ -20,7 +20,8 @@ import javax.jcr.Session;
 
 import org.argeo.cms.CmsException;
 import org.argeo.cms.auth.CurrentUser;
-import org.argeo.cms.util.CmsUtils;
+import org.argeo.cms.jcr.CmsJcrUtils;
+import org.argeo.cms.ui.util.CmsUiUtils;
 import org.argeo.eclipse.ui.ColumnDefinition;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.fs.FileIconNameLabelProvider;
@@ -29,7 +30,6 @@ import org.argeo.eclipse.ui.fs.FsUiConstants;
 import org.argeo.eclipse.ui.fs.FsUiUtils;
 import org.argeo.eclipse.ui.fs.NioFileLabelProvider;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.node.NodeUtils;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -98,7 +98,7 @@ public class CmsFsBrowser extends Composite {
 		try {
 			Repository repo = currentBaseContext.getSession().getRepository();
 			session = CurrentUser.tryAs(() -> repo.login());
-			String homepath = NodeUtils.getUserHome(session).getPath();
+			String homepath = CmsJcrUtils.getUserHome(session).getPath();
 			return homepath;
 		} catch (Exception e) {
 			throw new CmsException("Cannot retrieve Current User Home Path", e);
@@ -277,7 +277,7 @@ public class CmsFsBrowser extends Composite {
 		else
 			nameStr = path.getFileName().toString();
 		elemBtn.setText(nameStr + " >> ");
-		CmsUtils.style(elemBtn, FsStyles.BREAD_CRUMB_BTN);
+		CmsUiUtils.style(elemBtn, FsStyles.BREAD_CRUMB_BTN);
 		elemBtn.addSelectionListener(new SelectionAdapter() {
 			private static final long serialVersionUID = -4103695476023480651L;
 
@@ -323,7 +323,7 @@ public class CmsFsBrowser extends Composite {
 	}
 
 	private void populateBookmarks(Composite parent) {
-		CmsUtils.clear(parent);
+		CmsUiUtils.clear(parent);
 		parent.setLayout(new GridLayout());
 		ISelectionChangedListener selList = new BookmarksSelChangeListener();