From 9e788b09cb4cac5cd19b3e85963d1f26661e35a1 Mon Sep 17 00:00:00 2001
From: Dmitry Cherniachenko <d.cherniachenko@gmail.com>
Date: Mon, 1 May 2017 12:28:01 +0200
Subject: [PATCH] Fixed conflicts after recent changes in master

---
 testData/classes/pkg/TestPrimitives.class | Bin 2832 -> 2926 bytes
 testData/results/TestClassLambda.dec      |   2 +-
 testData/results/TestPrimitives.dec       |  14 +++++++-------
 testData/results/TestVarArgCalls.dec      |   4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/testData/classes/pkg/TestPrimitives.class b/testData/classes/pkg/TestPrimitives.class
index 022c8c1860db9321f95c8d604faa47ffb5727aa3..2bea08c59f1a52511b968c8e469db716adbad741 100644
GIT binary patch
literal 2926
zcmaKu`*#yX6vw}tY_sWhY11?<MZtm)39+=GpkP6uEy0#b(IA-OYnyJ{g*02!O%d>c
z@Am`oE%=1rJe;FHgd9Ek2l%^xfPaHO_?yRjXE&Q^OXxY-nYoY8%$>P&r+@zU>mLAi
z;71)XJf$Ozr}^^?e@y;NHj$qH&hsd*?z=L7m3vc>eg9lfocsIGbsky#nT}#c!>kS)
zr*xb~Aq-sJuVW6y8YHd5!Mu)VQEJ8l+$hTIxyYY0I#PI!duMf=^X7YA#|wBdikG6e
z5XH+nUcsw6Uc>8AyrJPu_IOLf+X^Ck?4s>Hs34r$a$JEr<V;x#+Q#gnb)-BuX_bzd
zlLeB*$DF)bIBu3~9{WPoowXMfB*x}X&-5R&7TlvHd(L+4MQdR|L3F-k7u^Gef&xQy
z2OXzinMIl<HNlf9lk}TV(Clf?x-^fP8WgHQ1-cMtXPuJE@~n{4bV|0y9w`dVh|t)i
z8L7d>oZ<{SjS3a5KpCw8GX=*KZW*DQCS68Bi<oTKDT`>;)UZ%ak#e}k9GW#t%p4M`
zJgJ6=Ib*p&T(pN2j>aMp42>y{D2@FnNI;8^kU%V*hP2{UV(KGispOooXvUVjQ(SOM
z<-F_Ae0tU?m-1G|=2Pfcy2*W~%th0{-RL!NFLoHXAG-`ZfB^#!VxNIQ3>nDakbzMg
zHgE*vbdbr(-u1~T=|_>o7}Q@di!=S>lc%h_tKl63@8UfT?{oWsh7Y;@NW(>LKh|)`
zz$f@r!)FFQ#}^7(mvRj}imZWSc#Q48G;kazG<?N_uMIqooQBH=uHYL5p(N!&C`plr
zlG7T#Wt;Cbe9!F<ETjdt))&ZI%Q5ewSXSnpf_BNYmT=mlStwiMbk<#zdSfdrC|e~r
zIvZ=oqP_1*jmXBnoQyl_1kMUG@3MI}rG~@~G~^(y-%HI7N=?a@g=8k3L)N9+LpdCo
zc1m-cu)9-|y{8>GDT%y;8<45K)l%-+1=pIR`|gwp+UWsor~fElR&ub+IS!Dnp~U7r
zCuv(fY(JqBbS))2A!T=AxRgp4LnL~E3P9&gV&PjQP2gYCL@FasAf!t-s&;2P>CQ?^
z@x%kzKy@)D3ULeyUlsaprEx#C3bjq?8&H0xP6&PUjR;|w)PUg`U>mm6NWndU^S{2`
zwX|A6C>=XrK{(y6C>5w;(3DOfQb9BwZ>~V6K}!Xz(y@sOTH|f8$nS{d!fF-m*_=vE
zJezB3$6uloiFb%ri{-0GWOLC3I;&Wnt)lzHFIW@5O%u-P3U2rOskgR@b%dba9aZ#X
za}nyTX9_u0u%RAYA6i6+P0*+pMI6oOhK?Q@B`MrqtfC;>=;4XsD%zz@xE5>z)fw6f
z-obI&gb=l>d0ls^VqIcU%cs?aSpr??6v!^m%|{XdJ8>UD6|P@5gKrGr>sG|%!Mh2*
zrXhT{fKy$(HN2+*d@aG(HGuEIUIC|idu#a0)9_Zlp5PlA!1v>TfKwe0;2P+^18>j$
zZRzpzW64o_@J$3yHh>S~pn%i+5WuAa-Q?~0#wwBxwk1XIEe+rgVMM^`-3j2*%6<6e
zD(-3k?<M%w2JkUFEa3E>1#oHQn}cjgG=Og-`1S_yqj*HX>G|^ETrs#(gu*}ZS1J=b
z1;Z;7q2Pwlo9BCO^*zI}3(H-1ORnL-l^#jowa<4|+b>|b?_SAQ4SeZMT`_HXx$6PR
zwLa}cP}mMqd>m^>nrp~KE^FMmM1`$hMp{J*9;D)tp%QXPLUshJIT;{#ku@Xr-;m0w
ZH?ZYIo#bWdD3K0J6g{9kAvXNU{{c#C0l)wN

delta 1307
zcmZ{j*-sNu6vn^l!kymS00I`=A_N*sDHKFhRAf_d-*6YvvMM5?0t%=_MR7qzE3TkE
z=o=v+B!u{&k0w6&VB)KZ|9~&P8soXQ!?b8-nx465=Kj9Zp7Y(G?qPT6^Pl%00Ia|p
zjzk>c@S;|RqcYUVaLh^X<<%#%<Brm?j<<3Zj4S;$k<$C4dO~LPGBoIDWN6}OMhnLY
zoU{X@WgM+IH7nxdXv1lacARmc17&A*oRjEz89F(-&@ERNI4+_`u6jB8a7o8y9anUO
zIQnsw;~K8(7+|<D`DsK8x7spuvf&dbz;b~itQ1&{Vu5ui5hz2szy@p-*o4gj+ps-6
zWAlY>3Jl^F!)<xL!*EyLhZye3`+bH70>gO7@JJwx#~R{2_5O5E<Lp;p7j_HmK@G!*
zM4kxj#Xg3oGI=Jj9|sto3%tNf4K`1`42?20GmHu(4q}YqmE8PVK5dv9u-9q{@vXt`
zV4yA7-V&(j>1+yrcYI0q(qQD301fmnDdvPfI^E0s^em1tz>ZvsLam+1Lx3_3`NrPg
z&S}jbo{B466y5dC+(j)@iW>74NktAD#T2+PU#YrPo@(p|Qc*~5(da{cR%G2AGL6Uu
zmgFi$(r^rNVdc`A8Kg}kW0I=c5d8&<NoR?L&Kj&$Iy7HXC&@x5opdrRbk?I(>5xT~
zPM03rgDfIF7Gwn~6-mBQ<kvZ*m&j}jvI^CTBr_^9;EJv3Co<Q9+=8u&BnK;U$mI=1
z`;|{*fd#n(I~7Tml_YiAuX5_RecbGO#7jj=BjP2S=@Rm}LFO8yJ+Xfrq1l;5*y0%0
zZnAVN3^vbT9rOC}Z{3m@)?u=AivFwXi=vs4y5%u!wC+K}|KE64K=vt~&IxE<E>t0j
QrVu?1$!5JnsvC#@0>-D3{Qv*}

diff --git a/testData/results/TestClassLambda.dec b/testData/results/TestClassLambda.dec
index 7133344..bc12180 100644
--- a/testData/results/TestClassLambda.dec
+++ b/testData/results/TestClassLambda.dec
@@ -15,7 +15,7 @@ public class TestClassLambda {
    public int field = 0;
 
    public void testLambda() {
-      List var1 = Arrays.asList(new Integer[]{1, 2, 3, 4, 5, 6, 7});// 29
+      List var1 = Arrays.asList(1, 2, 3, 4, 5, 6, 7);// 29
       int var2 = (int)Math.random();// 30
       var1.forEach((var2x) -> {// 32
          int var3 = 2 * var2x.intValue();// 33
diff --git a/testData/results/TestPrimitives.dec b/testData/results/TestPrimitives.dec
index 1cc23bc..705a27d 100644
--- a/testData/results/TestPrimitives.dec
+++ b/testData/results/TestPrimitives.dec
@@ -10,7 +10,7 @@ public class TestPrimitives {
       this.printFloat(1.23F);// 11
       this.printDouble(1.23D);// 12
       this.printChar('Z');// 13
-      String.format("%b, %d, %d, %d, %c", new Object[]{true, 1, 213, 40000, 'c', 42L});// 15
+      String.format("%b, %d, %d, %d, %c", true, 1, 213, 40000, 'c', 42L);// 15
       System.out.println(String.format("%b, %d, %d, %d", this.getBoolean(), this.getByte(), this.getShort(), this.getInt()));// 16
    }// 17
 
@@ -63,9 +63,9 @@ public class TestPrimitives {
    }
 
    public void printNarrowed() {
-      this.printByte((byte)this.getInt());// 68
-      this.printShort((short)this.getInt());// 69
-   }// 70
+      this.printByte((byte)this.getInt());// 69
+      this.printShort((short)this.getInt());// 70
+   }// 71
 
    public void constructor() {
       new Byte((byte)1);// 73
@@ -239,8 +239,8 @@ class 'pkg/TestPrimitives' {
    }
 
    method 'constructor ()V' {
-      4      69
-      9      70
+      4      70
+      9      71
    }
 
    method 'compare (C)Z' {
@@ -320,7 +320,7 @@ Lines mapping:
 65 <-> 62
 69 <-> 66
 70 <-> 67
-73 <-> 70
+71 <-> 68
 74 <-> 71
 77 <-> 74
 78 <-> 75
diff --git a/testData/results/TestVarArgCalls.dec b/testData/results/TestVarArgCalls.dec
index 1ccd16a..6cdcd8f 100644
--- a/testData/results/TestVarArgCalls.dec
+++ b/testData/results/TestVarArgCalls.dec
@@ -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