From a76fb328cb6a563f124a856484caef43a1be2c83 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Fri, 16 Oct 2015 19:01:01 +0300 Subject: [PATCH] Dropping package facades: - fix testData for 'move' tests (NB regression in **/onDemandStaticImport.java, see: https://youtrack.jetbrains.com/issue/KT-9624) --- .../after/a/noImports.java | 14 +++++++------- .../after/a/onDemandStaticImport.java | 14 ++++++++------ .../after/a/specificStaticImports.java | 6 +++--- .../after/c/noImports.java | 14 +++++++------- .../after/c/onDemandImport.java | 14 +++++++------- .../after/c/onDemandStaticImport.java | 14 ++++++++------ .../after/c/specificImports.java | 14 +++++++------- .../after/c/specificStaticImports.java | 6 +++--- .../before/a/noImports.java | 12 ++++++------ .../before/a/onDemandStaticImport.java | 2 +- .../before/a/specificStaticImports.java | 6 +++--- .../before/c/noImports.java | 12 ++++++------ .../before/c/onDemandImport.java | 12 ++++++------ .../before/c/onDemandStaticImport.java | 2 +- .../before/c/specificImports.java | 14 +++++++------- .../before/c/specificStaticImports.java | 6 +++--- .../after/a/onDemandStaticImport.java | 2 ++ .../after/b/onDemandStaticImport.java | 2 ++ .../after/c/onDemandStaticImport.java | 2 ++ .../after/a/onDemandStaticImport.java | 2 ++ .../after/b/onDemandStaticImport.java | 2 ++ .../after/c/onDemandStaticImport.java | 2 ++ .../after/a/onDemandStaticImport.java | 2 ++ .../after/b/onDemandStaticImport.java | 2 ++ .../after/c/onDemandStaticImport.java | 2 ++ .../moveFunctionToPackage/after/a/noImports.java | 4 ++-- .../after/a/onDemandStaticImport.java | 4 +++- .../after/a/specificStaticImports.java | 2 +- .../moveFunctionToPackage/after/b/noImports.java | 2 +- .../after/b/onDemandImport.java | 2 +- .../after/b/onDemandStaticImport.java | 4 +++- .../after/b/specificImports.java | 2 +- .../after/b/specificStaticImports.java | 2 +- .../moveFunctionToPackage/after/c/noImports.java | 4 ++-- .../after/c/onDemandImport.java | 4 ++-- .../after/c/onDemandStaticImport.java | 4 +++- .../after/c/specificImports.java | 4 ++-- .../after/c/specificStaticImports.java | 2 +- .../after/a/onDemandStaticImport.java | 2 ++ .../after/b/onDemandStaticImport.java | 2 ++ .../after/c/onDemandStaticImport.java | 2 ++ .../movePropertyToPackage/after/a/noImports.java | 6 +++--- .../after/a/onDemandStaticImport.java | 6 ++++-- .../after/a/specificStaticImports.java | 4 ++-- .../movePropertyToPackage/after/b/noImports.java | 4 ++-- .../after/b/onDemandImport.java | 4 ++-- .../after/b/onDemandStaticImport.java | 6 ++++-- .../after/b/specificImports.java | 4 ++-- .../after/b/specificStaticImports.java | 4 ++-- .../movePropertyToPackage/after/c/noImports.java | 6 +++--- .../after/c/onDemandImport.java | 6 +++--- .../after/c/onDemandStaticImport.java | 6 ++++-- .../after/c/specificImports.java | 6 +++--- .../after/c/specificStaticImports.java | 4 ++-- 54 files changed, 166 insertions(+), 126 deletions(-) diff --git a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/a/noImports.java index 4c8bd9a511f..423044fe3bc 100644 --- a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/a/noImports.java @@ -1,16 +1,16 @@ package a; -import b.BPackage; +import b.MainKt; import b.Test; class J { void bar() { Test t = new Test(); - BPackage.test(); - BPackage.test(t); - System.out.println(BPackage.getTEST()); - System.out.println(BPackage.getTEST(t)); - BPackage.setTEST(""); - BPackage.setTEST(t, ""); + MainKt.test(); + MainKt.test(t); + System.out.println(MainKt.getTEST()); + System.out.println(MainKt.getTEST(t)); + MainKt.setTEST(""); + MainKt.setTEST(t, ""); } } diff --git a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/a/onDemandStaticImport.java index a8303af57de..5d5b256a829 100644 --- a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/a/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/a/onDemandStaticImport.java @@ -2,14 +2,16 @@ package a; import b.Test; +import static a.MainKt.*; + class J { void bar() { Test t = new Test(); - b.BPackage.test(); - b.BPackage.test(t); - System.out.println(b.BPackage.getTEST()); - System.out.println(b.BPackage.getTEST(t)); - b.BPackage.setTEST(""); - b.BPackage.setTEST(t, ""); + b.MainKt.test(); + b.MainKt.test(t); + System.out.println(b.MainKt.getTEST()); + System.out.println(b.MainKt.getTEST(t)); + b.MainKt.setTEST(""); + b.MainKt.setTEST(t, ""); } } diff --git a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/a/specificStaticImports.java index 4a2d61a8684..aaf1d322720 100644 --- a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/a/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/a/specificStaticImports.java @@ -2,9 +2,9 @@ package a; import b.Test; -import static b.BPackage.test; -import static b.BPackage.getTEST; -import static b.BPackage.setTEST; +import static b.MainKt.test; +import static b.MainKt.getTEST; +import static b.MainKt.setTEST; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/noImports.java index 221f414f204..9fc2727ec44 100644 --- a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/noImports.java @@ -1,16 +1,16 @@ package c; -import b.BPackage; +import b.MainKt; import b.Test; class J { void bar() { Test t = new Test(); - BPackage.test(); - BPackage.test(t); - System.out.println(BPackage.getTEST()); - System.out.println(BPackage.getTEST(t)); - BPackage.setTEST(""); - BPackage.setTEST(t, ""); + MainKt.test(); + MainKt.test(t); + System.out.println(MainKt.getTEST()); + System.out.println(MainKt.getTEST(t)); + MainKt.setTEST(""); + MainKt.setTEST(t, ""); } } diff --git a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/onDemandImport.java index 221f414f204..9fc2727ec44 100644 --- a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/onDemandImport.java @@ -1,16 +1,16 @@ package c; -import b.BPackage; +import b.MainKt; import b.Test; class J { void bar() { Test t = new Test(); - BPackage.test(); - BPackage.test(t); - System.out.println(BPackage.getTEST()); - System.out.println(BPackage.getTEST(t)); - BPackage.setTEST(""); - BPackage.setTEST(t, ""); + MainKt.test(); + MainKt.test(t); + System.out.println(MainKt.getTEST()); + System.out.println(MainKt.getTEST(t)); + MainKt.setTEST(""); + MainKt.setTEST(t, ""); } } diff --git a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/onDemandStaticImport.java index f3e65e2c231..431e18d44b2 100644 --- a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/onDemandStaticImport.java @@ -2,14 +2,16 @@ package c; import b.Test; +import static a.MainKt.*; + class J { void bar() { Test t = new Test(); - b.BPackage.test(); - b.BPackage.test(t); - System.out.println(b.BPackage.getTEST()); - System.out.println(b.BPackage.getTEST(t)); - b.BPackage.setTEST(""); - b.BPackage.setTEST(t, ""); + b.MainKt.test(); + b.MainKt.test(t); + System.out.println(b.MainKt.getTEST()); + System.out.println(b.MainKt.getTEST(t)); + b.MainKt.setTEST(""); + b.MainKt.setTEST(t, ""); } } diff --git a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/specificImports.java index e4992ef479d..f82596a97a5 100644 --- a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/specificImports.java @@ -1,16 +1,16 @@ package c; import b.Test; -import b.BPackage; +import b.MainKt; class J { void bar() { Test t = new Test(); - BPackage.test(); - BPackage.test(t); - System.out.println(BPackage.getTEST()); - System.out.println(BPackage.getTEST(t)); - BPackage.setTEST(""); - BPackage.setTEST(t, ""); + MainKt.test(); + MainKt.test(t); + System.out.println(MainKt.getTEST()); + System.out.println(MainKt.getTEST(t)); + MainKt.setTEST(""); + MainKt.setTEST(t, ""); } } diff --git a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/specificStaticImports.java index 1db3b6e7a4c..3a486df98e2 100644 --- a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/specificStaticImports.java @@ -2,9 +2,9 @@ package c; import b.Test; -import static b.BPackage.test; -import static b.BPackage.getTEST; -import static b.BPackage.setTEST; +import static b.MainKt.test; +import static b.MainKt.getTEST; +import static b.MainKt.setTEST; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/a/noImports.java index ef1deba3ee2..8bb1afbea8a 100644 --- a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/a/noImports.java @@ -3,11 +3,11 @@ package a; class J { void bar() { Test t = new Test(); - APackage.test(); - APackage.test(t); - System.out.println(APackage.getTEST()); - System.out.println(APackage.getTEST(t)); - APackage.setTEST(""); - APackage.setTEST(t, ""); + MainKt.test(); + MainKt.test(t); + System.out.println(MainKt.getTEST()); + System.out.println(MainKt.getTEST(t)); + MainKt.setTEST(""); + MainKt.setTEST(t, ""); } } diff --git a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/a/onDemandStaticImport.java index 56250b50fbf..36be1f79be1 100644 --- a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/a/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/a/onDemandStaticImport.java @@ -1,6 +1,6 @@ package a; -import static a.APackage.*; +import static a.MainKt.*; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/a/specificStaticImports.java index bbce0542fe4..094b81b60dd 100644 --- a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/a/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/a/specificStaticImports.java @@ -1,8 +1,8 @@ package a; -import static a.APackage.test; -import static a.APackage.getTEST; -import static a.APackage.setTEST; +import static a.MainKt.test; +import static a.MainKt.getTEST; +import static a.MainKt.setTEST; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/noImports.java index b8781e04990..f968b8bbab9 100644 --- a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/noImports.java @@ -3,11 +3,11 @@ package c; class J { void bar() { a.Test t = new a.Test(); - a.APackage.test(); - a.APackage.test(t); - System.out.println(a.APackage.getTEST()); - System.out.println(a.APackage.getTEST(t)); - a.APackage.setTEST(""); - a.APackage.setTEST(t, ""); + a.MainKt.test(); + a.MainKt.test(t); + System.out.println(a.MainKt.getTEST()); + System.out.println(a.MainKt.getTEST(t)); + a.MainKt.setTEST(""); + a.MainKt.setTEST(t, ""); } } diff --git a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/onDemandImport.java index 3f97a339b73..4aada34d9c5 100644 --- a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/onDemandImport.java @@ -5,11 +5,11 @@ import a.*; class J { void bar() { Test t = new Test(); - APackage.test(); - APackage.test(t); - System.out.println(APackage.getTEST()); - System.out.println(APackage.getTEST(t)); - APackage.setTEST(""); - APackage.setTEST(t, ""); + MainKt.test(); + MainKt.test(t); + System.out.println(MainKt.getTEST()); + System.out.println(MainKt.getTEST(t)); + MainKt.setTEST(""); + MainKt.setTEST(t, ""); } } diff --git a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/onDemandStaticImport.java index 2a20fd2eb17..ce13313d1d8 100644 --- a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/onDemandStaticImport.java @@ -1,6 +1,6 @@ package c; -import static a.APackage.*; +import static a.MainKt.*; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/specificImports.java index dcb92bbc562..2a6fb1f6ea2 100644 --- a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/specificImports.java @@ -1,16 +1,16 @@ package c; import a.Test; -import a.APackage; +import a.MainKt; class J { void bar() { Test t = new Test(); - APackage.test(); - APackage.test(t); - System.out.println(APackage.getTEST()); - System.out.println(APackage.getTEST(t)); - APackage.setTEST(""); - APackage.setTEST(t, ""); + MainKt.test(); + MainKt.test(t); + System.out.println(MainKt.getTEST()); + System.out.println(MainKt.getTEST(t)); + MainKt.setTEST(""); + MainKt.setTEST(t, ""); } } diff --git a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/specificStaticImports.java index a0e4e932076..680da50f50d 100644 --- a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/specificStaticImports.java @@ -1,8 +1,8 @@ package c; -import static a.APackage.test; -import static a.APackage.getTEST; -import static a.APackage.setTEST; +import static a.MainKt.test; +import static a.MainKt.getTEST; +import static a.MainKt.setTEST; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/onDemandStaticImport.java index 8224a279512..072b23354b4 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/onDemandStaticImport.java @@ -1,5 +1,7 @@ package a; +import static a.MainKt.*; + class J { void bar() { b.DependencyKt.test(new Test()); diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandStaticImport.java index e998c377616..def508e5930 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandStaticImport.java @@ -1,5 +1,7 @@ package b; +import static a.MainKt.*; + class J { void bar() { b.DependencyKt.test(new a.Test()); diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandStaticImport.java index 1e0035747e4..9098c686471 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandStaticImport.java @@ -1,5 +1,7 @@ package c; +import static a.MainKt.*; + class J { void bar() { b.DependencyKt.test(new a.Test()); diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/onDemandStaticImport.java index 4f0d7cb0fb2..f785feba4cb 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/onDemandStaticImport.java @@ -1,5 +1,7 @@ package a; +import static a.MainKt.*; + class J { void bar() { b.DependencyKt.getTest(new Test()); diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandStaticImport.java index c51a9474c3f..5a05ac87bbf 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandStaticImport.java @@ -1,5 +1,7 @@ package b; +import static a.MainKt.*; + class J { void bar() { b.DependencyKt.getTest(new a.Test()); diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandStaticImport.java index e205c4e953c..533c383b988 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandStaticImport.java @@ -1,5 +1,7 @@ package c; +import static a.MainKt.*; + class J { void bar() { b.DependencyKt.getTest(new a.Test()); diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/onDemandStaticImport.java index 27bccae2678..5fe3a80498c 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/onDemandStaticImport.java @@ -1,5 +1,7 @@ package a; +import static a.MainKt.*; + class J { void bar() { b.DependencyKt.test(); diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandStaticImport.java index 63093982a99..cd8fc38d42f 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandStaticImport.java @@ -1,5 +1,7 @@ package b; +import static a.MainKt.*; + class J { void bar() { b.DependencyKt.test(); diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandStaticImport.java index d0739a83600..1f37a9f8eaa 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandStaticImport.java @@ -1,5 +1,7 @@ package c; +import static a.MainKt.*; + class J { void bar() { b.DependencyKt.test(); diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/noImports.java index b0586092f4f..2219158ca07 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/noImports.java @@ -1,9 +1,9 @@ package a; -import b.DependencyKt; +import b.TestKt; class J { void bar() { - DependencyKt.test(); + TestKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/onDemandStaticImport.java index 27bccae2678..7975741148f 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/onDemandStaticImport.java @@ -1,7 +1,9 @@ package a; +import static a.MainKt.*; + class J { void bar() { - b.DependencyKt.test(); + b.TestKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/specificStaticImports.java index bc3435934da..492fd0b87e5 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/specificStaticImports.java @@ -1,6 +1,6 @@ package a; -import static b.DependencyKt.test; +import static b.TestKt.test; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/noImports.java index 04aad5babdb..f17de9eccc0 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/noImports.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - DependencyKt.test(); + TestKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandImport.java index 04aad5babdb..f17de9eccc0 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandImport.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - DependencyKt.test(); + TestKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandStaticImport.java index 63093982a99..e4b0fe7eb77 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandStaticImport.java @@ -1,7 +1,9 @@ package b; +import static a.MainKt.*; + class J { void bar() { - b.DependencyKt.test(); + b.TestKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificImports.java index 04aad5babdb..f17de9eccc0 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificImports.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - DependencyKt.test(); + TestKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificStaticImports.java index 2014d1abf6b..84228b28e61 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificStaticImports.java @@ -1,6 +1,6 @@ package b; -import static b.DependencyKt.test; +import static b.TestKt.test; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/noImports.java index d95d7beda0c..311bcc3415a 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/noImports.java @@ -1,9 +1,9 @@ package c; -import b.DependencyKt; +import b.TestKt; class J { void bar() { - DependencyKt.test(); + TestKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandImport.java index d95d7beda0c..311bcc3415a 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandImport.java @@ -1,9 +1,9 @@ package c; -import b.DependencyKt; +import b.TestKt; class J { void bar() { - DependencyKt.test(); + TestKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandStaticImport.java index d0739a83600..b550dd91fc5 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandStaticImport.java @@ -1,7 +1,9 @@ package c; +import static a.MainKt.*; + class J { void bar() { - b.DependencyKt.test(); + b.TestKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/specificImports.java index d95d7beda0c..311bcc3415a 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/specificImports.java @@ -1,9 +1,9 @@ package c; -import b.DependencyKt; +import b.TestKt; class J { void bar() { - DependencyKt.test(); + TestKt.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/specificStaticImports.java index 03cfe568cea..cdc8c8a0993 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/specificStaticImports.java @@ -1,6 +1,6 @@ package c; -import static b.DependencyKt.test; +import static b.TestKt.test; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/onDemandStaticImport.java index da7656dcd91..ace68cefe24 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/onDemandStaticImport.java @@ -1,5 +1,7 @@ package a; +import static a.MainKt.*; + class J { void bar() { b.DependencyKt.setTest(""); diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandStaticImport.java index 0a7d28e83ef..504a26e279e 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandStaticImport.java @@ -1,5 +1,7 @@ package b; +import static a.MainKt.*; + class J { void bar() { b.DependencyKt.setTest(""); diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandStaticImport.java index 0b464bb828f..bcb764f89e3 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandStaticImport.java @@ -1,5 +1,7 @@ package c; +import static a.MainKt.*; + class J { void bar() { b.DependencyKt.setTest(""); diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/noImports.java index c0c072e7222..362e5fd1b83 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/noImports.java @@ -1,10 +1,10 @@ package a; -import b.DependencyKt; +import b.TestKt; class J { void bar() { - DependencyKt.setTest(""); - System.out.println(DependencyKt.getTest()); + TestKt.setTest(""); + System.out.println(TestKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/onDemandStaticImport.java index da7656dcd91..abbbc38bec9 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/onDemandStaticImport.java @@ -1,8 +1,10 @@ package a; +import static a.MainKt.*; + class J { void bar() { - b.DependencyKt.setTest(""); - System.out.println(b.DependencyKt.getTest()); + b.TestKt.setTest(""); + System.out.println(b.TestKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/specificStaticImports.java index a464f023674..efb1d6761bf 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/specificStaticImports.java @@ -1,7 +1,7 @@ package a; -import static b.DependencyKt.getTest; -import static b.DependencyKt.setTest; +import static b.TestKt.getTest; +import static b.TestKt.setTest; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/noImports.java index 61f425f6221..d9a87e3feda 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/noImports.java @@ -2,7 +2,7 @@ package b; class J { void bar() { - DependencyKt.setTest(""); - System.out.println(DependencyKt.getTest()); + TestKt.setTest(""); + System.out.println(TestKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandImport.java index 61f425f6221..d9a87e3feda 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandImport.java @@ -2,7 +2,7 @@ package b; class J { void bar() { - DependencyKt.setTest(""); - System.out.println(DependencyKt.getTest()); + TestKt.setTest(""); + System.out.println(TestKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandStaticImport.java index 0a7d28e83ef..5f1f10b71ba 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandStaticImport.java @@ -1,8 +1,10 @@ package b; +import static a.MainKt.*; + class J { void bar() { - b.DependencyKt.setTest(""); - System.out.println(b.DependencyKt.getTest()); + b.TestKt.setTest(""); + System.out.println(b.TestKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificImports.java index 61f425f6221..d9a87e3feda 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificImports.java @@ -2,7 +2,7 @@ package b; class J { void bar() { - DependencyKt.setTest(""); - System.out.println(DependencyKt.getTest()); + TestKt.setTest(""); + System.out.println(TestKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificStaticImports.java index 7d142a23c50..45fc6af6e5b 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificStaticImports.java @@ -1,7 +1,7 @@ package b; -import static b.DependencyKt.getTest; -import static b.DependencyKt.setTest; +import static b.TestKt.getTest; +import static b.TestKt.setTest; class J { void bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/noImports.java index f5da4e0b0f9..fb061af45b0 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/noImports.java @@ -1,10 +1,10 @@ package c; -import b.DependencyKt; +import b.TestKt; class J { void bar() { - DependencyKt.setTest(""); - System.out.println(DependencyKt.getTest()); + TestKt.setTest(""); + System.out.println(TestKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandImport.java index f5da4e0b0f9..fb061af45b0 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandImport.java @@ -1,10 +1,10 @@ package c; -import b.DependencyKt; +import b.TestKt; class J { void bar() { - DependencyKt.setTest(""); - System.out.println(DependencyKt.getTest()); + TestKt.setTest(""); + System.out.println(TestKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandStaticImport.java index 0b464bb828f..a5a34b47cc6 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandStaticImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandStaticImport.java @@ -1,8 +1,10 @@ package c; +import static a.MainKt.*; + class J { void bar() { - b.DependencyKt.setTest(""); - System.out.println(b.DependencyKt.getTest()); + b.TestKt.setTest(""); + System.out.println(b.TestKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/specificImports.java index f5da4e0b0f9..fb061af45b0 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/specificImports.java @@ -1,10 +1,10 @@ package c; -import b.DependencyKt; +import b.TestKt; class J { void bar() { - DependencyKt.setTest(""); - System.out.println(DependencyKt.getTest()); + TestKt.setTest(""); + System.out.println(TestKt.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/specificStaticImports.java index ad13069db20..451d009eb61 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/specificStaticImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/specificStaticImports.java @@ -1,7 +1,7 @@ package c; -import static b.DependencyKt.getTest; -import static b.DependencyKt.setTest; +import static b.TestKt.getTest; +import static b.TestKt.setTest; class J { void bar() {