From e13063017a87cd5a6ceb8f9e2f8f9a48008bc4cd Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Tue, 1 Oct 2013 21:42:07 +0400 Subject: [PATCH] Exception class moved --- .../src/org/jetbrains/jet/lang/resolve/BodyResolver.java | 2 +- .../frontend/src/org/jetbrains/jet/lang/types/DeferredType.java | 2 +- .../types/expressions/ExpressionTypingVisitorDispatcher.java | 2 +- .../src/org/jetbrains/jet/storage/NullableLazyValueImpl.java | 1 - .../ReenteringLazyValueComputationException.java | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) rename core/util.runtime/src/org/jetbrains/jet/{utils => storage}/ReenteringLazyValueComputationException.java (96%) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java index ee393e2e298..db9d7a83b64 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java @@ -48,7 +48,7 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.lexer.JetTokens; import org.jetbrains.jet.util.Box; import org.jetbrains.jet.util.slicedmap.WritableSlice; -import org.jetbrains.jet.utils.ReenteringLazyValueComputationException; +import org.jetbrains.jet.storage.ReenteringLazyValueComputationException; import javax.inject.Inject; import java.util.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java index b09eea68f73..026d1493348 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java @@ -22,7 +22,7 @@ import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.storage.NotNullLazyValueImpl; import org.jetbrains.jet.util.Box; -import org.jetbrains.jet.utils.ReenteringLazyValueComputationException; +import org.jetbrains.jet.storage.ReenteringLazyValueComputationException; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java index 0dff98efcf2..0fa943f0215 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.types.DeferredType; import org.jetbrains.jet.lang.types.ErrorUtils; import org.jetbrains.jet.lang.types.JetTypeInfo; -import org.jetbrains.jet.utils.ReenteringLazyValueComputationException; +import org.jetbrains.jet.storage.ReenteringLazyValueComputationException; import static org.jetbrains.jet.lang.diagnostics.Errors.TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM; diff --git a/core/util.runtime/src/org/jetbrains/jet/storage/NullableLazyValueImpl.java b/core/util.runtime/src/org/jetbrains/jet/storage/NullableLazyValueImpl.java index e09feae9ec8..8c0a75da66b 100644 --- a/core/util.runtime/src/org/jetbrains/jet/storage/NullableLazyValueImpl.java +++ b/core/util.runtime/src/org/jetbrains/jet/storage/NullableLazyValueImpl.java @@ -18,7 +18,6 @@ package org.jetbrains.jet.storage; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.utils.ExceptionUtils; -import org.jetbrains.jet.utils.ReenteringLazyValueComputationException; import org.jetbrains.jet.utils.WrappedValues; public abstract class NullableLazyValueImpl implements NullableLazyValue { diff --git a/core/util.runtime/src/org/jetbrains/jet/utils/ReenteringLazyValueComputationException.java b/core/util.runtime/src/org/jetbrains/jet/storage/ReenteringLazyValueComputationException.java similarity index 96% rename from core/util.runtime/src/org/jetbrains/jet/utils/ReenteringLazyValueComputationException.java rename to core/util.runtime/src/org/jetbrains/jet/storage/ReenteringLazyValueComputationException.java index aff0dda2fa8..c4c9076cca8 100644 --- a/core/util.runtime/src/org/jetbrains/jet/utils/ReenteringLazyValueComputationException.java +++ b/core/util.runtime/src/org/jetbrains/jet/storage/ReenteringLazyValueComputationException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.utils; +package org.jetbrains.jet.storage; import org.jetbrains.annotations.NotNull;