X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.e4%2Fsrc%2Forg%2Fargeo%2Fcms%2Fe4%2Fjcr%2FJcrBrowserView.java;h=28dee610354fa65fd8e15ae415758756d7fa3326;hb=40b85df6007cebbc5586f936c4fd693009e15dcd;hp=3eff807330d6012564f0ebb7e840a1ef06a16f62;hpb=6ba130a04c057858b151d5d460b8c95976bd619b;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java
index 3eff80733..28dee6103 100644
--- a/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java
+++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java
@@ -33,19 +33,23 @@ import javax.jcr.observation.ObservationManager;
 
 import org.argeo.cms.CmsException;
 import org.argeo.cms.ui.jcr.JcrBrowserUtils;
-import org.argeo.cms.ui.jcr.JcrDClickListener;
 import org.argeo.cms.ui.jcr.NodeContentProvider;
 import org.argeo.cms.ui.jcr.NodeLabelProvider;
 import org.argeo.cms.ui.jcr.OsgiRepositoryRegister;
 import org.argeo.cms.ui.jcr.PropertiesContentProvider;
 import org.argeo.cms.ui.jcr.model.SingleJcrNodeElem;
+import org.argeo.cms.util.CmsUtils;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
 import org.argeo.eclipse.ui.jcr.utils.NodeViewerComparer;
 import org.argeo.node.security.CryptoKeyring;
-import org.eclipse.jface.action.MenuManager;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.ui.services.EMenuService;
+import org.eclipse.e4.ui.workbench.modeling.EPartService;
+import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.IBaseLabelProvider;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITreeContentProvider;
@@ -58,16 +62,17 @@ 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.swt.widgets.Display;
-import org.eclipse.swt.widgets.Menu;
 
 /**
  * Basic View to display a sash form to browse a JCR compliant multiple
  * repository environment
  */
 public class JcrBrowserView {
+	final static String ID = "org.argeo.cms.e4.jcrbrowser";
+	final static String NODE_VIEWER_POPUP_MENU_ID = "org.argeo.cms.e4.popupmenu.nodeViewer";
+
 	private boolean sortChildNodes = true;
 
 	/* DEPENDENCY INJECTION */
@@ -77,7 +82,7 @@ public class JcrBrowserView {
 	@Inject
 	private Repository nodeRepository;
 
-	// Current user session on the "Argeo node" default workspace
+	// Current user session on the home repository default workspace
 	private Session userSession;
 
 	private OsgiRepositoryRegister repositoryRegister = new OsgiRepositoryRegister();
@@ -89,18 +94,19 @@ public class JcrBrowserView {
 	private EventListener resultsObserver;
 
 	@PostConstruct
-	public void createPartControl(Composite parent) {
+	public void createPartControl(Composite parent, IEclipseContext context, EPartService partService,
+			ESelectionService selectionService, EMenuService menuService) {
 		repositoryRegister.init();
 
 		parent.setLayout(new FillLayout());
 		SashForm sashForm = new SashForm(parent, SWT.VERTICAL);
-		sashForm.setSashWidth(4);
-		sashForm.setLayout(new FillLayout());
+		// 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);
+		// GridLayout gl = new GridLayout(1, false);
+		top.setLayout(CmsUtils.noSpaceGridLayout());
 
 		try {
 			this.userSession = this.nodeRepository.login();
@@ -115,21 +121,28 @@ public class JcrBrowserView {
 		nodesViewer = createNodeViewer(top, nodeContentProvider);
 
 		// context menu : it is completely defined in the plugin.xml file.
-		MenuManager menuManager = new MenuManager();
-		Menu menu = menuManager.createContextMenu(nodesViewer.getTree());
+		// MenuManager menuManager = new MenuManager();
+		// Menu menu = menuManager.createContextMenu(nodesViewer.getTree());
 
-		nodesViewer.getTree().setMenu(menu);
+		// nodesViewer.getTree().setMenu(menu);
 
 		nodesViewer.setInput("");
 
 		// Create the property viewer on the bottom
 		Composite bottom = new Composite(sashForm, SWT.NONE);
-		bottom.setLayout(new GridLayout(1, false));
+		bottom.setLayout(CmsUtils.noSpaceGridLayout());
 		propertiesViewer = createPropertiesViewer(bottom);
 
 		sashForm.setWeights(getWeights());
 		nodesViewer.setComparer(new NodeViewerComparer());
-
+		nodesViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+			public void selectionChanged(SelectionChangedEvent event) {
+				IStructuredSelection selection = (IStructuredSelection) event.getSelection();
+				selectionService.setSelection(selection.toList());
+			}
+		});
+		nodesViewer.addDoubleClickListener(new JcrE4DClickListener(nodesViewer, partService));
+		menuService.registerContextMenu(nodesViewer.getControl(), NODE_VIEWER_POPUP_MENU_ID);
 		// getSite().registerContextMenu(menuManager, nodesViewer);
 		// getSite().setSelectionProvider(nodesViewer);
 	}
@@ -167,7 +180,7 @@ public class JcrBrowserView {
 		tmpNodeViewer.getTree().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 
 		tmpNodeViewer.setContentProvider(nodeContentProvider);
-		tmpNodeViewer.setLabelProvider(new NodeLabelProvider());
+		tmpNodeViewer.setLabelProvider((IBaseLabelProvider) new NodeLabelProvider());
 		tmpNodeViewer.addSelectionChangedListener(new ISelectionChangedListener() {
 			public void selectionChanged(SelectionChangedEvent event) {
 				if (!event.getSelection().isEmpty()) {
@@ -191,12 +204,12 @@ public class JcrBrowserView {
 				throw new EclipseUiException("Cannot register listeners", e);
 			}
 
-		tmpNodeViewer.addDoubleClickListener(new JcrDClickListener(tmpNodeViewer));
+		// tmpNodeViewer.addDoubleClickListener(new JcrDClickListener(tmpNodeViewer));
 		return tmpNodeViewer;
 	}
 
 	protected TableViewer createPropertiesViewer(Composite parent) {
-		propertiesViewer = new TableViewer(parent);
+		propertiesViewer = new TableViewer(parent, SWT.NONE);
 		propertiesViewer.getTable().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		propertiesViewer.getTable().setHeaderVisible(true);
 		propertiesViewer.setContentProvider(new PropertiesContentProvider());