From 182e9c96d84cc5c9596f7d982c497fbc3cb6da20 Mon Sep 17 00:00:00 2001 From: Andrea Aime Date: Sun, 15 Jan 2006 16:46:50 +0000 Subject: [PATCH] Avoid breaking previous behaviour for -output (from Antti Hakala feedback) --- src/gr/spinellis/umlgraph/doclet/ClassGraph.java | 11 ++++++++++- src/org/umlgraph/doclet/ClassGraph.java | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java index d229e1d..84f2320 100644 --- a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java +++ b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java @@ -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" + diff --git a/src/org/umlgraph/doclet/ClassGraph.java b/src/org/umlgraph/doclet/ClassGraph.java index d229e1d..84f2320 100644 --- a/src/org/umlgraph/doclet/ClassGraph.java +++ b/src/org/umlgraph/doclet/ClassGraph.java @@ -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" +