From df11095eb061728ab76bbfa2c2eb0f972951ac11 Mon Sep 17 00:00:00 2001 From: Diomidis Spinellis Date: Wed, 26 May 2004 17:02:27 +0000 Subject: [PATCH] Do not show arcs of hidden elements. Generate javadoc hyperlink paths into a directory-tree structure. Submitted-by: Alessandro Riva --- src/gr/spinellis/umlgraph/doclet/ClassGraph.java | 12 +++++++----- src/gr/spinellis/umlgraph/doclet/ClassInfo.java | 12 +++++++----- src/gr/spinellis/umlgraph/doclet/Options.java | 12 +++++++----- src/gr/spinellis/umlgraph/doclet/StringUtil.java | 12 +++++++----- src/gr/spinellis/umlgraph/doclet/UmlGraph.java | 12 +++++++----- src/org/umlgraph/doclet/ClassGraph.java | 12 +++++++----- src/org/umlgraph/doclet/ClassInfo.java | 12 +++++++----- src/org/umlgraph/doclet/Options.java | 12 +++++++----- src/org/umlgraph/doclet/StringUtil.java | 12 +++++++----- src/org/umlgraph/doclet/UmlGraph.java | 12 +++++++----- 10 files changed, 70 insertions(+), 50 deletions(-) diff --git a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java index 894bafa..a2a68e9 100644 --- a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java +++ b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java @@ -428,7 +428,7 @@ class ClassGraph { attributes(c.fields()); if (showMembers) opt.w.print("|"); - if (opt.showAttributes) + if (opt.showOperations) operations(c.methods()); if (showMembers) opt.w.print("}\""); @@ -441,7 +441,7 @@ class ClassGraph { opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontsize=" + opt.nodeFontSize); - opt.w.print(", URL=\"" + c.toString() + ".html\""); + opt.w.print(", URL=\"" + c.toString().replace('.',File.separatorChar) + ".html\""); opt.w.println("];"); ci.nodePrinted = true; } @@ -487,7 +487,8 @@ class ClassGraph { if (s != null && !s.toString().equals("java.lang.Object")) { if (!opt.matchesHideExpression(c.toString()) - && !opt.matchesHideExpression(s.toString())) + && !opt.matchesHideExpression(s.toString()) + && !hidden(c) && !hidden(s)) { opt.w.println("\t//" + c + " extends " + s); opt.w.println("\t" + name(s) + " -> " + cs + " [dir=back,arrowtail=empty];"); @@ -509,7 +510,8 @@ class ClassGraph { for (int i = 0; i < ifs.length; i++) { if (!opt.matchesHideExpression(c.toString()) - && !opt.matchesHideExpression(ifs[i].toString())) + && !opt.matchesHideExpression(ifs[i].toString()) + && !hidden(c) && !hidden(ifs[i])) { opt.w.print("\t" + name(ifs[i]) + " -> " + cs + " [dir=back,arrowtail=empty,style=dashed];"); opt.w.println("\t//" + c + " implements " + ifs[i]); @@ -550,7 +552,7 @@ class ClassGraph { opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontsize=" + opt.nodeFontSize); - opt.w.print(", URL=\"" + entry.getKey().toString() + ".html\""); + opt.w.print(", URL=\"" + entry.getKey().toString().replace('.',File.separatorChar) + ".html\""); opt.w.println("]"); } } diff --git a/src/gr/spinellis/umlgraph/doclet/ClassInfo.java b/src/gr/spinellis/umlgraph/doclet/ClassInfo.java index 894bafa..a2a68e9 100644 --- a/src/gr/spinellis/umlgraph/doclet/ClassInfo.java +++ b/src/gr/spinellis/umlgraph/doclet/ClassInfo.java @@ -428,7 +428,7 @@ class ClassGraph { attributes(c.fields()); if (showMembers) opt.w.print("|"); - if (opt.showAttributes) + if (opt.showOperations) operations(c.methods()); if (showMembers) opt.w.print("}\""); @@ -441,7 +441,7 @@ class ClassGraph { opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontsize=" + opt.nodeFontSize); - opt.w.print(", URL=\"" + c.toString() + ".html\""); + opt.w.print(", URL=\"" + c.toString().replace('.',File.separatorChar) + ".html\""); opt.w.println("];"); ci.nodePrinted = true; } @@ -487,7 +487,8 @@ class ClassGraph { if (s != null && !s.toString().equals("java.lang.Object")) { if (!opt.matchesHideExpression(c.toString()) - && !opt.matchesHideExpression(s.toString())) + && !opt.matchesHideExpression(s.toString()) + && !hidden(c) && !hidden(s)) { opt.w.println("\t//" + c + " extends " + s); opt.w.println("\t" + name(s) + " -> " + cs + " [dir=back,arrowtail=empty];"); @@ -509,7 +510,8 @@ class ClassGraph { for (int i = 0; i < ifs.length; i++) { if (!opt.matchesHideExpression(c.toString()) - && !opt.matchesHideExpression(ifs[i].toString())) + && !opt.matchesHideExpression(ifs[i].toString()) + && !hidden(c) && !hidden(ifs[i])) { opt.w.print("\t" + name(ifs[i]) + " -> " + cs + " [dir=back,arrowtail=empty,style=dashed];"); opt.w.println("\t//" + c + " implements " + ifs[i]); @@ -550,7 +552,7 @@ class ClassGraph { opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontsize=" + opt.nodeFontSize); - opt.w.print(", URL=\"" + entry.getKey().toString() + ".html\""); + opt.w.print(", URL=\"" + entry.getKey().toString().replace('.',File.separatorChar) + ".html\""); opt.w.println("]"); } } diff --git a/src/gr/spinellis/umlgraph/doclet/Options.java b/src/gr/spinellis/umlgraph/doclet/Options.java index 894bafa..a2a68e9 100644 --- a/src/gr/spinellis/umlgraph/doclet/Options.java +++ b/src/gr/spinellis/umlgraph/doclet/Options.java @@ -428,7 +428,7 @@ class ClassGraph { attributes(c.fields()); if (showMembers) opt.w.print("|"); - if (opt.showAttributes) + if (opt.showOperations) operations(c.methods()); if (showMembers) opt.w.print("}\""); @@ -441,7 +441,7 @@ class ClassGraph { opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontsize=" + opt.nodeFontSize); - opt.w.print(", URL=\"" + c.toString() + ".html\""); + opt.w.print(", URL=\"" + c.toString().replace('.',File.separatorChar) + ".html\""); opt.w.println("];"); ci.nodePrinted = true; } @@ -487,7 +487,8 @@ class ClassGraph { if (s != null && !s.toString().equals("java.lang.Object")) { if (!opt.matchesHideExpression(c.toString()) - && !opt.matchesHideExpression(s.toString())) + && !opt.matchesHideExpression(s.toString()) + && !hidden(c) && !hidden(s)) { opt.w.println("\t//" + c + " extends " + s); opt.w.println("\t" + name(s) + " -> " + cs + " [dir=back,arrowtail=empty];"); @@ -509,7 +510,8 @@ class ClassGraph { for (int i = 0; i < ifs.length; i++) { if (!opt.matchesHideExpression(c.toString()) - && !opt.matchesHideExpression(ifs[i].toString())) + && !opt.matchesHideExpression(ifs[i].toString()) + && !hidden(c) && !hidden(ifs[i])) { opt.w.print("\t" + name(ifs[i]) + " -> " + cs + " [dir=back,arrowtail=empty,style=dashed];"); opt.w.println("\t//" + c + " implements " + ifs[i]); @@ -550,7 +552,7 @@ class ClassGraph { opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontsize=" + opt.nodeFontSize); - opt.w.print(", URL=\"" + entry.getKey().toString() + ".html\""); + opt.w.print(", URL=\"" + entry.getKey().toString().replace('.',File.separatorChar) + ".html\""); opt.w.println("]"); } } diff --git a/src/gr/spinellis/umlgraph/doclet/StringUtil.java b/src/gr/spinellis/umlgraph/doclet/StringUtil.java index 894bafa..a2a68e9 100644 --- a/src/gr/spinellis/umlgraph/doclet/StringUtil.java +++ b/src/gr/spinellis/umlgraph/doclet/StringUtil.java @@ -428,7 +428,7 @@ class ClassGraph { attributes(c.fields()); if (showMembers) opt.w.print("|"); - if (opt.showAttributes) + if (opt.showOperations) operations(c.methods()); if (showMembers) opt.w.print("}\""); @@ -441,7 +441,7 @@ class ClassGraph { opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontsize=" + opt.nodeFontSize); - opt.w.print(", URL=\"" + c.toString() + ".html\""); + opt.w.print(", URL=\"" + c.toString().replace('.',File.separatorChar) + ".html\""); opt.w.println("];"); ci.nodePrinted = true; } @@ -487,7 +487,8 @@ class ClassGraph { if (s != null && !s.toString().equals("java.lang.Object")) { if (!opt.matchesHideExpression(c.toString()) - && !opt.matchesHideExpression(s.toString())) + && !opt.matchesHideExpression(s.toString()) + && !hidden(c) && !hidden(s)) { opt.w.println("\t//" + c + " extends " + s); opt.w.println("\t" + name(s) + " -> " + cs + " [dir=back,arrowtail=empty];"); @@ -509,7 +510,8 @@ class ClassGraph { for (int i = 0; i < ifs.length; i++) { if (!opt.matchesHideExpression(c.toString()) - && !opt.matchesHideExpression(ifs[i].toString())) + && !opt.matchesHideExpression(ifs[i].toString()) + && !hidden(c) && !hidden(ifs[i])) { opt.w.print("\t" + name(ifs[i]) + " -> " + cs + " [dir=back,arrowtail=empty,style=dashed];"); opt.w.println("\t//" + c + " implements " + ifs[i]); @@ -550,7 +552,7 @@ class ClassGraph { opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontsize=" + opt.nodeFontSize); - opt.w.print(", URL=\"" + entry.getKey().toString() + ".html\""); + opt.w.print(", URL=\"" + entry.getKey().toString().replace('.',File.separatorChar) + ".html\""); opt.w.println("]"); } } diff --git a/src/gr/spinellis/umlgraph/doclet/UmlGraph.java b/src/gr/spinellis/umlgraph/doclet/UmlGraph.java index 894bafa..a2a68e9 100644 --- a/src/gr/spinellis/umlgraph/doclet/UmlGraph.java +++ b/src/gr/spinellis/umlgraph/doclet/UmlGraph.java @@ -428,7 +428,7 @@ class ClassGraph { attributes(c.fields()); if (showMembers) opt.w.print("|"); - if (opt.showAttributes) + if (opt.showOperations) operations(c.methods()); if (showMembers) opt.w.print("}\""); @@ -441,7 +441,7 @@ class ClassGraph { opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontsize=" + opt.nodeFontSize); - opt.w.print(", URL=\"" + c.toString() + ".html\""); + opt.w.print(", URL=\"" + c.toString().replace('.',File.separatorChar) + ".html\""); opt.w.println("];"); ci.nodePrinted = true; } @@ -487,7 +487,8 @@ class ClassGraph { if (s != null && !s.toString().equals("java.lang.Object")) { if (!opt.matchesHideExpression(c.toString()) - && !opt.matchesHideExpression(s.toString())) + && !opt.matchesHideExpression(s.toString()) + && !hidden(c) && !hidden(s)) { opt.w.println("\t//" + c + " extends " + s); opt.w.println("\t" + name(s) + " -> " + cs + " [dir=back,arrowtail=empty];"); @@ -509,7 +510,8 @@ class ClassGraph { for (int i = 0; i < ifs.length; i++) { if (!opt.matchesHideExpression(c.toString()) - && !opt.matchesHideExpression(ifs[i].toString())) + && !opt.matchesHideExpression(ifs[i].toString()) + && !hidden(c) && !hidden(ifs[i])) { opt.w.print("\t" + name(ifs[i]) + " -> " + cs + " [dir=back,arrowtail=empty,style=dashed];"); opt.w.println("\t//" + c + " implements " + ifs[i]); @@ -550,7 +552,7 @@ class ClassGraph { opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontsize=" + opt.nodeFontSize); - opt.w.print(", URL=\"" + entry.getKey().toString() + ".html\""); + opt.w.print(", URL=\"" + entry.getKey().toString().replace('.',File.separatorChar) + ".html\""); opt.w.println("]"); } } diff --git a/src/org/umlgraph/doclet/ClassGraph.java b/src/org/umlgraph/doclet/ClassGraph.java index 894bafa..a2a68e9 100644 --- a/src/org/umlgraph/doclet/ClassGraph.java +++ b/src/org/umlgraph/doclet/ClassGraph.java @@ -428,7 +428,7 @@ class ClassGraph { attributes(c.fields()); if (showMembers) opt.w.print("|"); - if (opt.showAttributes) + if (opt.showOperations) operations(c.methods()); if (showMembers) opt.w.print("}\""); @@ -441,7 +441,7 @@ class ClassGraph { opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontsize=" + opt.nodeFontSize); - opt.w.print(", URL=\"" + c.toString() + ".html\""); + opt.w.print(", URL=\"" + c.toString().replace('.',File.separatorChar) + ".html\""); opt.w.println("];"); ci.nodePrinted = true; } @@ -487,7 +487,8 @@ class ClassGraph { if (s != null && !s.toString().equals("java.lang.Object")) { if (!opt.matchesHideExpression(c.toString()) - && !opt.matchesHideExpression(s.toString())) + && !opt.matchesHideExpression(s.toString()) + && !hidden(c) && !hidden(s)) { opt.w.println("\t//" + c + " extends " + s); opt.w.println("\t" + name(s) + " -> " + cs + " [dir=back,arrowtail=empty];"); @@ -509,7 +510,8 @@ class ClassGraph { for (int i = 0; i < ifs.length; i++) { if (!opt.matchesHideExpression(c.toString()) - && !opt.matchesHideExpression(ifs[i].toString())) + && !opt.matchesHideExpression(ifs[i].toString()) + && !hidden(c) && !hidden(ifs[i])) { opt.w.print("\t" + name(ifs[i]) + " -> " + cs + " [dir=back,arrowtail=empty,style=dashed];"); opt.w.println("\t//" + c + " implements " + ifs[i]); @@ -550,7 +552,7 @@ class ClassGraph { opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontsize=" + opt.nodeFontSize); - opt.w.print(", URL=\"" + entry.getKey().toString() + ".html\""); + opt.w.print(", URL=\"" + entry.getKey().toString().replace('.',File.separatorChar) + ".html\""); opt.w.println("]"); } } diff --git a/src/org/umlgraph/doclet/ClassInfo.java b/src/org/umlgraph/doclet/ClassInfo.java index 894bafa..a2a68e9 100644 --- a/src/org/umlgraph/doclet/ClassInfo.java +++ b/src/org/umlgraph/doclet/ClassInfo.java @@ -428,7 +428,7 @@ class ClassGraph { attributes(c.fields()); if (showMembers) opt.w.print("|"); - if (opt.showAttributes) + if (opt.showOperations) operations(c.methods()); if (showMembers) opt.w.print("}\""); @@ -441,7 +441,7 @@ class ClassGraph { opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontsize=" + opt.nodeFontSize); - opt.w.print(", URL=\"" + c.toString() + ".html\""); + opt.w.print(", URL=\"" + c.toString().replace('.',File.separatorChar) + ".html\""); opt.w.println("];"); ci.nodePrinted = true; } @@ -487,7 +487,8 @@ class ClassGraph { if (s != null && !s.toString().equals("java.lang.Object")) { if (!opt.matchesHideExpression(c.toString()) - && !opt.matchesHideExpression(s.toString())) + && !opt.matchesHideExpression(s.toString()) + && !hidden(c) && !hidden(s)) { opt.w.println("\t//" + c + " extends " + s); opt.w.println("\t" + name(s) + " -> " + cs + " [dir=back,arrowtail=empty];"); @@ -509,7 +510,8 @@ class ClassGraph { for (int i = 0; i < ifs.length; i++) { if (!opt.matchesHideExpression(c.toString()) - && !opt.matchesHideExpression(ifs[i].toString())) + && !opt.matchesHideExpression(ifs[i].toString()) + && !hidden(c) && !hidden(ifs[i])) { opt.w.print("\t" + name(ifs[i]) + " -> " + cs + " [dir=back,arrowtail=empty,style=dashed];"); opt.w.println("\t//" + c + " implements " + ifs[i]); @@ -550,7 +552,7 @@ class ClassGraph { opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontsize=" + opt.nodeFontSize); - opt.w.print(", URL=\"" + entry.getKey().toString() + ".html\""); + opt.w.print(", URL=\"" + entry.getKey().toString().replace('.',File.separatorChar) + ".html\""); opt.w.println("]"); } } diff --git a/src/org/umlgraph/doclet/Options.java b/src/org/umlgraph/doclet/Options.java index 894bafa..a2a68e9 100644 --- a/src/org/umlgraph/doclet/Options.java +++ b/src/org/umlgraph/doclet/Options.java @@ -428,7 +428,7 @@ class ClassGraph { attributes(c.fields()); if (showMembers) opt.w.print("|"); - if (opt.showAttributes) + if (opt.showOperations) operations(c.methods()); if (showMembers) opt.w.print("}\""); @@ -441,7 +441,7 @@ class ClassGraph { opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontsize=" + opt.nodeFontSize); - opt.w.print(", URL=\"" + c.toString() + ".html\""); + opt.w.print(", URL=\"" + c.toString().replace('.',File.separatorChar) + ".html\""); opt.w.println("];"); ci.nodePrinted = true; } @@ -487,7 +487,8 @@ class ClassGraph { if (s != null && !s.toString().equals("java.lang.Object")) { if (!opt.matchesHideExpression(c.toString()) - && !opt.matchesHideExpression(s.toString())) + && !opt.matchesHideExpression(s.toString()) + && !hidden(c) && !hidden(s)) { opt.w.println("\t//" + c + " extends " + s); opt.w.println("\t" + name(s) + " -> " + cs + " [dir=back,arrowtail=empty];"); @@ -509,7 +510,8 @@ class ClassGraph { for (int i = 0; i < ifs.length; i++) { if (!opt.matchesHideExpression(c.toString()) - && !opt.matchesHideExpression(ifs[i].toString())) + && !opt.matchesHideExpression(ifs[i].toString()) + && !hidden(c) && !hidden(ifs[i])) { opt.w.print("\t" + name(ifs[i]) + " -> " + cs + " [dir=back,arrowtail=empty,style=dashed];"); opt.w.println("\t//" + c + " implements " + ifs[i]); @@ -550,7 +552,7 @@ class ClassGraph { opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontsize=" + opt.nodeFontSize); - opt.w.print(", URL=\"" + entry.getKey().toString() + ".html\""); + opt.w.print(", URL=\"" + entry.getKey().toString().replace('.',File.separatorChar) + ".html\""); opt.w.println("]"); } } diff --git a/src/org/umlgraph/doclet/StringUtil.java b/src/org/umlgraph/doclet/StringUtil.java index 894bafa..a2a68e9 100644 --- a/src/org/umlgraph/doclet/StringUtil.java +++ b/src/org/umlgraph/doclet/StringUtil.java @@ -428,7 +428,7 @@ class ClassGraph { attributes(c.fields()); if (showMembers) opt.w.print("|"); - if (opt.showAttributes) + if (opt.showOperations) operations(c.methods()); if (showMembers) opt.w.print("}\""); @@ -441,7 +441,7 @@ class ClassGraph { opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontsize=" + opt.nodeFontSize); - opt.w.print(", URL=\"" + c.toString() + ".html\""); + opt.w.print(", URL=\"" + c.toString().replace('.',File.separatorChar) + ".html\""); opt.w.println("];"); ci.nodePrinted = true; } @@ -487,7 +487,8 @@ class ClassGraph { if (s != null && !s.toString().equals("java.lang.Object")) { if (!opt.matchesHideExpression(c.toString()) - && !opt.matchesHideExpression(s.toString())) + && !opt.matchesHideExpression(s.toString()) + && !hidden(c) && !hidden(s)) { opt.w.println("\t//" + c + " extends " + s); opt.w.println("\t" + name(s) + " -> " + cs + " [dir=back,arrowtail=empty];"); @@ -509,7 +510,8 @@ class ClassGraph { for (int i = 0; i < ifs.length; i++) { if (!opt.matchesHideExpression(c.toString()) - && !opt.matchesHideExpression(ifs[i].toString())) + && !opt.matchesHideExpression(ifs[i].toString()) + && !hidden(c) && !hidden(ifs[i])) { opt.w.print("\t" + name(ifs[i]) + " -> " + cs + " [dir=back,arrowtail=empty,style=dashed];"); opt.w.println("\t//" + c + " implements " + ifs[i]); @@ -550,7 +552,7 @@ class ClassGraph { opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontsize=" + opt.nodeFontSize); - opt.w.print(", URL=\"" + entry.getKey().toString() + ".html\""); + opt.w.print(", URL=\"" + entry.getKey().toString().replace('.',File.separatorChar) + ".html\""); opt.w.println("]"); } } diff --git a/src/org/umlgraph/doclet/UmlGraph.java b/src/org/umlgraph/doclet/UmlGraph.java index 894bafa..a2a68e9 100644 --- a/src/org/umlgraph/doclet/UmlGraph.java +++ b/src/org/umlgraph/doclet/UmlGraph.java @@ -428,7 +428,7 @@ class ClassGraph { attributes(c.fields()); if (showMembers) opt.w.print("|"); - if (opt.showAttributes) + if (opt.showOperations) operations(c.methods()); if (showMembers) opt.w.print("}\""); @@ -441,7 +441,7 @@ class ClassGraph { opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontsize=" + opt.nodeFontSize); - opt.w.print(", URL=\"" + c.toString() + ".html\""); + opt.w.print(", URL=\"" + c.toString().replace('.',File.separatorChar) + ".html\""); opt.w.println("];"); ci.nodePrinted = true; } @@ -487,7 +487,8 @@ class ClassGraph { if (s != null && !s.toString().equals("java.lang.Object")) { if (!opt.matchesHideExpression(c.toString()) - && !opt.matchesHideExpression(s.toString())) + && !opt.matchesHideExpression(s.toString()) + && !hidden(c) && !hidden(s)) { opt.w.println("\t//" + c + " extends " + s); opt.w.println("\t" + name(s) + " -> " + cs + " [dir=back,arrowtail=empty];"); @@ -509,7 +510,8 @@ class ClassGraph { for (int i = 0; i < ifs.length; i++) { if (!opt.matchesHideExpression(c.toString()) - && !opt.matchesHideExpression(ifs[i].toString())) + && !opt.matchesHideExpression(ifs[i].toString()) + && !hidden(c) && !hidden(ifs[i])) { opt.w.print("\t" + name(ifs[i]) + " -> " + cs + " [dir=back,arrowtail=empty,style=dashed];"); opt.w.println("\t//" + c + " implements " + ifs[i]); @@ -550,7 +552,7 @@ class ClassGraph { opt.w.print(", style=filled, fillcolor=\"" + opt.nodeFillColor + "\""); opt.w.print(", fontcolor=\"" + opt.nodeFontColor + "\""); opt.w.print(", fontsize=" + opt.nodeFontSize); - opt.w.print(", URL=\"" + entry.getKey().toString() + ".html\""); + opt.w.print(", URL=\"" + entry.getKey().toString().replace('.',File.separatorChar) + ".html\""); opt.w.println("]"); } }