From 4c49c39f8d61cbda4b8dbfd0aa1a8907e22d655d Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 3 Mar 2014 21:24:05 +0400
Subject: [PATCH] Minor, delete unnecessary parameter from util method

---
 .../jet/codegen/inline/InlineCodegenUtil.java          |  7 ++++++-
 .../lang/resolve/kotlin/DeserializedResolverUtils.java | 10 +---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java
index bf0d93b50cb..e7cd9124d02 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java
@@ -37,6 +37,7 @@ import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedSimpl
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.resolve.BindingContextUtils;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
+import org.jetbrains.jet.lang.resolve.java.JvmAbi;
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
 import org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils;
 import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder;
@@ -125,7 +126,11 @@ public class InlineCodegenUtil {
             return PackageClassUtils.getPackageClassFqName(getFqName(containerDescriptor).toSafe());
         }
         if (containerDescriptor instanceof ClassDescriptor) {
-            return DeserializedResolverUtils.kotlinFqNameToJavaFqName(getFqName(containerDescriptor), isTrait(containerDescriptor));
+            FqName fqName = DeserializedResolverUtils.kotlinFqNameToJavaFqName(getFqName(containerDescriptor));
+            if (isTrait(containerDescriptor)) {
+                return fqName.parent().child(Name.identifier(fqName.shortName() + JvmAbi.TRAIT_IMPL_SUFFIX));
+            }
+            return fqName;
         }
         return null;
     }
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedResolverUtils.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedResolverUtils.java
index 1ec8c459994..4c150d9a3d0 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedResolverUtils.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedResolverUtils.java
@@ -34,21 +34,13 @@ public class DeserializedResolverUtils {
     private DeserializedResolverUtils() {
     }
 
-    public static FqName kotlinFqNameToJavaFqName(@NotNull FqNameUnsafe kotlinFqName) {
-        return kotlinFqNameToJavaFqName(kotlinFqName, false);
-    }
-
     @NotNull
-    public static FqName kotlinFqNameToJavaFqName(@NotNull FqNameUnsafe kotlinFqName, boolean addTraitImplSuffix) {
+    public static FqName kotlinFqNameToJavaFqName(@NotNull FqNameUnsafe kotlinFqName) {
         List<Name> segments = kotlinFqName.pathSegments();
         List<String> correctedSegments = new ArrayList<String>(segments.size());
         for (Name segment : segments) {
             correctedSegments.add(isClassObjectName(segment) ? JvmAbi.CLASS_OBJECT_CLASS_NAME : segment.getIdentifier());
         }
-        if (addTraitImplSuffix) {
-            int lastIndex = correctedSegments.size() - 1;
-            correctedSegments.set(lastIndex, correctedSegments.get(lastIndex) + JvmAbi.TRAIT_IMPL_SUFFIX);
-        }
         return FqName.fromSegments(correctedSegments);
     }