Changeset 9657

Timestamp:

2005-04-13T10:21:50+12:00 (19 years ago)

Author:

davidb

Message:

Files with spaces in failed to launch properly. The relevant section
has been reworked to avoid this pitfall. The split on spaces now happens
*before* %1 is substituted with its real filename.

File:

• trunk/gli/src/org/greenstone/gatherer/file/FileAssociationManager.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/file/FileAssociationManager.java

@@ -28 +28 @@
 
 import java.io.*;
+import java.util.regex.*;
 import javax.swing.table.*;
 import org.greenstone.gatherer.Configuration;
@@ -212 +213 @@
         }
         if(command != null) {
+
+        // Make the command into a string []        
+        commands = command.split(" ");
+
+        // Now substitute any occurrences of %1 with its filename
+        // Note this is done after the split on spaces to avoid
+        // any conflict with filenames with spaces in them.
+
         // We have to fix filename under windows to escape the backslashes
         filename = filename.replaceAll(ESCAPE, ESCAPED_ESCAPE);
-        // Replace %1 with the appropriate filename
-        command = command.replaceAll(FILENAME_ARG, filename);
-
-        // Make the command into a string [] in case the filename has spaces in it
-        commands = command.split(" ");
+
+        for (int i=0; i<commands.length; i++) {
+            // Replace %1 with the appropriate filename
+            commands[i] = commands[i].replaceAll(FILENAME_ARG, filename);
+        }
+
         }