Avoid breaking previous behaviour for -output (from Antti Hakala feedback)

This commit is contained in:
Andrea Aime 2006-01-15 16:46:50 +00:00
parent 2ae9b91a43
commit 182e9c96d8
2 changed files with 20 additions and 2 deletions

View File

@ -788,7 +788,16 @@ class ClassGraph {
* @throws IOException */
public void prologue() throws IOException {
Options opt = optionProvider.getGlobalOptions();
FileOutputStream fos = new FileOutputStream(new File(opt.outputDirectory, opt.outputFileName));
// prepare output file. Use the output file name as a full path unless the output
// directory is specified
File file = null;
if(opt.outputDirectory != null)
file = new File(opt.outputDirectory, opt.outputFileName);
else
file = new File(opt.outputFileName);
FileOutputStream fos = new FileOutputStream(file);
// print plologue
w = new PrintWriter(new BufferedWriter(new OutputStreamWriter(fos, opt.outputEncoding)));
w.println(
"#!/usr/local/bin/dot\n" +

View File

@ -788,7 +788,16 @@ class ClassGraph {
* @throws IOException */
public void prologue() throws IOException {
Options opt = optionProvider.getGlobalOptions();
FileOutputStream fos = new FileOutputStream(new File(opt.outputDirectory, opt.outputFileName));
// prepare output file. Use the output file name as a full path unless the output
// directory is specified
File file = null;
if(opt.outputDirectory != null)
file = new File(opt.outputDirectory, opt.outputFileName);
else
file = new File(opt.outputFileName);
FileOutputStream fos = new FileOutputStream(file);
// print plologue
w = new PrintWriter(new BufferedWriter(new OutputStreamWriter(fos, opt.outputEncoding)));
w.println(
"#!/usr/local/bin/dot\n" +