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

Avoid breaking previous behaviour for -output, properly parse the enumerations options (from Antti Hakala feedback). 

Plus a little bug fix, since the parser accepted inferassoctype as a command line parameter.
This commit is contained in:
Andrea Aime 2006-01-15 16:48:23 +00:00
parent 182e9c96d8
commit 3983568510
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,7 @@ class Options implements Cloneable, OptionProvider {
nodeFillColor = null; nodeFillColor = null;
bgColor = null; bgColor = null;
outputFileName = "graph.dot"; outputFileName = "graph.dot";
outputDirectory= "."; outputDirectory= null;
outputEncoding = "ISO-8859-1"; outputEncoding = "ISO-8859-1";
hidePatterns = new Vector<Pattern>(); hidePatterns = new Vector<Pattern>();
apiDocMapFileName = null; apiDocMapFileName = null;
@ -145,10 +145,10 @@ class Options implements Cloneable, OptionProvider {
option.equals("-types") || option.equals("-types") ||
option.equals("-all") || option.equals("-all") ||
option.equals("-noguillemot") || option.equals("-noguillemot") ||
option.equals("-hideall") || option.equals("-enumconstants") ||
option.equals("-enumerations") ||
option.equals("-views") || option.equals("-views") ||
option.equals("-inferrel") || option.equals("-inferrel") ||
option.equals("-inferreltype") ||
option.equals("-useimports") || option.equals("-useimports") ||
option.equals("-inferdep")) option.equals("-inferdep"))
@ -170,7 +170,7 @@ class Options implements Cloneable, OptionProvider {
option.equals("-apidocmap") || option.equals("-apidocmap") ||
option.equals("-d") || option.equals("-d") ||
option.equals("-view") || option.equals("-view") ||
option.equals("-inferassoctype") || option.equals("-inferreltype") ||
option.equals("-collpackages") option.equals("-collpackages")
) )
return 2; return 2;
@ -304,7 +304,7 @@ class Options implements Cloneable, OptionProvider {
} else if (opt[0].equals("-d")) { } else if (opt[0].equals("-d")) {
outputDirectory = opt[1]; outputDirectory = opt[1];
} else if (opt[0].equals("-!d")) { } else if (opt[0].equals("-!d")) {
outputDirectory = "."; outputDirectory = null;
} else if(opt[0].equals("-inferrel")) { } else if(opt[0].equals("-inferrel")) {
inferRelationships = true; inferRelationships = true;
} else if(opt[0].equals("-!inferrel")) { } else if(opt[0].equals("-!inferrel")) {

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

@ -91,7 +91,7 @@ class Options implements Cloneable, OptionProvider {
nodeFillColor = null; nodeFillColor = null;
bgColor = null; bgColor = null;
outputFileName = "graph.dot"; outputFileName = "graph.dot";
outputDirectory= "."; outputDirectory= null;
outputEncoding = "ISO-8859-1"; outputEncoding = "ISO-8859-1";
hidePatterns = new Vector<Pattern>(); hidePatterns = new Vector<Pattern>();
apiDocMapFileName = null; apiDocMapFileName = null;
@ -145,10 +145,10 @@ class Options implements Cloneable, OptionProvider {
option.equals("-types") || option.equals("-types") ||
option.equals("-all") || option.equals("-all") ||
option.equals("-noguillemot") || option.equals("-noguillemot") ||
option.equals("-hideall") || option.equals("-enumconstants") ||
option.equals("-enumerations") ||
option.equals("-views") || option.equals("-views") ||
option.equals("-inferrel") || option.equals("-inferrel") ||
option.equals("-inferreltype") ||
option.equals("-useimports") || option.equals("-useimports") ||
option.equals("-inferdep")) option.equals("-inferdep"))
@ -170,7 +170,7 @@ class Options implements Cloneable, OptionProvider {
option.equals("-apidocmap") || option.equals("-apidocmap") ||
option.equals("-d") || option.equals("-d") ||
option.equals("-view") || option.equals("-view") ||
option.equals("-inferassoctype") || option.equals("-inferreltype") ||
option.equals("-collpackages") option.equals("-collpackages")
) )
return 2; return 2;
@ -304,7 +304,7 @@ class Options implements Cloneable, OptionProvider {
} else if (opt[0].equals("-d")) { } else if (opt[0].equals("-d")) {
outputDirectory = opt[1]; outputDirectory = opt[1];
} else if (opt[0].equals("-!d")) { } else if (opt[0].equals("-!d")) {
outputDirectory = "."; outputDirectory = null;
} else if(opt[0].equals("-inferrel")) { } else if(opt[0].equals("-inferrel")) {
inferRelationships = true; inferRelationships = true;
} else if(opt[0].equals("-!inferrel")) { } else if(opt[0].equals("-!inferrel")) {