* make sure --output is resolved against current working dir (as opposed to --format which is resolved against the folder of the file to rename)

This commit is contained in:
Reinhard Pointner 2012-06-08 05:21:32 +00:00
parent f1b75f5e0e
commit 379df2dea8
1 changed files with 1 additions and 1 deletions

View File

@ -86,7 +86,7 @@ public class CmdlineOperations implements CmdlineInterface {
public List<File> rename(Collection<File> files, String action, String conflict, String output, String formatExpression, String db, String query, String sortOrder, String filterExpression, String lang, boolean strict) throws Exception { public List<File> rename(Collection<File> files, String action, String conflict, String output, String formatExpression, String db, String query, String sortOrder, String filterExpression, String lang, boolean strict) throws Exception {
ExpressionFormat format = (formatExpression != null) ? new ExpressionFormat(formatExpression) : null; ExpressionFormat format = (formatExpression != null) ? new ExpressionFormat(formatExpression) : null;
ExpressionFilter filter = (filterExpression != null) ? new ExpressionFilter(filterExpression) : null; ExpressionFilter filter = (filterExpression != null) ? new ExpressionFilter(filterExpression) : null;
File outputDir = (output != null && output.length() > 0) ? new File(output) : null; File outputDir = (output != null && output.length() > 0) ? new File(output).getAbsoluteFile() : null;
Locale locale = getLanguage(lang).toLocale(); Locale locale = getLanguage(lang).toLocale();
RenameAction renameAction = StandardRenameAction.forName(action); RenameAction renameAction = StandardRenameAction.forName(action);
ConflictAction conflictAction = ConflictAction.forName(conflict); ConflictAction conflictAction = ConflictAction.forName(conflict);