From da59c886d43b9b4d4e8dd8dc3fd7345fac53cd7f Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Mon, 18 Nov 2013 18:14:41 +0000
Subject: [PATCH] Minor updated

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-csv-export-widget@85655 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../client/CSVWorkSpaceSelectionCard.java     | 38 +++++++------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVWorkSpaceSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVWorkSpaceSelectionCard.java
index f3b8d01..7977712 100644
--- a/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVWorkSpaceSelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVWorkSpaceSelectionCard.java
@@ -5,8 +5,6 @@ package org.gcube.portlets.user.td.csvexportwidget.client;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.gcube.portlets.user.td.csvexportwidget.client.workspace.WorkspacePanel;
 import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
@@ -86,8 +84,7 @@ public class CSVWorkSpaceSelectionCard extends WizardCard {
 				}
 			}
 		});
-		p.add(new FieldLabel(wpanel, "Folder"), new VerticalLayoutData(-1,
-				-1));
+		p.add(new FieldLabel(wpanel, "Folder"), new VerticalLayoutData(-1, -1));
 		wpanel.loadTree();
 		setContent(formPanel);
 
@@ -100,44 +97,35 @@ public class CSVWorkSpaceSelectionCard extends WizardCard {
 		getWizardWindow().setEnableNextButton(false);
 		getWizardWindow().setEnableBackButton(false);
 		AlertMessageBox d;
-		HideHandler hideHandler=new HideHandler() {
-			
+		HideHandler hideHandler = new HideHandler() {
+
 			@Override
 			public void onHide(HideEvent event) {
 				wpanel.enable();
 				getWizardWindow().setEnableNextButton(true);
-				getWizardWindow().setEnableBackButton(true);	
+				getWizardWindow().setEnableBackButton(true);
 			}
 		};
 		if (fileName.getCurrentValue() != null
 				&& !fileName.getCurrentValue().isEmpty() && fileName.validate()) {
-			Pattern p = Pattern.compile("[_a-zA-Z0-9\\-\\.]+");
-			Matcher matcher = p.matcher(fileName.getCurrentValue());
-			if (matcher.matches()) {
-				Log.debug("fileName match");
-				if (exportSession.getItemId() != null) {
-					exportSession.setFileName(fileName.getCurrentValue());
-					getFileFromWorkspace();
-				} else {
-					d = new AlertMessageBox("Attention", "No folder selected");
-				    d.addHideHandler(hideHandler);
-					d.show();
-				    
-				}
-
+			if (exportSession.getItemId() != null) {
+				exportSession.setFileName(fileName.getCurrentValue());
+				getFileFromWorkspace();
 			} else {
-				Log.debug("fileName no match");
-				d = new AlertMessageBox("Attention", "No valid file name");
+				d = new AlertMessageBox("Attention", "No folder selected");
 				d.addHideHandler(hideHandler);
+				d.setModal(false);
 				d.show();
+
 			}
 		} else {
-			
+
 			d = new AlertMessageBox("Attention", "No valid file name");
 			d.addHideHandler(hideHandler);
+			d.setModal(false);
 			d.show();
 		}
-	
+
 	}
 
 	@Override