From e1dcf9db674b4bf473067d8f30aaa5eb05959d34 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Wed, 14 Dec 2011 22:38:31 +0400 Subject: [PATCH] rename internal package --- .../org/jetbrains/jet/codegen/BothSignatureWriter.java | 6 +++--- .../jet/lang/resolve/java/JavaTypeTransformer.java | 2 +- .../jet/lang/resolve/java/JetTypeJetSignatureReader.java | 6 ++---- stdlib/src/jet/typeinfo/TypeInfo.java | 4 ++-- .../internal => org/jetbrains/jet/rt}/Signature.java | 2 +- .../internal => org/jetbrains/jet/rt}/TypeInfoImpl.java | 2 +- .../internal => org/jetbrains/jet/rt}/TypeInfoParser.java | 8 ++++---- .../jetbrains/jet/rt}/TypeInfoProjectionImpl.java | 4 ++-- .../internal => org/jetbrains/jet/rt}/TypeInfoUtils.java | 2 +- .../internal => org/jetbrains/jet/rt}/TypeInfoVar.java | 2 +- .../jetbrains/jet/rt}/signature/JetSignatureAdapter.java | 2 +- .../jet/rt}/signature/JetSignatureExceptionsAdapter.java | 2 +- .../jetbrains/jet/rt}/signature/JetSignatureReader.java | 2 +- .../jetbrains/jet/rt}/signature/JetSignatureVisitor.java | 2 +- .../jetbrains/jet/rt}/signature/JetSignatureWriter.java | 2 +- 15 files changed, 23 insertions(+), 25 deletions(-) rename stdlib/src/{jet/typeinfo/internal => org/jetbrains/jet/rt}/Signature.java (98%) rename stdlib/src/{jet/typeinfo/internal => org/jetbrains/jet/rt}/TypeInfoImpl.java (99%) rename stdlib/src/{jet/typeinfo/internal => org/jetbrains/jet/rt}/TypeInfoParser.java (97%) rename stdlib/src/{jet/typeinfo/internal => org/jetbrains/jet/rt}/TypeInfoProjectionImpl.java (88%) rename stdlib/src/{jet/typeinfo/internal => org/jetbrains/jet/rt}/TypeInfoUtils.java (97%) rename stdlib/src/{jet/typeinfo/internal => org/jetbrains/jet/rt}/TypeInfoVar.java (98%) rename stdlib/src/{jet/typeinfo/internal => org/jetbrains/jet/rt}/signature/JetSignatureAdapter.java (97%) rename stdlib/src/{jet/typeinfo/internal => org/jetbrains/jet/rt}/signature/JetSignatureExceptionsAdapter.java (98%) rename stdlib/src/{jet/typeinfo/internal => org/jetbrains/jet/rt}/signature/JetSignatureReader.java (99%) rename stdlib/src/{jet/typeinfo/internal => org/jetbrains/jet/rt}/signature/JetSignatureVisitor.java (98%) rename stdlib/src/{jet/typeinfo/internal => org/jetbrains/jet/rt}/signature/JetSignatureWriter.java (99%) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/BothSignatureWriter.java b/compiler/backend/src/org/jetbrains/jet/codegen/BothSignatureWriter.java index 8fcbabac1ac..d83d838cb95 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/BothSignatureWriter.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/BothSignatureWriter.java @@ -3,9 +3,9 @@ package org.jetbrains.jet.codegen; import jet.typeinfo.TypeInfoVariance; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import jet.typeinfo.internal.signature.JetSignatureAdapter; -import jet.typeinfo.internal.signature.JetSignatureReader; -import jet.typeinfo.internal.signature.JetSignatureWriter; +import org.jetbrains.jet.rt.signature.JetSignatureAdapter; +import org.jetbrains.jet.rt.signature.JetSignatureReader; +import org.jetbrains.jet.rt.signature.JetSignatureWriter; import org.jetbrains.jet.lang.types.Variance; import org.objectweb.asm.Type; import org.objectweb.asm.signature.SignatureVisitor; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java index fd74d3d4d1e..4aed6ee493d 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java @@ -2,7 +2,7 @@ package org.jetbrains.jet.lang.resolve.java; import com.google.common.collect.Lists; import com.intellij.psi.*; -import jet.typeinfo.internal.signature.JetSignatureReader; +import org.jetbrains.jet.rt.signature.JetSignatureReader; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetTypeJetSignatureReader.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetTypeJetSignatureReader.java index 2c190cbc956..64bf4d30633 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetTypeJetSignatureReader.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetTypeJetSignatureReader.java @@ -1,12 +1,10 @@ package org.jetbrains.jet.lang.resolve.java; -import jet.typeinfo.TypeInfoVariance; -import jet.typeinfo.internal.signature.JetSignatureAdapter; -import jet.typeinfo.internal.signature.JetSignatureExceptionsAdapter; +import org.jetbrains.jet.rt.signature.JetSignatureExceptionsAdapter; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; -import jet.typeinfo.internal.signature.JetSignatureVisitor; +import org.jetbrains.jet.rt.signature.JetSignatureVisitor; import org.jetbrains.jet.lang.types.ErrorUtils; import org.jetbrains.jet.lang.types.JetStandardClasses; import org.jetbrains.jet.lang.types.JetStandardLibrary; diff --git a/stdlib/src/jet/typeinfo/TypeInfo.java b/stdlib/src/jet/typeinfo/TypeInfo.java index f2bc7734534..3e9a3ddaa30 100644 --- a/stdlib/src/jet/typeinfo/TypeInfo.java +++ b/stdlib/src/jet/typeinfo/TypeInfo.java @@ -2,8 +2,8 @@ package jet.typeinfo; import jet.JetObject; import jet.Tuple0; -import jet.typeinfo.internal.TypeInfoImpl; -import jet.typeinfo.internal.TypeInfoProjectionImpl; +import org.jetbrains.jet.rt.TypeInfoImpl; +import org.jetbrains.jet.rt.TypeInfoProjectionImpl; /** * @author abreslav diff --git a/stdlib/src/jet/typeinfo/internal/Signature.java b/stdlib/src/org/jetbrains/jet/rt/Signature.java similarity index 98% rename from stdlib/src/jet/typeinfo/internal/Signature.java rename to stdlib/src/org/jetbrains/jet/rt/Signature.java index 879ad3e46ae..ffa29d62636 100644 --- a/stdlib/src/jet/typeinfo/internal/Signature.java +++ b/stdlib/src/org/jetbrains/jet/rt/Signature.java @@ -1,4 +1,4 @@ -package jet.typeinfo.internal; +package org.jetbrains.jet.rt; import jet.typeinfo.TypeInfo; import jet.typeinfo.TypeInfoProjection; diff --git a/stdlib/src/jet/typeinfo/internal/TypeInfoImpl.java b/stdlib/src/org/jetbrains/jet/rt/TypeInfoImpl.java similarity index 99% rename from stdlib/src/jet/typeinfo/internal/TypeInfoImpl.java rename to stdlib/src/org/jetbrains/jet/rt/TypeInfoImpl.java index fe784eb8eae..48ba799f33d 100644 --- a/stdlib/src/jet/typeinfo/internal/TypeInfoImpl.java +++ b/stdlib/src/org/jetbrains/jet/rt/TypeInfoImpl.java @@ -1,4 +1,4 @@ -package jet.typeinfo.internal; +package org.jetbrains.jet.rt; import jet.JetObject; import jet.typeinfo.TypeInfo; diff --git a/stdlib/src/jet/typeinfo/internal/TypeInfoParser.java b/stdlib/src/org/jetbrains/jet/rt/TypeInfoParser.java similarity index 97% rename from stdlib/src/jet/typeinfo/internal/TypeInfoParser.java rename to stdlib/src/org/jetbrains/jet/rt/TypeInfoParser.java index 4ffdf66fc30..1a3b67a3d2e 100644 --- a/stdlib/src/jet/typeinfo/internal/TypeInfoParser.java +++ b/stdlib/src/org/jetbrains/jet/rt/TypeInfoParser.java @@ -1,12 +1,12 @@ -package jet.typeinfo.internal; +package org.jetbrains.jet.rt; import jet.typeinfo.JetSignature; import jet.typeinfo.TypeInfo; import jet.typeinfo.TypeInfoProjection; import jet.typeinfo.TypeInfoVariance; -import jet.typeinfo.internal.signature.JetSignatureExceptionsAdapter; -import jet.typeinfo.internal.signature.JetSignatureReader; -import jet.typeinfo.internal.signature.JetSignatureVisitor; +import org.jetbrains.jet.rt.signature.JetSignatureExceptionsAdapter; +import org.jetbrains.jet.rt.signature.JetSignatureReader; +import org.jetbrains.jet.rt.signature.JetSignatureVisitor; import java.lang.reflect.TypeVariable; import java.util.ArrayList; diff --git a/stdlib/src/jet/typeinfo/internal/TypeInfoProjectionImpl.java b/stdlib/src/org/jetbrains/jet/rt/TypeInfoProjectionImpl.java similarity index 88% rename from stdlib/src/jet/typeinfo/internal/TypeInfoProjectionImpl.java rename to stdlib/src/org/jetbrains/jet/rt/TypeInfoProjectionImpl.java index 94438ffbd5e..6a9d46f1c7e 100644 --- a/stdlib/src/jet/typeinfo/internal/TypeInfoProjectionImpl.java +++ b/stdlib/src/org/jetbrains/jet/rt/TypeInfoProjectionImpl.java @@ -1,4 +1,4 @@ -package jet.typeinfo.internal; +package org.jetbrains.jet.rt; import jet.typeinfo.TypeInfo; import jet.typeinfo.TypeInfoProjection; @@ -27,7 +27,7 @@ public abstract class TypeInfoProjectionImpl implements TypeInfoProjection { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - jet.typeinfo.internal.TypeInfoProjectionImpl that = (jet.typeinfo.internal.TypeInfoProjectionImpl) o; + TypeInfoProjectionImpl that = (TypeInfoProjectionImpl) o; // no need to compare variance as we compared classes already return type.equals(that.type); } diff --git a/stdlib/src/jet/typeinfo/internal/TypeInfoUtils.java b/stdlib/src/org/jetbrains/jet/rt/TypeInfoUtils.java similarity index 97% rename from stdlib/src/jet/typeinfo/internal/TypeInfoUtils.java rename to stdlib/src/org/jetbrains/jet/rt/TypeInfoUtils.java index 15747bb7c74..3a249cf295e 100644 --- a/stdlib/src/jet/typeinfo/internal/TypeInfoUtils.java +++ b/stdlib/src/org/jetbrains/jet/rt/TypeInfoUtils.java @@ -1,4 +1,4 @@ -package jet.typeinfo.internal; +package org.jetbrains.jet.rt; import jet.typeinfo.TypeInfo; import jet.typeinfo.TypeInfoProjection; diff --git a/stdlib/src/jet/typeinfo/internal/TypeInfoVar.java b/stdlib/src/org/jetbrains/jet/rt/TypeInfoVar.java similarity index 98% rename from stdlib/src/jet/typeinfo/internal/TypeInfoVar.java rename to stdlib/src/org/jetbrains/jet/rt/TypeInfoVar.java index 9b20798ab93..598151b8bd4 100644 --- a/stdlib/src/jet/typeinfo/internal/TypeInfoVar.java +++ b/stdlib/src/org/jetbrains/jet/rt/TypeInfoVar.java @@ -1,4 +1,4 @@ -package jet.typeinfo.internal; +package org.jetbrains.jet.rt; import jet.JetObject; import jet.typeinfo.TypeInfo; diff --git a/stdlib/src/jet/typeinfo/internal/signature/JetSignatureAdapter.java b/stdlib/src/org/jetbrains/jet/rt/signature/JetSignatureAdapter.java similarity index 97% rename from stdlib/src/jet/typeinfo/internal/signature/JetSignatureAdapter.java rename to stdlib/src/org/jetbrains/jet/rt/signature/JetSignatureAdapter.java index 8e229360bc4..3366e3b410f 100644 --- a/stdlib/src/jet/typeinfo/internal/signature/JetSignatureAdapter.java +++ b/stdlib/src/org/jetbrains/jet/rt/signature/JetSignatureAdapter.java @@ -1,4 +1,4 @@ -package jet.typeinfo.internal.signature; +package org.jetbrains.jet.rt.signature; import jet.typeinfo.TypeInfoVariance; diff --git a/stdlib/src/jet/typeinfo/internal/signature/JetSignatureExceptionsAdapter.java b/stdlib/src/org/jetbrains/jet/rt/signature/JetSignatureExceptionsAdapter.java similarity index 98% rename from stdlib/src/jet/typeinfo/internal/signature/JetSignatureExceptionsAdapter.java rename to stdlib/src/org/jetbrains/jet/rt/signature/JetSignatureExceptionsAdapter.java index 02b54de2868..cca55b64951 100644 --- a/stdlib/src/jet/typeinfo/internal/signature/JetSignatureExceptionsAdapter.java +++ b/stdlib/src/org/jetbrains/jet/rt/signature/JetSignatureExceptionsAdapter.java @@ -1,4 +1,4 @@ -package jet.typeinfo.internal.signature; +package org.jetbrains.jet.rt.signature; import jet.typeinfo.TypeInfoVariance; diff --git a/stdlib/src/jet/typeinfo/internal/signature/JetSignatureReader.java b/stdlib/src/org/jetbrains/jet/rt/signature/JetSignatureReader.java similarity index 99% rename from stdlib/src/jet/typeinfo/internal/signature/JetSignatureReader.java rename to stdlib/src/org/jetbrains/jet/rt/signature/JetSignatureReader.java index 4b94431bf88..49624917f09 100644 --- a/stdlib/src/jet/typeinfo/internal/signature/JetSignatureReader.java +++ b/stdlib/src/org/jetbrains/jet/rt/signature/JetSignatureReader.java @@ -1,4 +1,4 @@ -package jet.typeinfo.internal.signature; +package org.jetbrains.jet.rt.signature; import jet.typeinfo.TypeInfoVariance; diff --git a/stdlib/src/jet/typeinfo/internal/signature/JetSignatureVisitor.java b/stdlib/src/org/jetbrains/jet/rt/signature/JetSignatureVisitor.java similarity index 98% rename from stdlib/src/jet/typeinfo/internal/signature/JetSignatureVisitor.java rename to stdlib/src/org/jetbrains/jet/rt/signature/JetSignatureVisitor.java index 4aa667d515a..ee7bfc3e2d1 100644 --- a/stdlib/src/jet/typeinfo/internal/signature/JetSignatureVisitor.java +++ b/stdlib/src/org/jetbrains/jet/rt/signature/JetSignatureVisitor.java @@ -1,4 +1,4 @@ -package jet.typeinfo.internal.signature; +package org.jetbrains.jet.rt.signature; import jet.typeinfo.TypeInfoVariance; diff --git a/stdlib/src/jet/typeinfo/internal/signature/JetSignatureWriter.java b/stdlib/src/org/jetbrains/jet/rt/signature/JetSignatureWriter.java similarity index 99% rename from stdlib/src/jet/typeinfo/internal/signature/JetSignatureWriter.java rename to stdlib/src/org/jetbrains/jet/rt/signature/JetSignatureWriter.java index 3ac43dba3fd..9bd16db1c52 100644 --- a/stdlib/src/jet/typeinfo/internal/signature/JetSignatureWriter.java +++ b/stdlib/src/org/jetbrains/jet/rt/signature/JetSignatureWriter.java @@ -1,4 +1,4 @@ -package jet.typeinfo.internal.signature; +package org.jetbrains.jet.rt.signature; import jet.typeinfo.TypeInfoVariance;