]> git.argeo.org Git - lgpl/argeo-commons.git/blobdiff - eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/views/GenericJcrBrowser.java
+ Implementation of file handlers for both RCP & RAP, finalisation.
[lgpl/argeo-commons.git] / eclipse / runtime / org.argeo.eclipse.ui.jcr / src / main / java / org / argeo / eclipse / ui / jcr / views / GenericJcrBrowser.java
index 414cb010ac71d4a6974429c16d9ad8104477b78e..4685fbb2131fc7af0d40645e5e2d7af6edc19d60 100644 (file)
@@ -1,25 +1,22 @@
 package org.argeo.eclipse.ui.jcr.views;
 
-import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 
 import javax.jcr.Node;
 import javax.jcr.Property;
 import javax.jcr.PropertyType;
 import javax.jcr.RepositoryException;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
-import org.argeo.eclipse.ui.dialogs.Error;
 import org.argeo.eclipse.ui.jcr.browser.NodeContentProvider;
 import org.argeo.eclipse.ui.jcr.browser.NodeLabelProvider;
 import org.argeo.eclipse.ui.jcr.browser.PropertiesContentProvider;
 import org.argeo.eclipse.ui.jcr.browser.RepositoryNode;
 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.RepositoryRegister;
 import org.eclipse.jface.action.MenuManager;
@@ -43,7 +40,7 @@ import org.eclipse.swt.widgets.Menu;
 import org.eclipse.ui.part.ViewPart;
 
 public class GenericJcrBrowser extends ViewPart {
-       private static Log log = LogFactory.getLog(GenericJcrBrowser.class);
+       private final static Log log = LogFactory.getLog(GenericJcrBrowser.class);
 
        private TreeViewer nodesViewer;
        private TableViewer propertiesViewer;
@@ -52,6 +49,16 @@ public class GenericJcrBrowser extends ViewPart {
 
        @Override
        public void createPartControl(Composite parent) {
+
+               // Instantiate the generic object that fits for
+               // both RCP & RAP, must be final to be accessed in the double click
+               // listener.
+               // Not that in RAP, it registers a service handler that provide the
+               // access to the files.
+
+               final JcrFileProvider jfp = new JcrFileProvider();
+               final FileHandler fh = new FileHandler(jfp);
+
                parent.setLayout(new FillLayout());
 
                SashForm sashForm = new SashForm(parent, SWT.VERTICAL);
@@ -81,6 +88,7 @@ public class GenericJcrBrowser extends ViewPart {
                                                }
                                        }
                                });
+
                nodesViewer.addDoubleClickListener(new IDoubleClickListener() {
                        public void doubleClick(DoubleClickEvent event) {
                                if (event.getSelection() == null
@@ -89,50 +97,33 @@ public class GenericJcrBrowser extends ViewPart {
                                Object obj = ((IStructuredSelection) event.getSelection())
                                                .getFirstElement();
                                if (obj instanceof RepositoryNode) {
-                                       ((RepositoryNode) obj).login();
+                                       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);
-                               } // call the openFile commands on node
-                               else if (obj instanceof Node) {
+                               } else if (obj instanceof Node) {
                                        Node node = (Node) obj;
+                                       
+                                       // double clic on a file node triggers its opening
                                        try {
                                                if (node.isNodeType("nt:file")) {
-
-                                                       Node child = node.getNodes().nextNode();
-                                                       if (!child.isNodeType("nt:resource")) {
-                                                               Error.show("Cannot open file children Node that are not of 'nt:resource' type.");
-                                                               return;
-                                                       }
-                                                       InputStream fis = null;
-
-                                                       try {
-                                                               fis = (InputStream) child
-                                                                               .getProperty("jcr:data").getBinary()
-                                                                               .getStream();
-
-                                                               String name = node.getName();
-
-                                                               // Instantiate the generic object that fits for
-                                                               // both
-                                                               // RCP & RAP.
-                                                               FileHandler fh = new FileHandler();
-                                                               fh.openFile(name, fis);
-                                                               // fh.openFile(file);
-                                                       } catch (Exception e) {
-                                                               throw new ArgeoException(
-                                                                               "Stream error while opening file", e);
-                                                       } finally {
-                                                               IOUtils.closeQuietly(fis);
-                                                       }
+                                                       String name = node.getName();
+                                                       String id = node.getIdentifier();
+                                                       fh.openFile(name, id);
                                                }
                                        } catch (RepositoryException re) {
-                                               re.printStackTrace();
-
+                                               throw new ArgeoException(
+                                                               "Repository error while getting Node file info",
+                                                               re);
                                        }
                                }
-
                        }
                });
 
@@ -205,6 +196,8 @@ public class GenericJcrBrowser extends ViewPart {
 
                sashForm.setWeights(getWeights());
 
+               nodesViewer.setComparer(new NodeViewerComparer());
+
        }
 
        @Override
@@ -235,71 +228,17 @@ public class GenericJcrBrowser extends ViewPart {
 
        public void nodeRemoved(Node parentNode) {
 
-               List<Node> al = new ArrayList<Node>();
-               al.add(parentNode);
-
-               IStructuredSelection newSel = new StructuredSelection(al);
-               // IStructuredSelection newSel = new StructuredSelection(parentNode);
-
-               if (log.isDebugEnabled())
-                       log.debug("new selection size = " + newSel.size());
-
+               IStructuredSelection newSel = new StructuredSelection(parentNode);
                nodesViewer.setSelection(newSel, true);
+               // Force refresh
                IStructuredSelection tmpSel = (IStructuredSelection) nodesViewer
                                .getSelection();
-
-               if (log.isDebugEnabled())
-                       log.debug("set selection size = " + tmpSel.size());
-
-               nodesViewer.refresh();
-
-               //
-               // log.debug(" Class selected (Parent 1ST element) : "
-               // + tmpSel.getFirstElement().getClass());
-               // setFocus();
-               //
-               // nodesViewer.refresh(parentNode);
-
-               // // Call the refresh node command
-               // try {
-               // IWorkbench iw = JcrUiPlugin.getDefault().getWorkbench();
-               // IHandlerService handlerService = (IHandlerService) iw
-               // .getService(IHandlerService.class);
-               //
-               // // get the command from plugin.xml
-               // IWorkbenchWindow window = iw.getActiveWorkbenchWindow();
-               // ICommandService cmdService = (ICommandService) window
-               // .getService(ICommandService.class);
-               // Command cmd = cmdService
-               // .getCommand(OpenEbiDetailsEditor.COMMAND_NAME);
-               //
-               // // log.debug("cmd : " + cmd);
-               // ArrayList<Parameterization> parameters = new
-               // ArrayList<Parameterization>();
-               //
-               // // get the parameter
-               // IParameter iparam = cmd
-               // .getParameter(OpenEbiDetailsEditor.PARAM_UUID);
-               //
-               // Parameterization params = new Parameterization(iparam,
-               // ((String[]) obj)[0]);
-               // parameters.add(params);
-               //
-               // // build the parameterized command
-               // ParameterizedCommand pc = new ParameterizedCommand(cmd,
-               // parameters.toArray(new Parameterization[parameters.size()]));
-               //
-               // // execute the command
-               // handlerService = (IHandlerService) window
-               // .getService(IHandlerService.class);
-               // handlerService.executeCommand(pc, null);
-               //
-               // } catch (Exception e) {
-               // throw new ArgeoException("Error opening EBI", e);
-               // }
+               nodesViewer.refresh(tmpSel.getFirstElement());
        }
 
+       // IoC
        public void setRepositoryRegister(RepositoryRegister repositoryRegister) {
                this.repositoryRegister = repositoryRegister;
        }
+
 }