From 309348c9bedc320368134d3ed3d74e9548433c0f Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Wed, 27 Apr 2016 17:57:20 +0300 Subject: [PATCH] Code clean --- .../tests/CodegenTestsOnAndroidGenerator.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java index 33c100a0d4b..42faeef21a4 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java @@ -261,7 +261,8 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase { for (String annotation : FILE_NAME_ANNOTATIONS) { if (text.contains(annotation)) { int indexOf = text.indexOf(annotation); - return packageFqName.child(Name.identifier(text.substring(text.indexOf("(\"", indexOf) + 2, text.indexOf("\")", indexOf)))); + String annotationParameter = text.substring(text.indexOf("(\"", indexOf) + 2, text.indexOf("\")", indexOf)); + return packageFqName.child(Name.identifier(annotationParameter)); } } @@ -272,17 +273,17 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase { return text.contains("fun box()"); } - private String changePackage(String packageName, String text, Ref oldPackage) { + private String changePackage(String newPackageName, String text, Ref oldPackage) { if (text.contains("package ")) { Matcher matcher = packagePattern.matcher(text); assert matcher.find(); - String group = matcher.toMatchResult().group(1); - oldPackage.set(FqName.fromSegments(Arrays.asList(group.split("\\.")))); - return matcher.replaceAll("package " + packageName); + String oldPackageName = matcher.toMatchResult().group(1); + oldPackage.set(new FqName(oldPackageName)); + return matcher.replaceAll("package " + newPackageName); } else { oldPackage.set(FqName.ROOT); - String packageDirective = "package " + packageName + ";\n"; + String packageDirective = "package " + newPackageName + ";\n"; if (text.contains("@file:")) { int index = text.lastIndexOf("@file:"); int packageDirectiveIndex = text.indexOf("\n", index);