diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameterImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameterImpl.java
index a8bff6858b0..0c63d9eb250 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameterImpl.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameterImpl.java
@@ -77,6 +77,6 @@ public class JavaTypeParameterImpl extends JavaClassifierImpl implements JavaTyp
     @Override
     @NotNull
     public JavaTypeProvider getTypeProvider() {
-        return new JavaTypeProvider(getPsi().getManager());
+        return new JavaTypeProviderImpl(getPsi().getManager());
     }
 }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeProvider.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeProvider.java
index 456cc2f0e22..e29fbd2ea5e 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeProvider.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeProvider.java
@@ -16,20 +16,9 @@
 
 package org.jetbrains.jet.lang.resolve.java.structure;
 
-import com.intellij.psi.PsiManager;
-import com.intellij.psi.PsiType;
-import com.intellij.psi.search.GlobalSearchScope;
 import org.jetbrains.annotations.NotNull;
 
-public class JavaTypeProvider {
-    private final PsiManager manager;
-
-    public JavaTypeProvider(@NotNull PsiManager manager) {
-        this.manager = manager;
-    }
-
+public interface JavaTypeProvider {
     @NotNull
-    public JavaType createJavaLangObjectType() {
-        return JavaTypeImpl.create(PsiType.getJavaLangObject(manager, GlobalSearchScope.allScope(manager.getProject())));
-    }
+    JavaType createJavaLangObjectType();
 }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeProviderImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeProviderImpl.java
new file mode 100644
index 00000000000..268132e78ac
--- /dev/null
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeProviderImpl.java
@@ -0,0 +1,36 @@
+/*
+ * 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.structure;
+
+import com.intellij.psi.PsiManager;
+import com.intellij.psi.PsiType;
+import com.intellij.psi.search.GlobalSearchScope;
+import org.jetbrains.annotations.NotNull;
+
+public class JavaTypeProviderImpl implements JavaTypeProvider {
+    private final PsiManager manager;
+
+    public JavaTypeProviderImpl(@NotNull PsiManager manager) {
+        this.manager = manager;
+    }
+
+    @Override
+    @NotNull
+    public JavaType createJavaLangObjectType() {
+        return JavaTypeImpl.create(PsiType.getJavaLangObject(manager, GlobalSearchScope.allScope(manager.getProject())));
+    }
+}
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaWildcardTypeImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaWildcardTypeImpl.java
index e160f4372f7..6d590017a74 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaWildcardTypeImpl.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaWildcardTypeImpl.java
@@ -47,6 +47,6 @@ public class JavaWildcardTypeImpl extends JavaTypeImpl implements JavaWildcardTy
     @Override
     @NotNull
     public JavaTypeProvider getTypeProvider() {
-        return new JavaTypeProvider(getPsi().getManager());
+        return new JavaTypeProviderImpl(getPsi().getManager());
     }
 }