URLHandler now uses new CommandUtils.parseArguments

Related to issue CLIENT-224

Change-Id: Icbc7e67a96f6da77691626820c1dc2c3cb1f1cb4
Reviewed-on: http://gerrit.dmdirc.com/1895
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/ui/core/util/URLHandler.java

@@ -30,15 +30,14 @@ import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.interfaces.UIController;
+import com.dmdirc.util.CommandUtils;
 
 import java.awt.Desktop;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 
 /** Handles URLs. */
 public class URLHandler {
@@ -249,54 +248,13 @@ public class URLHandler {
      */
     private void execApp(final String command) {
         try {
-            Runtime.getRuntime().exec(parseArguments(command));
+            Runtime.getRuntime().exec(CommandUtils.parseArguments(command));
         } catch (IOException ex) {
             Logger.userError(ErrorLevel.LOW, "Unable to run application: "
                     + ex.getMessage(), ex);
         }
     }
 
-    /**
-     * Parses the specified command into an array of arguments. Arguments are
-     * separated by spaces. Multi-word arguments may be specified by starting
-     * the argument with a quote (") and finishing it with a quote (").
-     *
-     * @param command The command to parse
-     * @return An array of arguments corresponding to the command
-     */
-    protected static String[] parseArguments(final String command) {
-        final List<String> args = new ArrayList<String>();
-        final StringBuilder builder = new StringBuilder();
-        boolean inquote = false;
-
-        for (String word : command.split(" ")) {
-            if (word.endsWith("\"") && inquote) {
-                args.add(builder.toString() + ' ' + word.substring(0, word.length() - 1));
-                builder.delete(0, builder.length());
-                inquote = false;
-            } else if (inquote) {
-                if (builder.length() > 0) {
-                    builder.append(' ');
-                }
-
-                builder.append(word);
-            } else if (word.startsWith("\"") && !word.endsWith("\"")) {
-                inquote = true;
-                builder.append(word.substring(1));
-            } else if (word.startsWith("\"") && word.endsWith("\"")) {
-                if (word.length() == 1) {
-                    inquote = true;
-                } else {
-                    args.add(word.substring(1, word.length() - 1));
-                }
-            } else {
-                args.add(word);
-            }
-        }
-
-        return args.toArray(new String[args.size()]);
-    }
-
     /**
      * Opens the specified URL in the users browser.
      *
@@ -341,4 +299,4 @@ public class URLHandler {
                     "manually");
         }
     }
-}
+}

test/com/dmdirc/ui/core/util/URLHandlerTest.java

@@ -25,31 +25,12 @@ package com.dmdirc.ui.core.util;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.Arrays;
+
 import org.junit.Test;
 import static org.junit.Assert.*;
 
 public class URLHandlerTest {
     
-    @Test
-    public void testParseArguments() {
-        final String[][][] tests = new String[][][]{
-            {{"abcdef abcdef abcdef"}, {"abcdef", "abcdef", "abcdef"}},
-            {{"abcdef \"abcdef abcdef\""}, {"abcdef", "abcdef abcdef"}},
-            {{"abcdef \"abcdef foo abcdef\""}, {"abcdef", "abcdef foo abcdef"}},
-            {{"abcdef \"abcdef\" \"abcdef\""}, {"abcdef", "abcdef", "abcdef"}},
-            {{"abcdef \"\""}, {"abcdef", ""}},
-            {{"abcdef \" foo?\""}, {"abcdef", " foo?"}},
-        };
-        
-        for (String[][] test : tests) {
-            final String[] res = URLHandler.parseArguments(test[0][0]);
-            assertTrue(test[0][0] + " - " + Arrays.toString(test[1]) + " - "
-                    + Arrays.toString(res),
-                    Arrays.equals(test[1], res));
-        }
-    }
-
     @Test
     public void testSubstituteParams() throws MalformedURLException, URISyntaxException {
         final Object[][] tests = new Object[][]{
@@ -63,7 +44,7 @@ public class URLHandlerTest {
             {new URI("protocol://@host:33/?foo+bar#frag"), "$query $fragment", "foo+bar frag"},
             {new URI("host.com"), "$path $protocol$host", "host.com "},
         };
-        
+
         for (Object[] test : tests) {
             final String result = URLHandler.substituteParams((URI) test[0],
                     (String) test[1]);
@@ -71,5 +52,4 @@ public class URLHandlerTest {
                     (String) test[2], result);
         }
     }
-    
 }