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

Prevent crash when processing erroneous relation specifications (Andrea Aime)

This commit is contained in:
Diomidis Spinellis 2005-11-01 07:53:42 +00:00
parent 4ec2ecd767
commit d56b998d5f
10 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -643,8 +643,10 @@ class ClassGraph {
Tag tags[] = from.tags(tagname); Tag tags[] = from.tags(tagname);
for (int i = 0; i < tags.length; i++) { for (int i = 0; i < tags.length; i++) {
String t[] = StringUtil.tokenize(tags[i].text()); // l-src label l-dst target String t[] = StringUtil.tokenize(tags[i].text()); // l-src label l-dst target
if (t.length != 4) if (t.length != 4) {
System.err.println("Expected four fields: " + tags[i].text()); System.err.println("Error in " + from + "\n" + tagname + " expectes four fields (l-src label l-dst target): " + tags[i].text());
return;
}
opt.w.println("\t// " + from + " " + tagname + " " + t[3]); opt.w.println("\t// " + from + " " + tagname + " " + t[3]);
opt.w.println("\t" + name + " -> " + name(t[3]) + " [" + opt.w.println("\t" + name + " -> " + name(t[3]) + " [" +
"taillabel=\"" + t[0] + "\", " + "taillabel=\"" + t[0] + "\", " +

6
src/gr/spinellis/umlgraph/doclet/ClassInfo.java
View File

@ -643,8 +643,10 @@ class ClassGraph {
Tag tags[] = from.tags(tagname); Tag tags[] = from.tags(tagname);
for (int i = 0; i < tags.length; i++) { for (int i = 0; i < tags.length; i++) {
String t[] = StringUtil.tokenize(tags[i].text()); // l-src label l-dst target String t[] = StringUtil.tokenize(tags[i].text()); // l-src label l-dst target
if (t.length != 4) if (t.length != 4) {
System.err.println("Expected four fields: " + tags[i].text()); System.err.println("Error in " + from + "\n" + tagname + " expectes four fields (l-src label l-dst target): " + tags[i].text());
return;
}
opt.w.println("\t// " + from + " " + tagname + " " + t[3]); opt.w.println("\t// " + from + " " + tagname + " " + t[3]);
opt.w.println("\t" + name + " -> " + name(t[3]) + " [" + opt.w.println("\t" + name + " -> " + name(t[3]) + " [" +
"taillabel=\"" + t[0] + "\", " + "taillabel=\"" + t[0] + "\", " +

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

@ -643,8 +643,10 @@ class ClassGraph {
Tag tags[] = from.tags(tagname); Tag tags[] = from.tags(tagname);
for (int i = 0; i < tags.length; i++) { for (int i = 0; i < tags.length; i++) {
String t[] = StringUtil.tokenize(tags[i].text()); // l-src label l-dst target String t[] = StringUtil.tokenize(tags[i].text()); // l-src label l-dst target
if (t.length != 4) if (t.length != 4) {
System.err.println("Expected four fields: " + tags[i].text()); System.err.println("Error in " + from + "\n" + tagname + " expectes four fields (l-src label l-dst target): " + tags[i].text());
return;
}
opt.w.println("\t// " + from + " " + tagname + " " + t[3]); opt.w.println("\t// " + from + " " + tagname + " " + t[3]);
opt.w.println("\t" + name + " -> " + name(t[3]) + " [" + opt.w.println("\t" + name + " -> " + name(t[3]) + " [" +
"taillabel=\"" + t[0] + "\", " + "taillabel=\"" + t[0] + "\", " +

6
src/gr/spinellis/umlgraph/doclet/StringUtil.java
View File

@ -643,8 +643,10 @@ class ClassGraph {
Tag tags[] = from.tags(tagname); Tag tags[] = from.tags(tagname);
for (int i = 0; i < tags.length; i++) { for (int i = 0; i < tags.length; i++) {
String t[] = StringUtil.tokenize(tags[i].text()); // l-src label l-dst target String t[] = StringUtil.tokenize(tags[i].text()); // l-src label l-dst target
if (t.length != 4) if (t.length != 4) {
System.err.println("Expected four fields: " + tags[i].text()); System.err.println("Error in " + from + "\n" + tagname + " expectes four fields (l-src label l-dst target): " + tags[i].text());
return;
}
opt.w.println("\t// " + from + " " + tagname + " " + t[3]); opt.w.println("\t// " + from + " " + tagname + " " + t[3]);
opt.w.println("\t" + name + " -> " + name(t[3]) + " [" + opt.w.println("\t" + name + " -> " + name(t[3]) + " [" +
"taillabel=\"" + t[0] + "\", " + "taillabel=\"" + t[0] + "\", " +

6
src/gr/spinellis/umlgraph/doclet/UmlGraph.java
View File

@ -643,8 +643,10 @@ class ClassGraph {
Tag tags[] = from.tags(tagname); Tag tags[] = from.tags(tagname);
for (int i = 0; i < tags.length; i++) { for (int i = 0; i < tags.length; i++) {
String t[] = StringUtil.tokenize(tags[i].text()); // l-src label l-dst target String t[] = StringUtil.tokenize(tags[i].text()); // l-src label l-dst target
if (t.length != 4) if (t.length != 4) {
System.err.println("Expected four fields: " + tags[i].text()); System.err.println("Error in " + from + "\n" + tagname + " expectes four fields (l-src label l-dst target): " + tags[i].text());
return;
}
opt.w.println("\t// " + from + " " + tagname + " " + t[3]); opt.w.println("\t// " + from + " " + tagname + " " + t[3]);
opt.w.println("\t" + name + " -> " + name(t[3]) + " [" + opt.w.println("\t" + name + " -> " + name(t[3]) + " [" +
"taillabel=\"" + t[0] + "\", " + "taillabel=\"" + t[0] + "\", " +

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

@ -643,8 +643,10 @@ class ClassGraph {
Tag tags[] = from.tags(tagname); Tag tags[] = from.tags(tagname);
for (int i = 0; i < tags.length; i++) { for (int i = 0; i < tags.length; i++) {
String t[] = StringUtil.tokenize(tags[i].text()); // l-src label l-dst target String t[] = StringUtil.tokenize(tags[i].text()); // l-src label l-dst target
if (t.length != 4) if (t.length != 4) {
System.err.println("Expected four fields: " + tags[i].text()); System.err.println("Error in " + from + "\n" + tagname + " expectes four fields (l-src label l-dst target): " + tags[i].text());
return;
}
opt.w.println("\t// " + from + " " + tagname + " " + t[3]); opt.w.println("\t// " + from + " " + tagname + " " + t[3]);
opt.w.println("\t" + name + " -> " + name(t[3]) + " [" + opt.w.println("\t" + name + " -> " + name(t[3]) + " [" +
"taillabel=\"" + t[0] + "\", " + "taillabel=\"" + t[0] + "\", " +

6
src/org/umlgraph/doclet/ClassInfo.java
View File

@ -643,8 +643,10 @@ class ClassGraph {
Tag tags[] = from.tags(tagname); Tag tags[] = from.tags(tagname);
for (int i = 0; i < tags.length; i++) { for (int i = 0; i < tags.length; i++) {
String t[] = StringUtil.tokenize(tags[i].text()); // l-src label l-dst target String t[] = StringUtil.tokenize(tags[i].text()); // l-src label l-dst target
if (t.length != 4) if (t.length != 4) {
System.err.println("Expected four fields: " + tags[i].text()); System.err.println("Error in " + from + "\n" + tagname + " expectes four fields (l-src label l-dst target): " + tags[i].text());
return;
}
opt.w.println("\t// " + from + " " + tagname + " " + t[3]); opt.w.println("\t// " + from + " " + tagname + " " + t[3]);
opt.w.println("\t" + name + " -> " + name(t[3]) + " [" + opt.w.println("\t" + name + " -> " + name(t[3]) + " [" +
"taillabel=\"" + t[0] + "\", " + "taillabel=\"" + t[0] + "\", " +

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

@ -643,8 +643,10 @@ class ClassGraph {
Tag tags[] = from.tags(tagname); Tag tags[] = from.tags(tagname);
for (int i = 0; i < tags.length; i++) { for (int i = 0; i < tags.length; i++) {
String t[] = StringUtil.tokenize(tags[i].text()); // l-src label l-dst target String t[] = StringUtil.tokenize(tags[i].text()); // l-src label l-dst target
if (t.length != 4) if (t.length != 4) {
System.err.println("Expected four fields: " + tags[i].text()); System.err.println("Error in " + from + "\n" + tagname + " expectes four fields (l-src label l-dst target): " + tags[i].text());
return;
}
opt.w.println("\t// " + from + " " + tagname + " " + t[3]); opt.w.println("\t// " + from + " " + tagname + " " + t[3]);
opt.w.println("\t" + name + " -> " + name(t[3]) + " [" + opt.w.println("\t" + name + " -> " + name(t[3]) + " [" +
"taillabel=\"" + t[0] + "\", " + "taillabel=\"" + t[0] + "\", " +

6
src/org/umlgraph/doclet/StringUtil.java
View File

@ -643,8 +643,10 @@ class ClassGraph {
Tag tags[] = from.tags(tagname); Tag tags[] = from.tags(tagname);
for (int i = 0; i < tags.length; i++) { for (int i = 0; i < tags.length; i++) {
String t[] = StringUtil.tokenize(tags[i].text()); // l-src label l-dst target String t[] = StringUtil.tokenize(tags[i].text()); // l-src label l-dst target
if (t.length != 4) if (t.length != 4) {
System.err.println("Expected four fields: " + tags[i].text()); System.err.println("Error in " + from + "\n" + tagname + " expectes four fields (l-src label l-dst target): " + tags[i].text());
return;
}
opt.w.println("\t// " + from + " " + tagname + " " + t[3]); opt.w.println("\t// " + from + " " + tagname + " " + t[3]);
opt.w.println("\t" + name + " -> " + name(t[3]) + " [" + opt.w.println("\t" + name + " -> " + name(t[3]) + " [" +
"taillabel=\"" + t[0] + "\", " + "taillabel=\"" + t[0] + "\", " +

6
src/org/umlgraph/doclet/UmlGraph.java
View File

@ -643,8 +643,10 @@ class ClassGraph {
Tag tags[] = from.tags(tagname); Tag tags[] = from.tags(tagname);
for (int i = 0; i < tags.length; i++) { for (int i = 0; i < tags.length; i++) {
String t[] = StringUtil.tokenize(tags[i].text()); // l-src label l-dst target String t[] = StringUtil.tokenize(tags[i].text()); // l-src label l-dst target
if (t.length != 4) if (t.length != 4) {
System.err.println("Expected four fields: " + tags[i].text()); System.err.println("Error in " + from + "\n" + tagname + " expectes four fields (l-src label l-dst target): " + tags[i].text());
return;
}
opt.w.println("\t// " + from + " " + tagname + " " + t[3]); opt.w.println("\t// " + from + " " + tagname + " " + t[3]);
opt.w.println("\t" + name + " -> " + name(t[3]) + " [" + opt.w.println("\t" + name + " -> " + name(t[3]) + " [" +
"taillabel=\"" + t[0] + "\", " + "taillabel=\"" + t[0] + "\", " +