Changeset 852:5a74670b3de6

Timestamp:

02/06/12 10:06:08 (4 months ago)

Author:

delmitz@delmitz-PC.office.nchovy.net

Branch:

default

Message:

modified script argument parser.

Location:

kraken-core/src

Files:

• main/java/org/krakenapps/console/ScriptArgumentParser.java (modified) (3 diffs)
• test/java/org/krakenapps/console/ScriptArgumentParserTest.java (modified) (1 diff)

kraken-core/src/main/java/org/krakenapps/console/ScriptArgumentParser.java

@@ -5 +5 @@
 
 public class ScriptArgumentParser {
-
         public static String[] tokenize(String line) {
                 StringBuilder sb = new StringBuilder();
@@ -36 +35 @@
                                         escape = false;
                                         sb.append(c);
-                                } else
+                                } else {
                                         quoteOpen = !quoteOpen;
+                                        if (!quoteOpen) {
+                                                args.add(sb.toString());
+                                                sb = new StringBuilder();
+                                        }
+                                }
                                 continue;
                         }
@@ -61 +65 @@
                         args.add(sb.toString());
 
-                String[] s = new String[args.size()];
-                i = 0;
-                for (String arg : args)
-                        s[i++] = arg;
-                return s;
+                return args.toArray(new String[0]);
         }
 }

kraken-core/src/test/java/org/krakenapps/console/ScriptArgumentParserTest.java

@@ -44 +44 @@
                 assertEquals(1, tokenized.length);
                 assertEquals("  space world   ", tokenized[0]);
+                
+                String haystack5 = "\" \"";
+                System.out.println("test5: " + haystack5);
+                tokenized = ScriptArgumentParser.tokenize(haystack5);
+                
+                assertEquals(1, tokenized.length);
+                assertEquals(" ", tokenized[0]);
+                
         }
 }