Changeset 7092

Timestamp:

2004-03-18T13:24:32+13:00 (20 years ago)

Author:

mdewsnip

Message:

Fixed opening files on Windows (%1 was not being replaced with filename correctly).

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• file/FileAssociationManager.java (modified) (1 diff)
• gui/PreviewCommandDialog.java (modified) (1 diff)

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

@@ -223 +223 @@
         }
         if(command != null) {
-        // Make the command into a string [] just in case the filename has spaces in it
-        commands = command.split(" ");
-        
-        // We have to fix filename under windows to escape the backslashes.
+        // We have to fix filename under windows to escape the backslashes
         filename = filename.replaceAll(ESCAPE, ESCAPED_ESCAPE);
         // Replace %1 with the appropriate filename
-        for(int i=0; i<commands.length; i++) {
-            if (commands[i].equals(FILENAME_ARG)) {
-            commands[i] = filename;
-            }
-        }
-        //command = command.replaceAll(FILENAME_ARG, filename);
+        command = command.replaceAll(FILENAME_ARG, filename);
+
+        // Make the command into a string [] in case the filename has spaces in it
+        commands = command.split(" ");
         }
         

trunk/gli/src/org/greenstone/gatherer/gui/PreviewCommandDialog.java

@@ -47 +47 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
-import org.greenstone.gatherer.file.FileAssociationManager;
 import org.greenstone.gatherer.gui.GComboBox;
 import org.greenstone.gatherer.gui.GLIButton;