Index: Source/devtools/scripts/jsdoc-validator/src/org/chromium/devtools/jsdoc/FileCheckerCallable.java |
diff --git a/Source/devtools/scripts/jsdoc-validator/src/org/chromium/devtools/jsdoc/FileCheckerCallable.java b/Source/devtools/scripts/jsdoc-validator/src/org/chromium/devtools/jsdoc/FileCheckerCallable.java |
index 58db42a51d2edaefd32e0fc3a7a519338be04770..fcef7ab1ebe1379df818dcdf79cf294edf5fe954 100644 |
--- a/Source/devtools/scripts/jsdoc-validator/src/org/chromium/devtools/jsdoc/FileCheckerCallable.java |
+++ b/Source/devtools/scripts/jsdoc-validator/src/org/chromium/devtools/jsdoc/FileCheckerCallable.java |
@@ -5,10 +5,7 @@ import com.google.javascript.rhino.head.IRFactory; |
import com.google.javascript.rhino.head.ast.AstNode; |
import com.google.javascript.rhino.head.ast.AstRoot; |
-import org.chromium.devtools.jsdoc.checks.ProtoFollowsExtendsAnnotationCheck; |
-import org.chromium.devtools.jsdoc.checks.RequiredReturnAnnotationCheck; |
-import org.chromium.devtools.jsdoc.checks.RequiredThisAnnotationCheck; |
-import org.chromium.devtools.jsdoc.checks.ValidationCheck; |
+import org.chromium.devtools.jsdoc.checks.ContextTrackingValidationCheck; |
import java.io.FileNotFoundException; |
import java.io.IOException; |
@@ -21,7 +18,7 @@ import java.util.ArrayList; |
import java.util.List; |
import java.util.concurrent.Callable; |
-class FileCheckerCallable implements Callable<ValidatorContext> { |
+public class FileCheckerCallable implements Callable<ValidatorContext> { |
private final String fileName; |
@@ -35,9 +32,7 @@ class FileCheckerCallable implements Callable<ValidatorContext> { |
ValidatorContext context = new ValidatorContext(readScriptText(), fileName); |
AstRoot node = parseScript(context); |
ValidationCheckDispatcher dispatcher = new ValidationCheckDispatcher(context); |
- dispatcher.registerCheck(new ProtoFollowsExtendsAnnotationCheck()); |
- dispatcher.registerCheck(new RequiredReturnAnnotationCheck()); |
- dispatcher.registerCheck(new RequiredThisAnnotationCheck()); |
+ dispatcher.registerCheck(new ContextTrackingValidationCheck()); |
node.visit(dispatcher); |
dispatcher.flush(); |
return context; |
@@ -96,13 +91,5 @@ class FileCheckerCallable implements Callable<ValidatorContext> { |
check.didVisit(node); |
} |
} |
- |
- @Override |
- public void flush() { |
- super.flush(); |
- for (ValidationCheck check : checks) { |
- check.didTraverseTree(); |
- } |
- } |
} |
-} |
+} |