diff --git a/compiler/frontend.java/src/META-INF/services/org.jetbrains.jet.lang.resolve.java.structure.JavaElementFactory b/compiler/frontend.java/src/META-INF/services/org.jetbrains.jet.lang.resolve.java.structure.JavaElementFactory deleted file mode 100644 index 6922eb666fe..00000000000 --- a/compiler/frontend.java/src/META-INF/services/org.jetbrains.jet.lang.resolve.java.structure.JavaElementFactory +++ /dev/null @@ -1 +0,0 @@ -org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementFactoryImpl diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/PropagationHeuristics.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/PropagationHeuristics.java index f0b1181588f..40201b1384a 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/PropagationHeuristics.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/PropagationHeuristics.java @@ -216,7 +216,7 @@ class PropagationHeuristics { @NotNull private static JavaType varargToArray(@NotNull JavaType type, boolean isVararg) { - return isVararg ? JavaElementFactory.getInstance().createArrayType(((JavaArrayType) type).getComponentType()) : type; + return isVararg ? ((JavaArrayType) type).getComponentType().createArrayType() : type; } @NotNull diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementFactoryImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementFactoryImpl.java deleted file mode 100644 index 2318876e999..00000000000 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementFactoryImpl.java +++ /dev/null @@ -1,30 +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.structure.impl; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.java.structure.JavaArrayType; -import org.jetbrains.jet.lang.resolve.java.structure.JavaElementFactory; -import org.jetbrains.jet.lang.resolve.java.structure.JavaType; - -public class JavaElementFactoryImpl extends JavaElementFactory { - @NotNull - @Override - public JavaArrayType createArrayType(@NotNull JavaType elementType) { - return new JavaArrayTypeImpl(((JavaTypeImpl) elementType).getPsi().createArrayType()); - } -} diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeImpl.java index 7aedf56671c..680d5c53cdb 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeImpl.java @@ -19,6 +19,7 @@ package org.jetbrains.jet.lang.resolve.java.structure.impl; import com.intellij.psi.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.resolve.java.structure.JavaArrayType; import org.jetbrains.jet.lang.resolve.java.structure.JavaType; public abstract class JavaTypeImpl implements JavaType { @@ -68,6 +69,12 @@ public abstract class JavaTypeImpl implements JavaType { }); } + @NotNull + @Override + public JavaArrayType createArrayType() { + return new JavaArrayTypeImpl(getPsi().createArrayType()); + } + @Override public int hashCode() { return getPsi().hashCode(); diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java index 0d56f27ba93..c546a7849d3 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java @@ -183,7 +183,7 @@ public final class DescriptorResolverUtils { } else if (type instanceof JavaArrayType) { JavaType erasure = erasure(((JavaArrayType) type).getComponentType(), substitutor); - return erasure == null ? null : JavaElementFactory.getInstance().createArrayType(erasure); + return erasure == null ? null : erasure.createArrayType(); } else if (type instanceof JavaWildcardType) { JavaWildcardType wildcardType = (JavaWildcardType) type; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementFactory.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementFactory.java deleted file mode 100644 index 258edac4c43..00000000000 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementFactory.java +++ /dev/null @@ -1,40 +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.structure; - -import org.jetbrains.annotations.NotNull; - -import java.util.Iterator; -import java.util.ServiceLoader; - -public abstract class JavaElementFactory { - private static JavaElementFactory instance; - - @NotNull - public static JavaElementFactory getInstance() { - if (instance == null) { - Iterator iterator = - ServiceLoader.load(JavaElementFactory.class, JavaElementFactory.class.getClassLoader()).iterator(); - assert iterator.hasNext() : "No service found: " + JavaElementFactory.class.getName(); - instance = iterator.next(); - } - return instance; - } - - @NotNull - public abstract JavaArrayType createArrayType(@NotNull JavaType elementType); -} diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaType.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaType.java index cae4313b16a..203ef73856c 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaType.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaType.java @@ -16,5 +16,9 @@ package org.jetbrains.jet.lang.resolve.java.structure; +import org.jetbrains.annotations.NotNull; + public interface JavaType { + @NotNull + JavaArrayType createArrayType(); }