From 545613a15bffc9f34e0a2ef438fc01a5f12c33db Mon Sep 17 00:00:00 2001 From: Andrea Aime Date: Sun, 9 Jul 2006 15:14:27 +0000 Subject: [PATCH] Clean up and name fixes --- src/gr/spinellis/umlgraph/doclet/ClassGraph.java | 4 ++-- src/gr/spinellis/umlgraph/doclet/Options.java | 11 ++++------- src/org/umlgraph/doclet/ClassGraph.java | 4 ++-- src/org/umlgraph/doclet/Options.java | 11 ++++------- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java index 2308a1b..e0c3525 100644 --- a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java +++ b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java @@ -737,7 +737,7 @@ class ClassGraph { Set types = new HashSet(); // 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()); } } diff --git a/src/gr/spinellis/umlgraph/doclet/Options.java b/src/gr/spinellis/umlgraph/doclet/Options.java index 29feec8..80dd4d4 100644 --- a/src/gr/spinellis/umlgraph/doclet/Options.java +++ b/src/gr/spinellis/umlgraph/doclet/Options.java @@ -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 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")) { diff --git a/src/org/umlgraph/doclet/ClassGraph.java b/src/org/umlgraph/doclet/ClassGraph.java index 2308a1b..e0c3525 100644 --- a/src/org/umlgraph/doclet/ClassGraph.java +++ b/src/org/umlgraph/doclet/ClassGraph.java @@ -737,7 +737,7 @@ class ClassGraph { Set types = new HashSet(); // 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()); } } diff --git a/src/org/umlgraph/doclet/Options.java b/src/org/umlgraph/doclet/Options.java index 29feec8..80dd4d4 100644 --- a/src/org/umlgraph/doclet/Options.java +++ b/src/org/umlgraph/doclet/Options.java @@ -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 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")) {