ra/fernflower
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed conflicts after recent changes in master

Browse Source
This commit is contained in:
Dmitry Cherniachenko
2017-05-01 12:28:01 +02:00
committed by Egor.Ushakov
parent 5f292c415c
commit 9e788b09cb
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
testData/results/TestVarArgCalls.dec
View File

@@ -9,8 +9,8 @@ public class TestVarArgCalls {
this.printComplex("Test: %[0]s", new String[]{"abc"});// 10
this.printComplex("Test: %[0]s - %[0]s", new String[]{"abc"}, new String[]{"DEF"});// 11
String.format("Test");// 13
String.format("Test: %d", Integer.valueOf(123));// 14
String.format("Test: %d - %s", Integer.valueOf(123), "DEF");// 15
String.format("Test: %d", 123);// 14
String.format("Test: %d - %s", 123, "DEF");// 15
Object[] data = new Object[]{"Hello"};// 17
String.format("Test: %s", (Object)data);// 18
String.format("Test: %s", (Object[])data);// 19