X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fplugins%2Forg.argeo.jcr.ui.explorer%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2Fui%2Fexplorer%2Futils%2FGenericNodeDoubleClickListener.java;h=da13a236602abe0e10b427804a650a1f01d0d9a5;hb=ae696952b94054d3b9ec8ab05c02fc82d11607bf;hp=708c024e171c4885963126de6d98094c0bdc22e0;hpb=c425aea5b318f0c291804cf3973b3059f923e9b5;p=lgpl%2Fargeo-commons.git

diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/utils/GenericNodeDoubleClickListener.java b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/utils/GenericNodeDoubleClickListener.java
index 708c024e1..da13a2366 100644
--- a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/utils/GenericNodeDoubleClickListener.java
+++ b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/utils/GenericNodeDoubleClickListener.java
@@ -4,32 +4,28 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 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.utils.JcrFileProvider;
 import org.argeo.eclipse.ui.specific.FileHandler;
 import org.argeo.jcr.ui.explorer.JcrExplorerPlugin;
-import org.argeo.jcr.ui.explorer.browser.NodeContentProvider;
-import org.argeo.jcr.ui.explorer.browser.RepositoryNode;
-import org.argeo.jcr.ui.explorer.browser.WorkspaceNode;
 import org.argeo.jcr.ui.explorer.editors.GenericNodeEditor;
 import org.argeo.jcr.ui.explorer.editors.GenericNodeEditorInput;
+import org.argeo.jcr.ui.explorer.model.RepositoryNode;
+import org.argeo.jcr.ui.explorer.model.SingleJcrNode;
+import org.argeo.jcr.ui.explorer.model.WorkspaceNode;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.ui.PartInitException;
 
 /**
- * 
  * Centralizes the management of double click on a NodeTreeViewer
- * 
  */
 public class GenericNodeDoubleClickListener implements IDoubleClickListener {
 
-	private final static Log log = LogFactory
-			.getLog(GenericNodeDoubleClickListener.class);
+	// private final static Log log = LogFactory
+	// .getLog(GenericNodeDoubleClickListener.class);
 
 	private TreeViewer nodeViewer;
 	private JcrFileProvider jfp;
@@ -48,13 +44,17 @@ public class GenericNodeDoubleClickListener implements IDoubleClickListener {
 				.getFirstElement();
 		if (obj instanceof RepositoryNode) {
 			RepositoryNode rpNode = (RepositoryNode) obj;
-			rpNode.login();
-			nodeViewer.refresh(obj);
+			if (rpNode.getChildren().length == 0) {
+				rpNode.login();
+				nodeViewer.refresh(obj);
+			}
+			// else do nothing
 		} else if (obj instanceof WorkspaceNode) {
 			((WorkspaceNode) obj).login();
 			nodeViewer.refresh(obj);
-		} else if (obj instanceof Node) {
-			Node node = (Node) obj;
+		} else if (obj instanceof SingleJcrNode) {
+			SingleJcrNode sjn = (SingleJcrNode) obj;
+			Node node = sjn.getNode();
 			try {
 				if (node.isNodeType(NodeType.NT_FILE)) {
 					// double click on a file node triggers its opening
@@ -65,29 +65,16 @@ public class GenericNodeDoubleClickListener implements IDoubleClickListener {
 					// various
 					// repository.
 					// TODO : enhanced that.
-					ITreeContentProvider itcp = (ITreeContentProvider) nodeViewer
-							.getContentProvider();
-					jfp.setRootNodes((Object[]) itcp.getElements(null));
+					// ITreeContentProvider itcp = (ITreeContentProvider)
+					// nodeViewer
+					// .getContentProvider();
+					jfp.setReferenceNode(node);
 					fileHandler.openFile(name, id);
 				}
-				// File or not, we always open the corresponding node Editor.
-				String repositoryAlias = getRepositoryAlias(obj);
-				String workspaceName = node.getSession().getWorkspace()
-						.getName();
-				String path = node.getPath();
-
-				if (log.isDebugEnabled()) {
-					log.debug("RepoAlias: " + repositoryAlias + " - WS Name: "
-							+ workspaceName + " - path:" + path);
-				}
-				GenericNodeEditorInput gnei = new GenericNodeEditorInput(
-						repositoryAlias, workspaceName, path);
-
-				GenericNodeEditor gne = (GenericNodeEditor) JcrExplorerPlugin
-						.getDefault().getWorkbench().getActiveWorkbenchWindow()
-						.getActivePage().openEditor(gnei, GenericNodeEditor.ID);
-				gne.setCurrentNode(node);
-
+				GenericNodeEditorInput gnei = new GenericNodeEditorInput(node);
+				JcrExplorerPlugin.getDefault().getWorkbench()
+						.getActiveWorkbenchWindow().getActivePage()
+						.openEditor(gnei, GenericNodeEditor.ID);
 			} catch (RepositoryException re) {
 				throw new ArgeoException(
 						"Repository error while getting node info", re);
@@ -97,15 +84,4 @@ public class GenericNodeDoubleClickListener implements IDoubleClickListener {
 			}
 		}
 	}
-
-	// Enhance this method
-	private String getRepositoryAlias(Object element) {
-		NodeContentProvider ncp = (NodeContentProvider) nodeViewer
-				.getContentProvider();
-		Object parent = element;
-		while (!(ncp.getParent(parent) instanceof RepositoryNode)
-				&& parent != null)
-			parent = ncp.getParent(parent);
-		return parent == null ? null : ((RepositoryNode) parent).getName();
-	}
 }