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;h=8c2839a0d87d1e494bfcd6c0e9dfac8e5af165e2;hb=fd6362dda19f29ca746ecefae779694e6cb43dd4;hp=540a30b05a640deb20ae756c5c433683beb2e9d3;hpb=2bdb18c75fc87cd78ed18843149c469c180f3830;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 540a30b05..8c2839a0d 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
@@ -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.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.argeo.slc.client.ui.commands;
 
 import javax.jcr.Node;
@@ -41,7 +40,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
 public class AddResultFolder extends AbstractHandler {
 	public final static String ID = ClientUiPlugin.ID + ".addResultFolder";
 	public final static String DEFAULT_ICON_REL_PATH = "icons/addFolder.gif";
-	public final static String DEFAULT_LABEL = "New result folder";
+	public final static String DEFAULT_LABEL = "Add folder...";
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		IStructuredSelection selection = (IStructuredSelection) HandlerUtil
@@ -68,6 +67,12 @@ public class AddResultFolder extends AbstractHandler {
 					String folderName = SingleValue.ask("Folder name",
 							"Enter folder name");
 					if (folderName != null) {
+						if (folderName.contains("/")) {
+							ErrorFeedback
+									.show("Folder names can't contain a '/'.");
+							return null;
+						}
+
 						String absPath = parentNode.getPath() + "/"
 								+ folderName;
 						SlcJcrResultUtils.createResultFolderNode(