diff options
Diffstat (limited to 'ajdoc/src/main')
| -rw-r--r-- | ajdoc/src/main/java/org/aspectj/tools/ajdoc/HtmlDecorator.java | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ajdoc/src/main/java/org/aspectj/tools/ajdoc/HtmlDecorator.java b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/HtmlDecorator.java index 42d029e06..3e3a05c07 100644 --- a/ajdoc/src/main/java/org/aspectj/tools/ajdoc/HtmlDecorator.java +++ b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/HtmlDecorator.java @@ -31,6 +31,7 @@ import org.aspectj.asm.AsmManager; import org.aspectj.asm.HierarchyWalker; import org.aspectj.asm.IProgramElement; import org.aspectj.asm.IRelationship; +import org.aspectj.util.LangUtil; import org.aspectj.util.TypeSafeEnum; /** @@ -38,6 +39,10 @@ import org.aspectj.util.TypeSafeEnum; */ class HtmlDecorator { + public static final String TYPE_NAME_LABEL = LangUtil.is15VMOrGreater() + ? "type-name-label" + : (LangUtil.is1dot8VMOrGreater() ? "typeNameLabel" : "strong"); + private static final String POINTCUT_DETAIL = "Pointcut Detail"; private static final String ADVICE_DETAIL = "Advice Detail"; private static final String DECLARE_DETAIL = "Declare Detail"; @@ -267,19 +272,14 @@ class HtmlDecorator { } } else { - // Java8: - // <pre>static class <span class="typeNameLabel">ClassA.InnerAspect</span> - classStartIndex = fileContents.toString().indexOf("class <span class=\"typeNameLabel\">"); - if (classStartIndex == -1) { - // Java7: 464604 - // <pre>public class <span class="strong">Azpect</span> - classStartIndex = fileContents.toString().indexOf("class <span class=\"strong\">"); - } + // Java15: <pre>static class <span class="type-name-label">ClassA.InnerAspect</span> + // Java8: <pre>static class <span class="typeNameLabel">ClassA.InnerAspect</span> + // Java7 (464604): <pre>public class <span class="strong">Azpect</span> + classStartIndex = fileContents.toString().indexOf("class <span class=\"" + HtmlDecorator.TYPE_NAME_LABEL + "\">"); int classEndIndex = fileContents.toString().indexOf("</span>", classStartIndex); if (classEndIndex != -1) { - // Convert it to "aspect <span class="typeNameLabel">ClassA.InnerAspect</span>" - String classLine = fileContents.toString().substring(classStartIndex, classEndIndex); - String aspectLine = "aspect"+fileContents.substring(classStartIndex+5,classEndIndex); + // Convert it to "aspect <span class="TYPE_NAME_LABEL">ClassA.InnerAspect</span>" + String aspectLine = "aspect" + fileContents.substring(classStartIndex + 5, classEndIndex); fileContents.delete(classStartIndex, classEndIndex); fileContents.insert(classStartIndex, aspectLine); } |