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

Clean up and name fixes

This commit is contained in:
Andrea Aime 2006-07-09 15:14:27 +00:00
parent 92d45a67d4
commit 545613a15b
4 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gr/spinellis/umlgraph/doclet/ClassGraph.java
View File

@ -737,7 +737,7 @@ class ClassGraph {
Set<Type> types = new HashSet<Type>();
// harvest method return and parameter types
for (MethodDoc method : filterByVisibility(c.methods(false), opt.inferDendencyVisibility)) {
for (MethodDoc method : filterByVisibility(c.methods(false), opt.inferDependencyVisibility)) {
types.add(method.returnType());
for (Parameter parameter : method.parameters()) {
types.add(parameter.type());
@ -745,7 +745,7 @@ class ClassGraph {
}
// and the field types
if (!opt.inferRelationships) {
for (FieldDoc field : filterByVisibility(c.fields(false), opt.inferDendencyVisibility)) {
for (FieldDoc field : filterByVisibility(c.fields(false), opt.inferDependencyVisibility)) {
types.add(field.type());
}
}

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

@ -111,9 +111,8 @@ public class Options implements Cloneable, OptionProvider {
boolean inferDependencies;
RelationPattern contextRelationPattern;
boolean useImports;
Visibility inferDendencyVisibility;
Visibility inferDependencyVisibility;
boolean inferDepInPackage;
boolean verbose2;
RelationType inferRelationshipType;
private Vector<Pattern> collPackages;
boolean compact;
@ -165,7 +164,7 @@ public class Options implements Cloneable, OptionProvider {
contextRelationPattern = new RelationPattern(RelationDirection.BOTH);
inferRelationships = false;
inferDependencies = false;
inferDendencyVisibility = Visibility.PRIVATE;
inferDependencyVisibility = Visibility.PRIVATE;
inferDepInPackage = false;
useImports = false;
inferRelationshipType = RelationType.NAVASSOC;
@ -222,8 +221,6 @@ public class Options implements Cloneable, OptionProvider {
option.equals("-useimports") ||
option.equals("-inferdep") ||
option.equals("-inferdepinpackage") ||
option.equals("-fullContext") ||
option.equals("-verbose2") ||
option.equals("-compact"))
return 1;
@ -437,13 +434,13 @@ public class Options implements Cloneable, OptionProvider {
} else if(opt[0].equals("-inferdepvis")) {
try {
Visibility vis = Visibility.valueOf(opt[1].toUpperCase());
inferDendencyVisibility = vis;
inferDependencyVisibility = vis;
} catch(IllegalArgumentException e) {
System.err.println("Ignoring invalid visibility specification for " +
"dependency inference: " + opt[1]);
}
} else if(opt[0].equals("-!inferdepvis")) {
inferDendencyVisibility = Visibility.PRIVATE;
inferDependencyVisibility = Visibility.PRIVATE;
} else if(opt[0].equals("-inferdep")) {
inferDependencies = true;
} else if(opt[0].equals("-!inferdep")) {

4
src/org/umlgraph/doclet/ClassGraph.java
View File

@ -737,7 +737,7 @@ class ClassGraph {
Set<Type> types = new HashSet<Type>();
// harvest method return and parameter types
for (MethodDoc method : filterByVisibility(c.methods(false), opt.inferDendencyVisibility)) {
for (MethodDoc method : filterByVisibility(c.methods(false), opt.inferDependencyVisibility)) {
types.add(method.returnType());
for (Parameter parameter : method.parameters()) {
types.add(parameter.type());
@ -745,7 +745,7 @@ class ClassGraph {
}
// and the field types
if (!opt.inferRelationships) {
for (FieldDoc field : filterByVisibility(c.fields(false), opt.inferDendencyVisibility)) {
for (FieldDoc field : filterByVisibility(c.fields(false), opt.inferDependencyVisibility)) {
types.add(field.type());
}
}

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

@ -111,9 +111,8 @@ public class Options implements Cloneable, OptionProvider {
boolean inferDependencies;
RelationPattern contextRelationPattern;
boolean useImports;
Visibility inferDendencyVisibility;
Visibility inferDependencyVisibility;
boolean inferDepInPackage;
boolean verbose2;
RelationType inferRelationshipType;
private Vector<Pattern> collPackages;
boolean compact;
@ -165,7 +164,7 @@ public class Options implements Cloneable, OptionProvider {
contextRelationPattern = new RelationPattern(RelationDirection.BOTH);
inferRelationships = false;
inferDependencies = false;
inferDendencyVisibility = Visibility.PRIVATE;
inferDependencyVisibility = Visibility.PRIVATE;
inferDepInPackage = false;
useImports = false;
inferRelationshipType = RelationType.NAVASSOC;
@ -222,8 +221,6 @@ public class Options implements Cloneable, OptionProvider {
option.equals("-useimports") ||
option.equals("-inferdep") ||
option.equals("-inferdepinpackage") ||
option.equals("-fullContext") ||
option.equals("-verbose2") ||
option.equals("-compact"))
return 1;
@ -437,13 +434,13 @@ public class Options implements Cloneable, OptionProvider {
} else if(opt[0].equals("-inferdepvis")) {
try {
Visibility vis = Visibility.valueOf(opt[1].toUpperCase());
inferDendencyVisibility = vis;
inferDependencyVisibility = vis;
} catch(IllegalArgumentException e) {
System.err.println("Ignoring invalid visibility specification for " +
"dependency inference: " + opt[1]);
}
} else if(opt[0].equals("-!inferdepvis")) {
inferDendencyVisibility = Visibility.PRIVATE;
inferDependencyVisibility = Visibility.PRIVATE;
} else if(opt[0].equals("-inferdep")) {
inferDependencies = true;
} else if(opt[0].equals("-!inferdep")) {