Remove PsiClassWrapper class

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/MembersCache.java

@@ -107,7 +107,7 @@ public final class MembersCache {
             boolean staticMembers
     ) {
         if (psiClass != null) {
-            membersCache.new ClassMemberProcessor(new PsiClassWrapper(psiClass), staticMembers).process();
+            membersCache.new ClassMemberProcessor(psiClass, staticMembers).process();
         }
 
         //TODO:
@@ -142,10 +142,10 @@ public final class MembersCache {
 
     private class ClassMemberProcessor {
         @NotNull
-        private final PsiClassWrapper psiClass;
+        private final PsiClass psiClass;
         private final boolean staticMembers;
 
-        private ClassMemberProcessor(@NotNull PsiClassWrapper psiClass, boolean staticMembers) {
+        private ClassMemberProcessor(@NotNull PsiClass psiClass, boolean staticMembers) {
             this.psiClass = psiClass;
             this.staticMembers = staticMembers;
         }
@@ -157,7 +157,7 @@ public final class MembersCache {
         }
 
         private void processFields() {
-            for (final PsiField field : psiClass.getPsiClass().getAllFields()) {
+            for (final PsiField field : psiClass.getAllFields()) {
                 addTask(field, new RunOnce() {
                     @Override
                     public void doRun() {
@@ -173,7 +173,7 @@ public final class MembersCache {
         }
 
         private void processOwnMethods() {
-            for (final PsiMethod method : psiClass.getPsiClass().getMethods()) {
+            for (final PsiMethod method : psiClass.getMethods()) {
                 RunOnce task = new RunOnce() {
                     @Override
                     public void doRun() {
@@ -190,7 +190,7 @@ public final class MembersCache {
         }
 
         private void parseAllMethodsAsProperties() {
-            for (PsiMethod method : psiClass.getPsiClass().getAllMethods()) {
+            for (PsiMethod method : psiClass.getAllMethods()) {
                 createEmptyEntry(Name.identifier(method.getName()));
 
                 PropertyParseResult propertyParseResult = PropertyNameUtils.parseMethodToProperty(method.getName());
@@ -204,7 +204,7 @@ public final class MembersCache {
             if (!staticMembers) {
                 return;
             }
-            for (final PsiClass nested : psiClass.getPsiClass().getInnerClasses()) {
+            for (final PsiClass nested : psiClass.getInnerClasses()) {
                 addTask(nested, new RunOnce() {
                     @Override
                     public void doRun() {
@@ -215,7 +215,7 @@ public final class MembersCache {
         }
 
         private boolean includeMember(PsiMemberWrapper member) {
-            if (psiClass.getPsiClass().isEnum() && staticMembers) {
+            if (psiClass.isEnum() && staticMembers) {
                 return member.isStatic();
             }
 
@@ -223,7 +223,7 @@ public final class MembersCache {
                 return false;
             }
 
-            if (member.getPsiMember().getContainingClass() != psiClass.getPsiClass()) {
+            if (member.getPsiMember().getContainingClass() != psiClass) {
                 return false;
             }
 

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java

@@ -36,7 +36,6 @@ import org.jetbrains.jet.lang.resolve.java.provider.ClassPsiDeclarationProvider;
 import org.jetbrains.jet.lang.resolve.java.provider.MembersCache;
 import org.jetbrains.jet.lang.resolve.java.sam.SingleAbstractMethodUtils;
 import org.jetbrains.jet.lang.resolve.java.scope.JavaClassNonStaticMembersScope;
-import org.jetbrains.jet.lang.resolve.java.wrapper.PsiClassWrapper;
 import org.jetbrains.jet.lang.resolve.java.wrapper.PsiMethodWrapper;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.FqNameBase;
@@ -289,7 +288,7 @@ public final class JavaClassResolver {
 
         // TODO: ugly hack: tests crash if initializeTypeParameters called with class containing proper supertypes
         List<TypeParameterDescriptor> classTypeParameters = classDescriptor.getTypeConstructor().getParameters();
-        supertypes.addAll(supertypesResolver.getSupertypes(classDescriptor, new PsiClassWrapper(psiClass), classTypeParameters));
+        supertypes.addAll(supertypesResolver.getSupertypes(classDescriptor, psiClass, classTypeParameters));
 
         if (psiClass.isEnum()) {
             ClassDescriptorFromJvmBytecode classObjectDescriptor = createClassObjectDescriptorForEnum(classDescriptor, psiClass);

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java

@@ -26,7 +26,6 @@ import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.resolve.java.*;
-import org.jetbrains.jet.lang.resolve.java.wrapper.PsiClassWrapper;
 import org.jetbrains.jet.lang.types.ErrorUtils;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.TypeUtils;
@@ -60,7 +59,7 @@ public final class JavaSupertypeResolver {
 
     public Collection<JetType> getSupertypes(
             @NotNull ClassDescriptor classDescriptor,
-            @NotNull PsiClassWrapper psiClass,
+            @NotNull PsiClass psiClass,
             @NotNull List<TypeParameterDescriptor> typeParameters
     ) {
 
@@ -70,8 +69,8 @@ public final class JavaSupertypeResolver {
 
         TypeVariableResolver typeVariableResolverForSupertypes =
                 TypeVariableResolvers.typeVariableResolverFromTypeParameters(typeParameters, classDescriptor, context);
-        transformSupertypeList(result, psiClass.getPsiClass().getExtendsListTypes(), typeVariableResolverForSupertypes);
-        transformSupertypeList(result, psiClass.getPsiClass().getImplementsListTypes(), typeVariableResolverForSupertypes);
+        transformSupertypeList(result, psiClass.getExtendsListTypes(), typeVariableResolverForSupertypes);
+        transformSupertypeList(result, psiClass.getImplementsListTypes(), typeVariableResolverForSupertypes);
 
         reportIncompleteHierarchyForErrorTypes(classDescriptor, result);
 
@@ -82,7 +81,7 @@ public final class JavaSupertypeResolver {
     }
 
     private void addBaseClass(
-            @NotNull PsiClassWrapper psiClass,
+            @NotNull PsiClass psiClass,
             @NotNull ClassDescriptor classDescriptor,
             @NotNull List<JetType> result
     ) {

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PsiClassWrapper.java

@@ -1,39 +0,0 @@
-/*
- * Copyright 2010-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.lang.resolve.java.wrapper;
-
-import com.intellij.psi.PsiClass;
-import org.jetbrains.annotations.NotNull;
-
-public class PsiClassWrapper {
-
-    @NotNull
-    private final PsiClass psiClass;
-
-    public PsiClassWrapper(@NotNull PsiClass psiClass) {
-        this.psiClass = psiClass;
-    }
-
-    public String getQualifiedName() {
-        return psiClass.getQualifiedName();
-    }
-
-    @NotNull
-    public PsiClass getPsiClass() {
-        return psiClass;
-    }
-}