X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.e4%2Fsrc%2Forg%2Fargeo%2Fcms%2Fe4%2Fjcr%2FJcrBrowserView.java;h=7639df459dedc55f3478b9d926b412b58e68fcfb;hb=886858a08bc07c85a0f70bd58af871989a3d2e18;hp=dd5bcb184fe4457ca6796d4a4af3ff4280222d93;hpb=c4bdde7eb5a3b527654b6a2a0de3743f5ba4cf7b;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 dd5bcb184..7639df459 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,7 +33,6 @@ 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;
@@ -45,6 +44,10 @@ 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.argeo.node.security.Keyring;
+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;
@@ -68,21 +71,20 @@ import org.eclipse.swt.widgets.Display;
  * repository environment
  */
 public class JcrBrowserView {
-	public final static String ID = "org.argeo.cms.e4.jcrbrowser";
-
-	@Inject
-	private ESelectionService selectionService;
+	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 */
-	private CryptoKeyring keyring;
+	@Inject
+	private Keyring keyring;
 	@Inject
 	private RepositoryFactory repositoryFactory;
 	@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();
@@ -94,7 +96,8 @@ 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());
@@ -140,6 +143,8 @@ public class JcrBrowserView {
 				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);
 	}
@@ -201,7 +206,7 @@ public class JcrBrowserView {
 				throw new EclipseUiException("Cannot register listeners", e);
 			}
 
-		tmpNodeViewer.addDoubleClickListener(new JcrDClickListener(tmpNodeViewer));
+		// tmpNodeViewer.addDoubleClickListener(new JcrDClickListener(tmpNodeViewer));
 		return tmpNodeViewer;
 	}