Correct checking of attributes and operations (Jonathan Wright).

This commit is contained in:
Diomidis Spinellis 2004-11-19 15:57:44 +00:00
parent f9d197f472
commit f8924f44eb
11 changed files with 31 additions and 31 deletions

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)