MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-17 04:35:13 +07:00
Code Issues Packages Projects Releases Wiki Activity

JavaDocInfoGenerator cleanup

Browse Source
This commit is contained in:
Dmitry Batrak
2016-06-09 13:26:05 +03:00
parent 8e3e178333
commit 82c4f6ab17
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
+9 -16
View File
@@ -445,7 +445,7 @@ public class JavaDocInfoGenerator {
buffer.append("<html><body></body></html>");
}
String errorSection = "<p id=\"error\">Following external urls were checked:<br>&nbsp;&nbsp;&nbsp;<i>" +
StringUtil.join(docURLs, url -> XmlStringUtil.escapeString(url), "</i><br>&nbsp;&nbsp;&nbsp;<i>") +
StringUtil.join(docURLs, XmlStringUtil::escapeString, "</i><br>&nbsp;&nbsp;&nbsp;<i>") +
"</i><br>The documentation for this element is not found. Please add all the needed paths to API docs in " +
"<a href=\"open://Project Settings\">Project Settings.</a></p>";
buffer.insert(buffer.indexOf("<body>"), errorSection);
@@ -489,14 +489,12 @@ public class JavaDocInfoGenerator {
buffer.append("<small><b>");
buffer.append(packageName);
buffer.append("</b></small>");
//buffer.append("<br>");
}
}
buffer.append("<PRE>");
if (generateClassSignature(buffer, aClass, true)) return;
buffer.append("</PRE>");
//buffer.append("<br>");
PsiDocComment comment = getDocComment(aClass);
if (comment != null) {
@@ -515,7 +513,7 @@ public class JavaDocInfoGenerator {
buffer.append(modifiers);
buffer.append(" ");
}
buffer.append(aClass.isInterface() ? LangBundle.message("java.terms.interface") : LangBundle.message("java.terms.class"));
buffer.append(LangBundle.message(aClass.isInterface() ? "java.terms.interface" : "java.terms.class"));
buffer.append(" ");
String refText = JavaDocUtil.getReferenceText(aClass.getProject(), aClass);
if (refText == null) {
@@ -650,7 +648,6 @@ public class JavaDocInfoGenerator {
buffer.append("<PRE>");
generateFieldSignature(buffer, field, true);
buffer.append("</PRE>");
//buffer.append("<br>");
ColorUtil.appendColorPreview(field, buffer);
@@ -708,7 +705,6 @@ public class JavaDocInfoGenerator {
appendInitializer(buffer, variable);
buffer.append("</b>");
buffer.append("</PRE>");
//buffer.append("<br>");
ColorUtil.appendColorPreview(variable, buffer);
@@ -1087,9 +1083,7 @@ public class JavaDocInfoGenerator {
buffer.append("<PRE>");
generateMethodSignature(buffer, method, true, false);
buffer.append("</PRE>");
//buffer.append("<br>");
PsiDocComment comment = getMethodDocComment(method);
@@ -1249,7 +1243,9 @@ public class JavaDocInfoGenerator {
String s = buffer.toString();
PsiClass containingClass = method.getContainingClass();
assert containingClass != null;
s = StringUtil.replace(s, "<ClassName>", containingClass.getName());
String containingClassName = containingClass.getName();
assert containingClassName != null;
s = StringUtil.replace(s, "<ClassName>", containingClassName);
final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(myProject).getElementFactory();
try {
return elementFactory.createDocCommentFromText(s);
@@ -1375,9 +1371,8 @@ public class JavaDocInfoGenerator {
if (elements != null) {
buffer.append("<DD><DL>");
buffer.append("<DT><b>");
buffer.append(extendee.isInterface() ?
CodeInsightBundle.message("javadoc.description.copied.from.interface") :
CodeInsightBundle .message("javadoc.description.copied.from.class"));
buffer.append(CodeInsightBundle.message( extendee.isInterface() ? "javadoc.description.copied.from.interface"
: "javadoc.description.copied.from.class"));
buffer.append("</b>&nbsp;");
generateLink(buffer, extendee, JavaDocUtil.getShortestClassName(extendee, method), false);
buffer.append(BR_TAG);
@@ -1886,7 +1881,7 @@ public class JavaDocInfoGenerator {
for (PsiMethod superMethod : supers) {
boolean isAbstract = superMethod.hasModifierProperty(PsiModifier.ABSTRACT);
if (overrides) {
if (parentClass.isInterface() ? !isAbstract : isAbstract) continue;
if (parentClass.isInterface() != isAbstract) continue;
}
else {
if (!isAbstract) continue;
@@ -1896,9 +1891,7 @@ public class JavaDocInfoGenerator {
if (!headerGenerated) {
buffer.append("<DD><DL>");
buffer.append("<DT><b>");
buffer.append(overrides ?
CodeInsightBundle.message("javadoc.method.overrides") :
CodeInsightBundle .message("javadoc.method.specified.by"));
buffer.append(CodeInsightBundle.message(overrides ? "javadoc.method.overrides" : "javadoc.method.specified.by"));
buffer.append("</b>");
headerGenerated = true;
}