From 23ae29b83ad8a659b79b22f67603b45d94440597 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 14 Nov 2012 16:01:37 +0400 Subject: [PATCH] Remove obsolete JetNamespaceBody --- .../jet/lang/psi/JetFunctionNotStubbed.java | 2 +- .../jet/lang/psi/JetNamedFunction.java | 2 +- .../jet/lang/psi/JetNamespaceBody.java | 48 ------------------- .../jetbrains/jet/lang/psi/JetProperty.java | 2 +- .../jetbrains/jet/lang/psi/JetVisitor.java | 4 -- .../jet/lang/psi/JetVisitorVoid.java | 4 -- 6 files changed, 3 insertions(+), 59 deletions(-) delete mode 100644 compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamespaceBody.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionNotStubbed.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionNotStubbed.java index 42333525b60..ce1426a6040 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionNotStubbed.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionNotStubbed.java @@ -105,6 +105,6 @@ abstract public class JetFunctionNotStubbed extends JetTypeParameterListOwnerNot @Override public boolean isLocal() { PsiElement parent = getParent(); - return !(parent instanceof JetFile || parent instanceof JetClassBody || parent instanceof JetNamespaceBody); + return !(parent instanceof JetFile || parent instanceof JetClassBody); } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java index 0ab89ffb090..54aa720e644 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java @@ -189,6 +189,6 @@ public class JetNamedFunction extends JetTypeParameterListOwnerStub getDeclarations() { - return PsiTreeUtil.getChildrenOfTypeAsList(this, JetDeclaration.class); - } - - @Override - public void accept(@NotNull JetVisitorVoid visitor) { - visitor.visitNamespaceBody(this); - } - - @Override - public R accept(@NotNull JetVisitor visitor, D data) { - return visitor.visitNamespaceBody(this, data); - } -} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java index 4923cd6b7dd..9dbdf157ed5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java @@ -78,7 +78,7 @@ public class JetProperty extends JetTypeParameterListOwnerStub extends PsiElementVisitor { return visitJetElement(classBody, data); } - public R visitNamespaceBody(JetNamespaceBody body, D data) { - return visitJetElement(body, data); - } - public R visitModifierList(JetModifierList list, D data) { return visitJetElement(list, data); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java index 0092d06c5e0..cbead52336a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java @@ -66,10 +66,6 @@ public class JetVisitorVoid extends PsiElementVisitor { visitJetElement(classBody); } - public void visitNamespaceBody(JetNamespaceBody body) { - visitJetElement(body); - } - public void visitModifierList(JetModifierList list) { visitJetElement(list); }