Major refactoring of Argeo CMS UI

[lgpl/argeo-commons.git] / org.argeo.cms.ui / src / org / argeo / cms / ui / fs / CmsFsBrowser.java

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 4e0067521d4c70d7ff057b1b6f52707c004f2f79..5a5ecdb8bf4be58e19c0476e779d16d4cad2e6a2 100644 (file)
--- 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
@@ -18,10 +18,10 @@ import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.Session;
 
-import org.argeo.api.NodeUtils;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.auth.CurrentUser;
-import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.cms.jcr.CmsJcrUtils;
+import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.eclipse.ui.ColumnDefinition;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.fs.FileIconNameLabelProvider;
@@ -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 + " >> ");
-               CmsUiUtils.style(elemBtn, FsStyles.BREAD_CRUMB_BTN);
+               CmsSwtUtils.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) {
-               CmsUiUtils.clear(parent);
+               CmsSwtUtils.clear(parent);
                parent.setLayout(new GridLayout());
                ISelectionChangedListener selList = new BookmarksSelChangeListener();