X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=eclipse%2Fruntime%2Forg.argeo.eclipse.ui.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Feclipse%2Fui%2Fjcr%2Fviews%2FGenericJcrBrowser.java;h=f949be319d74eba1ee693a257a5f8c68dbb1d379;hb=dc61e15280d5430c637effd689d45322a08cc4d8;hp=eb23629673f4c367f7fef24847eabc2cdd555c13;hpb=591e96576707e4139b142026a7d915ffdde1e223;p=lgpl%2Fargeo-commons.git 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 eb2362967..f949be319 100644 --- 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,14 +5,24 @@ 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; import org.argeo.ArgeoException; 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.ArgeoJcrConstants; +import org.argeo.jcr.JcrUtils; import org.argeo.jcr.RepositoryRegister; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.viewers.ColumnLabelProvider; @@ -20,6 +30,7 @@ import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TableViewerColumn; @@ -31,62 +42,59 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Menu; -import org.eclipse.ui.part.ViewPart; -public class GenericJcrBrowser extends ViewPart { +public class GenericJcrBrowser extends AbstractJcrBrowser { + private final static Log log = LogFactory.getLog(GenericJcrBrowser.class); + + private Session session; + private TreeViewer nodesViewer; + private NodeContentProvider nodeContentProvider; private TableViewer propertiesViewer; + private JcrFileProvider jcrFileProvider; + private FileHandler fileHandler; + private RepositoryRegister repositoryRegister; @Override public void createPartControl(Composite parent) { - parent.setLayout(new FillLayout()); + // 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"); + } + } + + // Instantiate the generic object that fits for + // both RCP & RAP + // Note that in RAP, it registers a service handler that provide the + // access to the files. + jcrFileProvider = new JcrFileProvider(); + fileHandler = new FileHandler(jcrFileProvider); + + parent.setLayout(new FillLayout()); SashForm sashForm = new SashForm(parent, SWT.VERTICAL); sashForm.setSashWidth(4); sashForm.setLayout(new FillLayout()); + // Create the tree on top of the view Composite top = new Composite(sashForm, SWT.NONE); GridLayout gl = new GridLayout(1, false); top.setLayout(gl); - // nodes viewer - nodesViewer = new TreeViewer(top, SWT.MULTI | SWT.H_SCROLL - | SWT.V_SCROLL); - nodesViewer.getTree().setLayoutData( - new GridData(SWT.FILL, SWT.FILL, true, true)); - nodesViewer.setContentProvider(new NodeContentProvider()); - nodesViewer.setLabelProvider(new NodeLabelProvider()); - nodesViewer - .addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - if (!event.getSelection().isEmpty()) { - IStructuredSelection sel = (IStructuredSelection) event - .getSelection(); - propertiesViewer.setInput(sel.getFirstElement()); - } else { - propertiesViewer.setInput(getViewSite()); - } - } - }); - nodesViewer.addDoubleClickListener(new IDoubleClickListener() { - public void doubleClick(DoubleClickEvent event) { - if (event.getSelection() == null - || event.getSelection().isEmpty()) - return; - Object obj = ((IStructuredSelection) event.getSelection()) - .getFirstElement(); - if (obj instanceof RepositoryNode) { - ((RepositoryNode) obj).login(); - nodesViewer.refresh(obj); - } else if (obj instanceof WorkspaceNode) { - ((WorkspaceNode) obj).login(); - nodesViewer.refresh(obj); - } + nodeContentProvider = new NodeContentProvider(nodeSession, + repositoryRegister); - } - }); + // nodes viewer + nodesViewer = createNodeViewer(top, nodeContentProvider); // context menu MenuManager menuManager = new MenuManager(); @@ -94,13 +102,11 @@ public class GenericJcrBrowser extends ViewPart { nodesViewer.getTree().setMenu(menu); getSite().registerContextMenu(menuManager, nodesViewer); getSite().setSelectionProvider(nodesViewer); + nodesViewer.setInput(getViewSite()); - nodesViewer.setInput(repositoryRegister); - + // Create the property viewer on the bottom Composite bottom = new Composite(sashForm, SWT.NONE); bottom.setLayout(new GridLayout(1, false)); - - // properties viewer propertiesViewer = new TableViewer(bottom); propertiesViewer.getTable().setLayoutData( new GridData(SWT.FILL, SWT.FILL, true, true)); @@ -156,40 +162,129 @@ public class GenericJcrBrowser extends ViewPart { propertiesViewer.setInput(getViewSite()); sashForm.setWeights(getWeights()); - - } - - @Override - public void setFocus() { - nodesViewer.getTree().setFocus(); + nodesViewer.setComparer(new NodeViewerComparer()); } /** - * To be overidden to adapt size of form and result frames. - * - * @return + * To be overridden to adapt size of form and result frames. */ protected int[] getWeights() { return new int[] { 70, 30 }; } - /* - * NOTIFICATION - */ - public void refresh(Object obj) { - nodesViewer.refresh(obj); + // @Override + // public void setFocus() { + // nodesViewer.getTree().setFocus(); + // } + // + // /* + // * NOTIFICATION + // */ + // public void refresh(Object obj) { + // nodesViewer.refresh(obj); + // } + // + // public void nodeAdded(Node parentNode, Node newNode) { + // nodesViewer.refresh(parentNode); + // nodesViewer.expandToLevel(newNode, 0); + // } + // + // public void nodeRemoved(Node parentNode) { + // + // IStructuredSelection newSel = new StructuredSelection(parentNode); + // nodesViewer.setSelection(newSel, true); + // // Force refresh + // IStructuredSelection tmpSel = (IStructuredSelection) nodesViewer + // .getSelection(); + // nodesViewer.refresh(tmpSel.getFirstElement()); + // } + + private JcrFileProvider getJcrFileProvider() { + return jcrFileProvider; } - public void nodeAdded(Node parentNode, Node newNode) { - nodesViewer.refresh(parentNode); - nodesViewer.expandToLevel(newNode, 0); + private FileHandler getFileHandler() { + return fileHandler; + } + + protected TreeViewer createNodeViewer(Composite parent, + final ITreeContentProvider nodeContentProvider) { + + final TreeViewer tmpNodeViewer = new TreeViewer(parent, SWT.MULTI); + + tmpNodeViewer.getTree().setLayoutData( + new GridData(SWT.FILL, SWT.FILL, true, true)); + + tmpNodeViewer.setContentProvider(nodeContentProvider); + tmpNodeViewer.setLabelProvider(new NodeLabelProvider()); + tmpNodeViewer + .addSelectionChangedListener(new ISelectionChangedListener() { + public void selectionChanged(SelectionChangedEvent event) { + if (!event.getSelection().isEmpty()) { + IStructuredSelection sel = (IStructuredSelection) event + .getSelection(); + propertiesViewer.setInput(sel.getFirstElement()); + } else { + propertiesViewer.setInput(getViewSite()); + } + } + }); + + tmpNodeViewer.addDoubleClickListener(new IDoubleClickListener() { + public void doubleClick(DoubleClickEvent event) { + if (event.getSelection() == null + || event.getSelection().isEmpty()) + return; + Object obj = ((IStructuredSelection) event.getSelection()) + .getFirstElement(); + if (obj instanceof RepositoryNode) { + RepositoryNode rpNode = (RepositoryNode) obj; + rpNode.login(); + tmpNodeViewer.refresh(obj); + } else if (obj instanceof WorkspaceNode) { + ((WorkspaceNode) obj).login(); + tmpNodeViewer.refresh(obj); + } else if (obj instanceof Node) { + Node node = (Node) obj; + + // double clic on a file node triggers its opening + try { + 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. + getJcrFileProvider().setRootNodes( + (Object[]) nodeContentProvider + .getElements(null)); + + getFileHandler().openFile(name, id); + } + } catch (RepositoryException re) { + throw new ArgeoException( + "Repository error while getting Node file info", + re); + } + } + } + }); + return tmpNodeViewer; } - public void nodeRemoved(Node parentNode) { - nodesViewer.refresh(parentNode); + @Override + protected TreeViewer getNodeViewer() { + return nodesViewer; } + // IoC public void setRepositoryRegister(RepositoryRegister repositoryRegister) { this.repositoryRegister = repositoryRegister; } + + public void setSession(Session session) { + this.session = session; + } + }