Revert package rename for backward compatibility

Author: zuevmaxim

instrumentation/src/com/intellij/rt/coverage/instrumentation/Instrumentator.java

@@ -20,7 +20,7 @@
 import com.intellij.rt.coverage.instrumentation.testTracking.TestTrackingArrayMode;
 import com.intellij.rt.coverage.instrumentation.testTracking.TestTrackingClassDataMode;
 import com.intellij.rt.coverage.instrumentation.testTracking.TestTrackingMode;
-import com.intellij.rt.coverage.report.CoverageReport;
+import com.intellij.rt.coverage.util.CoverageReport;
 import com.intellij.rt.coverage.util.ErrorReporter;
 import com.intellij.rt.coverage.util.OptionsUtil;
 import com.intellij.rt.coverage.util.TestTrackingCallback;

instrumentation/src/com/intellij/rt/coverage/report/ClassListSection.java instrumentation/src/com/intellij/rt/coverage/util/ClassListSection.java

@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package com.intellij.rt.coverage.report;
+package com.intellij.rt.coverage.util;
 
 import com.intellij.rt.coverage.data.ClassData;
 import com.intellij.rt.coverage.data.ProjectData;
-import com.intellij.rt.coverage.util.CoverageIOUtil;
 import org.jetbrains.coverage.gnu.trove.TIntObjectHashMap;
 import org.jetbrains.coverage.gnu.trove.TObjectIntHashMap;
 import org.jetbrains.coverage.gnu.trove.TObjectIntProcedure;

instrumentation/src/com/intellij/rt/coverage/report/CoverageReport.java instrumentation/src/com/intellij/rt/coverage/util/CoverageReport.java

@@ -14,16 +14,12 @@
  * limitations under the License.
  */
 
-package com.intellij.rt.coverage.report;
+package com.intellij.rt.coverage.util;
 
 import com.intellij.rt.coverage.data.ClassData;
 import com.intellij.rt.coverage.data.ProjectData;
 import com.intellij.rt.coverage.instrumentation.UnloadedUtil;
 import com.intellij.rt.coverage.instrumentation.filters.lines.KotlinInlineFilter;
-import com.intellij.rt.coverage.util.CoverageIOUtil;
-import com.intellij.rt.coverage.util.DictionaryLookup;
-import com.intellij.rt.coverage.util.ErrorReporter;
-import com.intellij.rt.coverage.util.OptionsUtil;
 import com.intellij.rt.coverage.util.classFinder.ClassFinder;
 import org.jetbrains.coverage.gnu.trove.TObjectIntHashMap;
 

instrumentation/src/com/intellij/rt/coverage/report/InstructionsSection.java instrumentation/src/com/intellij/rt/coverage/util/InstructionsSection.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.intellij.rt.coverage.report;
+package com.intellij.rt.coverage.util;
 
 import com.intellij.rt.coverage.data.ClassData;
 import com.intellij.rt.coverage.data.LineData;
@@ -24,7 +24,6 @@
 import com.intellij.rt.coverage.data.instructions.JumpInstructions;
 import com.intellij.rt.coverage.data.instructions.LineInstructions;
 import com.intellij.rt.coverage.data.instructions.SwitchInstructions;
-import com.intellij.rt.coverage.util.CoverageIOUtil;
 import org.jetbrains.coverage.gnu.trove.TIntObjectHashMap;
 
 import java.io.DataInputStream;

instrumentation/src/com/intellij/rt/coverage/report/PartlyAnalysedClassesSection.java instrumentation/src/com/intellij/rt/coverage/util/PartlyAnalysedClassesSection.java

@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package com.intellij.rt.coverage.report;
+package com.intellij.rt.coverage.util;
 
 import com.intellij.rt.coverage.data.ClassData;
 import com.intellij.rt.coverage.data.ProjectData;
-import com.intellij.rt.coverage.util.CoverageIOUtil;
 
 import java.io.DataInputStream;
 import java.io.DataOutput;

instrumentation/src/com/intellij/rt/coverage/report/ProjectDataLoader.java instrumentation/src/com/intellij/rt/coverage/util/ProjectDataLoader.java

@@ -14,15 +14,12 @@
  * limitations under the License.
  */
 
-package com.intellij.rt.coverage.report;
+package com.intellij.rt.coverage.util;
 
 import com.intellij.rt.coverage.data.ClassData;
 import com.intellij.rt.coverage.data.LineData;
 import com.intellij.rt.coverage.data.ProjectData;
-import com.intellij.rt.coverage.util.CoverageIOUtil;
-import com.intellij.rt.coverage.util.ErrorReporter;
 import com.intellij.rt.coverage.instrumentation.util.LinesUtil;
-import com.intellij.rt.coverage.util.StringsPool;
 import org.jetbrains.coverage.gnu.trove.TIntObjectHashMap;
 
 import java.io.DataInputStream;

instrumentation/src/com/intellij/rt/coverage/report/ReportSection.java instrumentation/src/com/intellij/rt/coverage/util/ReportSection.java

@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package com.intellij.rt.coverage.report;
+package com.intellij.rt.coverage.util;
 
 import com.intellij.rt.coverage.data.ClassData;
 import com.intellij.rt.coverage.data.ProjectData;
-import com.intellij.rt.coverage.util.CoverageIOUtil;
 import org.jetbrains.coverage.gnu.trove.TIntObjectHashMap;
 import org.jetbrains.coverage.gnu.trove.TObjectIntHashMap;
 

instrumentation/src/com/intellij/rt/coverage/report/ReportSectionsUtil.java instrumentation/src/com/intellij/rt/coverage/util/ReportSectionsUtil.java

@@ -14,12 +14,10 @@
  * limitations under the License.
  */
 
-package com.intellij.rt.coverage.report;
+package com.intellij.rt.coverage.util;
 
 import com.intellij.rt.coverage.data.ClassData;
 import com.intellij.rt.coverage.data.ProjectData;
-import com.intellij.rt.coverage.util.CoverageIOUtil;
-import com.intellij.rt.coverage.util.ErrorReporter;
 import org.jetbrains.coverage.gnu.trove.TIntObjectHashMap;
 import org.jetbrains.coverage.gnu.trove.TObjectIntHashMap;
 

instrumentation/src/com/intellij/rt/coverage/report/UncoveredBranchesSection.java instrumentation/src/com/intellij/rt/coverage/util/UncoveredBranchesSection.java

@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package com.intellij.rt.coverage.report;
+package com.intellij.rt.coverage.util;
 
 import com.intellij.rt.coverage.data.ClassData;
 import com.intellij.rt.coverage.data.LineData;
 import com.intellij.rt.coverage.data.ProjectData;
-import com.intellij.rt.coverage.util.CoverageIOUtil;
 
 import java.io.DataInputStream;
 import java.io.DataOutput;

reporter/src/com/intellij/rt/coverage/aggregate/Aggregator.java

@@ -20,11 +20,11 @@
 import com.intellij.rt.coverage.data.instructions.InstructionsUtil;
 import com.intellij.rt.coverage.instrumentation.UnloadedUtil;
 import com.intellij.rt.coverage.instrumentation.offline.RawReportLoader;
-import com.intellij.rt.coverage.report.CoverageReport;
-import com.intellij.rt.coverage.report.ProjectDataLoader;
 import com.intellij.rt.coverage.report.data.BinaryReport;
 import com.intellij.rt.coverage.report.data.Filters;
 import com.intellij.rt.coverage.report.data.Module;
+import com.intellij.rt.coverage.util.CoverageReport;
+import com.intellij.rt.coverage.util.ProjectDataLoader;
 import com.intellij.rt.coverage.util.classFinder.ClassFilter;
 import com.intellij.rt.coverage.util.classFinder.ClassFinder;
 import com.intellij.rt.coverage.util.classFinder.ClassPathEntry;

reporter/src/com/intellij/rt/coverage/report/data/BinaryReport.java

@@ -18,9 +18,9 @@
 
 import com.intellij.rt.coverage.data.ProjectData;
 import com.intellij.rt.coverage.offline.RawHitsReport;
-import com.intellij.rt.coverage.report.CoverageReport;
-import com.intellij.rt.coverage.report.ProjectDataLoader;
+import com.intellij.rt.coverage.util.CoverageReport;
 import com.intellij.rt.coverage.util.ErrorReporter;
+import com.intellij.rt.coverage.util.ProjectDataLoader;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;

reporter/src/com/intellij/rt/coverage/verify/Verifier.java

@@ -17,8 +17,8 @@
 package com.intellij.rt.coverage.verify;
 
 import com.intellij.rt.coverage.data.ProjectData;
-import com.intellij.rt.coverage.report.ProjectDataLoader;
 import com.intellij.rt.coverage.report.util.FileUtils;
+import com.intellij.rt.coverage.util.ProjectDataLoader;
 import org.json.JSONObject;
 
 import java.io.File;

reporter/test/com/intellij/rt/coverage/aggregate/AggregatorTest.java

@@ -18,10 +18,10 @@
 
 import com.intellij.rt.coverage.data.ClassData;
 import com.intellij.rt.coverage.data.ProjectData;
-import com.intellij.rt.coverage.report.ProjectDataLoader;
 import com.intellij.rt.coverage.report.TestUtils;
 import com.intellij.rt.coverage.report.data.BinaryReport;
 import com.intellij.rt.coverage.report.data.Filters;
+import com.intellij.rt.coverage.util.ProjectDataLoader;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Assert;
 import org.junit.Test;

test-kotlin/src/com/intellij/rt/coverage/caseTests/ReportFormatTest.kt

@@ -18,8 +18,8 @@ package com.intellij.rt.coverage.caseTests
 
 import com.intellij.rt.coverage.createTmpFile
 import com.intellij.rt.coverage.logFile
-import com.intellij.rt.coverage.report.ProjectDataLoader
 import com.intellij.rt.coverage.util.CoverageIOUtil
+import com.intellij.rt.coverage.util.ProjectDataLoader
 import org.junit.After
 import org.junit.Assert
 import org.junit.Before

tests/src/com/intellij/rt/coverage/CoverageStatusTest.java

@@ -19,9 +19,9 @@
 import com.intellij.rt.coverage.data.ClassData;
 import com.intellij.rt.coverage.data.LineData;
 import com.intellij.rt.coverage.data.ProjectData;
-import com.intellij.rt.coverage.report.ProjectDataLoader;
 import com.intellij.rt.coverage.util.FileUtil;
 import com.intellij.rt.coverage.util.ProcessUtil;
+import com.intellij.rt.coverage.util.ProjectDataLoader;
 import com.intellij.rt.coverage.util.ResourceUtil;
 import com.sun.tools.javac.Main;
 import junit.framework.TestCase;

tests/src/com/intellij/rt/coverage/SourceMapTest.java

@@ -17,7 +17,7 @@
 package com.intellij.rt.coverage;
 
 import com.intellij.rt.coverage.data.ClassData;
-import com.intellij.rt.coverage.report.CoverageReport;
+import com.intellij.rt.coverage.util.CoverageReport;
 import junit.framework.TestCase;
 
 import java.io.File;