From f0db65d7985c0f71c94199fc7efbe5a5aab3c196 Mon Sep 17 00:00:00 2001 From: Alex Tkachman Date: Wed, 29 Aug 2012 10:45:34 +0300 Subject: [PATCH] optimizing imports --- .../src/org/jetbrains/jet/codegen/ClassBodyCodegen.java | 3 ++- .../backend/src/org/jetbrains/jet/codegen/StubCodegen.java | 3 ++- .../org/jetbrains/jet/codegen/context/CalculatedClosure.java | 1 - .../jet/codegen/context/CodegenAnnotatingVisitor.java | 2 +- .../src/org/jetbrains/jet/codegen/context/CodegenContext.java | 1 - .../src/org/jetbrains/jet/codegen/context/MutableClosure.java | 1 - 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java index a055c4d2616..bf41f2b735f 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java @@ -31,7 +31,8 @@ import java.util.Collections; import java.util.List; import static org.jetbrains.asm4.Opcodes.*; -import static org.jetbrains.jet.codegen.CodegenUtil.*; +import static org.jetbrains.jet.codegen.CodegenUtil.generateMethodThrow; +import static org.jetbrains.jet.codegen.CodegenUtil.getAccessModifiers; /** * @author max diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/StubCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/StubCodegen.java index 9fb32d0f2e6..7647dd34b4e 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/StubCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/StubCodegen.java @@ -18,7 +18,8 @@ package org.jetbrains.jet.codegen; import org.jetbrains.asm4.MethodVisitor; -import static org.jetbrains.jet.codegen.CodegenUtil.*; +import static org.jetbrains.jet.codegen.CodegenUtil.generateMethodThrow; +import static org.jetbrains.jet.codegen.CodegenUtil.generateThrow; /** * @author Stepan Koltsov diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/CalculatedClosure.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/CalculatedClosure.java index 2a670cf6bd1..f8f1674eff4 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/context/CalculatedClosure.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/CalculatedClosure.java @@ -24,7 +24,6 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.psi.JetDelegatorToSuperCall; -import org.jetbrains.jet.lang.resolve.java.JvmClassName; import java.util.List; import java.util.Map; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenAnnotatingVisitor.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenAnnotatingVisitor.java index 6f9a6fc59b1..ce0dcfd60f9 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenAnnotatingVisitor.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenAnnotatingVisitor.java @@ -32,7 +32,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import static org.jetbrains.jet.codegen.CodegenUtil.*; +import static org.jetbrains.jet.codegen.CodegenUtil.peekFromStack; import static org.jetbrains.jet.codegen.context.CodegenBinding.*; import static org.jetbrains.jet.lang.resolve.BindingContext.*; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java index b569e6af0b2..b2fa9b99e31 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java @@ -22,7 +22,6 @@ import org.jetbrains.asm4.Type; import org.jetbrains.jet.codegen.*; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.resolve.java.JvmClassName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.TypeSubstitutor; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/MutableClosure.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/MutableClosure.java index 0ea11b6e8dc..a2fa2d1d80b 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/context/MutableClosure.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/MutableClosure.java @@ -25,7 +25,6 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.psi.JetDelegatorToSuperCall; -import org.jetbrains.jet.lang.resolve.java.JvmClassName; import java.util.*;