Merged bug fix from Stable into Unstable

This commit is contained in:
Mark DePristo 2011-10-17 13:58:56 -04:00
commit 3550798c4c
2 changed files with 5 additions and 1 deletions

View File

@ -380,7 +380,7 @@ class RodBindingArgumentTypeDescriptor extends ArgumentTypeDescriptor {
if ( tribbleType == null )
if ( ! file.canRead() | ! file.isFile() ) {
throw new UserException.BadArgumentValue(name, "Couldn't read file to determine type: " + file);
throw new UserException.CouldNotReadInputFile(file, "file does exist or couldn't be read");
} else {
throw new UserException.CommandLineException(
String.format("No tribble type was provided on the command line and the type of the file could not be determined dynamically. " +

View File

@ -111,6 +111,10 @@ public class UserException extends ReviewedStingException {
super(String.format("Couldn't read file because %s caused by %s", message, e.getMessage()));
}
public CouldNotReadInputFile(File file) {
super(String.format("Couldn't read file %s", file.getAbsolutePath()));
}
public CouldNotReadInputFile(File file, String message) {
super(String.format("Couldn't read file %s because %s", file.getAbsolutePath(), message));
}