Centralized option handling in the Option class (even for command line arguments)

doc/ver.xml

@@ -8,6 +8,7 @@
 <li> Correct the handling of qualified class names following
 the extends keyword (Arnaud Rogues).</li>
 <li> Javadoc documentation (Andrea Aime).</li>
+<li> Centralized option handling in the Option class (even for command line arguments) (Andrea Aime).</li>
 </ul>
 
 <dt>Version 4.1 2005/11/15</dt><dd>

src/gr/spinellis/umlgraph/doclet/Options.java

@@ -112,6 +112,38 @@ class Options implements Cloneable {
 	showVisibility = true;
 	showType = true;
     }
+    
+    /** Option checking */
+    public static int optionLength(String option) {
+        if(option.equals("-qualify") ||
+           option.equals("-horizontal") ||
+           option.equals("-attributes") ||
+           option.equals("-operations") ||
+           option.equals("-constructors") ||
+           option.equals("-visibility") ||
+           option.equals("-types") ||
+           option.equals("-all") ||
+           option.equals("-noguillemot"))
+            return 1;
+        else if(option.equals("-nodefillcolor") ||
+           option.equals("-nodefontcolor") ||
+           option.equals("-nodefontsize") ||
+           option.equals("-nodefontname") ||
+           option.equals("-nodefontabstractname") ||
+           option.equals("-edgefontcolor") ||
+           option.equals("-edgecolor") ||
+           option.equals("-edgefontsize") ||
+           option.equals("-edgefontname") ||
+           option.equals("-output") ||
+           option.equals("-outputencoding") ||
+           option.equals("-bgcolor") ||
+           option.equals("-hide") ||
+           option.equals("-apidocroot") ||
+           option.equals("-apidocmap"))
+            return 2;
+        else
+            return 0;
+    }
 
     /** Set the options based on a lingle option and its arguments */
     private void setOption(String[] opt) {

src/gr/spinellis/umlgraph/doclet/UmlGraph.java

@@ -67,34 +67,7 @@ public class UmlGraph {
 
     /** Option checking */
     public static int optionLength(String option) {
-	if(option.equals("-qualify") ||
-	   option.equals("-horizontal") ||
-	   option.equals("-attributes") ||
-	   option.equals("-operations") ||
-	   option.equals("-constructors") ||
-	   option.equals("-visibility") ||
-	   option.equals("-types") ||
-	   option.equals("-all") ||
-	   option.equals("-noguillemot"))
-	    return 1;
-	else if(option.equals("-nodefillcolor") ||
-	   option.equals("-nodefontcolor") ||
-	   option.equals("-nodefontsize") ||
-	   option.equals("-nodefontname") ||
-	   option.equals("-nodefontabstractname") ||
-	   option.equals("-edgefontcolor") ||
-	   option.equals("-edgecolor") ||
-	   option.equals("-edgefontsize") ||
-	   option.equals("-edgefontname") ||
-	   option.equals("-output") ||
-	   option.equals("-outputencoding") ||
-	   option.equals("-bgcolor") ||
-	   option.equals("-hide") ||
-	   option.equals("-apidocroot") ||
-	   option.equals("-apidocmap"))
-	    return 2;
-	else
-	    return 0;
+	return Options.optionLength(option);
     }
 
     /** Indicate the language version we support */

src/org/umlgraph/doclet/Options.java

@@ -112,6 +112,38 @@ class Options implements Cloneable {
 	showVisibility = true;
 	showType = true;
     }
+    
+    /** Option checking */
+    public static int optionLength(String option) {
+        if(option.equals("-qualify") ||
+           option.equals("-horizontal") ||
+           option.equals("-attributes") ||
+           option.equals("-operations") ||
+           option.equals("-constructors") ||
+           option.equals("-visibility") ||
+           option.equals("-types") ||
+           option.equals("-all") ||
+           option.equals("-noguillemot"))
+            return 1;
+        else if(option.equals("-nodefillcolor") ||
+           option.equals("-nodefontcolor") ||
+           option.equals("-nodefontsize") ||
+           option.equals("-nodefontname") ||
+           option.equals("-nodefontabstractname") ||
+           option.equals("-edgefontcolor") ||
+           option.equals("-edgecolor") ||
+           option.equals("-edgefontsize") ||
+           option.equals("-edgefontname") ||
+           option.equals("-output") ||
+           option.equals("-outputencoding") ||
+           option.equals("-bgcolor") ||
+           option.equals("-hide") ||
+           option.equals("-apidocroot") ||
+           option.equals("-apidocmap"))
+            return 2;
+        else
+            return 0;
+    }
 
     /** Set the options based on a lingle option and its arguments */
     private void setOption(String[] opt) {

src/org/umlgraph/doclet/UmlGraph.java

@@ -67,34 +67,7 @@ public class UmlGraph {
 
     /** Option checking */
     public static int optionLength(String option) {
-	if(option.equals("-qualify") ||
-	   option.equals("-horizontal") ||
-	   option.equals("-attributes") ||
-	   option.equals("-operations") ||
-	   option.equals("-constructors") ||
-	   option.equals("-visibility") ||
-	   option.equals("-types") ||
-	   option.equals("-all") ||
-	   option.equals("-noguillemot"))
-	    return 1;
-	else if(option.equals("-nodefillcolor") ||
-	   option.equals("-nodefontcolor") ||
-	   option.equals("-nodefontsize") ||
-	   option.equals("-nodefontname") ||
-	   option.equals("-nodefontabstractname") ||
-	   option.equals("-edgefontcolor") ||
-	   option.equals("-edgecolor") ||
-	   option.equals("-edgefontsize") ||
-	   option.equals("-edgefontname") ||
-	   option.equals("-output") ||
-	   option.equals("-outputencoding") ||
-	   option.equals("-bgcolor") ||
-	   option.equals("-hide") ||
-	   option.equals("-apidocroot") ||
-	   option.equals("-apidocmap"))
-	    return 2;
-	else
-	    return 0;
+	return Options.optionLength(option);
     }
 
     /** Indicate the language version we support */