summaryrefslogtreecommitdiff
path: root/java/java-tests/testData/refactoring/inlineMethod/multifile/preserveStaticImportsIfOverloaded/before/Bar.java
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2014-09-04 20:44:00 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-09-04 20:44:01 +0000
commitfb5a02906f644d044eb0286bf27d413ba0e05216 (patch)
treebca7d49005d81d10c70bc3f547df041c636b4300 /java/java-tests/testData/refactoring/inlineMethod/multifile/preserveStaticImportsIfOverloaded/before/Bar.java
parent9cde0e3c015174898df8b8f3672185941fad4786 (diff)
parentd245f58efbfc26b13b9b9d5e52e6a83a0d76216c (diff)
downloadidea-fb5a02906f644d044eb0286bf27d413ba0e05216.tar.gz
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'java/java-tests/testData/refactoring/inlineMethod/multifile/preserveStaticImportsIfOverloaded/before/Bar.java')
-rw-r--r--java/java-tests/testData/refactoring/inlineMethod/multifile/preserveStaticImportsIfOverloaded/before/Bar.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/java/java-tests/testData/refactoring/inlineMethod/multifile/preserveStaticImportsIfOverloaded/before/Bar.java b/java/java-tests/testData/refactoring/inlineMethod/multifile/preserveStaticImportsIfOverloaded/before/Bar.java
new file mode 100644
index 000000000000..19bfccb3a7cf
--- /dev/null
+++ b/java/java-tests/testData/refactoring/inlineMethod/multifile/preserveStaticImportsIfOverloaded/before/Bar.java
@@ -0,0 +1,7 @@
+import static Foo.foo;
+public class Bar {
+ void bar() {
+ foo();
+ foo(1);
+ }
+} \ No newline at end of file