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

Merge branch 'master' of github.com:dspinellis/UMLGraph

This commit is contained in:
Diomidis Spinellis 2013-05-23 18:27:05 +03:00
parent 4fe531b9d0 f517c8704e
commit 37cd34d38f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -972,7 +972,7 @@ class ClassGraph {
private Type[] getInterfaceTypeArguments(ClassDoc iface, Type t) {
if (t instanceof ParameterizedType) {
ParameterizedType pt = (ParameterizedType) t;
if (iface.equals(t.asClassDoc())) {
if (iface != null && iface.equals(t.asClassDoc())) {
return pt.typeArguments();
} else {
for (Type pti : pt.interfaceTypes()) {

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

@ -25,7 +25,7 @@ import java.util.List;
import java.util.Map;
/**
* Class's dot-comaptible alias name (for fully qualified class names)
* Class's dot-compatible alias name (for fully qualified class names)
* and printed information
* @version $Revision$
* @author <a href="http://www.spinellis.gr">Diomidis Spinellis</a>

2
src/org/umlgraph/doclet/UmlGraphDoc.java
View File

@ -98,7 +98,7 @@ public class UmlGraphDoc {
UmlGraph.buildGraph(root, view, packageDoc);
runGraphviz(opt.dotExecutable, outputFolder, packageDoc.name(), packageDoc.name(), root);
alterHtmlDocs(opt, outputFolder, packageDoc.name(), packageDoc.name(),
"package-summary.html", Pattern.compile(".*</[Hh]2>.*"), root);
"package-summary.html", Pattern.compile("(</[Hh]2>)|(<h1 title=\"Package\").*"), root);
}
}
}