This commit is contained in:
Andrey Breslav
2013-06-11 13:03:10 +04:00
parent dd0e919f8e
commit 994691579b
@@ -60,11 +60,11 @@ public class DescriptorValidator {
} }
private static void report(@NotNull DiagnosticCollector collector, @NotNull DeclarationDescriptor descriptor, @NotNull String message) { private static void report(@NotNull DiagnosticCollector collector, @NotNull DeclarationDescriptor descriptor, @NotNull String message) {
collector.report(new Diagnostic(descriptor, message)); collector.report(new ValidationDiagnostic(descriptor, message));
} }
public interface DiagnosticCollector { public interface DiagnosticCollector {
void report(@NotNull Diagnostic diagnostic); void report(@NotNull ValidationDiagnostic diagnostic);
} }
public static class ValidationVisitor implements DeclarationDescriptorVisitor<Boolean, DiagnosticCollector> { public static class ValidationVisitor implements DeclarationDescriptorVisitor<Boolean, DiagnosticCollector> {
@@ -452,13 +452,13 @@ public class DescriptorValidator {
} }
} }
public static class Diagnostic { public static class ValidationDiagnostic {
private final DeclarationDescriptor descriptor; private final DeclarationDescriptor descriptor;
private final String message; private final String message;
private final Throwable stackTrace; private final Throwable stackTrace;
private Diagnostic(@NotNull DeclarationDescriptor descriptor, @NotNull String message) { private ValidationDiagnostic(@NotNull DeclarationDescriptor descriptor, @NotNull String message) {
this.descriptor = descriptor; this.descriptor = descriptor;
this.message = message; this.message = message;
this.stackTrace = new Throwable(); this.stackTrace = new Throwable();
@@ -495,7 +495,7 @@ public class DescriptorValidator {
private boolean errorsFound = false; private boolean errorsFound = false;
@Override @Override
public void report(@NotNull Diagnostic diagnostic) { public void report(@NotNull ValidationDiagnostic diagnostic) {
diagnostic.printStackTrace(System.err); diagnostic.printStackTrace(System.err);
errorsFound = true; errorsFound = true;
} }