From 714dbe2df380c2082cfe66a48135804e9c121882 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 19 Aug 2013 20:52:07 +0400 Subject: [PATCH] Move JavaElement implementations to 'impl' package --- .../jet/lang/resolve/java/JavaClassFinderImpl.java | 4 ++-- .../jet/lang/resolve/java/JavaResolverPsiUtils.java | 2 +- .../java/kotlinSignature/PropagationHeuristics.java | 1 + .../kotlinSignature/SignaturesPropagationData.java | 2 +- .../resolver/PsiBasedExternalAnnotationResolver.java | 4 ++-- .../java/resolver/PsiBasedMethodSignatureChecker.java | 1 + .../resolve/java/structure/JavaElementFactory.java | 1 + .../resolve/java/structure/JavaSignatureFormatter.java | 1 + .../{ => impl}/JavaAnnotationArgumentImpl.java | 3 ++- .../JavaAnnotationAsAnnotationArgumentImpl.java | 4 +++- .../java/structure/{ => impl}/JavaAnnotationImpl.java | 6 ++++-- .../{ => impl}/JavaArrayAnnotationArgumentImpl.java | 6 ++++-- .../java/structure/{ => impl}/JavaArrayTypeImpl.java | 4 +++- .../java/structure/{ => impl}/JavaClassImpl.java | 5 +++-- .../java/structure/{ => impl}/JavaClassifierImpl.java | 3 ++- .../structure/{ => impl}/JavaClassifierTypeImpl.java | 8 ++++++-- .../JavaElementCollectionFromPsiArrayUtil.java | 3 ++- .../structure/{ => impl}/JavaElementFactoryImpl.java | 5 ++++- .../java/structure/{ => impl}/JavaElementImpl.java | 3 ++- .../java/structure/{ => impl}/JavaElementUtil.java | 7 +++++-- .../java/structure/{ => impl}/JavaFieldImpl.java | 4 +++- .../{ => impl}/JavaLiteralAnnotationArgumentImpl.java | 3 ++- .../java/structure/{ => impl}/JavaMemberImpl.java | 5 ++++- .../java/structure/{ => impl}/JavaMethodImpl.java | 10 +++++++--- .../java/structure/{ => impl}/JavaPackageImpl.java | 8 +++++--- .../structure/{ => impl}/JavaPrimitiveTypeImpl.java | 3 ++- .../JavaReferenceAnnotationArgumentImpl.java | 4 +++- .../{ => impl}/JavaSignatureFormatterImpl.java | 4 +++- .../java/structure/{ => impl}/JavaTypeImpl.java | 3 ++- .../structure/{ => impl}/JavaTypeParameterImpl.java | 5 +++-- .../structure/{ => impl}/JavaTypeProviderImpl.java | 4 +++- .../structure/{ => impl}/JavaTypeSubstitutorImpl.java | 5 ++++- .../structure/{ => impl}/JavaValueParameterImpl.java | 5 ++++- .../structure/{ => impl}/JavaWildcardTypeImpl.java | 7 +++++-- 34 files changed, 100 insertions(+), 43 deletions(-) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaAnnotationArgumentImpl.java (94%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaAnnotationAsAnnotationArgumentImpl.java (85%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaAnnotationImpl.java (84%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaArrayAnnotationArgumentImpl.java (80%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaArrayTypeImpl.java (85%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaClassImpl.java (96%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaClassifierImpl.java (91%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaClassifierTypeImpl.java (88%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaElementCollectionFromPsiArrayUtil.java (98%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaElementFactoryImpl.java (77%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaElementImpl.java (91%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaElementUtil.java (88%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaFieldImpl.java (86%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaLiteralAnnotationArgumentImpl.java (90%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaMemberImpl.java (90%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaMethodImpl.java (79%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaPackageImpl.java (77%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaPrimitiveTypeImpl.java (89%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaReferenceAnnotationArgumentImpl.java (88%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaSignatureFormatterImpl.java (87%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaTypeImpl.java (95%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaTypeParameterImpl.java (91%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaTypeProviderImpl.java (85%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaTypeSubstitutorImpl.java (92%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaValueParameterImpl.java (87%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/{ => impl}/JavaWildcardTypeImpl.java (81%) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinderImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinderImpl.java index 6f0f27f98fe..ca39d0ed5fc 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinderImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinderImpl.java @@ -21,9 +21,9 @@ import com.intellij.psi.PsiPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.java.structure.JavaClass; -import org.jetbrains.jet.lang.resolve.java.structure.JavaClassImpl; import org.jetbrains.jet.lang.resolve.java.structure.JavaPackage; -import org.jetbrains.jet.lang.resolve.java.structure.JavaPackageImpl; +import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl; +import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaPackageImpl; import org.jetbrains.jet.lang.resolve.name.FqName; import javax.inject.Inject; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverPsiUtils.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverPsiUtils.java index 57329000b9a..b8f6fc44f1f 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverPsiUtils.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverPsiUtils.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.java; import com.intellij.psi.PsiClass; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.java.structure.JavaClassImpl; +import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl; public class JavaResolverPsiUtils { private JavaResolverPsiUtils() { 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 4b873a89ad7..5d0355105a4 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 @@ -29,6 +29,7 @@ import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.descriptors.Visibilities; import org.jetbrains.jet.lang.resolve.java.resolver.JavaSupertypeResolver; import org.jetbrains.jet.lang.resolve.java.structure.*; +import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaTypeSubstitutorImpl; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.JetType; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java index 19ae56edf31..47692372b7f 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java @@ -40,7 +40,7 @@ import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetClsMethod; import org.jetbrains.jet.lang.resolve.java.mapping.JavaToKotlinClassMap; import org.jetbrains.jet.lang.resolve.java.structure.JavaClass; import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod; -import org.jetbrains.jet.lang.resolve.java.structure.JavaMethodImpl; +import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaMethodImpl; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; import org.jetbrains.jet.lang.resolve.name.Name; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedExternalAnnotationResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedExternalAnnotationResolver.java index 983831fb85b..aac85e37f6e 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedExternalAnnotationResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedExternalAnnotationResolver.java @@ -24,9 +24,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.java.JvmClassName; import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation; -import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationImpl; import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationOwner; -import org.jetbrains.jet.lang.resolve.java.structure.JavaElementCollectionFromPsiArrayUtil; +import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaAnnotationImpl; +import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil; import org.jetbrains.jet.lang.resolve.name.FqName; import java.util.Collection; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedMethodSignatureChecker.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedMethodSignatureChecker.java index b4ae173ff71..d2e1cfae9d6 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedMethodSignatureChecker.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedMethodSignatureChecker.java @@ -29,6 +29,7 @@ import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; import org.jetbrains.jet.lang.resolve.OverridingUtil; import org.jetbrains.jet.lang.resolve.java.kotlinSignature.SignaturesUtil; import org.jetbrains.jet.lang.resolve.java.structure.*; +import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaMethodImpl; import org.jetbrains.jet.lang.types.ErrorUtils; import org.jetbrains.jet.lang.types.SubstitutionUtils; import org.jetbrains.jet.lang.types.TypeSubstitution; 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 index 0cb4abd9ee7..b6873690a2e 100644 --- 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 @@ -17,6 +17,7 @@ package org.jetbrains.jet.lang.resolve.java.structure; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementFactoryImpl; public abstract class JavaElementFactory { @NotNull diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaSignatureFormatter.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaSignatureFormatter.java index dca3dbc0857..f50fabdceed 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaSignatureFormatter.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaSignatureFormatter.java @@ -17,6 +17,7 @@ package org.jetbrains.jet.lang.resolve.java.structure; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaSignatureFormatterImpl; public abstract class JavaSignatureFormatter { public static JavaSignatureFormatter getInstance() { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationArgumentImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationArgumentImpl.java similarity index 94% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationArgumentImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationArgumentImpl.java index f9155cbfb57..1ffe06bf744 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationArgumentImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationArgumentImpl.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +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.JavaAnnotationArgument; import org.jetbrains.jet.lang.resolve.name.Name; public abstract class JavaAnnotationArgumentImpl extends JavaElementImpl implements JavaAnnotationArgument { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationAsAnnotationArgumentImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationAsAnnotationArgumentImpl.java similarity index 85% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationAsAnnotationArgumentImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationAsAnnotationArgumentImpl.java index 90bee806b89..658d8a97d51 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationAsAnnotationArgumentImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationAsAnnotationArgumentImpl.java @@ -14,11 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +package org.jetbrains.jet.lang.resolve.java.structure.impl; import com.intellij.psi.PsiAnnotation; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation; +import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationAsAnnotationArgument; import org.jetbrains.jet.lang.resolve.name.Name; public class JavaAnnotationAsAnnotationArgumentImpl extends JavaAnnotationArgumentImpl implements JavaAnnotationAsAnnotationArgument { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationImpl.java similarity index 84% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationImpl.java index b8f9eb433c6..e0a714837c2 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationImpl.java @@ -14,18 +14,20 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +package org.jetbrains.jet.lang.resolve.java.structure.impl; import com.intellij.psi.PsiAnnotation; import com.intellij.psi.PsiAnnotationMemberValue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation; +import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationArgument; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import java.util.Collection; -import static org.jetbrains.jet.lang.resolve.java.structure.JavaElementCollectionFromPsiArrayUtil.namedAnnotationArguments; +import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.namedAnnotationArguments; public class JavaAnnotationImpl extends JavaElementImpl implements JavaAnnotation { public JavaAnnotationImpl(@NotNull PsiAnnotation psiAnnotation) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayAnnotationArgumentImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaArrayAnnotationArgumentImpl.java similarity index 80% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayAnnotationArgumentImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaArrayAnnotationArgumentImpl.java index 780aa43c141..2b20d69ba35 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayAnnotationArgumentImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaArrayAnnotationArgumentImpl.java @@ -14,16 +14,18 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +package org.jetbrains.jet.lang.resolve.java.structure.impl; import com.intellij.psi.PsiArrayInitializerMemberValue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationArgument; +import org.jetbrains.jet.lang.resolve.java.structure.JavaArrayAnnotationArgument; import org.jetbrains.jet.lang.resolve.name.Name; import java.util.Collection; -import static org.jetbrains.jet.lang.resolve.java.structure.JavaElementCollectionFromPsiArrayUtil.namelessAnnotationArguments; +import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.namelessAnnotationArguments; public class JavaArrayAnnotationArgumentImpl extends JavaAnnotationArgumentImpl implements JavaArrayAnnotationArgument { protected JavaArrayAnnotationArgumentImpl(@NotNull PsiArrayInitializerMemberValue psiArrayInitializerMemberValue, @Nullable Name name) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayTypeImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaArrayTypeImpl.java similarity index 85% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayTypeImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaArrayTypeImpl.java index 1d2d6e88dc1..35b065e0571 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayTypeImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaArrayTypeImpl.java @@ -14,10 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +package org.jetbrains.jet.lang.resolve.java.structure.impl; import com.intellij.psi.PsiArrayType; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.resolve.java.structure.JavaArrayType; +import org.jetbrains.jet.lang.resolve.java.structure.JavaType; public class JavaArrayTypeImpl extends JavaTypeImpl implements JavaArrayType { public JavaArrayTypeImpl(@NotNull PsiArrayType psiArrayType) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassImpl.java similarity index 96% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassImpl.java index e7969178527..85dc94ec883 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +package org.jetbrains.jet.lang.resolve.java.structure.impl; import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiClass; @@ -27,12 +27,13 @@ import org.jetbrains.jet.lang.descriptors.ClassKind; import org.jetbrains.jet.lang.descriptors.Modality; import org.jetbrains.jet.lang.descriptors.Visibility; import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetJavaMirrorMarker; +import org.jetbrains.jet.lang.resolve.java.structure.*; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import java.util.Collection; -import static org.jetbrains.jet.lang.resolve.java.structure.JavaElementCollectionFromPsiArrayUtil.*; +import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.*; public class JavaClassImpl extends JavaClassifierImpl implements JavaClass { public JavaClassImpl(@NotNull PsiClass psiClass) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifierImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierImpl.java similarity index 91% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifierImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierImpl.java index 73773971448..7bef4a83cb8 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifierImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierImpl.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +package org.jetbrains.jet.lang.resolve.java.structure.impl; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiTypeParameter; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.resolve.java.structure.JavaClassifier; public abstract class JavaClassifierImpl extends JavaElementImpl implements JavaClassifier { protected JavaClassifierImpl(@NotNull PsiClass psiClass) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifierTypeImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierTypeImpl.java similarity index 88% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifierTypeImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierTypeImpl.java index 5b148c57aba..f84034c13e3 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifierTypeImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierTypeImpl.java @@ -14,20 +14,24 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +package org.jetbrains.jet.lang.resolve.java.structure.impl; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiClassType; import com.intellij.psi.PsiType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.resolve.java.structure.JavaClassifier; +import org.jetbrains.jet.lang.resolve.java.structure.JavaClassifierType; +import org.jetbrains.jet.lang.resolve.java.structure.JavaType; +import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeSubstitutor; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import static org.jetbrains.jet.lang.resolve.java.structure.JavaElementCollectionFromPsiArrayUtil.types; +import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.types; public class JavaClassifierTypeImpl extends JavaTypeImpl implements JavaClassifierType { private static class ResolutionResult { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementCollectionFromPsiArrayUtil.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java similarity index 98% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementCollectionFromPsiArrayUtil.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java index 98f338666c7..32cd7f039aa 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementCollectionFromPsiArrayUtil.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +package org.jetbrains.jet.lang.resolve.java.structure.impl; import com.intellij.psi.*; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.resolve.java.structure.*; import org.jetbrains.jet.lang.resolve.name.Name; import java.util.ArrayList; 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/impl/JavaElementFactoryImpl.java similarity index 77% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementFactoryImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementFactoryImpl.java index 40a9c92c2c1..bbb198ac853 100644 --- 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/impl/JavaElementFactoryImpl.java @@ -14,9 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +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 diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementImpl.java similarity index 91% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementImpl.java index 8b9a3cd9d8d..777b4807a58 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementImpl.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +package org.jetbrains.jet.lang.resolve.java.structure.impl; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.resolve.java.structure.JavaElement; public abstract class JavaElementImpl implements JavaElement { private final PsiElement psiElement; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementUtil.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementUtil.java similarity index 88% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementUtil.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementUtil.java index 27986f2cb7f..f74bdf14cd6 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementUtil.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +package org.jetbrains.jet.lang.resolve.java.structure.impl; import com.intellij.psi.PsiAnnotation; import com.intellij.psi.PsiModifier; @@ -24,12 +24,15 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.Visibilities; import org.jetbrains.jet.lang.descriptors.Visibility; import org.jetbrains.jet.lang.resolve.java.JavaVisibilities; +import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation; +import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationOwner; +import org.jetbrains.jet.lang.resolve.java.structure.JavaModifierListOwner; import org.jetbrains.jet.lang.resolve.name.FqName; import java.util.Collection; import java.util.Collections; -import static org.jetbrains.jet.lang.resolve.java.structure.JavaElementCollectionFromPsiArrayUtil.annotations; +import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.annotations; /* package */ class JavaElementUtil { private JavaElementUtil() { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaFieldImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaFieldImpl.java similarity index 86% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaFieldImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaFieldImpl.java index bdc2981ca70..e5cce3fde46 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaFieldImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaFieldImpl.java @@ -14,11 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +package org.jetbrains.jet.lang.resolve.java.structure.impl; import com.intellij.psi.PsiEnumConstant; import com.intellij.psi.PsiField; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.resolve.java.structure.JavaField; +import org.jetbrains.jet.lang.resolve.java.structure.JavaType; public class JavaFieldImpl extends JavaMemberImpl implements JavaField { public JavaFieldImpl(@NotNull PsiField psiField) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaLiteralAnnotationArgumentImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaLiteralAnnotationArgumentImpl.java similarity index 90% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaLiteralAnnotationArgumentImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaLiteralAnnotationArgumentImpl.java index 48d983ccb80..227bae73fc2 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaLiteralAnnotationArgumentImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaLiteralAnnotationArgumentImpl.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +package org.jetbrains.jet.lang.resolve.java.structure.impl; import com.intellij.psi.PsiLiteralExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.resolve.java.structure.JavaLiteralAnnotationArgument; import org.jetbrains.jet.lang.resolve.name.Name; public class JavaLiteralAnnotationArgumentImpl extends JavaAnnotationArgumentImpl implements JavaLiteralAnnotationArgument { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMemberImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMemberImpl.java similarity index 90% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMemberImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMemberImpl.java index 373a9165136..75cb2c7ce38 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMemberImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMemberImpl.java @@ -14,13 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +package org.jetbrains.jet.lang.resolve.java.structure.impl; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiMember; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.Visibility; +import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation; +import org.jetbrains.jet.lang.resolve.java.structure.JavaClass; +import org.jetbrains.jet.lang.resolve.java.structure.JavaMember; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMethodImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMethodImpl.java similarity index 79% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMethodImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMethodImpl.java index 340a00ae65d..62134a2f6c3 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMethodImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMethodImpl.java @@ -14,19 +14,23 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +package org.jetbrains.jet.lang.resolve.java.structure.impl; import com.intellij.psi.PsiAnnotationMethod; import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod; +import org.jetbrains.jet.lang.resolve.java.structure.JavaType; +import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeParameter; +import org.jetbrains.jet.lang.resolve.java.structure.JavaValueParameter; import org.jetbrains.jet.lang.resolve.name.Name; import java.util.Collection; -import static org.jetbrains.jet.lang.resolve.java.structure.JavaElementCollectionFromPsiArrayUtil.typeParameters; -import static org.jetbrains.jet.lang.resolve.java.structure.JavaElementCollectionFromPsiArrayUtil.valueParameters; +import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.typeParameters; +import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.valueParameters; public class JavaMethodImpl extends JavaMemberImpl implements JavaMethod { public JavaMethodImpl(@NotNull PsiMethod psiMethod) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPackageImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPackageImpl.java similarity index 77% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPackageImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPackageImpl.java index b11165969f9..1bee04eaed4 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPackageImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPackageImpl.java @@ -14,16 +14,18 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +package org.jetbrains.jet.lang.resolve.java.structure.impl; import com.intellij.psi.PsiPackage; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.resolve.java.structure.JavaClass; +import org.jetbrains.jet.lang.resolve.java.structure.JavaPackage; import org.jetbrains.jet.lang.resolve.name.FqName; import java.util.Collection; -import static org.jetbrains.jet.lang.resolve.java.structure.JavaElementCollectionFromPsiArrayUtil.classes; -import static org.jetbrains.jet.lang.resolve.java.structure.JavaElementCollectionFromPsiArrayUtil.packages; +import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.classes; +import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.packages; public class JavaPackageImpl extends JavaElementImpl implements JavaPackage { public JavaPackageImpl(@NotNull PsiPackage psiPackage) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPrimitiveTypeImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPrimitiveTypeImpl.java similarity index 89% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPrimitiveTypeImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPrimitiveTypeImpl.java index bd4bbe0e7c9..efc97c2b920 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPrimitiveTypeImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPrimitiveTypeImpl.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +package org.jetbrains.jet.lang.resolve.java.structure.impl; import com.intellij.psi.PsiPrimitiveType; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.resolve.java.structure.JavaPrimitiveType; public class JavaPrimitiveTypeImpl extends JavaTypeImpl implements JavaPrimitiveType { public JavaPrimitiveTypeImpl(@NotNull PsiPrimitiveType psiPrimitiveType) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaReferenceAnnotationArgumentImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaReferenceAnnotationArgumentImpl.java similarity index 88% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaReferenceAnnotationArgumentImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaReferenceAnnotationArgumentImpl.java index a7410b30acb..699ef706e8b 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaReferenceAnnotationArgumentImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaReferenceAnnotationArgumentImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +package org.jetbrains.jet.lang.resolve.java.structure.impl; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiEnumConstant; @@ -22,6 +22,8 @@ import com.intellij.psi.PsiField; import com.intellij.psi.PsiReferenceExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.resolve.java.structure.JavaElement; +import org.jetbrains.jet.lang.resolve.java.structure.JavaReferenceAnnotationArgument; import org.jetbrains.jet.lang.resolve.name.Name; public class JavaReferenceAnnotationArgumentImpl extends JavaAnnotationArgumentImpl implements JavaReferenceAnnotationArgument { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaSignatureFormatterImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaSignatureFormatterImpl.java similarity index 87% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaSignatureFormatterImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaSignatureFormatterImpl.java index 1b8c593bbbe..544da8d5106 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaSignatureFormatterImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaSignatureFormatterImpl.java @@ -14,11 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +package org.jetbrains.jet.lang.resolve.java.structure.impl; import com.intellij.psi.PsiSubstitutor; import com.intellij.psi.util.PsiFormatUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod; +import org.jetbrains.jet.lang.resolve.java.structure.JavaSignatureFormatter; import static com.intellij.psi.util.PsiFormatUtilBase.*; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeImpl.java similarity index 95% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeImpl.java index 788b41f5414..a9249696f65 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeImpl.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +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.JavaType; public abstract class JavaTypeImpl implements JavaType { private final PsiType psiType; 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/impl/JavaTypeParameterImpl.java similarity index 91% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameterImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeParameterImpl.java index 6292bfbcc1e..825f96c31a3 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/impl/JavaTypeParameterImpl.java @@ -14,16 +14,17 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +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.*; import org.jetbrains.jet.lang.resolve.name.Name; import java.util.Collection; -import static org.jetbrains.jet.lang.resolve.java.structure.JavaElementCollectionFromPsiArrayUtil.classifierTypes; +import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.classifierTypes; public class JavaTypeParameterImpl extends JavaClassifierImpl implements JavaTypeParameter { public JavaTypeParameterImpl(@NotNull PsiTypeParameter psiTypeParameter) { 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/impl/JavaTypeProviderImpl.java similarity index 85% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeProviderImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeProviderImpl.java index 268132e78ac..45ad66eaf8a 100644 --- 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/impl/JavaTypeProviderImpl.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +package org.jetbrains.jet.lang.resolve.java.structure.impl; import com.intellij.psi.PsiManager; import com.intellij.psi.PsiType; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.resolve.java.structure.JavaType; +import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeProvider; public class JavaTypeProviderImpl implements JavaTypeProvider { private final PsiManager manager; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeSubstitutorImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeSubstitutorImpl.java similarity index 92% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeSubstitutorImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeSubstitutorImpl.java index e4b19105a83..fe138707ad7 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeSubstitutorImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeSubstitutorImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +package org.jetbrains.jet.lang.resolve.java.structure.impl; import com.intellij.psi.PsiSubstitutor; import com.intellij.psi.PsiType; @@ -22,6 +22,9 @@ import com.intellij.psi.PsiTypeParameter; import com.intellij.psi.impl.PsiSubstitutorImpl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.resolve.java.structure.JavaType; +import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeParameter; +import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeSubstitutor; import java.util.HashMap; import java.util.Map; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaValueParameterImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaValueParameterImpl.java similarity index 87% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaValueParameterImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaValueParameterImpl.java index 43d86d2da88..6e85b5c5654 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaValueParameterImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaValueParameterImpl.java @@ -14,11 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +package org.jetbrains.jet.lang.resolve.java.structure.impl; import com.intellij.psi.PsiParameter; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation; +import org.jetbrains.jet.lang.resolve.java.structure.JavaType; +import org.jetbrains.jet.lang.resolve.java.structure.JavaValueParameter; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; 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/impl/JavaWildcardTypeImpl.java similarity index 81% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaWildcardTypeImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaWildcardTypeImpl.java index 6d590017a74..647a66a33e9 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/impl/JavaWildcardTypeImpl.java @@ -14,12 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure; +package org.jetbrains.jet.lang.resolve.java.structure.impl; import com.intellij.psi.PsiType; import com.intellij.psi.PsiWildcardType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.resolve.java.structure.JavaType; +import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeProvider; +import org.jetbrains.jet.lang.resolve.java.structure.JavaWildcardType; public class JavaWildcardTypeImpl extends JavaTypeImpl implements JavaWildcardType { public JavaWildcardTypeImpl(@NotNull PsiWildcardType psiWildcardType) { @@ -36,7 +39,7 @@ public class JavaWildcardTypeImpl extends JavaTypeImpl implements JavaWildcardTy @Nullable public JavaType getBound() { PsiType bound = getPsi().getBound(); - return bound == null ? null : JavaTypeImpl.create(bound); + return bound == null ? null : create(bound); } @Override