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=c2b7b87a4f0167cb8a4d6944caf821c8c3ca8804;hb=4ae398701e9b425766ae3e974bda7460adc9cc68;hp=5308015f5245b3b5185b46088de274757004e9de;hpb=e20bb1ef1c9c03d5e704d1634f3c83a971d15df8;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 5308015f5..c2b7b87a4 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
@@ -1,35 +1,46 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.jcr.ui.explorer.utils;
 
 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.RepositoryElem;
+import org.argeo.jcr.ui.explorer.model.SingleJcrNodeElem;
+import org.argeo.jcr.ui.explorer.model.WorkspaceElem;
 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;
@@ -38,7 +49,9 @@ public class GenericNodeDoubleClickListener implements IDoubleClickListener {
 	public GenericNodeDoubleClickListener(TreeViewer nodeViewer) {
 		this.nodeViewer = nodeViewer;
 		jfp = new JcrFileProvider();
-		fileHandler = new FileHandler(jfp);
+		// TODO remove this
+		fileHandler = null;
+		// fileHandler = new FileHandler(jfp);
 	}
 
 	public void doubleClick(DoubleClickEvent event) {
@@ -46,15 +59,23 @@ public class GenericNodeDoubleClickListener implements IDoubleClickListener {
 			return;
 		Object obj = ((IStructuredSelection) event.getSelection())
 				.getFirstElement();
-		if (obj instanceof RepositoryNode) {
-			RepositoryNode rpNode = (RepositoryNode) obj;
-			rpNode.login();
-			nodeViewer.refresh(obj);
-		} else if (obj instanceof WorkspaceNode) {
-			((WorkspaceNode) obj).login();
+		if (obj instanceof RepositoryElem) {
+			RepositoryElem rpNode = (RepositoryElem) obj;
+			if (!rpNode.isConnected()) {
+				rpNode.login();
+				nodeViewer.refresh(obj);
+			}
+			// else do nothing
+		} else if (obj instanceof WorkspaceElem) {
+			WorkspaceElem wn = (WorkspaceElem) obj;
+			if (wn.isConnected())
+				wn.logout();
+			else
+				wn.login();
 			nodeViewer.refresh(obj);
-		} else if (obj instanceof Node) {
-			Node node = (Node) obj;
+		} else if (obj instanceof SingleJcrNodeElem) {
+			SingleJcrNodeElem sjn = (SingleJcrNodeElem) obj;
+			Node node = sjn.getNode();
 			try {
 				if (node.isNodeType(NodeType.NT_FILE)) {
 					// double click on a file node triggers its opening
@@ -65,10 +86,12 @@ public class GenericNodeDoubleClickListener implements IDoubleClickListener {
 					// various
 					// repository.
 					// TODO : enhanced that.
-					ITreeContentProvider itcp = (ITreeContentProvider) nodeViewer
-							.getContentProvider();
-					jfp.setRootNodes((Object[]) itcp.getElements(null));
-					fileHandler.openFile(name, id);
+					// ITreeContentProvider itcp = (ITreeContentProvider)
+					// nodeViewer
+					// .getContentProvider();
+					jfp.setReferenceNode(node);
+					if (fileHandler != null)
+						fileHandler.openFile(name, id);
 				}
 				GenericNodeEditorInput gnei = new GenericNodeEditorInput(node);
 				JcrExplorerPlugin.getDefault().getWorkbench()
@@ -83,15 +106,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();
-	}
 }