diff --git a/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java index ad83fd65cb1..92b5774f673 100644 --- a/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java +++ b/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java @@ -32,7 +32,7 @@ import java.util.*; * @author max * @author yole */ -public class ExpressionCodegen extends JetVisitor { +public class ExpressionCodegen extends JetVisitorVoid { private static final String CLASS_OBJECT = "java/lang/Object"; private static final String CLASS_STRING = "java/lang/String"; public static final String CLASS_STRING_BUILDER = "java/lang/StringBuilder"; diff --git a/idea/src/org/jetbrains/jet/codegen/GenerationState.java b/idea/src/org/jetbrains/jet/codegen/GenerationState.java index a4fe3f758fe..acee32c2f09 100644 --- a/idea/src/org/jetbrains/jet/codegen/GenerationState.java +++ b/idea/src/org/jetbrains/jet/codegen/GenerationState.java @@ -109,7 +109,7 @@ public class GenerationState { } public static void prepareAnonymousClasses(JetElement aClass, final JetTypeMapper typeMapper) { - aClass.acceptChildren(new JetVisitor() { + aClass.acceptChildren(new JetVisitorVoid() { @Override public void visitJetElement(JetElement element) { super.visitJetElement(element); diff --git a/idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java b/idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java index 89569df5078..999b1713bac 100644 --- a/idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java +++ b/idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java @@ -89,7 +89,7 @@ public class JetControlFlowProcessor { return result; } - private class CFPVisitor extends JetVisitor { + private class CFPVisitor extends JetVisitorVoid { private final boolean preferBlock; private final boolean inCondition; @@ -643,8 +643,8 @@ public class JetControlFlowProcessor { JetWhenCondition[] conditions = whenEntry.getConditions(); for (int i = 0; i < conditions.length; i++) { JetWhenCondition condition = conditions[i]; - condition.accept(new JetVisitor() { - private final JetVisitor conditionVisitor = this; + condition.accept(new JetVisitorVoid() { + private final JetVisitorVoid conditionVisitor = this; @Override public void visitWhenConditionCall(JetWhenConditionCall condition) { @@ -662,7 +662,7 @@ public class JetControlFlowProcessor { public void visitWhenConditionIsPattern(JetWhenConditionIsPattern condition) { JetPattern pattern = condition.getPattern(); if (pattern != null) { - pattern.accept(new JetVisitor() { + pattern.accept(new JetVisitorVoid() { @Override public void visitTypePattern(JetTypePattern typePattern) { // TODO diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetAnnotatedExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetAnnotatedExpression.java index 37e83bb7d3b..b1971144600 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetAnnotatedExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetAnnotatedExpression.java @@ -17,7 +17,7 @@ public class JetAnnotatedExpression extends JetExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitAnnotatedExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetAnnotation.java b/idea/src/org/jetbrains/jet/lang/psi/JetAnnotation.java index 1395bc548b6..8aeb905805c 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetAnnotation.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetAnnotation.java @@ -15,7 +15,7 @@ public class JetAnnotation extends JetElement { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitAnnotation(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java b/idea/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java index 932e053c4cf..fa6d4bfc04f 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java @@ -17,7 +17,7 @@ public class JetAnnotationEntry extends JetElement implements JetCall { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitAnnotationEntry(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetArrayAccessExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetArrayAccessExpression.java index 716615bf83b..505def6c493 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetArrayAccessExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetArrayAccessExpression.java @@ -29,7 +29,7 @@ public class JetArrayAccessExpression extends JetReferenceExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitArrayAccessExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetBinaryExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetBinaryExpression.java index 7b42b809a5f..413c790e73a 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetBinaryExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetBinaryExpression.java @@ -16,7 +16,7 @@ public class JetBinaryExpression extends JetExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitBinaryExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetBinaryExpressionWithTypeRHS.java b/idea/src/org/jetbrains/jet/lang/psi/JetBinaryExpressionWithTypeRHS.java index 11693a01248..7c8b5c68924 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetBinaryExpressionWithTypeRHS.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetBinaryExpressionWithTypeRHS.java @@ -15,7 +15,7 @@ public class JetBinaryExpressionWithTypeRHS extends JetExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitBinaryWithTypeRHSExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetBindingPattern.java b/idea/src/org/jetbrains/jet/lang/psi/JetBindingPattern.java index 2732addd248..ec51a5dcda3 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetBindingPattern.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetBindingPattern.java @@ -24,7 +24,7 @@ public class JetBindingPattern extends JetPattern { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitBindingPattern(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetBlockExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetBlockExpression.java index 9a2e63e0afb..8c72b344395 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetBlockExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetBlockExpression.java @@ -15,7 +15,7 @@ public class JetBlockExpression extends JetExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitBlockExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetBlockStringTemplateEntry.java b/idea/src/org/jetbrains/jet/lang/psi/JetBlockStringTemplateEntry.java index de7b50ad3d4..813a65ca662 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetBlockStringTemplateEntry.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetBlockStringTemplateEntry.java @@ -12,7 +12,7 @@ public class JetBlockStringTemplateEntry extends JetStringTemplateEntryWithExpre } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitBlockStringTemplateEntry(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetBreakExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetBreakExpression.java index 33f88ccd652..e5910ef438c 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetBreakExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetBreakExpression.java @@ -12,7 +12,7 @@ public class JetBreakExpression extends JetLabelQualifiedExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitBreakExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetCallExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetCallExpression.java index cc1b738843a..50320de963a 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetCallExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetCallExpression.java @@ -17,7 +17,7 @@ public class JetCallExpression extends JetExpression implements JetCall { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitCallExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetCatchClause.java b/idea/src/org/jetbrains/jet/lang/psi/JetCatchClause.java index cd9f2c25ccd..8af80e5d9bd 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetCatchClause.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetCatchClause.java @@ -16,7 +16,7 @@ public class JetCatchClause extends JetElement { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitCatchSection(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetClass.java b/idea/src/org/jetbrains/jet/lang/psi/JetClass.java index 37c8e92c84e..80f0b854d32 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetClass.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetClass.java @@ -34,7 +34,7 @@ public class JetClass extends JetTypeParameterListOwner implements JetClassOrObj } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitClass(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetClassBody.java b/idea/src/org/jetbrains/jet/lang/psi/JetClassBody.java index 79efeaeccf9..18c67f098fb 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetClassBody.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetClassBody.java @@ -25,7 +25,7 @@ public class JetClassBody extends JetElement { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitClassBody(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetClassInitializer.java b/idea/src/org/jetbrains/jet/lang/psi/JetClassInitializer.java index 4144b33744c..f383815bb46 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetClassInitializer.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetClassInitializer.java @@ -12,7 +12,7 @@ public class JetClassInitializer extends JetDeclaration { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitAnonymousInitializer(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetClassObject.java b/idea/src/org/jetbrains/jet/lang/psi/JetClassObject.java index 5487061f5cc..460360d8df5 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetClassObject.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetClassObject.java @@ -14,7 +14,7 @@ public class JetClassObject extends JetDeclaration { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitClassObject(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetConstantExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetConstantExpression.java index e12629179bc..af95666a040 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetConstantExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetConstantExpression.java @@ -12,7 +12,7 @@ public class JetConstantExpression extends JetExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitConstantExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetConstructor.java b/idea/src/org/jetbrains/jet/lang/psi/JetConstructor.java index 0f50a730a33..cfc79f73ad2 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetConstructor.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetConstructor.java @@ -18,7 +18,7 @@ public class JetConstructor extends JetDeclaration implements JetDeclarationWith } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitConstructor(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetContinueExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetContinueExpression.java index 0c70e55c4b0..bce3e2805cd 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetContinueExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetContinueExpression.java @@ -12,7 +12,7 @@ public class JetContinueExpression extends JetLabelQualifiedExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitContinueExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetDecomposerPattern.java b/idea/src/org/jetbrains/jet/lang/psi/JetDecomposerPattern.java index 17868971494..9816c4a7e41 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetDecomposerPattern.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetDecomposerPattern.java @@ -23,7 +23,7 @@ public class JetDecomposerPattern extends JetPattern { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitDecomposerPattern(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifier.java b/idea/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifier.java index 8fd359a4d79..efb898562c9 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifier.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifier.java @@ -14,7 +14,7 @@ public class JetDelegationSpecifier extends JetElement{ } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitDelegationSpecifier(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifierList.java b/idea/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifierList.java index 723d44a375b..c3e3f70a174 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifierList.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifierList.java @@ -15,7 +15,7 @@ public class JetDelegationSpecifierList extends JetElement { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitDelegationSpecifierList(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorByExpressionSpecifier.java b/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorByExpressionSpecifier.java index 276c880309a..2e214d67f45 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorByExpressionSpecifier.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorByExpressionSpecifier.java @@ -13,7 +13,7 @@ public class JetDelegatorByExpressionSpecifier extends JetDelegationSpecifier { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitDelegationByExpressionSpecifier(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperCall.java b/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperCall.java index 0fb8e63ea70..f3b31fa1e87 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperCall.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperCall.java @@ -17,7 +17,7 @@ public class JetDelegatorToSuperCall extends JetDelegationSpecifier implements J } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitDelegationToSuperCallSpecifier(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperClass.java b/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperClass.java index ca57c10bca9..a8850a21164 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperClass.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperClass.java @@ -12,7 +12,7 @@ public class JetDelegatorToSuperClass extends JetDelegationSpecifier { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitDelegationToSuperClassSpecifier(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToThisCall.java b/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToThisCall.java index e64449782e0..40c8a6fc4c8 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToThisCall.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToThisCall.java @@ -18,7 +18,7 @@ public class JetDelegatorToThisCall extends JetDelegationSpecifier implements Je } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitDelegationToThisCall(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetDoWhileExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetDoWhileExpression.java index 70260e42c53..d2699700a23 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetDoWhileExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetDoWhileExpression.java @@ -14,7 +14,7 @@ public class JetDoWhileExpression extends JetLoopExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitDoWhileExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetDotQualifiedExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetDotQualifiedExpression.java index 6705b33c8a4..5df790b0c3c 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetDotQualifiedExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetDotQualifiedExpression.java @@ -12,7 +12,7 @@ public class JetDotQualifiedExpression extends JetQualifiedExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitDotQualifiedExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetElement.java b/idea/src/org/jetbrains/jet/lang/psi/JetElement.java index 55d06eeb59e..ba907a21127 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetElement.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetElement.java @@ -40,15 +40,15 @@ public class JetElement extends ASTWrapperPsiElement { @Override public final void accept(@NotNull PsiElementVisitor visitor) { - if (visitor instanceof JetVisitor) { - accept((JetVisitor) visitor); + if (visitor instanceof JetVisitorVoid) { + accept((JetVisitorVoid) visitor); } else { visitor.visitElement(this); } } - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitJetElement(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetEnumEntry.java b/idea/src/org/jetbrains/jet/lang/psi/JetEnumEntry.java index 1ab95f34f5b..0779b99dd45 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetEnumEntry.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetEnumEntry.java @@ -47,7 +47,7 @@ public class JetEnumEntry extends JetClass { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitEnumEntry(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetEscapeStringTemplateEntry.java b/idea/src/org/jetbrains/jet/lang/psi/JetEscapeStringTemplateEntry.java index c6215bbfd93..ecfe0da310a 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetEscapeStringTemplateEntry.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetEscapeStringTemplateEntry.java @@ -13,7 +13,7 @@ public class JetEscapeStringTemplateEntry extends JetStringTemplateEntry { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitEscapeStringTemplateEntry(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetExpression.java index 3c316106777..fb874aff860 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetExpression.java @@ -13,7 +13,7 @@ public class JetExpression extends JetElement { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetExpressionPattern.java b/idea/src/org/jetbrains/jet/lang/psi/JetExpressionPattern.java index c5a1ecd48d6..ec6db757895 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetExpressionPattern.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetExpressionPattern.java @@ -18,7 +18,7 @@ public class JetExpressionPattern extends JetPattern { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitExpressionPattern(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetFile.java b/idea/src/org/jetbrains/jet/lang/psi/JetFile.java index 7d1e9d290a8..ff07eab855f 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetFile.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetFile.java @@ -34,8 +34,8 @@ public class JetFile extends PsiFileBase { @Override public void accept(@NotNull PsiElementVisitor visitor) { - if (visitor instanceof JetVisitor) { - ((JetVisitor) visitor).visitJetFile(this); + if (visitor instanceof JetVisitorVoid) { + ((JetVisitorVoid) visitor).visitJetFile(this); } else { visitor.visitFile(this); diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetFinallySection.java b/idea/src/org/jetbrains/jet/lang/psi/JetFinallySection.java index 0b61633e56e..932fc323ea3 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetFinallySection.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetFinallySection.java @@ -13,7 +13,7 @@ public class JetFinallySection extends JetElement { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitFinallySection(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetForExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetForExpression.java index eca792f6a55..e715ef0ad89 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetForExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetForExpression.java @@ -14,7 +14,7 @@ public class JetForExpression extends JetLoopExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitForExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetFunctionLiteralExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetFunctionLiteralExpression.java index 9edf8b69842..c8cae2b7c84 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetFunctionLiteralExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetFunctionLiteralExpression.java @@ -13,7 +13,7 @@ public class JetFunctionLiteralExpression extends JetExpression implements JetDe } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitFunctionLiteralExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetFunctionType.java b/idea/src/org/jetbrains/jet/lang/psi/JetFunctionType.java index 5ca6c2f8611..d3ef73316c4 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetFunctionType.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetFunctionType.java @@ -40,7 +40,7 @@ public class JetFunctionType extends JetTypeElement { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitFunctionType(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetHashQualifiedExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetHashQualifiedExpression.java index b0810b91e60..e9a22d62467 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetHashQualifiedExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetHashQualifiedExpression.java @@ -12,7 +12,7 @@ public class JetHashQualifiedExpression extends JetQualifiedExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitHashQualifiedExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetIfExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetIfExpression.java index fc101f3d9d7..d94ac7e3796 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetIfExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetIfExpression.java @@ -14,7 +14,7 @@ public class JetIfExpression extends JetExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitIfExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetImportDirective.java b/idea/src/org/jetbrains/jet/lang/psi/JetImportDirective.java index ea17d84371c..0fdc753094c 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetImportDirective.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetImportDirective.java @@ -15,7 +15,7 @@ public class JetImportDirective extends JetElement { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitImportDirective(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetInitializerList.java b/idea/src/org/jetbrains/jet/lang/psi/JetInitializerList.java index 3b3e10fcd78..29ee57669e5 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetInitializerList.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetInitializerList.java @@ -15,7 +15,7 @@ public class JetInitializerList extends JetElement { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitInitializerList(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetIsExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetIsExpression.java index 2ec6bf10630..cac953b6ba3 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetIsExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetIsExpression.java @@ -15,7 +15,7 @@ public class JetIsExpression extends JetExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitIsExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetLiteralStringTemplateEntry.java b/idea/src/org/jetbrains/jet/lang/psi/JetLiteralStringTemplateEntry.java index ef108e98441..c9e09c4aeb3 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetLiteralStringTemplateEntry.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetLiteralStringTemplateEntry.java @@ -12,7 +12,7 @@ public class JetLiteralStringTemplateEntry extends JetStringTemplateEntry { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitLiteralStringTemplateEntry(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetModifierList.java b/idea/src/org/jetbrains/jet/lang/psi/JetModifierList.java index a1adbcf0abc..fa89f007d23 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetModifierList.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetModifierList.java @@ -19,7 +19,7 @@ public class JetModifierList extends JetElement { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitModifierList(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java b/idea/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java index c8e91a2bdf7..27e828979b1 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java @@ -14,7 +14,7 @@ public class JetNamedFunction extends JetFunction { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitNamedFunction(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetNamespace.java b/idea/src/org/jetbrains/jet/lang/psi/JetNamespace.java index 4a485ec1ea0..4300ca6291c 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetNamespace.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetNamespace.java @@ -19,7 +19,7 @@ public class JetNamespace extends JetNamedDeclaration { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitNamespace(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetNamespaceBody.java b/idea/src/org/jetbrains/jet/lang/psi/JetNamespaceBody.java index e94052eff29..60cd885f799 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetNamespaceBody.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetNamespaceBody.java @@ -19,7 +19,7 @@ public class JetNamespaceBody extends JetElement { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitNamespaceBody(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetNewExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetNewExpression.java index a4e5cf39f3e..62301009b10 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetNewExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetNewExpression.java @@ -9,7 +9,7 @@ package org.jetbrains.jet.lang.psi; // } // // @Override -// public void accept(JetVisitor visitor) { +// public void accept(JetVisitorVoid visitor) { // visitor.visitNewExpression(this); // } // diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetNullableType.java b/idea/src/org/jetbrains/jet/lang/psi/JetNullableType.java index 6d99b922fac..cf31ac66548 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetNullableType.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetNullableType.java @@ -20,7 +20,7 @@ public class JetNullableType extends JetTypeElement { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitNullableType(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java b/idea/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java index 7e6f1399451..1609185788e 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java @@ -79,7 +79,7 @@ public class JetObjectDeclaration extends JetNamedDeclaration implements JetClas } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitObjectDeclaration(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetObjectLiteralExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetObjectLiteralExpression.java index 0ea4211d465..5162e569baa 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetObjectLiteralExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetObjectLiteralExpression.java @@ -13,7 +13,7 @@ public class JetObjectLiteralExpression extends JetExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitObjectLiteralExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetParameter.java b/idea/src/org/jetbrains/jet/lang/psi/JetParameter.java index 172d9dfc8f9..2daa1a0b31c 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetParameter.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetParameter.java @@ -15,7 +15,7 @@ public class JetParameter extends JetNamedDeclaration { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitParameter(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetParameterList.java b/idea/src/org/jetbrains/jet/lang/psi/JetParameterList.java index 1f814c3aae7..fd2396ee9ad 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetParameterList.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetParameterList.java @@ -15,7 +15,7 @@ public class JetParameterList extends JetElement { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitParameterList(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetParenthesizedExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetParenthesizedExpression.java index 6111b67e938..500baf0ec7e 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetParenthesizedExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetParenthesizedExpression.java @@ -13,7 +13,7 @@ public class JetParenthesizedExpression extends JetExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitParenthesizedExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetPostfixExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetPostfixExpression.java index ebe92d5bc2a..074c95b5890 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetPostfixExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetPostfixExpression.java @@ -19,7 +19,7 @@ public class JetPostfixExpression extends JetUnaryExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitPostfixExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetPredicateExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetPredicateExpression.java index 6d05c4dd76b..28dd6145633 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetPredicateExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetPredicateExpression.java @@ -12,7 +12,7 @@ public class JetPredicateExpression extends JetQualifiedExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitPredicateExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetPrefixExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetPrefixExpression.java index b81f119e382..533984f549a 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetPrefixExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetPrefixExpression.java @@ -14,7 +14,7 @@ public class JetPrefixExpression extends JetUnaryExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitPrefixExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetProperty.java b/idea/src/org/jetbrains/jet/lang/psi/JetProperty.java index 13345dffe19..0fb00cda730 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetProperty.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetProperty.java @@ -20,7 +20,7 @@ public class JetProperty extends JetTypeParameterListOwner { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitProperty(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetPropertyAccessor.java b/idea/src/org/jetbrains/jet/lang/psi/JetPropertyAccessor.java index de4f54f23b6..23a23da2683 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetPropertyAccessor.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetPropertyAccessor.java @@ -17,7 +17,7 @@ public class JetPropertyAccessor extends JetDeclaration implements JetDeclaratio } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitPropertyAccessor(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java b/idea/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java index 56557b58226..0c44160a992 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java @@ -29,7 +29,7 @@ public class JetPsiUtil { public static Set findRootExpressions(@NotNull Collection unreachableElements) { Set rootElements = new HashSet(); final Set shadowedElements = new HashSet(); - JetVisitor shadowAllChildren = new JetVisitor() { + JetVisitorVoid shadowAllChildren = new JetVisitorVoid() { @Override public void visitJetElement(JetElement element) { if (shadowedElements.add(element)) { diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetReturnExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetReturnExpression.java index 1f24184413d..554a8b604c7 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetReturnExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetReturnExpression.java @@ -13,7 +13,7 @@ public class JetReturnExpression extends JetLabelQualifiedExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitReturnExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetRootNamespaceExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetRootNamespaceExpression.java index b77cbe71344..c9bd02e9516 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetRootNamespaceExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetRootNamespaceExpression.java @@ -12,7 +12,7 @@ public class JetRootNamespaceExpression extends JetExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitRootNamespaceExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetSafeQualifiedExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetSafeQualifiedExpression.java index 6056522a065..7b3ebcae10d 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetSafeQualifiedExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetSafeQualifiedExpression.java @@ -12,7 +12,7 @@ public class JetSafeQualifiedExpression extends JetQualifiedExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitSafeQualifiedExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetSelfType.java b/idea/src/org/jetbrains/jet/lang/psi/JetSelfType.java index f71e3b39c32..faf61389a4f 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetSelfType.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetSelfType.java @@ -21,7 +21,7 @@ public class JetSelfType extends JetTypeElement { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitSelfType(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.java index 03ebff7e8a6..bcf5dcad164 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.java @@ -157,7 +157,7 @@ public class JetSimpleNameExpression extends JetReferenceExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitSimpleNameExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetSimpleNameStringTemplateEntry.java b/idea/src/org/jetbrains/jet/lang/psi/JetSimpleNameStringTemplateEntry.java index a974ef16f1d..a55b51ca28c 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetSimpleNameStringTemplateEntry.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetSimpleNameStringTemplateEntry.java @@ -2,7 +2,6 @@ package org.jetbrains.jet.lang.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetNodeTypes; /** * @author abreslav @@ -14,7 +13,7 @@ public class JetSimpleNameStringTemplateEntry extends JetStringTemplateEntryWith } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitSimpleNameStringTemplateEntry(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetStringTemplateEntryWithExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetStringTemplateEntryWithExpression.java index 1557131ebc1..7bbda4c9efe 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetStringTemplateEntryWithExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetStringTemplateEntryWithExpression.java @@ -12,7 +12,7 @@ public abstract class JetStringTemplateEntryWithExpression extends JetStringTemp } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitStringTemplateEntryWithExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetStringTemplateExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetStringTemplateExpression.java index be6f55d2899..50a771dc19c 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetStringTemplateExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetStringTemplateExpression.java @@ -12,7 +12,7 @@ public class JetStringTemplateExpression extends JetExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitStringTemplateExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetThisExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetThisExpression.java index 099b27d22b8..c43956fdff8 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetThisExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetThisExpression.java @@ -15,7 +15,7 @@ public class JetThisExpression extends JetLabelQualifiedExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitThisExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetThrowExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetThrowExpression.java index 3d3108b0111..bc1aa8fdf52 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetThrowExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetThrowExpression.java @@ -13,7 +13,7 @@ public class JetThrowExpression extends JetExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitThrowExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTryExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetTryExpression.java index 27bc8668f87..454a8dac9c9 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTryExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTryExpression.java @@ -16,7 +16,7 @@ public class JetTryExpression extends JetExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitTryExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTupleExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetTupleExpression.java index fbbe6086bf2..1613f530c3c 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTupleExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTupleExpression.java @@ -15,7 +15,7 @@ public class JetTupleExpression extends JetExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitTupleExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTuplePattern.java b/idea/src/org/jetbrains/jet/lang/psi/JetTuplePattern.java index 3ea50bf4ba1..ab277ffcf8e 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTuplePattern.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTuplePattern.java @@ -15,7 +15,7 @@ public class JetTuplePattern extends JetPattern { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitTuplePattern(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTupleType.java b/idea/src/org/jetbrains/jet/lang/psi/JetTupleType.java index 9b1248b5175..33211d8dbc3 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTupleType.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTupleType.java @@ -21,7 +21,7 @@ public class JetTupleType extends JetTypeElement { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitTupleType(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTypeArgumentList.java b/idea/src/org/jetbrains/jet/lang/psi/JetTypeArgumentList.java index 9e58f3cd658..8e414e68e30 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTypeArgumentList.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTypeArgumentList.java @@ -15,7 +15,7 @@ public class JetTypeArgumentList extends JetElement { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitTypeArgumentList(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java b/idea/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java index 088b42a0764..756f25acf35 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java @@ -16,7 +16,7 @@ public class JetTypeConstraint extends JetElement { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitTypeConstraint(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTypeConstraintList.java b/idea/src/org/jetbrains/jet/lang/psi/JetTypeConstraintList.java index 671519cb696..25f15b69069 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTypeConstraintList.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTypeConstraintList.java @@ -15,7 +15,7 @@ public class JetTypeConstraintList extends JetElement { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitTypeConstraintList(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java b/idea/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java index a8cf0998c14..eaf5039d5ea 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java @@ -16,7 +16,7 @@ public class JetTypeParameter extends JetNamedDeclaration { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitTypeParameter(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTypeParameterList.java b/idea/src/org/jetbrains/jet/lang/psi/JetTypeParameterList.java index 032d0fc4ff4..9c01c6de412 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTypeParameterList.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTypeParameterList.java @@ -19,7 +19,7 @@ public class JetTypeParameterList extends JetElement { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitTypeParameterList(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTypePattern.java b/idea/src/org/jetbrains/jet/lang/psi/JetTypePattern.java index f041419e4e2..81640a43588 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTypePattern.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTypePattern.java @@ -18,7 +18,7 @@ public class JetTypePattern extends JetPattern { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitTypePattern(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTypeProjection.java b/idea/src/org/jetbrains/jet/lang/psi/JetTypeProjection.java index e88eebe74f4..b9f33ee44fb 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTypeProjection.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTypeProjection.java @@ -28,7 +28,7 @@ public class JetTypeProjection extends JetDeclaration { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitTypeProjection(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTypeReference.java b/idea/src/org/jetbrains/jet/lang/psi/JetTypeReference.java index fe29c5300d8..d6306b14073 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTypeReference.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTypeReference.java @@ -18,7 +18,7 @@ public class JetTypeReference extends JetElement { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitTypeReference(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTypedef.java b/idea/src/org/jetbrains/jet/lang/psi/JetTypedef.java index 5b5f88ee346..4f73491320b 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTypedef.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTypedef.java @@ -14,7 +14,7 @@ public class JetTypedef extends JetTypeParameterListOwner { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitTypedef(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetUserType.java b/idea/src/org/jetbrains/jet/lang/psi/JetUserType.java index 08450e7a092..6dce94427a1 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetUserType.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetUserType.java @@ -23,7 +23,7 @@ public class JetUserType extends JetTypeElement { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitUserType(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetValueArgument.java b/idea/src/org/jetbrains/jet/lang/psi/JetValueArgument.java index 497d61c18e6..e85f92f5c7f 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetValueArgument.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetValueArgument.java @@ -14,7 +14,7 @@ public class JetValueArgument extends JetElement implements ValueArgumentPsi { super(node); } - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitArgument(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetValueArgumentList.java b/idea/src/org/jetbrains/jet/lang/psi/JetValueArgumentList.java index f46029eba2b..0b78893d02f 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetValueArgumentList.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetValueArgumentList.java @@ -15,7 +15,7 @@ public class JetValueArgumentList extends JetElement { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitValueArgumentList(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java b/idea/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java similarity index 99% rename from idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java rename to idea/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java index 0d1c3965304..8fc840217da 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java @@ -5,7 +5,7 @@ import com.intellij.psi.PsiElementVisitor; /** * @author max */ -public class JetVisitor extends PsiElementVisitor { +public class JetVisitorVoid extends PsiElementVisitor { public void visitJetElement(JetElement element) { visitElement(element); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionCall.java b/idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionCall.java index a4661e4e12d..9ae0f3b5f18 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionCall.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionCall.java @@ -29,7 +29,7 @@ public class JetWhenConditionCall extends JetWhenCondition { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitWhenConditionCall(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionInRange.java b/idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionInRange.java index 8a3efc12527..29fe31fd5ab 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionInRange.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionInRange.java @@ -35,7 +35,7 @@ public class JetWhenConditionInRange extends JetWhenCondition { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitWhenConditionInRange(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionIsPattern.java b/idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionIsPattern.java index b1ccf6220fc..eebaf51a1b2 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionIsPattern.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionIsPattern.java @@ -23,7 +23,7 @@ public class JetWhenConditionIsPattern extends JetWhenCondition { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitWhenConditionIsPattern(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetWhenEntry.java b/idea/src/org/jetbrains/jet/lang/psi/JetWhenEntry.java index ba298f990b0..730b996fa78 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetWhenEntry.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetWhenEntry.java @@ -23,7 +23,7 @@ public class JetWhenEntry extends JetElement { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitWhenEntry(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetWhenExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetWhenExpression.java index b30c4dad652..496fdb04dbf 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetWhenExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetWhenExpression.java @@ -26,7 +26,7 @@ public class JetWhenExpression extends JetExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitWhenExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetWhileExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetWhileExpression.java index ddcce91b30d..201782f40ec 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetWhileExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetWhileExpression.java @@ -14,7 +14,7 @@ public class JetWhileExpression extends JetLoopExpression { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitWhileExpression(this); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetWildcardPattern.java b/idea/src/org/jetbrains/jet/lang/psi/JetWildcardPattern.java index 080ee5ac31e..17f8f15a9cb 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetWildcardPattern.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetWildcardPattern.java @@ -12,7 +12,7 @@ public class JetWildcardPattern extends JetPattern { } @Override - public void accept(@NotNull JetVisitor visitor) { + public void accept(@NotNull JetVisitorVoid visitor) { visitor.visitWildcardPattern(this); } diff --git a/idea/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java b/idea/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java index 16043fa378b..73bd83fa595 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java @@ -48,7 +48,7 @@ public class AnnotationResolver { public CompileTimeConstant resolveAnnotationArgument(@NotNull JetExpression expression, @NotNull JetType expectedType) { final CompileTimeConstant[] result = new CompileTimeConstant[1]; -// expression.accept(new JetVisitor() { +// expression.accept(new JetVisitorVoid() { // @Override // public void visitConstantExpression(JetConstantExpression expression) { // JetType type = typeInferrer.getType(JetScope.EMPTY, expression, false, expectedType); diff --git a/idea/src/org/jetbrains/jet/lang/resolve/ClassDescriptorResolver.java b/idea/src/org/jetbrains/jet/lang/resolve/ClassDescriptorResolver.java index 88244f6e02d..9e3e747c234 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/ClassDescriptorResolver.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/ClassDescriptorResolver.java @@ -71,7 +71,7 @@ public class ClassDescriptorResolver { List declarations = classElement.getDeclarations(); for (JetDeclaration declaration : declarations) { - declaration.accept(new JetVisitor() { + declaration.accept(new JetVisitorVoid() { @Override public void visitProperty(JetProperty property) { if (property.getPropertyTypeRef() != null) { diff --git a/idea/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java b/idea/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java index e7fe8dabbce..567db243537 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java @@ -138,7 +138,7 @@ public class TopDownAnalyzer { @NotNull final NamespaceLike owner, @NotNull Collection declarations) { for (JetDeclaration declaration : declarations) { - declaration.accept(new JetVisitor() { + declaration.accept(new JetVisitorVoid() { @Override public void visitNamespace(JetNamespace namespace) { @@ -413,7 +413,7 @@ public class TopDownAnalyzer { private void resolveFunctionAndPropertyHeaders(@NotNull List declarations, final @NotNull JetScope scope, final @NotNull NamespaceLike namespaceLike) { for (JetDeclaration declaration : declarations) { - declaration.accept(new JetVisitor() { + declaration.accept(new JetVisitorVoid() { @Override public void visitNamedFunction(JetNamedFunction function) { FunctionDescriptorImpl functionDescriptor = classDescriptorResolver.resolveFunctionDescriptor(namespaceLike, scope, function); @@ -565,7 +565,7 @@ public class TopDownAnalyzer { final JetTypeInferrer.Services typeInferrer = semanticServices.getTypeInferrerServices(traceForConstructors, JetFlowInformationProvider.NONE); // TODO : flow for (JetDelegationSpecifier delegationSpecifier : jetClass.getDelegationSpecifiers()) { - delegationSpecifier.accept(new JetVisitor() { + delegationSpecifier.accept(new JetVisitorVoid() { @Override public void visitDelegationByExpressionSpecifier(JetDelegatorByExpressionSpecifier specifier) { JetExpression delegateExpression = specifier.getDelegateExpression(); @@ -684,7 +684,7 @@ public class TopDownAnalyzer { trace.getErrorHandler().genericError(declaration.getNameNode(), "Secondary constructors must have an initializer list"); } else { - initializers.get(0).accept(new JetVisitor() { + initializers.get(0).accept(new JetVisitorVoid() { @Override public void visitDelegationToSuperCallSpecifier(JetDelegatorToSuperCall call) { JetTypeReference typeReference = call.getTypeReference(); diff --git a/idea/src/org/jetbrains/jet/lang/resolve/TypeResolver.java b/idea/src/org/jetbrains/jet/lang/resolve/TypeResolver.java index 97e07aa592d..7333f8dbc76 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/TypeResolver.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/TypeResolver.java @@ -46,7 +46,7 @@ public class TypeResolver { private JetType resolveTypeElement(final JetScope scope, final List annotations, JetTypeElement typeElement, final boolean nullable) { final JetType[] result = new JetType[1]; if (typeElement != null) { - typeElement.accept(new JetVisitor() { + typeElement.accept(new JetVisitorVoid() { @Override public void visitUserType(JetUserType type) { JetSimpleNameExpression referenceExpression = type.getReferenceExpression(); diff --git a/idea/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantResolver.java b/idea/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantResolver.java index 082fe500d91..ca83c3a75b8 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantResolver.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantResolver.java @@ -7,7 +7,7 @@ import org.jetbrains.jet.lang.JetSemanticServices; import org.jetbrains.jet.lang.psi.JetEscapeStringTemplateEntry; import org.jetbrains.jet.lang.psi.JetLiteralStringTemplateEntry; import org.jetbrains.jet.lang.psi.JetStringTemplateEntry; -import org.jetbrains.jet.lang.psi.JetVisitor; +import org.jetbrains.jet.lang.psi.JetVisitorVoid; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.types.*; @@ -223,7 +223,7 @@ public class CompileTimeConstantResolver { final StringBuilder builder = new StringBuilder(); final CompileTimeConstant[] result = new CompileTimeConstant[1]; for (JetStringTemplateEntry entry : entries) { - entry.accept(new JetVisitor() { + entry.accept(new JetVisitorVoid() { @Override public void visitStringTemplateEntry(JetStringTemplateEntry entry) { result[0] = new ErrorValue("String templates are not allowed in compile-time constants"); diff --git a/idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java b/idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java index d68fe0b66d3..518580db48e 100644 --- a/idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java +++ b/idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java @@ -213,7 +213,7 @@ public class JetTypeInferrer { ) { final OverloadDomain[] result = new OverloadDomain[1]; final JetSimpleNameExpression[] reference = new JetSimpleNameExpression[1]; - calleeExpression.accept(new JetVisitor() { + calleeExpression.accept(new JetVisitorVoid() { @Override public void visitHashQualifiedExpression(JetHashQualifiedExpression expression) { @@ -445,7 +445,7 @@ public class JetTypeInferrer { } for (JetExpression returnedExpression : returnedExpressions) { - returnedExpression.accept(new JetVisitor() { + returnedExpression.accept(new JetVisitorVoid() { @Override public void visitReturnExpression(JetReturnExpression expression) { if (!blockBody) { @@ -1484,7 +1484,7 @@ public class JetTypeInferrer { private DataFlowInfo checkWhenCondition(@Nullable final JetExpression subjectExpression, final JetType subjectType, JetWhenCondition condition, final WritableScope scopeToExtend, final TypeInferenceContext context, final VariableDescriptor... subjectVariables) { final DataFlowInfo[] newDataFlowInfo = new DataFlowInfo[]{context.dataFlowInfo}; - condition.accept(new JetVisitor() { + condition.accept(new JetVisitorVoid() { @Override public void visitWhenConditionCall(JetWhenConditionCall condition) { @@ -1524,7 +1524,7 @@ public class JetTypeInferrer { private DataFlowInfo checkPatternType(@NotNull JetPattern pattern, @NotNull final JetType subjectType, @NotNull final WritableScope scopeToExtend, final TypeInferenceContext context, @NotNull final VariableDescriptor... subjectVariables) { final DataFlowInfo[] result = new DataFlowInfo[] {context.dataFlowInfo}; - pattern.accept(new JetVisitor() { + pattern.accept(new JetVisitorVoid() { @Override public void visitTypePattern(JetTypePattern typePattern) { JetTypeReference typeReference = typePattern.getTypeReference(); @@ -1729,7 +1729,7 @@ public class JetTypeInferrer { private DataFlowInfo extractDataFlowInfoFromCondition(@Nullable JetExpression condition, final boolean conditionValue, @Nullable final WritableScope scopeToExtend, final TypeInferenceContext context) { if (condition == null) return context.dataFlowInfo; final DataFlowInfo[] result = new DataFlowInfo[] {context.dataFlowInfo}; - condition.accept(new JetVisitor() { + condition.accept(new JetVisitorVoid() { @Override public void visitIsExpression(JetIsExpression expression) { if (conditionValue && !expression.isNegated() || !conditionValue && expression.isNegated()) { @@ -2190,7 +2190,7 @@ public class JetTypeInferrer { @NotNull private FunctionDescriptor getCalleeFunctionDescriptor(@NotNull JetExpression selectorExpression, final TypeInferenceContext context) { final FunctionDescriptor[] result = new FunctionDescriptor[1]; - selectorExpression.accept(new JetVisitor() { + selectorExpression.accept(new JetVisitorVoid() { @Override public void visitCallExpression(JetCallExpression callExpression) { JetExpression calleeExpression = callExpression.getCalleeExpression(); @@ -2583,7 +2583,7 @@ public class JetTypeInferrer { final StringBuilder builder = new StringBuilder(); final CompileTimeConstant[] value = new CompileTimeConstant[1]; for (JetStringTemplateEntry entry : expression.getEntries()) { - entry.accept(new JetVisitor() { + entry.accept(new JetVisitorVoid() { @Override public void visitStringTemplateEntryWithExpression(JetStringTemplateEntryWithExpression entry) { diff --git a/idea/src/org/jetbrains/jet/plugin/annotations/JetPsiChecker.java b/idea/src/org/jetbrains/jet/plugin/annotations/JetPsiChecker.java index 0cf5d8bdf25..c0032711bfa 100644 --- a/idea/src/org/jetbrains/jet/plugin/annotations/JetPsiChecker.java +++ b/idea/src/org/jetbrains/jet/plugin/annotations/JetPsiChecker.java @@ -103,7 +103,7 @@ public class JetPsiChecker implements Annotator { highlightBackingFields(holder, file, bindingContext); - file.acceptChildren(new JetVisitor() { + file.acceptChildren(new JetVisitorVoid() { @Override public void visitExpression(JetExpression expression) { JetType autoCast = bindingContext.getAutoCastType(expression); @@ -132,7 +132,7 @@ public class JetPsiChecker implements Annotator { private void highlightBackingFields(final AnnotationHolder holder, JetFile file, final BindingContext bindingContext) { - file.acceptChildren(new JetVisitor() { + file.acceptChildren(new JetVisitorVoid() { @Override public void visitProperty(JetProperty property) { VariableDescriptor propertyDescriptor = bindingContext.getVariableDescriptor(property); diff --git a/idea/src/org/jetbrains/jet/plugin/annotations/LabelsAnnotator.java b/idea/src/org/jetbrains/jet/plugin/annotations/LabelsAnnotator.java index 10c218864eb..f29c07db362 100644 --- a/idea/src/org/jetbrains/jet/plugin/annotations/LabelsAnnotator.java +++ b/idea/src/org/jetbrains/jet/plugin/annotations/LabelsAnnotator.java @@ -7,17 +7,17 @@ import com.intellij.lang.annotation.AnnotationHolder; import com.intellij.lang.annotation.Annotator; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.psi.JetVisitorVoid; import org.jetbrains.jet.plugin.JetHighlighter; import org.jetbrains.jet.lang.psi.JetLabelQualifiedExpression; import org.jetbrains.jet.lang.psi.JetPrefixExpression; import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; -import org.jetbrains.jet.lang.psi.JetVisitor; import org.jetbrains.jet.lexer.JetTokens; public class LabelsAnnotator implements Annotator { public void annotate(@NotNull PsiElement element, @NotNull final AnnotationHolder holder) { // if (ApplicationManager.getApplication().isUnitTestMode()) return; - element.accept(new JetVisitor() { + element.accept(new JetVisitorVoid() { @Override public void visitPrefixExpression(JetPrefixExpression expression) { JetSimpleNameExpression operationSign = expression.getOperationSign(); diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java index 2c8d5ac5277..d8fcb6558ef 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java +++ b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java @@ -128,7 +128,7 @@ public class JetPositionManager implements PositionManager { final BindingContext bindingContext = AnalyzingUtils.analyzeFileWithCache(file); final JetStandardLibrary standardLibrary = JetStandardLibrary.getJetStandardLibrary(myDebugProcess.getProject()); final JetTypeMapper typeMapper = new JetTypeMapper(standardLibrary, bindingContext); - file.acceptChildren(new JetVisitor() { + file.acceptChildren(new JetVisitorVoid() { @Override public void visitJetElement(JetElement element) { element.acceptChildren(this); diff --git a/idea/tests/org/jetbrains/jet/parsing/JetParsingTest.java b/idea/tests/org/jetbrains/jet/parsing/JetParsingTest.java index 9de16d5a5fc..d74d147bf1e 100644 --- a/idea/tests/org/jetbrains/jet/parsing/JetParsingTest.java +++ b/idea/tests/org/jetbrains/jet/parsing/JetParsingTest.java @@ -16,7 +16,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestCaseBase; import org.jetbrains.jet.lang.parsing.JetParserDefinition; import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.psi.JetVisitor; +import org.jetbrains.jet.lang.psi.JetVisitorVoid; import java.io.File; import java.io.IOException; @@ -51,7 +51,7 @@ public class JetParsingTest extends ParsingTestCase { @Override protected void checkResult(@NonNls String targetDataName, PsiFile file) throws IOException { - file.acceptChildren(new JetVisitor() { + file.acceptChildren(new JetVisitorVoid() { @Override public void visitJetElement(JetElement element) { element.acceptChildren(this);