diff options
Diffstat (limited to 'org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java')
| -rw-r--r-- | org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java | 182 |
1 files changed, 180 insertions, 2 deletions
diff --git a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java index 39190cdd86..d8c2a1c127 100644 --- a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java +++ b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java @@ -3467,7 +3467,60 @@ private void handleErrorOrWarningToken(String token, boolean isEnabling, int sev CompilerOptions.OPTION_IncludeNullInfoFromAsserts, isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); return; - } + } else if (token.equals("invalidJavadoc")) { //$NON-NLS-1$ + setSeverity(CompilerOptions.OPTION_ReportInvalidJavadoc, severity, isEnabling); + this.options.put( + CompilerOptions.OPTION_ReportInvalidJavadocTags, + isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); + this.options.put( + CompilerOptions.OPTION_ReportInvalidJavadocTagsDeprecatedRef, + isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); + this.options.put( + CompilerOptions.OPTION_ReportInvalidJavadocTagsNotVisibleRef, + isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); + if (isEnabling) { + this.options.put( + CompilerOptions.OPTION_DocCommentSupport, + CompilerOptions.ENABLED); + this.options.put( + CompilerOptions.OPTION_ReportInvalidJavadocTagsVisibility, + CompilerOptions.PRIVATE); + } + return; + } else if (token.equals("invalidJavadocTag")) { //$NON-NLS-1$ + this.options.put( + CompilerOptions.OPTION_ReportInvalidJavadocTags, + isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); + return; + } else if (token.equals("invalidJavadocTagDep")) { //$NON-NLS-1$ + this.options.put( + CompilerOptions.OPTION_ReportInvalidJavadocTagsDeprecatedRef, + isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); + return; + } else if (token.equals("invalidJavadocTagNotVisible")) { //$NON-NLS-1$ + this.options.put( + CompilerOptions.OPTION_ReportInvalidJavadocTagsNotVisibleRef, + isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); + return; + } else if (token.startsWith("invalidJavadocTagVisibility")) { //$NON-NLS-1$ + int start = token.indexOf('('); + int end = token.indexOf(')'); + String visibility = null; + if (isEnabling && start >= 0 && end >= 0 && start < end){ + visibility = token.substring(start+1, end).trim(); + } + if (visibility != null && visibility.equals(CompilerOptions.PUBLIC) + || visibility.equals(CompilerOptions.PRIVATE) + || visibility.equals(CompilerOptions.PROTECTED) + || visibility.equals(CompilerOptions.DEFAULT)) { + this.options.put( + CompilerOptions.OPTION_ReportInvalidJavadocTagsVisibility, + visibility); + return; + } else { + throw new IllegalArgumentException(this.bind("configure.invalidJavadocTagVisibility", token)); //$NON-NLS-1$ + } + } break; case 'j' : if (token.equals("javadoc")) {//$NON-NLS-1$ @@ -3487,6 +3540,89 @@ private void handleErrorOrWarningToken(String token, boolean isEnabling, int sev if (token.equals("maskedCatchBlock") || token.equals("maskedCatchBlocks")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$ setSeverity(CompilerOptions.OPTION_ReportHiddenCatchBlock, severity, isEnabling); return; + } else if (token.equals("missingJavadocTags")) { //$NON-NLS-1$ + setSeverity(CompilerOptions.OPTION_ReportMissingJavadocTags, severity, isEnabling); + this.options.put( + CompilerOptions.OPTION_ReportMissingJavadocTagsOverriding, + isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); + this.options.put( + CompilerOptions.OPTION_ReportMissingJavadocTagsMethodTypeParameters, + isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); + if (isEnabling) { + this.options.put( + CompilerOptions.OPTION_DocCommentSupport, + CompilerOptions.ENABLED); + this.options.put( + CompilerOptions.OPTION_ReportMissingJavadocTagsVisibility, + CompilerOptions.PRIVATE); + } + return; + } else if (token.equals("missingJavadocTagsOverriding")) { //$NON-NLS-1$ + this.options.put( + CompilerOptions.OPTION_ReportMissingJavadocTagsOverriding, + isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); + return; + } else if (token.equals("missingJavadocTagsMethod")) { //$NON-NLS-1$ + this.options.put( + CompilerOptions.OPTION_ReportMissingJavadocTagsMethodTypeParameters, + isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); + return; + } else if (token.startsWith("missingJavadocTagsVisibility")) { //$NON-NLS-1$ + int start = token.indexOf('('); + int end = token.indexOf(')'); + String visibility = null; + if (isEnabling && start >= 0 && end >= 0 && start < end){ + visibility = token.substring(start+1, end).trim(); + } + if (visibility != null && visibility.equals(CompilerOptions.PUBLIC) + || visibility.equals(CompilerOptions.PRIVATE) + || visibility.equals(CompilerOptions.PROTECTED) + || visibility.equals(CompilerOptions.DEFAULT)) { + this.options.put( + CompilerOptions.OPTION_ReportMissingJavadocTagsVisibility, + visibility); + return; + } else { + throw new IllegalArgumentException(this.bind("configure.missingJavadocTagsVisibility", token)); //$NON-NLS-1$ + } + } else if (token.equals("missingJavadocComments")) { //$NON-NLS-1$ + setSeverity(CompilerOptions.OPTION_ReportMissingJavadocComments, severity, isEnabling); + this.options.put( + CompilerOptions.OPTION_ReportMissingJavadocCommentsOverriding, + isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); + if (isEnabling) { + this.options.put( + CompilerOptions.OPTION_DocCommentSupport, + CompilerOptions.ENABLED); + this.options.put( + CompilerOptions.OPTION_ReportMissingJavadocCommentsVisibility, + CompilerOptions.PRIVATE); + } + return; + } else if (token.equals("missingJavadocCommentsOverriding")) { //$NON-NLS-1$ + setSeverity(CompilerOptions.OPTION_ReportMissingJavadocComments, severity, isEnabling); + this.options.put( + CompilerOptions.OPTION_ReportMissingJavadocCommentsOverriding, + isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); + return; + } else if (token.startsWith("missingJavadocCommentsVisibility")) { //$NON-NLS-1$ + int start = token.indexOf('('); + int end = token.indexOf(')'); + String visibility = null; + if (isEnabling && start >= 0 && end >= 0 && start < end){ + visibility = token.substring(start+1, end).trim(); + } + if (visibility != null && visibility.equals(CompilerOptions.PUBLIC) + || visibility.equals(CompilerOptions.PRIVATE) + || visibility.equals(CompilerOptions.PROTECTED) + || visibility.equals(CompilerOptions.DEFAULT)) { + this.options.put( + CompilerOptions.OPTION_ReportMissingJavadocCommentsVisibility, + visibility); + return; + } else { + throw new IllegalArgumentException(this.bind("configure.missingJavadocCommentsVisibility", token)); //$NON-NLS-1$ + } } break; case 'n' : @@ -3511,6 +3647,12 @@ private void handleErrorOrWarningToken(String token, boolean isEnabling, int sev setSeverity(CompilerOptions.OPTION_ReportRedundantNullCheck, ProblemSeverities.Ignore, isEnabling); } return; + }else if (token.equals("nullAnnotConflict")) { //$NON-NLS-1$ + setSeverity(CompilerOptions.OPTION_ReportNullAnnotationInferenceConflict, severity, isEnabling); + return; + } else if (token.equals("nullAnnotRedundant")) { //$NON-NLS-1$ + setSeverity(CompilerOptions.OPTION_ReportRedundantNullAnnotation, severity, isEnabling); + return; } else if (token.startsWith("nullAnnot")) { //$NON-NLS-1$ String annotationNames = Util.EMPTY_STRING; int start = token.indexOf('('); @@ -3540,6 +3682,9 @@ private void handleErrorOrWarningToken(String token, boolean isEnabling, int sev setSeverity(CompilerOptions.OPTION_ReportNullUncheckedConversion, severity, isEnabling); setSeverity(CompilerOptions.OPTION_ReportRedundantNullAnnotation, severity, isEnabling); return; + } else if (token.equals("nullUncheckedConversion")) { //$NON-NLS-1$ + setSeverity(CompilerOptions.OPTION_ReportNullUncheckedConversion, severity, isEnabling); + return; } break; @@ -3687,6 +3832,21 @@ private void handleErrorOrWarningToken(String token, boolean isEnabling, int sev } else if (token.equals("unusedThrown")) { //$NON-NLS-1$ setSeverity(CompilerOptions.OPTION_ReportUnusedDeclaredThrownException, severity, isEnabling); return; + } else if (token.equals("unusedThrownWhenOverriding")) { //$NON-NLS-1$ + this.options.put( + CompilerOptions.OPTION_ReportUnusedDeclaredThrownExceptionWhenOverriding, + isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); + return; + } else if (token.equals("unusedThrownIncludeDocComment")) { //$NON-NLS-1$ + this.options.put( + CompilerOptions.OPTION_ReportUnusedDeclaredThrownExceptionIncludeDocCommentReference, + isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); + return; + } else if (token.equals("unusedThrownExemptExceptionThrowable")) { //$NON-NLS-1$ + this.options.put( + CompilerOptions.OPTION_ReportUnusedDeclaredThrownExceptionExemptExceptionAndThrowable, + isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); + return; } else if (token.equals("unqualifiedField") || token.equals("unqualified-field-access")) { //$NON-NLS-1$ //$NON-NLS-2$ setSeverity(CompilerOptions.OPTION_ReportUnqualifiedFieldAccess, severity, isEnabling); return; @@ -3700,7 +3860,25 @@ private void handleErrorOrWarningToken(String token, boolean isEnabling, int sev setSeverity(CompilerOptions.OPTION_ReportUnusedTypeArgumentsForMethodInvocation, severity, isEnabling); setSeverity(CompilerOptions.OPTION_ReportRedundantSpecificationOfTypeArguments, severity, isEnabling); return; - } else if (token.equals("unusedTypeArgs")) { //$NON-NLS-1$ + } else if (token.equals("unusedParam")) { //$NON-NLS-1$ + setSeverity(CompilerOptions.OPTION_ReportUnusedParameter, severity, isEnabling); + return; + } else if (token.equals("unusedParamIncludeDoc")) { //$NON-NLS-1$ + this.options.put( + CompilerOptions.OPTION_ReportUnusedParameterIncludeDocCommentReference, + isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); + return; + } else if (token.equals("unusedParamOverriding")) { //$NON-NLS-1$ + this.options.put( + CompilerOptions.OPTION_ReportUnusedParameterWhenOverridingConcrete, + isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); + return; + } else if (token.equals("unusedParamImplementing")) { //$NON-NLS-1$ + this.options.put( + CompilerOptions.OPTION_ReportUnusedParameterWhenImplementingAbstract, + isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); + return; + } else if (token.equals("unusedTypeArgs")) { //$NON-NLS-1$ setSeverity(CompilerOptions.OPTION_ReportUnusedTypeArgumentsForMethodInvocation, severity, isEnabling); setSeverity(CompilerOptions.OPTION_ReportRedundantSpecificationOfTypeArguments, severity, isEnabling); return; |