diff --git a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
index c0f00ba6f154..80c6b1f2541e 100644
--- a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
+++ b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
@@ -445,7 +445,7 @@ public class JavaDocInfoGenerator {
buffer.append("");
}
String errorSection = "Following external urls were checked:
" +
- StringUtil.join(docURLs, url -> XmlStringUtil.escapeString(url), "
") +
+ StringUtil.join(docURLs, XmlStringUtil::escapeString, "
") +
"
The documentation for this element is not found. Please add all the needed paths to API docs in " +
"Project Settings.
";
buffer.insert(buffer.indexOf(""), errorSection);
@@ -489,14 +489,12 @@ public class JavaDocInfoGenerator {
buffer.append("");
buffer.append(packageName);
buffer.append("");
- //buffer.append("
");
}
}
buffer.append("");
if (generateClassSignature(buffer, aClass, true)) return;
buffer.append("");
- //buffer.append("
");
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("");
generateFieldSignature(buffer, field, true);
buffer.append("");
- //buffer.append("
");
ColorUtil.appendColorPreview(field, buffer);
@@ -708,7 +705,6 @@ public class JavaDocInfoGenerator {
appendInitializer(buffer, variable);
buffer.append("");
buffer.append("");
- //buffer.append("
");
ColorUtil.appendColorPreview(variable, buffer);
@@ -1087,9 +1083,7 @@ public class JavaDocInfoGenerator {
buffer.append("");
generateMethodSignature(buffer, method, true, false);
-
buffer.append("");
- //buffer.append("
");
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, "", containingClass.getName());
+ String containingClassName = containingClass.getName();
+ assert containingClassName != null;
+ s = StringUtil.replace(s, "", 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("");
buffer.append("- ");
- 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(" ");
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("
");
buffer.append("- ");
- 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("");
headerGenerated = true;
}