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=e39bc56599e130d8fc01258826ff81e14bf990ea;hpb=92daeb190be66653f39544ae9b5a2f2c31a60797;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 e39bc5659..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 @@ -1,118 +1,112 @@ package org.argeo.eclipse.ui.jcr.views; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; - -import javax.jcr.Item; -import javax.jcr.LoginException; + import javax.jcr.Node; -import javax.jcr.NodeIterator; import javax.jcr.Property; -import javax.jcr.PropertyIterator; 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.TreeParent; +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; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TableViewerColumn; -import org.eclipse.jface.viewers.TreeNode; import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.viewers.Viewer; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.part.ViewPart; +import org.eclipse.swt.widgets.Menu; + +public class GenericJcrBrowser extends AbstractJcrBrowser { + private final static Log log = LogFactory.getLog(GenericJcrBrowser.class); -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 Session jcrSession; - private RepositoryRegister repositoryRegister; + private JcrFileProvider jcrFileProvider; + private FileHandler fileHandler; - private Comparator itemComparator = new Comparator() { - public int compare(Item o1, Item o2) { - try { - return o1.getName().compareTo(o2.getName()); - } catch (RepositoryException e) { - throw new ArgeoException("Cannot compare " + o1 + " and " + o2, - e); - } - } - }; + 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); - 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) { - Object obj = ((IStructuredSelection) event.getSelection()) - .getFirstElement(); - if (obj instanceof RepositoryNode) { - ((RepositoryNode) obj).login(); - } else if (obj instanceof WorkspaceNode) { - ((WorkspaceNode) obj).login(); - } + nodeContentProvider = new NodeContentProvider(nodeSession, + repositoryRegister); - } - }); - nodesViewer.setInput(repositoryRegister); + // nodes viewer + nodesViewer = createNodeViewer(top, nodeContentProvider); + + // context menu + MenuManager menuManager = new MenuManager(); + Menu menu = menuManager.createContextMenu(nodesViewer.getTree()); + nodesViewer.getTree().setMenu(menu); + getSite().registerContextMenu(menuManager, nodesViewer); + getSite().setSelectionProvider(nodesViewer); + nodesViewer.setInput(getViewSite()); + // Create the property viewer on the bottom Composite bottom = new Composite(sashForm, SWT.NONE); bottom.setLayout(new GridLayout(1, false)); - propertiesViewer = new TableViewer(bottom); propertiesViewer.getTable().setLayoutData( new GridData(SWT.FILL, SWT.FILL, true, true)); @@ -168,253 +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 }; } - public void setRepositoryRegister(RepositoryRegister repositoryRegister) { - this.repositoryRegister = repositoryRegister; + // @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; } - /* - * NODES - */ - protected Object[] childrenNodes(Node parentNode) { - try { - List children = new ArrayList(); - NodeIterator nit = parentNode.getNodes(); - while (nit.hasNext()) { - Node node = nit.nextNode(); - children.add(node); - } - Node[] arr = children.toArray(new Node[children.size()]); - Arrays.sort(arr, itemComparator); - return arr; - } catch (RepositoryException e) { - throw new ArgeoException("Cannot list children of " + parentNode, e); - } + private FileHandler getFileHandler() { + return fileHandler; } - private class NodeContentProvider implements ITreeContentProvider { - - public Object[] getElements(Object inputElement) { - return getChildren(inputElement); - } + protected TreeViewer createNodeViewer(Composite parent, + final ITreeContentProvider nodeContentProvider) { - public Object[] getChildren(Object parentElement) { - if (parentElement instanceof Node) { - return childrenNodes((Node) parentElement); - } else if (parentElement instanceof RepositoryNode) { - return ((RepositoryNode) parentElement).getChildren(); - } else if (parentElement instanceof WorkspaceNode) { - Session session = ((WorkspaceNode) parentElement).getSession(); - if (session == null) - return new Object[0]; + final TreeViewer tmpNodeViewer = new TreeViewer(parent, SWT.MULTI); - try { - return childrenNodes(session.getRootNode()); - } catch (RepositoryException e) { - throw new ArgeoException("Cannot retrieve root node of " - + session, e); - } - } else if (parentElement instanceof RepositoryRegister) { - RepositoryRegister repositoryRegister = (RepositoryRegister) parentElement; - List nodes = new ArrayList(); - Map repositories = repositoryRegister - .getRepositories(); - for (String name : repositories.keySet()) { - nodes.add(new RepositoryNode(name, repositories.get(name))); - } - return nodes.toArray(); - } else { - return new Object[0]; - } - } + tmpNodeViewer.getTree().setLayoutData( + new GridData(SWT.FILL, SWT.FILL, true, true)); - public Object getParent(Object element) { - try { - if (element instanceof Node) { - return ((Node) element).getParent(); - } - return null; - } catch (RepositoryException e) { - throw new ArgeoException( - "Cannot retrieve parent of " + element, e); - } - } + 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()); + } + } + }); - public boolean hasChildren(Object element) { - try { - if (element instanceof Node) { - return ((Node) element).hasNodes(); - } else if (element instanceof RepositoryNode) { - return ((RepositoryNode) element).hasChildren(); - } else if (element instanceof WorkspaceNode) { - return ((WorkspaceNode) element).getSession() != null; + 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 false; - } catch (RepositoryException e) { - throw new ArgeoException("Cannot check children of " + element, - e); } - } - - public void dispose() { - } - - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - } - + }); + return tmpNodeViewer; } - class NodeLabelProvider extends LabelProvider { - - public String getText(Object element) { - try { - if (element instanceof Node) { - Node node = (Node) element; - String label = node.getName(); - // try { - // Item primaryItem = node.getPrimaryItem(); - // label = primaryItem instanceof Property ? ((Property) - // primaryItem) - // .getValue().getString() - // + " (" - // + node.getName() - // + ")" : node.getName(); - // } catch (RepositoryException e) { - // label = node.getName(); - // } - StringBuffer mixins = new StringBuffer(""); - for (NodeType type : node.getMixinNodeTypes()) - mixins.append(' ').append(type.getName()); - - return label + " [" + node.getPrimaryNodeType().getName() - + mixins + "]"; - } - return element.toString(); - } catch (RepositoryException e) { - throw new ArgeoException("Cannot get text for of " + element, e); - } - } - + @Override + protected TreeViewer getNodeViewer() { + return nodesViewer; } - /* - * PROPERTIES - */ - private class PropertiesContentProvider implements - IStructuredContentProvider { - - public void dispose() { - } - - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - } - - public Object[] getElements(Object inputElement) { - try { - if (inputElement instanceof Node) { - Set props = new TreeSet(itemComparator); - PropertyIterator pit = ((Node) inputElement) - .getProperties(); - while (pit.hasNext()) - props.add(pit.nextProperty()); - return props.toArray(); - } - return new Object[] {}; - } catch (RepositoryException e) { - throw new ArgeoException("Cannot get element for " - + inputElement, e); - } - } - + // IoC + public void setRepositoryRegister(RepositoryRegister repositoryRegister) { + this.repositoryRegister = repositoryRegister; } - private class RepositoryNode extends TreeParent { - private final String name; - private final Repository repository; - private Session defaultSession = null; - - public RepositoryNode(String name, Repository repository) { - super(name); - this.name = name; - this.repository = repository; - } - - public Repository getRepository() { - return repository; - } - - public Session getDefaultSession() { - return defaultSession; - } - - public void login() { - try { - defaultSession = repository.login(); - String[] wkpNames = defaultSession.getWorkspace() - .getAccessibleWorkspaceNames(); - for (String wkpName : wkpNames) { - if (wkpName.equals(defaultSession.getWorkspace().getName())) - addChild(new WorkspaceNode(repository, wkpName, - defaultSession)); - else - addChild(new WorkspaceNode(repository, wkpName)); - } - nodesViewer.refresh(this); - } catch (RepositoryException e) { - throw new ArgeoException( - "Cannot connect to repository " + name, e); - } - } + public void setSession(Session session) { + this.session = session; } - private class WorkspaceNode extends TreeParent { - private final String name; - private final Repository repository; - private Session session = null; - - public WorkspaceNode(Repository repository, String name) { - this(repository, name, null); - } - - public WorkspaceNode(Repository repository, String name, Session session) { - super(name); - this.name = name; - this.repository = repository; - this.session = session; - } - - public Session getSession() { - return session; - } - - public void login() { - try { - if (session != null) - session.logout(); - - session = repository.login(name); - nodesViewer.refresh(this); - } catch (RepositoryException e) { - throw new ArgeoException( - "Cannot connect to repository " + name, e); - } - } - - } }