From 5768d65178d2f2a690b88a3a29a4b10761246135 Mon Sep 17 00:00:00 2001 From: David Johnson Date: Thu, 2 Feb 2017 15:03:29 +0000 Subject: [PATCH] Further fixes #309 --- .../formatmappingutility/ui/MappingUtilView.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/isatools/isacreator/formatmappingutility/ui/MappingUtilView.java b/src/main/java/org/isatools/isacreator/formatmappingutility/ui/MappingUtilView.java index cabb205e..502f1254 100644 --- a/src/main/java/org/isatools/isacreator/formatmappingutility/ui/MappingUtilView.java +++ b/src/main/java/org/isatools/isacreator/formatmappingutility/ui/MappingUtilView.java @@ -79,10 +79,10 @@ The ISA Team and the ISA software suite have been funded by the EU Carcinogenomi import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; -import java.util.HashMap; +import java.util.*; import java.util.List; -import java.util.Map; -import java.util.Stack; + +import org.apache.commons.lang.StringUtils; /** * @author Eamonn Maguire @@ -364,8 +364,9 @@ public void run() { } if (fileToMapFSP.notEmpty()) { - if (fileToMapFSP.getSelectedFilePath().contains("&")) { - statusLab.setText("filename of file to map must not contain special characters such as &, please select a different file or rename it..."); + String[] invalid_chars = new String[]{"&", ":", "?", "*", "|", ":"}; + if (StringUtils.indexOfAny(fileToMapFSP.getSelectedFilePath(), invalid_chars) > -1) { + statusLab.setText("filenames must not contain special characters such as " + StringUtils.substringBetween(Arrays.toString(invalid_chars), "[", "]") + ", please select a different file or rename it..."); setCurrentPage(lastPage); return; } else{