Fixed reading from file when using standard separator (" ")

splitting and trimming for list parameters
Revert "splitting and trimming for list parameters"

This reverts commit dc60698.

splitting and trimming for list parameters
Revert "splitting and trimming for list parameters"

This reverts commit 2f76521.

src/main/java/com/beust/jcommander/JCommander.java

@@ -351,11 +351,28 @@ private String[] expandArgs(String[] originalArgv) {
     // Expand @
     //
     for (String arg : originalArgv) {
-
       if (arg.startsWith("@")) {
         String fileName = arg.substring(1);
-        vResult1.addAll(readFile(fileName));
-      }
+        List<String> fileArgs = readFile(fileName);
+        List<String> splitFileArgs = Lists.newArrayList();
+        //special treatment for standard separator (" ")
+        String[] v1 = fileArgs.toArray(new String[0]);
+		for (int i = 0; i < fileArgs.size(); i++) {
+			String arg2 = fileArgs.get(i);
+			if (isOption(v1, arg2)) {
+				String sep = getSeparatorFor(v1, arg2);
+				if (" ".equals(sep)) {
+					String[] sp = arg2.split("[" + sep + "]", 2);
+					for (String ssp : sp) {
+						splitFileArgs.add(ssp);
+					}
+				}else{
+					splitFileArgs.add(arg2);
+				}
+			}
+		}
+		vResult1.addAll(splitFileArgs);
+	}
       else {
         List<String> expanded = expandDynamicArg(arg);
         vResult1.addAll(expanded);
@@ -481,9 +498,9 @@ private static List<String> readFile(String fileName) {
 
     try {
       BufferedReader bufRead = new BufferedReader(new FileReader(fileName));
-
+      
       String line;
-
+      
       // Read through file one line at time. Print line # and line
       while ((line = bufRead.readLine()) != null) {
         // Allow empty lines and # comments in these at files