+ Fix a bug on file download for the generic JCR view

[lgpl/argeo-commons.git] / eclipse / runtime / org.argeo.eclipse.ui.jcr / src / main / java / org / argeo / eclipse / ui / jcr / views / GenericJcrBrowser.java

diff --git a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/views/GenericJcrBrowser.java b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/views/GenericJcrBrowser.java
index 4685fbb2131fc7af0d40645e5e2d7af6edc19d60..e369c6c8a3e5dc0c76f98aff2a73840c56be176d 100644 (file)
--- a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/views/GenericJcrBrowser.java
+++ b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/views/GenericJcrBrowser.java
@@ -5,7 +5,10 @@ import java.util.Arrays;
 import javax.jcr.Node;
 import javax.jcr.Property;
 import javax.jcr.PropertyType;
+import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.nodetype.NodeType;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -18,6 +21,8 @@ import org.argeo.eclipse.ui.jcr.browser.WorkspaceNode;
 import org.argeo.eclipse.ui.jcr.utils.JcrFileProvider;
 import org.argeo.eclipse.ui.jcr.utils.NodeViewerComparer;
 import org.argeo.eclipse.ui.specific.FileHandler;
+import org.argeo.jcr.ArgeoJcrConstants;
+import org.argeo.jcr.JcrUtils;
 import org.argeo.jcr.RepositoryRegister;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
@@ -42,7 +47,10 @@ import org.eclipse.ui.part.ViewPart;
 public class GenericJcrBrowser extends ViewPart {
        private final static Log log = LogFactory.getLog(GenericJcrBrowser.class);
 
+       private Session session;
+
        private TreeViewer nodesViewer;
+       private NodeContentProvider nodeContentProvider;
        private TableViewer propertiesViewer;
 
        private RepositoryRegister repositoryRegister;
@@ -74,7 +82,22 @@ public class GenericJcrBrowser extends ViewPart {
                                | SWT.V_SCROLL);
                nodesViewer.getTree().setLayoutData(
                                new GridData(SWT.FILL, SWT.FILL, true, true));
-               nodesViewer.setContentProvider(new NodeContentProvider());
+
+               // look for session
+               Session nodeSession = session;
+               if (nodeSession == null) {
+                       Repository nodeRepository = JcrUtils.getRepositoryByAlias(
+                                       repositoryRegister, ArgeoJcrConstants.ALIAS_NODE);
+                       if (nodeRepository != null)
+                               try {
+                                       nodeSession = nodeRepository.login();
+                               } catch (RepositoryException e1) {
+                                       throw new ArgeoException("Cannot login to node repository");
+                               }
+               }
+               nodeContentProvider = new NodeContentProvider(nodeSession,
+                               repositoryRegister);
+               nodesViewer.setContentProvider(nodeContentProvider);
                nodesViewer.setLabelProvider(new NodeLabelProvider());
                nodesViewer
                                .addSelectionChangedListener(new ISelectionChangedListener() {
@@ -99,23 +122,25 @@ public class GenericJcrBrowser extends ViewPart {
                                if (obj instanceof RepositoryNode) {
                                        RepositoryNode rpNode = (RepositoryNode) obj;
                                        rpNode.login();
-                                       // For the file provider to be able to browse the various
-                                       // repository.
-                                       // TODO : enhanced that.
-                                       jfp.setRepositoryNode(rpNode);
                                        nodesViewer.refresh(obj);
-
                                } else if (obj instanceof WorkspaceNode) {
                                        ((WorkspaceNode) obj).login();
                                        nodesViewer.refresh(obj);
                                } else if (obj instanceof Node) {
                                        Node node = (Node) obj;
-                                       
+
                                        // double clic on a file node triggers its opening
                                        try {
-                                               if (node.isNodeType("nt:file")) {
+                                               if (node.isNodeType(NodeType.NT_FILE)) {
                                                        String name = node.getName();
                                                        String id = node.getIdentifier();
+                                                       // For the file provider to be able to browse the
+                                                       // various
+                                                       // repository.
+                                                       // TODO : enhanced that.
+                                                       jfp.setRootNodes((Object[]) nodeContentProvider
+                                                                       .getElements(null));
+
                                                        fh.openFile(name, id);
                                                }
                                        } catch (RepositoryException re) {
@@ -134,7 +159,7 @@ public class GenericJcrBrowser extends ViewPart {
                getSite().registerContextMenu(menuManager, nodesViewer);
                getSite().setSelectionProvider(nodesViewer);
 
-               nodesViewer.setInput(repositoryRegister);
+               nodesViewer.setInput(getViewSite());
 
                Composite bottom = new Composite(sashForm, SWT.NONE);
                bottom.setLayout(new GridLayout(1, false));
@@ -241,4 +266,8 @@ public class GenericJcrBrowser extends ViewPart {
                this.repositoryRegister = repositoryRegister;
        }
 
+       public void setSession(Session session) {
+               this.session = session;
+       }
+
 }