From 9fa146f4d50514e3cf6f2a449381dfc112672aae Mon Sep 17 00:00:00 2001 From: svtk Date: Tue, 16 Aug 2011 17:11:02 +0400 Subject: [PATCH] renamed JetExtendedVisitor to JetVisitor --- idea/src/org/jetbrains/jet/lang/psi/JetAnnotatedExpression.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetAnnotation.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java | 2 +- .../org/jetbrains/jet/lang/psi/JetArrayAccessExpression.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetBinaryExpression.java | 2 +- .../jetbrains/jet/lang/psi/JetBinaryExpressionWithTypeRHS.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetBindingPattern.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetBlockExpression.java | 2 +- .../org/jetbrains/jet/lang/psi/JetBlockStringTemplateEntry.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetBreakExpression.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetCallExpression.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetCatchClause.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetClass.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetClassBody.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetClassInitializer.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetClassObject.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetConstantExpression.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetConstructor.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetContinueExpression.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetDecomposerPattern.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifier.java | 2 +- .../org/jetbrains/jet/lang/psi/JetDelegationSpecifierList.java | 2 +- .../jet/lang/psi/JetDelegatorByExpressionSpecifier.java | 2 +- .../src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperCall.java | 2 +- .../org/jetbrains/jet/lang/psi/JetDelegatorToSuperClass.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToThisCall.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetDoWhileExpression.java | 2 +- .../org/jetbrains/jet/lang/psi/JetDotQualifiedExpression.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetElement.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetEnumEntry.java | 2 +- .../jetbrains/jet/lang/psi/JetEscapeStringTemplateEntry.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetExpression.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetExpressionPattern.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetFinallySection.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetForExpression.java | 2 +- .../jetbrains/jet/lang/psi/JetFunctionLiteralExpression.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetFunctionType.java | 2 +- .../org/jetbrains/jet/lang/psi/JetHashQualifiedExpression.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetIfExpression.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetImportDirective.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetInitializerList.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetIsExpression.java | 2 +- .../jetbrains/jet/lang/psi/JetLiteralStringTemplateEntry.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetModifierList.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetNamespace.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetNamespaceBody.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetNullableType.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java | 2 +- .../org/jetbrains/jet/lang/psi/JetObjectLiteralExpression.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetParameter.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetParameterList.java | 2 +- .../org/jetbrains/jet/lang/psi/JetParenthesizedExpression.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetPostfixExpression.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetPredicateExpression.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetPrefixExpression.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetProperty.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetPropertyAccessor.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetReturnExpression.java | 2 +- .../org/jetbrains/jet/lang/psi/JetRootNamespaceExpression.java | 2 +- .../org/jetbrains/jet/lang/psi/JetSafeQualifiedExpression.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetSelfType.java | 2 +- .../src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.java | 2 +- .../jet/lang/psi/JetSimpleNameStringTemplateEntry.java | 2 +- .../jet/lang/psi/JetStringTemplateEntryWithExpression.java | 2 +- .../org/jetbrains/jet/lang/psi/JetStringTemplateExpression.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetThisExpression.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetThrowExpression.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetTryExpression.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetTupleExpression.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetTuplePattern.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetTupleType.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetTypeArgumentList.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetTypeConstraintList.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetTypeParameterList.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetTypePattern.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetTypeProjection.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetTypeReference.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetTypedef.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetUserType.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetValueArgument.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetValueArgumentList.java | 2 +- .../jet/lang/psi/{JetExtendedVisitor.java => JetVisitor.java} | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionCall.java | 2 +- .../src/org/jetbrains/jet/lang/psi/JetWhenConditionInRange.java | 2 +- .../org/jetbrains/jet/lang/psi/JetWhenConditionIsPattern.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetWhenEntry.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetWhenExpression.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetWhileExpression.java | 2 +- idea/src/org/jetbrains/jet/lang/psi/JetWildcardPattern.java | 2 +- idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java | 2 +- 93 files changed, 93 insertions(+), 93 deletions(-) rename idea/src/org/jetbrains/jet/lang/psi/{JetExtendedVisitor.java => JetVisitor.java} (99%) diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetAnnotatedExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetAnnotatedExpression.java index b1971144600..0d06de6d8d6 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetAnnotatedExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetAnnotatedExpression.java @@ -22,7 +22,7 @@ public class JetAnnotatedExpression extends JetExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitAnnotatedExpression(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetAnnotation.java b/idea/src/org/jetbrains/jet/lang/psi/JetAnnotation.java index 8aeb905805c..29619099473 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetAnnotation.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetAnnotation.java @@ -20,7 +20,7 @@ public class JetAnnotation extends JetElement { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitAnnotation(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java b/idea/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java index fa6d4bfc04f..6c5dfb4cb82 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java @@ -22,7 +22,7 @@ public class JetAnnotationEntry extends JetElement implements JetCall { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitAnnotationEntry(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetArrayAccessExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetArrayAccessExpression.java index 505def6c493..73504018d0b 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetArrayAccessExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetArrayAccessExpression.java @@ -34,7 +34,7 @@ public class JetArrayAccessExpression extends JetReferenceExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitArrayAccessExpression(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetBinaryExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetBinaryExpression.java index 413c790e73a..378dda09480 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetBinaryExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetBinaryExpression.java @@ -21,7 +21,7 @@ public class JetBinaryExpression extends JetExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitBinaryExpression(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetBinaryExpressionWithTypeRHS.java b/idea/src/org/jetbrains/jet/lang/psi/JetBinaryExpressionWithTypeRHS.java index 7c8b5c68924..4c182794d96 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetBinaryExpressionWithTypeRHS.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetBinaryExpressionWithTypeRHS.java @@ -20,7 +20,7 @@ public class JetBinaryExpressionWithTypeRHS extends JetExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitBinaryWithTypeRHSExpression(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetBindingPattern.java b/idea/src/org/jetbrains/jet/lang/psi/JetBindingPattern.java index ec51a5dcda3..16a604244c0 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetBindingPattern.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetBindingPattern.java @@ -29,7 +29,7 @@ public class JetBindingPattern extends JetPattern { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitBindingPattern(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetBlockExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetBlockExpression.java index 8c72b344395..79248df6e36 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetBlockExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetBlockExpression.java @@ -20,7 +20,7 @@ public class JetBlockExpression extends JetExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitBlockExpression(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetBlockStringTemplateEntry.java b/idea/src/org/jetbrains/jet/lang/psi/JetBlockStringTemplateEntry.java index 813a65ca662..3982036894c 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetBlockStringTemplateEntry.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetBlockStringTemplateEntry.java @@ -17,7 +17,7 @@ public class JetBlockStringTemplateEntry extends JetStringTemplateEntryWithExpre } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitBlockStringTemplateEntry(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetBreakExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetBreakExpression.java index e5910ef438c..0d7592872cf 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetBreakExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetBreakExpression.java @@ -17,7 +17,7 @@ public class JetBreakExpression extends JetLabelQualifiedExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitBreakExpression(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetCallExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetCallExpression.java index 50320de963a..f49ff0c8dbe 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetCallExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetCallExpression.java @@ -22,7 +22,7 @@ public class JetCallExpression extends JetExpression implements JetCall { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitCallExpression(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetCatchClause.java b/idea/src/org/jetbrains/jet/lang/psi/JetCatchClause.java index 8af80e5d9bd..0b581e6aa4c 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetCatchClause.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetCatchClause.java @@ -21,7 +21,7 @@ public class JetCatchClause extends JetElement { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitCatchSection(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetClass.java b/idea/src/org/jetbrains/jet/lang/psi/JetClass.java index 80f0b854d32..1b859f92c3d 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetClass.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetClass.java @@ -39,7 +39,7 @@ public class JetClass extends JetTypeParameterListOwner implements JetClassOrObj } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitClass(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetClassBody.java b/idea/src/org/jetbrains/jet/lang/psi/JetClassBody.java index 18c67f098fb..0dec1a6dca4 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetClassBody.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetClassBody.java @@ -30,7 +30,7 @@ public class JetClassBody extends JetElement { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitClassBody(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetClassInitializer.java b/idea/src/org/jetbrains/jet/lang/psi/JetClassInitializer.java index f383815bb46..7f014f93787 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetClassInitializer.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetClassInitializer.java @@ -17,7 +17,7 @@ public class JetClassInitializer extends JetDeclaration { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitAnonymousInitializer(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetClassObject.java b/idea/src/org/jetbrains/jet/lang/psi/JetClassObject.java index 460360d8df5..92dd0b20077 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetClassObject.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetClassObject.java @@ -19,7 +19,7 @@ public class JetClassObject extends JetDeclaration { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitClassObject(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetConstantExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetConstantExpression.java index af95666a040..2bfff817e77 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetConstantExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetConstantExpression.java @@ -17,7 +17,7 @@ public class JetConstantExpression extends JetExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitConstantExpression(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetConstructor.java b/idea/src/org/jetbrains/jet/lang/psi/JetConstructor.java index cfc79f73ad2..bc53af61e4b 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetConstructor.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetConstructor.java @@ -23,7 +23,7 @@ public class JetConstructor extends JetDeclaration implements JetDeclarationWith } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitConstructor(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetContinueExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetContinueExpression.java index bce3e2805cd..4ce802eeafd 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetContinueExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetContinueExpression.java @@ -17,7 +17,7 @@ public class JetContinueExpression extends JetLabelQualifiedExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitContinueExpression(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetDecomposerPattern.java b/idea/src/org/jetbrains/jet/lang/psi/JetDecomposerPattern.java index 9816c4a7e41..c4e2bd801a4 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetDecomposerPattern.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetDecomposerPattern.java @@ -28,7 +28,7 @@ public class JetDecomposerPattern extends JetPattern { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitDecomposerPattern(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifier.java b/idea/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifier.java index efb898562c9..c5e8aab0c0a 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifier.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifier.java @@ -19,7 +19,7 @@ public class JetDelegationSpecifier extends JetElement{ } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitDelegationSpecifier(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifierList.java b/idea/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifierList.java index c3e3f70a174..cdf615c4dad 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifierList.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifierList.java @@ -20,7 +20,7 @@ public class JetDelegationSpecifierList extends JetElement { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitDelegationSpecifierList(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorByExpressionSpecifier.java b/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorByExpressionSpecifier.java index 2e214d67f45..ef5da2b1cf5 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorByExpressionSpecifier.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorByExpressionSpecifier.java @@ -18,7 +18,7 @@ public class JetDelegatorByExpressionSpecifier extends JetDelegationSpecifier { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitDelegationByExpressionSpecifier(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperCall.java b/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperCall.java index f3b31fa1e87..0f4db427370 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperCall.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperCall.java @@ -22,7 +22,7 @@ public class JetDelegatorToSuperCall extends JetDelegationSpecifier implements J } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitDelegationToSuperCallSpecifier(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperClass.java b/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperClass.java index a8850a21164..ef712c5eeb1 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperClass.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperClass.java @@ -17,7 +17,7 @@ public class JetDelegatorToSuperClass extends JetDelegationSpecifier { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitDelegationToSuperClassSpecifier(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToThisCall.java b/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToThisCall.java index 40c8a6fc4c8..6e0bb69ba46 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToThisCall.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetDelegatorToThisCall.java @@ -23,7 +23,7 @@ public class JetDelegatorToThisCall extends JetDelegationSpecifier implements Je } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitDelegationToThisCall(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetDoWhileExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetDoWhileExpression.java index d2699700a23..f2cf29fd203 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetDoWhileExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetDoWhileExpression.java @@ -19,7 +19,7 @@ public class JetDoWhileExpression extends JetLoopExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitDoWhileExpression(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetDotQualifiedExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetDotQualifiedExpression.java index 5df790b0c3c..aafeb45cb6e 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetDotQualifiedExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetDotQualifiedExpression.java @@ -17,7 +17,7 @@ public class JetDotQualifiedExpression extends JetQualifiedExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitDotQualifiedExpression(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetElement.java b/idea/src/org/jetbrains/jet/lang/psi/JetElement.java index ba907a21127..28b5c490b9a 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetElement.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetElement.java @@ -52,7 +52,7 @@ public class JetElement extends ASTWrapperPsiElement { visitor.visitJetElement(this); } - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitJetElement(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetEnumEntry.java b/idea/src/org/jetbrains/jet/lang/psi/JetEnumEntry.java index 0779b99dd45..a79f256c18c 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetEnumEntry.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetEnumEntry.java @@ -52,7 +52,7 @@ public class JetEnumEntry extends JetClass { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitEnumEntry(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetEscapeStringTemplateEntry.java b/idea/src/org/jetbrains/jet/lang/psi/JetEscapeStringTemplateEntry.java index ecfe0da310a..d483a9ba8ba 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetEscapeStringTemplateEntry.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetEscapeStringTemplateEntry.java @@ -18,7 +18,7 @@ public class JetEscapeStringTemplateEntry extends JetStringTemplateEntry { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitEscapeStringTemplateEntry(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetExpression.java index fb874aff860..10cb7b02400 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetExpression.java @@ -18,7 +18,7 @@ public class JetExpression extends JetElement { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitExpression(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetExpressionPattern.java b/idea/src/org/jetbrains/jet/lang/psi/JetExpressionPattern.java index ec6db757895..fdd02ead63c 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetExpressionPattern.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetExpressionPattern.java @@ -23,7 +23,7 @@ public class JetExpressionPattern extends JetPattern { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitExpressionPattern(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetFinallySection.java b/idea/src/org/jetbrains/jet/lang/psi/JetFinallySection.java index 932fc323ea3..3c62dfebd7d 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetFinallySection.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetFinallySection.java @@ -18,7 +18,7 @@ public class JetFinallySection extends JetElement { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitFinallySection(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetForExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetForExpression.java index e715ef0ad89..ef650988dc2 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetForExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetForExpression.java @@ -19,7 +19,7 @@ public class JetForExpression extends JetLoopExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitForExpression(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetFunctionLiteralExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetFunctionLiteralExpression.java index c8cae2b7c84..8aaefd0e229 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetFunctionLiteralExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetFunctionLiteralExpression.java @@ -18,7 +18,7 @@ public class JetFunctionLiteralExpression extends JetExpression implements JetDe } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitFunctionLiteralExpression(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetFunctionType.java b/idea/src/org/jetbrains/jet/lang/psi/JetFunctionType.java index d3ef73316c4..572212e6392 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetFunctionType.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetFunctionType.java @@ -45,7 +45,7 @@ public class JetFunctionType extends JetTypeElement { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitFunctionType(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetHashQualifiedExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetHashQualifiedExpression.java index e9a22d62467..8f48c5d5a9e 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetHashQualifiedExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetHashQualifiedExpression.java @@ -17,7 +17,7 @@ public class JetHashQualifiedExpression extends JetQualifiedExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitHashQualifiedExpression(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetIfExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetIfExpression.java index d94ac7e3796..59b6ba9207f 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetIfExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetIfExpression.java @@ -19,7 +19,7 @@ public class JetIfExpression extends JetExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitIfExpression(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetImportDirective.java b/idea/src/org/jetbrains/jet/lang/psi/JetImportDirective.java index 0fdc753094c..aa289179417 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetImportDirective.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetImportDirective.java @@ -20,7 +20,7 @@ public class JetImportDirective extends JetElement { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitImportDirective(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetInitializerList.java b/idea/src/org/jetbrains/jet/lang/psi/JetInitializerList.java index 29ee57669e5..7c161114e0f 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetInitializerList.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetInitializerList.java @@ -20,7 +20,7 @@ public class JetInitializerList extends JetElement { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitInitializerList(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetIsExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetIsExpression.java index cac953b6ba3..a88fe3dd204 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetIsExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetIsExpression.java @@ -20,7 +20,7 @@ public class JetIsExpression extends JetExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitIsExpression(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetLiteralStringTemplateEntry.java b/idea/src/org/jetbrains/jet/lang/psi/JetLiteralStringTemplateEntry.java index c9e09c4aeb3..0f3317acbc5 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetLiteralStringTemplateEntry.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetLiteralStringTemplateEntry.java @@ -17,7 +17,7 @@ public class JetLiteralStringTemplateEntry extends JetStringTemplateEntry { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitLiteralStringTemplateEntry(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetModifierList.java b/idea/src/org/jetbrains/jet/lang/psi/JetModifierList.java index fa89f007d23..8cfbe02064b 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetModifierList.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetModifierList.java @@ -24,7 +24,7 @@ public class JetModifierList extends JetElement { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitModifierList(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java b/idea/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java index 27e828979b1..5d791fbe2a4 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java @@ -19,7 +19,7 @@ public class JetNamedFunction extends JetFunction { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitNamedFunction(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetNamespace.java b/idea/src/org/jetbrains/jet/lang/psi/JetNamespace.java index 4300ca6291c..c73621199b9 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetNamespace.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetNamespace.java @@ -24,7 +24,7 @@ public class JetNamespace extends JetNamedDeclaration { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitNamespace(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetNamespaceBody.java b/idea/src/org/jetbrains/jet/lang/psi/JetNamespaceBody.java index 60cd885f799..9004b90ddc5 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetNamespaceBody.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetNamespaceBody.java @@ -24,7 +24,7 @@ public class JetNamespaceBody extends JetElement { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitNamespaceBody(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetNullableType.java b/idea/src/org/jetbrains/jet/lang/psi/JetNullableType.java index cf31ac66548..f674154a740 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetNullableType.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetNullableType.java @@ -25,7 +25,7 @@ public class JetNullableType extends JetTypeElement { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitNullableType(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java b/idea/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java index 1609185788e..dc3c76bc5f9 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java @@ -84,7 +84,7 @@ public class JetObjectDeclaration extends JetNamedDeclaration implements JetClas } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitObjectDeclaration(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetObjectLiteralExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetObjectLiteralExpression.java index 5162e569baa..d62bbc143b3 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetObjectLiteralExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetObjectLiteralExpression.java @@ -18,7 +18,7 @@ public class JetObjectLiteralExpression extends JetExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitObjectLiteralExpression(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetParameter.java b/idea/src/org/jetbrains/jet/lang/psi/JetParameter.java index 2daa1a0b31c..f37cb380e55 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetParameter.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetParameter.java @@ -20,7 +20,7 @@ public class JetParameter extends JetNamedDeclaration { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitParameter(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetParameterList.java b/idea/src/org/jetbrains/jet/lang/psi/JetParameterList.java index fd2396ee9ad..7241f612545 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetParameterList.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetParameterList.java @@ -20,7 +20,7 @@ public class JetParameterList extends JetElement { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitParameterList(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetParenthesizedExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetParenthesizedExpression.java index 500baf0ec7e..778deab905b 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetParenthesizedExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetParenthesizedExpression.java @@ -18,7 +18,7 @@ public class JetParenthesizedExpression extends JetExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitParenthesizedExpression(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetPostfixExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetPostfixExpression.java index 074c95b5890..01b31f87a63 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetPostfixExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetPostfixExpression.java @@ -24,7 +24,7 @@ public class JetPostfixExpression extends JetUnaryExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitPostfixExpression(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetPredicateExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetPredicateExpression.java index 28dd6145633..8f4f83737de 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetPredicateExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetPredicateExpression.java @@ -17,7 +17,7 @@ public class JetPredicateExpression extends JetQualifiedExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitPredicateExpression(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetPrefixExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetPrefixExpression.java index 533984f549a..d728fc9a519 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetPrefixExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetPrefixExpression.java @@ -19,7 +19,7 @@ public class JetPrefixExpression extends JetUnaryExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitPrefixExpression(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetProperty.java b/idea/src/org/jetbrains/jet/lang/psi/JetProperty.java index 0fb00cda730..a7d1af61ef4 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetProperty.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetProperty.java @@ -25,7 +25,7 @@ public class JetProperty extends JetTypeParameterListOwner { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitProperty(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetPropertyAccessor.java b/idea/src/org/jetbrains/jet/lang/psi/JetPropertyAccessor.java index 23a23da2683..df7e061e3a8 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetPropertyAccessor.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetPropertyAccessor.java @@ -22,7 +22,7 @@ public class JetPropertyAccessor extends JetDeclaration implements JetDeclaratio } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitPropertyAccessor(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetReturnExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetReturnExpression.java index 554a8b604c7..49634944ae2 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetReturnExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetReturnExpression.java @@ -18,7 +18,7 @@ public class JetReturnExpression extends JetLabelQualifiedExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitReturnExpression(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetRootNamespaceExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetRootNamespaceExpression.java index c9bd02e9516..0cb69e2fbb0 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetRootNamespaceExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetRootNamespaceExpression.java @@ -17,7 +17,7 @@ public class JetRootNamespaceExpression extends JetExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitRootNamespaceExpression(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetSafeQualifiedExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetSafeQualifiedExpression.java index 7b3ebcae10d..e2e6bba5c1a 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetSafeQualifiedExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetSafeQualifiedExpression.java @@ -17,7 +17,7 @@ public class JetSafeQualifiedExpression extends JetQualifiedExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitSafeQualifiedExpression(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetSelfType.java b/idea/src/org/jetbrains/jet/lang/psi/JetSelfType.java index faf61389a4f..84ae4b5a7e0 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetSelfType.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetSelfType.java @@ -26,7 +26,7 @@ public class JetSelfType extends JetTypeElement { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitSelfType(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.java index bcf5dcad164..39d08440360 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.java @@ -162,7 +162,7 @@ public class JetSimpleNameExpression extends JetReferenceExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitSimpleNameExpression(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetSimpleNameStringTemplateEntry.java b/idea/src/org/jetbrains/jet/lang/psi/JetSimpleNameStringTemplateEntry.java index a55b51ca28c..fd0384608e1 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetSimpleNameStringTemplateEntry.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetSimpleNameStringTemplateEntry.java @@ -18,7 +18,7 @@ public class JetSimpleNameStringTemplateEntry extends JetStringTemplateEntryWith } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitSimpleNameStringTemplateEntry(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetStringTemplateEntryWithExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetStringTemplateEntryWithExpression.java index 7bbda4c9efe..4e86ff3103b 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetStringTemplateEntryWithExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetStringTemplateEntryWithExpression.java @@ -17,7 +17,7 @@ public abstract class JetStringTemplateEntryWithExpression extends JetStringTemp } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitStringTemplateEntryWithExpression(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetStringTemplateExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetStringTemplateExpression.java index 50a771dc19c..e63f1f94c60 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetStringTemplateExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetStringTemplateExpression.java @@ -17,7 +17,7 @@ public class JetStringTemplateExpression extends JetExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitStringTemplateExpression(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetThisExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetThisExpression.java index c43956fdff8..b3e000ee32a 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetThisExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetThisExpression.java @@ -20,7 +20,7 @@ public class JetThisExpression extends JetLabelQualifiedExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitThisExpression(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetThrowExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetThrowExpression.java index bc1aa8fdf52..20015feb07b 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetThrowExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetThrowExpression.java @@ -18,7 +18,7 @@ public class JetThrowExpression extends JetExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitThrowExpression(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTryExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetTryExpression.java index 454a8dac9c9..260c91b0edb 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTryExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTryExpression.java @@ -21,7 +21,7 @@ public class JetTryExpression extends JetExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitTryExpression(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTupleExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetTupleExpression.java index 1613f530c3c..3d7f5f1db2a 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTupleExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTupleExpression.java @@ -20,7 +20,7 @@ public class JetTupleExpression extends JetExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitTupleExpression(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTuplePattern.java b/idea/src/org/jetbrains/jet/lang/psi/JetTuplePattern.java index ab277ffcf8e..e49b5e4382d 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTuplePattern.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTuplePattern.java @@ -20,7 +20,7 @@ public class JetTuplePattern extends JetPattern { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitTuplePattern(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTupleType.java b/idea/src/org/jetbrains/jet/lang/psi/JetTupleType.java index 33211d8dbc3..ac399480d51 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTupleType.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTupleType.java @@ -26,7 +26,7 @@ public class JetTupleType extends JetTypeElement { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitTupleType(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTypeArgumentList.java b/idea/src/org/jetbrains/jet/lang/psi/JetTypeArgumentList.java index 8e414e68e30..94e26b989c7 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTypeArgumentList.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTypeArgumentList.java @@ -20,7 +20,7 @@ public class JetTypeArgumentList extends JetElement { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitTypeArgumentList(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java b/idea/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java index 756f25acf35..90800e0f06d 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java @@ -21,7 +21,7 @@ public class JetTypeConstraint extends JetElement { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitTypeConstraint(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTypeConstraintList.java b/idea/src/org/jetbrains/jet/lang/psi/JetTypeConstraintList.java index 25f15b69069..fc0c340a9b5 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTypeConstraintList.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTypeConstraintList.java @@ -20,7 +20,7 @@ public class JetTypeConstraintList extends JetElement { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitTypeConstraintList(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java b/idea/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java index eaf5039d5ea..5eb5c4a1077 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java @@ -21,7 +21,7 @@ public class JetTypeParameter extends JetNamedDeclaration { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitTypeParameter(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTypeParameterList.java b/idea/src/org/jetbrains/jet/lang/psi/JetTypeParameterList.java index 9c01c6de412..ff36bf50b78 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTypeParameterList.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTypeParameterList.java @@ -24,7 +24,7 @@ public class JetTypeParameterList extends JetElement { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitTypeParameterList(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTypePattern.java b/idea/src/org/jetbrains/jet/lang/psi/JetTypePattern.java index 81640a43588..6e5a7bb3d4d 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTypePattern.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTypePattern.java @@ -23,7 +23,7 @@ public class JetTypePattern extends JetPattern { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitTypePattern(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTypeProjection.java b/idea/src/org/jetbrains/jet/lang/psi/JetTypeProjection.java index b9f33ee44fb..ba46a0f20d7 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTypeProjection.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTypeProjection.java @@ -33,7 +33,7 @@ public class JetTypeProjection extends JetDeclaration { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitTypeProjection(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTypeReference.java b/idea/src/org/jetbrains/jet/lang/psi/JetTypeReference.java index d6306b14073..1554f3971ff 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTypeReference.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTypeReference.java @@ -23,7 +23,7 @@ public class JetTypeReference extends JetElement { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitTypeReference(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTypedef.java b/idea/src/org/jetbrains/jet/lang/psi/JetTypedef.java index 4f73491320b..b2aabee2c4e 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTypedef.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTypedef.java @@ -19,7 +19,7 @@ public class JetTypedef extends JetTypeParameterListOwner { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitTypedef(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetUserType.java b/idea/src/org/jetbrains/jet/lang/psi/JetUserType.java index 6dce94427a1..37d24fe1989 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetUserType.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetUserType.java @@ -28,7 +28,7 @@ public class JetUserType extends JetTypeElement { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitUserType(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetValueArgument.java b/idea/src/org/jetbrains/jet/lang/psi/JetValueArgument.java index e85f92f5c7f..3d4628cb026 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetValueArgument.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetValueArgument.java @@ -19,7 +19,7 @@ public class JetValueArgument extends JetElement implements ValueArgumentPsi { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitArgument(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetValueArgumentList.java b/idea/src/org/jetbrains/jet/lang/psi/JetValueArgumentList.java index 0b78893d02f..f8d90abc36f 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetValueArgumentList.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetValueArgumentList.java @@ -20,7 +20,7 @@ public class JetValueArgumentList extends JetElement { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitValueArgumentList(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetExtendedVisitor.java b/idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java similarity index 99% rename from idea/src/org/jetbrains/jet/lang/psi/JetExtendedVisitor.java rename to idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java index 276bd8856e3..9c5787cda2c 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetExtendedVisitor.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java @@ -5,7 +5,7 @@ import com.intellij.psi.PsiElementVisitor; /** * @author svtk */ -public class JetExtendedVisitor extends PsiElementVisitor { +public class JetVisitor extends PsiElementVisitor { public R visitJetElement(JetElement element, D data) { visitElement(element); return null; diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionCall.java b/idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionCall.java index 9ae0f3b5f18..bca851832d2 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionCall.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionCall.java @@ -34,7 +34,7 @@ public class JetWhenConditionCall extends JetWhenCondition { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitWhenConditionCall(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionInRange.java b/idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionInRange.java index 29fe31fd5ab..ba59a80409e 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionInRange.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionInRange.java @@ -40,7 +40,7 @@ public class JetWhenConditionInRange extends JetWhenCondition { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitWhenConditionInRange(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionIsPattern.java b/idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionIsPattern.java index eebaf51a1b2..3b91e459b1f 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionIsPattern.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetWhenConditionIsPattern.java @@ -28,7 +28,7 @@ public class JetWhenConditionIsPattern extends JetWhenCondition { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitWhenConditionIsPattern(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetWhenEntry.java b/idea/src/org/jetbrains/jet/lang/psi/JetWhenEntry.java index 730b996fa78..b6342d90725 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetWhenEntry.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetWhenEntry.java @@ -28,7 +28,7 @@ public class JetWhenEntry extends JetElement { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitWhenEntry(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetWhenExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetWhenExpression.java index 496fdb04dbf..7e2a85c303a 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetWhenExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetWhenExpression.java @@ -31,7 +31,7 @@ public class JetWhenExpression extends JetExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitWhenExpression(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetWhileExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetWhileExpression.java index 201782f40ec..3d4670881df 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetWhileExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetWhileExpression.java @@ -19,7 +19,7 @@ public class JetWhileExpression extends JetLoopExpression { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitWhileExpression(this, data); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetWildcardPattern.java b/idea/src/org/jetbrains/jet/lang/psi/JetWildcardPattern.java index 17f8f15a9cb..f0fdaf33197 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetWildcardPattern.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetWildcardPattern.java @@ -17,7 +17,7 @@ public class JetWildcardPattern extends JetPattern { } @Override - public R visit(@NotNull JetExtendedVisitor visitor, D data) { + public R visit(@NotNull JetVisitor visitor, D data) { return visitor.visitWildcardPattern(this, data); } } diff --git a/idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java b/idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java index 518580db48e..2a34add25d3 100644 --- a/idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java +++ b/idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java @@ -896,7 +896,7 @@ public class JetTypeInferrer { } } - private class TypeInferrerVisitor extends JetExtendedVisitor { + private class TypeInferrerVisitor extends JetVisitor { protected DataFlowInfo resultDataFlowInfo;