natas_hw
/
UMLGraph
mirror of https://github.com/dspinellis/UMLGraph
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added a couple of methods to manage view inheritance 

Moved all output handling into ClassGraph (it's cleared, and it's needed
because otherwise the cloned Options would have needed a way to
share the output writer even when opened in a cloned class)
This commit is contained in:
Andrea Aime 2006-01-02 14:04:33 +00:00
parent b77d5a9eb6
commit dceb851073
2 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/gr/spinellis/umlgraph/doclet/Options.java
View File

@ -22,7 +22,6 @@ package gr.spinellis.umlgraph.doclet;
import com.sun.javadoc.*;
import java.io.*;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@ -35,7 +34,7 @@ import java.util.regex.PatternSyntaxException;
*/
class Options implements Cloneable, OptionProvider {
private Vector<Pattern> hidePatterns;
PrintWriter w;
// PrintWriter w;
boolean showQualified;
boolean showAttributes;
boolean showEnumerations;
@ -312,15 +311,6 @@ class Options implements Cloneable, OptionProvider {
}
}
public void openFile() throws IOException {
FileOutputStream fos = new FileOutputStream(new File(outputDirectory, outputFileName));
w = new PrintWriter(new BufferedWriter(new OutputStreamWriter(fos, outputEncoding)));
}
public void closeFile() {
w.close();
}
/**
* Check if the supplied string matches an entity specified
@ -337,22 +327,31 @@ class Options implements Cloneable, OptionProvider {
}
/*
* OptionProvider methods
*/
// ----------------------------------------------------------------
// OptionProvider methods
// ----------------------------------------------------------------
public Options getOptionsFor(ClassDoc cd) {
Options localOpt = (Options) this.clone();
Options localOpt = getGlobalOptions();
localOpt.setOptions(cd);
return localOpt;
}
public Options getOptionsFor(String name) {
return this;
return getGlobalOptions();
}
public Options getGlobalOptions() {
return this;
return (Options) clone();
}
public void overrideForClass(Options opt, ClassDoc cd) {
// nothing to do
}
public void overrideForClass(Options opt, String className) {
// nothing to do
}
}

33
src/org/umlgraph/doclet/Options.java
View File

@ -22,7 +22,6 @@ package gr.spinellis.umlgraph.doclet;
import com.sun.javadoc.*;
import java.io.*;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@ -35,7 +34,7 @@ import java.util.regex.PatternSyntaxException;
*/
class Options implements Cloneable, OptionProvider {
private Vector<Pattern> hidePatterns;
PrintWriter w;
// PrintWriter w;
boolean showQualified;
boolean showAttributes;
boolean showEnumerations;
@ -312,15 +311,6 @@ class Options implements Cloneable, OptionProvider {
}
}
public void openFile() throws IOException {
FileOutputStream fos = new FileOutputStream(new File(outputDirectory, outputFileName));
w = new PrintWriter(new BufferedWriter(new OutputStreamWriter(fos, outputEncoding)));
}
public void closeFile() {
w.close();
}
/**
* Check if the supplied string matches an entity specified
@ -337,22 +327,31 @@ class Options implements Cloneable, OptionProvider {
}
/*
* OptionProvider methods
*/
// ----------------------------------------------------------------
// OptionProvider methods
// ----------------------------------------------------------------
public Options getOptionsFor(ClassDoc cd) {
Options localOpt = (Options) this.clone();
Options localOpt = getGlobalOptions();
localOpt.setOptions(cd);
return localOpt;
}
public Options getOptionsFor(String name) {
return this;
return getGlobalOptions();
}
public Options getGlobalOptions() {
return this;
return (Options) clone();
}
public void overrideForClass(Options opt, ClassDoc cd) {
// nothing to do
}
public void overrideForClass(Options opt, String className) {
// nothing to do
}
}