MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-08 05:05:31 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Vladimir Krivosheev
2014-11-24 15:23:40 +01:00
parent a36125451b
commit 0d0a477b39
2 changed files with 31 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspectionBase.java
+30 -38
View File
@@ -89,17 +89,18 @@ public class JavaDocLocalInspectionBase extends BaseJavaBatchLocalInspectionTool
}
}
@NonNls protected final Options PACKAGE_OPTIONS = new Options("none", "");
@NonNls public Options TOP_LEVEL_CLASS_OPTIONS = new Options("none", "");
@NonNls public Options INNER_CLASS_OPTIONS = new Options("none", "");
@NonNls public Options METHOD_OPTIONS = new Options("none", "@return@param@throws or @exception");
@NonNls public Options FIELD_OPTIONS = new Options("none", "");
public boolean IGNORE_DEPRECATED = false;
public boolean IGNORE_JAVADOC_PERIOD = true;
@Deprecated
public boolean IGNORE_DUPLICATED_THROWS = false;
@NonNls protected final Options PACKAGE_OPTIONS = new Options("none", "");
@NonNls public Options TOP_LEVEL_CLASS_OPTIONS = new Options("none", "");
@NonNls public Options INNER_CLASS_OPTIONS = new Options("none", "");
@NonNls public Options METHOD_OPTIONS = new Options("none", "@return@param@throws or @exception");
@NonNls public Options FIELD_OPTIONS = new Options("none", "");
public boolean IGNORE_DEPRECATED = false;
public boolean IGNORE_JAVADOC_PERIOD = true;
@SuppressWarnings("unused") @Deprecated
public boolean IGNORE_DUPLICATED_THROWS = false;
private boolean myIgnoreDuplicatedThrows = true;
private boolean myIgnoreDuplicatedThrows = true;
public boolean getIgnoreDuplicatedThrows() {
return myIgnoreDuplicatedThrows;
}
@@ -108,8 +109,8 @@ public class JavaDocLocalInspectionBase extends BaseJavaBatchLocalInspectionTool
myIgnoreDuplicatedThrows = ignoreDuplicatedThrows;
}
public boolean IGNORE_POINT_TO_ITSELF = false;
public String myAdditionalJavadocTags = "";
public boolean IGNORE_POINT_TO_ITSELF = false;
public String myAdditionalJavadocTags = "";
private boolean myIgnoreEmptyDescriptions = false;
protected boolean myIgnoreSimpleAccessors = false;
@@ -128,8 +129,6 @@ public class JavaDocLocalInspectionBase extends BaseJavaBatchLocalInspectionTool
PACKAGE_OPTIONS.REQUIRED_TAGS = tags;
}
@Override
public void writeSettings(@NotNull Element node) throws WriteExternalException {
super.writeSettings(node);
@@ -436,9 +435,8 @@ public class JavaDocLocalInspectionBase extends BaseJavaBatchLocalInspectionTool
if (required) {
if (superMethods.length > 0) return null;
ExtensionPoint<Condition<PsiMember>> point = Extensions.getRootArea().getExtensionPoint(ToolExtensionPoints.JAVADOC_LOCAL);
final Condition<PsiMember>[] addins = point.getExtensions();
for (Condition<PsiMember> addin : addins) {
if (addin.value(psiMethod)) return null;
for (Condition<PsiMember> addIn : point.getExtensions()) {
if (addIn.value(psiMethod)) return null;
}
if (superMethods.length == 0) {
final PsiIdentifier nameIdentifier = psiMethod.getNameIdentifier();
@@ -749,16 +747,12 @@ public class JavaDocLocalInspectionBase extends BaseJavaBatchLocalInspectionTool
buf.append(token.getText());
}
}
else if (child instanceof PsiDocTagValue) {
buf.append(child.getText());
}
else if (child instanceof PsiInlineDocTag) {
else if (child instanceof PsiDocTagValue || child instanceof PsiInlineDocTag) {
buf.append(child.getText());
}
}
String s = buf.toString();
return s.trim();
return buf.toString().trim();
}
private static String extractThrowsTagDescription(PsiDocTag tag) {
@@ -1024,21 +1018,19 @@ public class JavaDocLocalInspectionBase extends BaseJavaBatchLocalInspectionTool
if (value != null) {
final PsiElement firstChild = value.getFirstChild();
if (firstChild != null && firstChild.getFirstChild() instanceof PsiJavaCodeReferenceElement) {
PsiJavaCodeReferenceElement refElement = (PsiJavaCodeReferenceElement) firstChild.getFirstChild();
if (refElement != null) {
PsiElement element = refElement.resolve();
if (element instanceof PsiClass) {
String fqName = ((PsiClass)element).getQualifiedName();
if (documentedExceptions == null) {
documentedExceptions = new HashSet<String>();
}
if (documentedExceptions.contains(fqName)) {
problems.add(createDescriptor(tag.getNameElement(),
InspectionsBundle.message("inspection.javadoc.problem.duplicate.throws", fqName),
manager, isOnTheFly));
}
documentedExceptions.add(fqName);
PsiJavaCodeReferenceElement refElement = (PsiJavaCodeReferenceElement)firstChild.getFirstChild();
PsiElement element = refElement.resolve();
if (element instanceof PsiClass) {
String fqName = ((PsiClass)element).getQualifiedName();
if (documentedExceptions == null) {
documentedExceptions = new HashSet<String>();
}
if (documentedExceptions.contains(fqName)) {
problems.add(createDescriptor(tag.getNameElement(),
InspectionsBundle.message("inspection.javadoc.problem.duplicate.throws", fqName),
manager, isOnTheFly));
}
documentedExceptions.add(fqName);
}
}
}
@@ -1104,7 +1096,7 @@ public class JavaDocLocalInspectionBase extends BaseJavaBatchLocalInspectionTool
@Override
@NotNull
public String getName() {
return QuickFixBundle.message("add.doctag.to.custom.tags", myTag);
return QuickFixBundle.message("add.docTag.to.custom.tags", myTag);
}
@Override