Changeset 24358 for main/trunk/gli

Timestamp:

2011-08-01T15:37:22+12:00 (13 years ago)

Author:

ak19

Message:

Improvement to previous commit (also process first command parameter, the actual program being launched): Now can put the %1 in file associations menu inside single or double quotes (John Rose found that this was not working previously).

File:

• main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -1417 +1417 @@
                 if(commands != null) {
                     StringBuffer whole_command = new StringBuffer();
-                    for(int i = 0; i < commands.length; i++) {
+                    for(int i = 0; i < commands.length; i++) {                      
+                        // get rid of any quotes around parameters in file associations
+                        if(commands[i].startsWith("\"") || commands[i].startsWith("\'")) {
+                            commands[i] = commands[i].substring(1);
+                        }
+                        if(commands[i].endsWith("\"") || commands[i].endsWith("\'")) {
+                            commands[i] = commands[i].substring(0, commands[i].length()-1);
+                        }
+
                         if (i>0) {
-                            // get rid of any quotes around parameters in file associations
-                            if(commands[i].startsWith("\"") || commands[i].startsWith("\'")) {
-                            commands[i] = commands[i].substring(1);
-                            }
-                            if(commands[i].endsWith("\"") || commands[i].endsWith("\'")) {
-                            commands[i] = commands[i].substring(0, commands[i].length()-1);
-                            }                           
                             whole_command.append(" ");
                         }
-                        whole_command.append(commands[i]);
+                        whole_command.append(commands[i]);          
                     }
                     DebugStream.println("Running " + whole_command.toString());