From f8924f44eb56b260718605f3919169109f1cb994 Mon Sep 17 00:00:00 2001 From: Diomidis Spinellis Date: Fri, 19 Nov 2004 15:57:44 +0000 Subject: [PATCH] Correct checking of attributes and operations (Jonathan Wright). --- Makefile | 2 +- src/gr/spinellis/umlgraph/doclet/ClassGraph.java | 6 +++--- src/gr/spinellis/umlgraph/doclet/ClassInfo.java | 6 +++--- src/gr/spinellis/umlgraph/doclet/Options.java | 6 +++--- src/gr/spinellis/umlgraph/doclet/StringUtil.java | 6 +++--- src/gr/spinellis/umlgraph/doclet/UmlGraph.java | 6 +++--- src/org/umlgraph/doclet/ClassGraph.java | 6 +++--- src/org/umlgraph/doclet/ClassInfo.java | 6 +++--- src/org/umlgraph/doclet/Options.java | 6 +++--- src/org/umlgraph/doclet/StringUtil.java | 6 +++--- src/org/umlgraph/doclet/UmlGraph.java | 6 +++--- 11 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index 1a68393..8d45891 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # .SUFFIXES:.class .java -VERSION=2.8 +VERSION=2.10 TARBALL=UMLGraph-$(VERSION).tar.gz ZIPBALL=UMLGraph-$(VERSION).zip DISTDIR=UMLGraph-$(VERSION) diff --git a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java index 024f500..5d71261 100644 --- a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java +++ b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java @@ -226,7 +226,7 @@ class StringUtil { /** Tokenize string s into an array */ public static String[] tokenize(String s) { ArrayList r = new ArrayList(); - String remain = s, tok; + String remain = s; int n = 0, pos; remain = remain.trim(); @@ -545,8 +545,8 @@ class ClassGraph { if (c.isInterface()) r = guilWrap("interface") + " \\n" + r; boolean showMembers = - (opt.showAttributes && c.methods().length > 0) || - (opt.showOperations && c.fields().length > 0) || + (opt.showAttributes && c.fields().length > 0) || + (opt.showOperations && c.methods().length > 0) || (opt.showConstructors && c.constructors().length > 0); r += tagvalue(c, "\\n", 'r'); if (showMembers) diff --git a/src/gr/spinellis/umlgraph/doclet/ClassInfo.java b/src/gr/spinellis/umlgraph/doclet/ClassInfo.java index 024f500..5d71261 100644 --- a/src/gr/spinellis/umlgraph/doclet/ClassInfo.java +++ b/src/gr/spinellis/umlgraph/doclet/ClassInfo.java @@ -226,7 +226,7 @@ class StringUtil { /** Tokenize string s into an array */ public static String[] tokenize(String s) { ArrayList r = new ArrayList(); - String remain = s, tok; + String remain = s; int n = 0, pos; remain = remain.trim(); @@ -545,8 +545,8 @@ class ClassGraph { if (c.isInterface()) r = guilWrap("interface") + " \\n" + r; boolean showMembers = - (opt.showAttributes && c.methods().length > 0) || - (opt.showOperations && c.fields().length > 0) || + (opt.showAttributes && c.fields().length > 0) || + (opt.showOperations && c.methods().length > 0) || (opt.showConstructors && c.constructors().length > 0); r += tagvalue(c, "\\n", 'r'); if (showMembers) diff --git a/src/gr/spinellis/umlgraph/doclet/Options.java b/src/gr/spinellis/umlgraph/doclet/Options.java index 024f500..5d71261 100644 --- a/src/gr/spinellis/umlgraph/doclet/Options.java +++ b/src/gr/spinellis/umlgraph/doclet/Options.java @@ -226,7 +226,7 @@ class StringUtil { /** Tokenize string s into an array */ public static String[] tokenize(String s) { ArrayList r = new ArrayList(); - String remain = s, tok; + String remain = s; int n = 0, pos; remain = remain.trim(); @@ -545,8 +545,8 @@ class ClassGraph { if (c.isInterface()) r = guilWrap("interface") + " \\n" + r; boolean showMembers = - (opt.showAttributes && c.methods().length > 0) || - (opt.showOperations && c.fields().length > 0) || + (opt.showAttributes && c.fields().length > 0) || + (opt.showOperations && c.methods().length > 0) || (opt.showConstructors && c.constructors().length > 0); r += tagvalue(c, "\\n", 'r'); if (showMembers) diff --git a/src/gr/spinellis/umlgraph/doclet/StringUtil.java b/src/gr/spinellis/umlgraph/doclet/StringUtil.java index 024f500..5d71261 100644 --- a/src/gr/spinellis/umlgraph/doclet/StringUtil.java +++ b/src/gr/spinellis/umlgraph/doclet/StringUtil.java @@ -226,7 +226,7 @@ class StringUtil { /** Tokenize string s into an array */ public static String[] tokenize(String s) { ArrayList r = new ArrayList(); - String remain = s, tok; + String remain = s; int n = 0, pos; remain = remain.trim(); @@ -545,8 +545,8 @@ class ClassGraph { if (c.isInterface()) r = guilWrap("interface") + " \\n" + r; boolean showMembers = - (opt.showAttributes && c.methods().length > 0) || - (opt.showOperations && c.fields().length > 0) || + (opt.showAttributes && c.fields().length > 0) || + (opt.showOperations && c.methods().length > 0) || (opt.showConstructors && c.constructors().length > 0); r += tagvalue(c, "\\n", 'r'); if (showMembers) diff --git a/src/gr/spinellis/umlgraph/doclet/UmlGraph.java b/src/gr/spinellis/umlgraph/doclet/UmlGraph.java index 024f500..5d71261 100644 --- a/src/gr/spinellis/umlgraph/doclet/UmlGraph.java +++ b/src/gr/spinellis/umlgraph/doclet/UmlGraph.java @@ -226,7 +226,7 @@ class StringUtil { /** Tokenize string s into an array */ public static String[] tokenize(String s) { ArrayList r = new ArrayList(); - String remain = s, tok; + String remain = s; int n = 0, pos; remain = remain.trim(); @@ -545,8 +545,8 @@ class ClassGraph { if (c.isInterface()) r = guilWrap("interface") + " \\n" + r; boolean showMembers = - (opt.showAttributes && c.methods().length > 0) || - (opt.showOperations && c.fields().length > 0) || + (opt.showAttributes && c.fields().length > 0) || + (opt.showOperations && c.methods().length > 0) || (opt.showConstructors && c.constructors().length > 0); r += tagvalue(c, "\\n", 'r'); if (showMembers) diff --git a/src/org/umlgraph/doclet/ClassGraph.java b/src/org/umlgraph/doclet/ClassGraph.java index 024f500..5d71261 100644 --- a/src/org/umlgraph/doclet/ClassGraph.java +++ b/src/org/umlgraph/doclet/ClassGraph.java @@ -226,7 +226,7 @@ class StringUtil { /** Tokenize string s into an array */ public static String[] tokenize(String s) { ArrayList r = new ArrayList(); - String remain = s, tok; + String remain = s; int n = 0, pos; remain = remain.trim(); @@ -545,8 +545,8 @@ class ClassGraph { if (c.isInterface()) r = guilWrap("interface") + " \\n" + r; boolean showMembers = - (opt.showAttributes && c.methods().length > 0) || - (opt.showOperations && c.fields().length > 0) || + (opt.showAttributes && c.fields().length > 0) || + (opt.showOperations && c.methods().length > 0) || (opt.showConstructors && c.constructors().length > 0); r += tagvalue(c, "\\n", 'r'); if (showMembers) diff --git a/src/org/umlgraph/doclet/ClassInfo.java b/src/org/umlgraph/doclet/ClassInfo.java index 024f500..5d71261 100644 --- a/src/org/umlgraph/doclet/ClassInfo.java +++ b/src/org/umlgraph/doclet/ClassInfo.java @@ -226,7 +226,7 @@ class StringUtil { /** Tokenize string s into an array */ public static String[] tokenize(String s) { ArrayList r = new ArrayList(); - String remain = s, tok; + String remain = s; int n = 0, pos; remain = remain.trim(); @@ -545,8 +545,8 @@ class ClassGraph { if (c.isInterface()) r = guilWrap("interface") + " \\n" + r; boolean showMembers = - (opt.showAttributes && c.methods().length > 0) || - (opt.showOperations && c.fields().length > 0) || + (opt.showAttributes && c.fields().length > 0) || + (opt.showOperations && c.methods().length > 0) || (opt.showConstructors && c.constructors().length > 0); r += tagvalue(c, "\\n", 'r'); if (showMembers) diff --git a/src/org/umlgraph/doclet/Options.java b/src/org/umlgraph/doclet/Options.java index 024f500..5d71261 100644 --- a/src/org/umlgraph/doclet/Options.java +++ b/src/org/umlgraph/doclet/Options.java @@ -226,7 +226,7 @@ class StringUtil { /** Tokenize string s into an array */ public static String[] tokenize(String s) { ArrayList r = new ArrayList(); - String remain = s, tok; + String remain = s; int n = 0, pos; remain = remain.trim(); @@ -545,8 +545,8 @@ class ClassGraph { if (c.isInterface()) r = guilWrap("interface") + " \\n" + r; boolean showMembers = - (opt.showAttributes && c.methods().length > 0) || - (opt.showOperations && c.fields().length > 0) || + (opt.showAttributes && c.fields().length > 0) || + (opt.showOperations && c.methods().length > 0) || (opt.showConstructors && c.constructors().length > 0); r += tagvalue(c, "\\n", 'r'); if (showMembers) diff --git a/src/org/umlgraph/doclet/StringUtil.java b/src/org/umlgraph/doclet/StringUtil.java index 024f500..5d71261 100644 --- a/src/org/umlgraph/doclet/StringUtil.java +++ b/src/org/umlgraph/doclet/StringUtil.java @@ -226,7 +226,7 @@ class StringUtil { /** Tokenize string s into an array */ public static String[] tokenize(String s) { ArrayList r = new ArrayList(); - String remain = s, tok; + String remain = s; int n = 0, pos; remain = remain.trim(); @@ -545,8 +545,8 @@ class ClassGraph { if (c.isInterface()) r = guilWrap("interface") + " \\n" + r; boolean showMembers = - (opt.showAttributes && c.methods().length > 0) || - (opt.showOperations && c.fields().length > 0) || + (opt.showAttributes && c.fields().length > 0) || + (opt.showOperations && c.methods().length > 0) || (opt.showConstructors && c.constructors().length > 0); r += tagvalue(c, "\\n", 'r'); if (showMembers) diff --git a/src/org/umlgraph/doclet/UmlGraph.java b/src/org/umlgraph/doclet/UmlGraph.java index 024f500..5d71261 100644 --- a/src/org/umlgraph/doclet/UmlGraph.java +++ b/src/org/umlgraph/doclet/UmlGraph.java @@ -226,7 +226,7 @@ class StringUtil { /** Tokenize string s into an array */ public static String[] tokenize(String s) { ArrayList r = new ArrayList(); - String remain = s, tok; + String remain = s; int n = 0, pos; remain = remain.trim(); @@ -545,8 +545,8 @@ class ClassGraph { if (c.isInterface()) r = guilWrap("interface") + " \\n" + r; boolean showMembers = - (opt.showAttributes && c.methods().length > 0) || - (opt.showOperations && c.fields().length > 0) || + (opt.showAttributes && c.fields().length > 0) || + (opt.showOperations && c.methods().length > 0) || (opt.showConstructors && c.constructors().length > 0); r += tagvalue(c, "\\n", 'r'); if (showMembers)