Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f3a49c
Fixed reading from file when using standard separator (" ")
TKlerx Mar 13, 2015
b537a6c
Merge pull request #3 from cbeust/master
TKlerx Apr 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 24 additions & 5 deletions src/main/java/com/beust/jcommander/JCommander.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
import java.util.Map;
import java.util.ResourceBundle;

import bsh.classpath.BshClassPath.GeneratedClassSource;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are adding an import but you are not referencing it.


import com.beust.jcommander.FuzzyMap.IKey;
import com.beust.jcommander.converters.IParameterSplitter;
import com.beust.jcommander.converters.NoConverter;
Expand Down Expand Up @@ -351,11 +353,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++) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please correct indentation.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why introducing i instead of simply using for-each?

String arg2 = fileArgs.get(i);
if (isOption(v1, arg2)) {
String sep = getSeparatorFor(v1, arg2);
if (" ".equals(sep)) {
String[] sp = arg2.split("[" + sep + "]", 2);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why using sep here instead of static " "?

for (String ssp : sp) {
splitFileArgs.add(ssp);
}
}else{
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please add blanks around else?

splitFileArgs.add(arg2);
}
}
}
vResult1.addAll(splitFileArgs);
}
else {
List<String> expanded = expandDynamicArg(arg);
vResult1.addAll(expanded);
Expand Down Expand Up @@ -481,9 +500,9 @@ private static List<String> readFile(String fileName) {

try {
BufferedReader bufRead = new BufferedReader(new FileReader(fileName));

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove whitespace added at the end of the line.

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
Expand Down