From cca21e96c15c2060ca2b29d4eb763b0cd582ceda Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Fri, 9 Nov 2012 22:02:33 +0400
Subject: [PATCH] Progress class moved to jvm backend

---
 .../backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java | 2 +-
 .../src/org/jetbrains/jet/codegen/state/GenerationState.java    | 1 -
 .../src/org/jetbrains/jet/codegen/state}/Progress.java          | 2 +-
 .../jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java       | 2 +-
 compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java   | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)
 rename compiler/{util/src/org/jetbrains/jet/utils => backend/src/org/jetbrains/jet/codegen/state}/Progress.java (95%)

diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
index 267cb2389e8..7048b69a159 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
@@ -37,7 +37,7 @@ import org.jetbrains.jet.lang.resolve.java.JvmAbi;
 import org.jetbrains.jet.lang.resolve.java.JvmClassName;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
-import org.jetbrains.jet.utils.Progress;
+import org.jetbrains.jet.codegen.state.Progress;
 
 import java.io.File;
 import java.util.Collection;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/GenerationState.java b/compiler/backend/src/org/jetbrains/jet/codegen/state/GenerationState.java
index b3241ddb23b..cb89d50dba1 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/state/GenerationState.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/state/GenerationState.java
@@ -31,7 +31,6 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace;
-import org.jetbrains.jet.utils.Progress;
 
 import java.util.List;
 
diff --git a/compiler/util/src/org/jetbrains/jet/utils/Progress.java b/compiler/backend/src/org/jetbrains/jet/codegen/state/Progress.java
similarity index 95%
rename from compiler/util/src/org/jetbrains/jet/utils/Progress.java
rename to compiler/backend/src/org/jetbrains/jet/codegen/state/Progress.java
index 0aee7fa48d8..b4e310651c2 100644
--- a/compiler/util/src/org/jetbrains/jet/utils/Progress.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/state/Progress.java
@@ -17,7 +17,7 @@
 /*
  * @author max
  */
-package org.jetbrains.jet.utils;
+package org.jetbrains.jet.codegen.state;
 
 public interface Progress {
     Progress DEAF = new Progress() {
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
index e3ecee6b8fe..6b66259d8f2 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
@@ -51,7 +51,7 @@ import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.plugin.JetMainDetector;
 import org.jetbrains.jet.utils.ExceptionUtils;
 import org.jetbrains.jet.utils.PathUtil;
-import org.jetbrains.jet.utils.Progress;
+import org.jetbrains.jet.codegen.state.Progress;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java
index cce18b3d220..62e8f39216f 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java
@@ -42,7 +42,7 @@ import org.jetbrains.jet.lang.resolve.ScriptNameUtil;
 import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
 import org.jetbrains.jet.parsing.JetParsingTest;
 import org.jetbrains.jet.utils.ExceptionUtils;
-import org.jetbrains.jet.utils.Progress;
+import org.jetbrains.jet.codegen.state.Progress;
 
 import java.io.File;
 import java.io.IOException;