diff --git a/src/main/java/org/apache/bcel/util/AttributeHTML.java b/src/main/java/org/apache/bcel/util/AttributeHTML.java
index e0bafaf254..f87b1b24d4 100644
--- a/src/main/java/org/apache/bcel/util/AttributeHTML.java
+++ b/src/main/java/org/apache/bcel/util/AttributeHTML.java
@@ -159,7 +159,7 @@ void writeAttribute(final Attribute attribute, final String anchor, final int me
signature = Utility.signatureToString(signature, false);
final int start = var.getStartPC();
final int end = start + var.getLength();
- printWriter.println("
" + Class2HTML.referenceType(signature) + " " + var.getName() + " in slot %" + var.getIndex()
+ printWriter.println("" + Class2HTML.referenceType(signature) + " " + Class2HTML.toHTML(var.getName()) + " in slot %" + var.getIndex()
+ "
Valid from lines " + start
+ " to " + end + "");
});
@@ -173,7 +173,7 @@ void writeAttribute(final Attribute attribute, final String anchor, final int me
final String access;
index = clazz.getInnerNameIndex();
if (index > 0) {
- name = constantPool.getConstantUtf8(index).getBytes();
+ name = Class2HTML.toHTML(constantPool.getConstantUtf8(index).getBytes());
} else {
name = "<anonymous>";
}
diff --git a/src/main/java/org/apache/bcel/util/Class2HTML.java b/src/main/java/org/apache/bcel/util/Class2HTML.java
index 3a427ffc9a..b0ced24d22 100644
--- a/src/main/java/org/apache/bcel/util/Class2HTML.java
+++ b/src/main/java/org/apache/bcel/util/Class2HTML.java
@@ -135,7 +135,7 @@ static String referenceClass(final int index) {
String str = constantPool.getConstantString(index, Const.CONSTANT_Class);
str = Utility.compactClassName(str);
str = Utility.compactClassName(str, classPackage + ".", true);
- return "" + str + "";
+ return "" + toHTML(str) + "";
}
static String referenceType(final String type) {
@@ -150,7 +150,7 @@ static String referenceType(final String type) {
if (basicTypes.contains(baseType)) {
return "" + type + "";
}
- return "" + shortType + "";
+ return "" + toHTML(shortType) + "";
}
static String toHTML(final String str) {
@@ -221,7 +221,7 @@ private void writeMainHTML(final AttributeHTML attributeHtml, final Charset char
try (PrintWriter file = new PrintWriter(dir + className + ".html", charset.name())) {
// @formatter:off
file.println("\n"
- + "Documentation for " + className + "\n"
+ + "Documentation for " + toHTML(className) + "\n"
+ "