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=65a009eefb2ea2f3478d6a21ec7c471566657580;hpb=1d5afdce3e91054f07ddd3c98309c363b4cf1d46;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 65a009eef..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,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Mathieu Baudier
+ * 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.
@@ -25,9 +25,9 @@ import org.argeo.eclipse.ui.specific.FileHandler;
 import org.argeo.jcr.ui.explorer.JcrExplorerPlugin;
 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.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;
@@ -49,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) {
@@ -57,18 +59,22 @@ public class GenericNodeDoubleClickListener implements IDoubleClickListener {
 			return;
 		Object obj = ((IStructuredSelection) event.getSelection())
 				.getFirstElement();
-		if (obj instanceof RepositoryNode) {
-			RepositoryNode rpNode = (RepositoryNode) obj;
-			if (rpNode.getChildren().length == 0) {
+		if (obj instanceof RepositoryElem) {
+			RepositoryElem rpNode = (RepositoryElem) obj;
+			if (!rpNode.isConnected()) {
 				rpNode.login();
 				nodeViewer.refresh(obj);
 			}
 			// else do nothing
-		} else if (obj instanceof WorkspaceNode) {
-			((WorkspaceNode) obj).login();
+		} else if (obj instanceof WorkspaceElem) {
+			WorkspaceElem wn = (WorkspaceElem) obj;
+			if (wn.isConnected())
+				wn.logout();
+			else
+				wn.login();
 			nodeViewer.refresh(obj);
-		} else if (obj instanceof SingleJcrNode) {
-			SingleJcrNode sjn = (SingleJcrNode) obj;
+		} else if (obj instanceof SingleJcrNodeElem) {
+			SingleJcrNodeElem sjn = (SingleJcrNodeElem) obj;
 			Node node = sjn.getNode();
 			try {
 				if (node.isNodeType(NodeType.NT_FILE)) {
@@ -84,7 +90,8 @@ public class GenericNodeDoubleClickListener implements IDoubleClickListener {
 					// nodeViewer
 					// .getContentProvider();
 					jfp.setReferenceNode(node);
-					fileHandler.openFile(name, id);
+					if (fileHandler != null)
+						fileHandler.openFile(name, id);
 				}
 				GenericNodeEditorInput gnei = new GenericNodeEditorInput(node);
 				JcrExplorerPlugin.getDefault().getWorkbench()