Fixes #309

ISA-tools · Feb 2, 2017 · c7806f3 · c7806f3
1 parent 7d146e3
commit c7806f3
Showing 1 changed file with 13 additions and 7 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
@@ -364,13 +364,19 @@ public void run() {
                         }
 
                         if (fileToMapFSP.notEmpty()) {
-                            previousPage.push(new HistoryComponent(finalLayout, listeners));
-                            statusLab.setText("");
-                            SwingUtilities.invokeLater(new Runnable() {
-                                public void run() {
-                                    setCurrentPage(createAssayUsedPanel(fileToMapFSP.getSelectedFilePath()));
-                                }
-                            });
+                            if (fileToMapFSP.getSelectedFilePath().contains("&")) {
+                                statusLab.setText("<html>filename of file to map must not contain special characters such as &, please select a different file or rename it...</html>");
+                                setCurrentPage(lastPage);
+                                return;
+                            } else{
+                                previousPage.push(new HistoryComponent(finalLayout, listeners));
+                                statusLab.setText("");
+                                SwingUtilities.invokeLater(new Runnable() {
+                                    public void run() {
+                                        setCurrentPage(createAssayUsedPanel(fileToMapFSP.getSelectedFilePath()));
+                                    }
+                                });
+                            }
                         } else {
                             statusLab.setText("<html>please <strong>select</strong> a file to map!</html>");
                             setCurrentPage(lastPage);