Merge pull request #50 from masonsbro/master

Updated BasicArgsParser to allow non-flag arguments to appear in places other than the end.
SKCraft · Jun 13, 2013 · 5364a07 · 5364a07
2 parents 479ef5e + 2c5e931
commit 5364a07
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/src/main/java/com/sk89q/mclauncher/util/BasicArgsParser.java b/src/main/java/com/sk89q/mclauncher/util/BasicArgsParser.java
@@ -42,16 +42,12 @@ public ArgsContext parse(String[] args) {
         List<String> leftOver = new ArrayList<String>();
         Set<String> flags = new HashSet<String>();
         Map<String, String> values = new HashMap<String, String>();
-
-        boolean processingFlags = true;
+
         String wantingFlag = null;
-        
+
         for (int i = 0; i < args.length; i++) {
             String arg = args[i];
             if (arg.startsWith("-")) {
-                if (!processingFlags) {
-                    throw new IllegalArgumentException("Flags must come first");
-                }
                 if (arg.length() == 1) {
                     throw new IllegalArgumentException("Flag with no name");
                 }
@@ -67,7 +63,6 @@ public ArgsContext parse(String[] args) {
                 values.put(wantingFlag, arg);
                 wantingFlag = null;
             } else {
-                processingFlags = false;
                 leftOver.add(arg);
             }
         }