X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=plugins%2Forg.argeo.slc.client.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fcommands%2FAddResultFolder.java;fp=plugins%2Forg.argeo.slc.client.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fcommands%2FAddResultFolder.java;h=dc61fc47786f1da0efbe2a63abfc8ed74d6dbc3c;hb=d50c0fe50cd69947bc7146991afa0826a8c8f53b;hp=e1b357482d85e6a3e014bc12a8f0b486d9d95bfc;hpb=844bc386a1854a29d282a23ffda820ed7a52b74e;p=gpl%2Fargeo-slc.git

diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/AddResultFolder.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/AddResultFolder.java
index e1b357482..dc61fc477 100644
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/AddResultFolder.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/AddResultFolder.java
@@ -23,6 +23,7 @@ import org.argeo.eclipse.ui.ErrorFeedback;
 import org.argeo.eclipse.ui.dialogs.SingleValue;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.ClientUiPlugin;
+import org.argeo.slc.client.ui.model.ParentNodeFolder;
 import org.argeo.slc.client.ui.model.ResultFolder;
 import org.argeo.slc.jcr.SlcJcrResultUtils;
 import org.eclipse.core.commands.AbstractHandler;
@@ -48,18 +49,32 @@ public class AddResultFolder extends AbstractHandler {
 
 		// Sanity check, already done when populating the corresponding popup
 		// menu.
-		if (selection != null && selection.size() == 1
-				&& selection.getFirstElement() instanceof ResultFolder) {
-			ResultFolder rf = (ResultFolder) selection.getFirstElement();
+		if (selection != null && selection.size() == 1) {
+			Object obj = selection.getFirstElement();
+
 			try {
-				String folderName = SingleValue.ask("Folder name",
-						"Enter folder name");
-				if (folderName != null) {
-					Node parentNode = rf.getNode();
-					String absPath = parentNode.getPath()+ "/"
-							+ folderName;
-					SlcJcrResultUtils.createResultFolderNode(
-							parentNode.getSession(), absPath);
+				Node parentNode = null;
+
+				if (obj instanceof ResultFolder) {
+					ResultFolder rf = (ResultFolder) obj;
+					parentNode = rf.getNode();
+				} else if (obj instanceof ParentNodeFolder) {
+					Node node = ((ParentNodeFolder) obj).getNode();
+					if (node.getPath().startsWith(
+							SlcJcrResultUtils.getMyResultsBasePath(node
+									.getSession())))
+						parentNode = node;
+				}
+
+				if (parentNode != null) {
+					String folderName = SingleValue.ask("Folder name",
+							"Enter folder name");
+					if (folderName != null) {
+						String absPath = parentNode.getPath() + "/"
+								+ folderName;
+						SlcJcrResultUtils.createResultFolderNode(
+								parentNode.getSession(), absPath);
+					}
 				}
 			} catch (RepositoryException e) {
 				throw new SlcException(