diff --git a/compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java b/compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java index 0bce353abbf..9a5c2c5bdde 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java +++ b/compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java @@ -35,8 +35,6 @@ public class DescriptorValidator { public static final ValidationVisitor FORBID_ERROR_TYPES = new ValidationVisitor(false); public static final ValidationVisitor ALLOW_ERROR_TYPES = new ValidationVisitor(true); - private DescriptorValidator() {} - public static void validate(DeclarationDescriptor... descriptors) { validate(FORBID_ERROR_TYPES, Arrays.asList(descriptors)); } @@ -61,15 +59,14 @@ public class DescriptorValidator { RecursiveDescriptorProcessor.process(descriptor, collector, validator); } - public interface DiagnosticCollector { - - void report(@NotNull Diagnostic diagnostic); - } - private static void report(@NotNull DiagnosticCollector collector, @NotNull DeclarationDescriptor descriptor, @NotNull String message) { collector.report(new Diagnostic(descriptor, message)); } + public interface DiagnosticCollector { + void report(@NotNull Diagnostic diagnostic); + } + public static class ValidationVisitor implements DeclarationDescriptorVisitor { private final boolean allowErrorTypes; @@ -510,4 +507,5 @@ public class DescriptorValidator { } } + private DescriptorValidator() {} }