From 08bf7f8eeeafee8287e335c9b5629e5eb4fefd45 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 19 Aug 2013 17:44:41 +0400 Subject: [PATCH] Create abstract JavaElementFactory Needed to wrap the logic of creation of elements/types, right now only array types --- .../resolve/java/DescriptorResolverUtils.java | 2 +- .../PropagationHeuristics.java | 2 +- .../resolve/java/structure/JavaArrayType.java | 5 ---- .../java/structure/JavaElementFactory.java | 30 +++++++++++++++++++ .../structure/JavaElementFactoryImpl.java | 27 +++++++++++++++++ 5 files changed, 59 insertions(+), 7 deletions(-) create mode 100644 compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementFactory.java create mode 100644 compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementFactoryImpl.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/DescriptorResolverUtils.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/DescriptorResolverUtils.java index d7e5e67a60b..0502e55b709 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/DescriptorResolverUtils.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/DescriptorResolverUtils.java @@ -176,7 +176,7 @@ public final class DescriptorResolverUtils { } else if (type instanceof JavaArrayType) { JavaType erasure = erasure(((JavaArrayType) type).getComponentType(), substitutor); - return erasure == null ? null : JavaArrayType.create(erasure); + return erasure == null ? null : JavaElementFactory.getInstance().createArrayType(erasure); } else if (type instanceof JavaWildcardType) { JavaWildcardType wildcardType = (JavaWildcardType) type; 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 0da61817941..39320c0b158 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 @@ -213,7 +213,7 @@ class PropagationHeuristics { @NotNull private static JavaType varargToArray(@NotNull JavaType type, boolean isVararg) { - return isVararg ? JavaArrayType.create(((JavaArrayType) type).getComponentType()) : type; + return isVararg ? JavaElementFactory.getInstance().createArrayType(((JavaArrayType) type).getComponentType()) : type; } @NotNull diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayType.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayType.java index a6be632baa3..b25d7b5df07 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayType.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayType.java @@ -30,11 +30,6 @@ public class JavaArrayType extends JavaTypeImpl { return (PsiArrayType) super.getPsi(); } - @NotNull - public static JavaArrayType create(@NotNull JavaType elementType) { - return new JavaArrayType(elementType.getPsi().createArrayType()); - } - @NotNull public JavaType getComponentType() { return JavaTypeImpl.create(getPsi().getComponentType()); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementFactory.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementFactory.java new file mode 100644 index 00000000000..0cb4abd9ee7 --- /dev/null +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementFactory.java @@ -0,0 +1,30 @@ +/* + * 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; + +public abstract class JavaElementFactory { + @NotNull + public static JavaElementFactory getInstance() { + // TODO: ServiceLoader.load + return new JavaElementFactoryImpl(); + } + + @NotNull + public abstract JavaArrayType createArrayType(@NotNull JavaType elementType); +} diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementFactoryImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementFactoryImpl.java new file mode 100644 index 00000000000..0bf84b1f274 --- /dev/null +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementFactoryImpl.java @@ -0,0 +1,27 @@ +/* + * 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; + +public class JavaElementFactoryImpl extends JavaElementFactory { + @NotNull + @Override + public JavaArrayType createArrayType(@NotNull JavaType elementType) { + return new JavaArrayType(elementType.getPsi().createArrayType()); + } +}