From bb7b7213d7e0339491c066eb457c27b70fad0b16 Mon Sep 17 00:00:00 2001 From: Christoph Date: Mon, 8 Apr 2019 19:13:51 +0200 Subject: [PATCH] Remove deprecated awt apple extension (#4860) --- lib/AppleJavaExtensions.jar | Bin 25467 -> 0 bytes src/main/java/org/jabref/gui/JabRefFrame.java | 14 --- .../org/jabref/gui/OSXCompatibleToolbar.java | 39 -------- src/main/java/osx/macadapter/MacAdapter.java | 83 ------------------ 4 files changed, 136 deletions(-) delete mode 100644 lib/AppleJavaExtensions.jar delete mode 100644 src/main/java/org/jabref/gui/OSXCompatibleToolbar.java delete mode 100644 src/main/java/osx/macadapter/MacAdapter.java diff --git a/lib/AppleJavaExtensions.jar b/lib/AppleJavaExtensions.jar deleted file mode 100644 index 6659a81c69fc189cf966dd79f5824b486c9c0281..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25467 zcmce;by${L6E}) zob!EL*L~?9_x*d;`mI?rvu0+Ek}McFEC>iR2na=lo*>9Ce=s26AoAjB!t~M#5{x&) zARtQrc@-Lj9Pn!INMyMI;B_0ogARE9c~xFmL0UpwRgFPj;#7WgL{65TVG2Q(o@RV> z;*|>1H0y_t&ZDBJPIOXo<5KD%5s%2}&!RkFM1N5PYNM5u(u9@ZeybRWSHY6VBN@n?0KU8PLDS4h|TQiGv;E-$VZQ8-O|g^@fq7 zqpjHk?_u0~&&0vr#Ld~+%-;2ZPmu0?VrJz2(98Gn|9aW%>BIPl_wlV9{uvAOUyHbE zAFjd)3Id`7V1e%5yT1%y%*w^l$koJ>Ov%~G!P&~ylflH+$i*dD)lTu968f`)g{mi- zbEasUW1Pr~@@1u#Bya(pN#uz*71--9UTV-$*a{*^S*&BrJG6Xi&J7Wd*0CFZB!*OQNt=a{sB$Ol*_%-&jy%OSdwXV6J3mU- zbutqDd1UH_9mqDGp%3AdzI_c$^A$OoT`X3UdrwiDS5$LXZ9k#2PVnwDjS~8)4fygY z9mN?P_(Z$O87mL45jeT1OA?UsL@XsSbu;;BFp4f9ED#^3!oNCX7<>P6yT8ckvZEe8 z@_GZ!yOHhFlkqy0)hS^U&es~4mZ@Q%CF3;vn_c~VYPV&VuqeJ-a)D|`t-)gVQ@2Rx z_~~Hn!Kn45xZjte4Is zvUO_kf$oveyWx`l&rqDR+(W@feBJzn1my(Q5S3ShhCPx5 z?tIhywq8xNN**?DrVYGUR2NnC0azcVz~P`u%Y|(pxlq)`KwVEz{^7MPT?w#KPDu_~BM) zYeVJ&w3#vWjC|AthZfAYAs5VfmFdfFf^+(YTV)J2D_W9SjM-9}u=bh<+Ux!#<3JX> z7M8@i@z$#2j4r#cR)<;iM;+fRk~{7T2X#_*ek(vIr~v{(d`~$3Qhvh54sNbeM)sz* zX3jrFBP6C3wp$2U{P1f;zq^?cW#B@SmTou|Y+#6CM|cp@dwHpXo6Hcx50c@#91%nc z%q~XbOT1qO&LIu`%fV)a3@&W;^Ni0%i;cm^syN zX71=H{zLPV{YAlF|NTjTn*x9UC3yZ>$%=-VsUcw}C8)?&XmNCKC*>svcG2RM6oIqW zEO02n&RA3zxWLGOO)|JIo3|LPCl{K4XA1hh%sP zY5x>bKmw8@bM(z9Dz5~jIl>r|1SID6_arq5$Y;5uZ`3;8E)`7|#Pt^8qfjWY#4MZiXcjRkd`_6zlc8+kac^Y3;)ueY*#_qpSv^l_g1E!A-`4{}(*8$!?A zFJrO-0tTxfStheVK`mkIm93UdbH=5v$r>dCO4bdB*jdl`;^EKp-=6Tq_OrBMY{V&~ zym+fuu4E1$t>Nv#XdbvN5#m$I^3JF2IKrJzP?l~$#C70+c*@}0XKx%@P!&XQI)7fPiN3Bb~|+Bfj>#a3-*QPX@uwNvZB zPNICio#E_-gI>zlC9l^=G{VN}(6!tK@i1z6-HN`iRgt=?w-K+8kUt?%-|xd!IETBh z&4NY>$QS|izXLq<56Gs3o2{*?iL=?g9qXnfFWV!8>}w-vY+^m5L0b?=H0Q+x9T*lt zR1A^tQB$yO$CH#iMo}cayLwXOG1)38lT~$L>|`WxF_!t7_3GRC1>y(vMTQfqRxRXK+Lp%V*rsN>tP^9_QaP*ZC3@ zJUDv5Hvqc+1XomAcjP#&AN1U>2;3Q=bz&foJd=xQ;Pg8h5u2?lVSzk?o+hIg`f>q3strGB_kap%@yyNxK0 z6&!WJ)J_lgp8H_wy%)4gT0kmmmmG`4Ue0b@+CG`w@iW~oec07+LbV>9tQW6KE zxg-X83$|{AAJuqrrb%C5Ny@~IgIDS^h3mDblx?xV^Qyi*mhP^P7hUNsiRNjPvxUQJ z4mccSIvXVZhR)k@*0UJrYRs&l8}OFI(7;Asc`|KV!5Xz@Kh5O# zgK!N2gKu)h`JF4dPYx+~Gz8pop1`6BI6N_6A-ozqiKV0ji{G1=+O$u7^&yM*S%}A) zh+&9{00bu&rr}sAFKhX6=;$`+tNzA{vgR=w!|Vz=nk+cJ#=s2auaE98LA`oTBng22 z8o)#IfbjoV0(BMXdm893$q!xqEC~?(T?^qVqO-{h!y`SEA~h=XkV~i45>ahwj(quY zzmdds;lmp$CzS=+KK{|YH>Z28yjRz!$1or8*r6bj@NM&r3$0C34WC#RCd!Jm&wG)f zw@jtMBnNQ#B!-gatW+oyMX;}J8qHCvWma`1X3$PJu7|%R=5kl&Isc|(Vfc+E#@mHs zNL!+rs=Kas+n5k4IFv9XCt|~&Ut=QtwK48%W?W`nba3~oJ=~sm_Ic*4IVje*X~>AT zPeJ!9#3UsMQXb>W(4r>|1SifA1+btwq-BVOEqNbvkAFo}h)-P|)<8^(CZ0+uXGkZ* zT6DWa*v9rRf+H=*>-$ z2aK?TNWjo0zY%pp_Xi*&j*m&)K##`^NXr0bQ~)ygkOBsTI_zD6^}ro5#Q*Un37$ee`~S(8948ta%*z3G z4@v;sq-%n{)rH>zqwhpsyU&YKw;6gJ0fT7_7a~4<1iYLOVGsx@GUzfa*}OlWHdAgu zz&-Ct2J~<5Nq~qR+?1Kwk@X1l+o+I^e+aOzVBq#Gy&u3641g!f2llG6o0aRY8&#n- zqFV`>e}j~H-cp7ZPS|L++mNxF1U3-5V9sEf`T*5Igy8atM&OS_7`*~090%fP7OO>0 zY{w#gCvL(t=JUoiU}SrF7SoMkLKa3rxX zJe!zMQ&j^~YGMrYr=c__i|H0ot5o(zltgPlq2z@%r;Vebwqfq8E#h#xlA-@$GySyJ zsc#r+%*0(QPvZk(&2$hT zAozb)DL=Q3ZxSH5Y=|8)0hU% zD{x^|b=z-O4qQ$1_*K%1-=BeghScACdUvfEDr2bPg+IjtAQt>$G{o*3i4*RP$qZR?&Z*Mb?3351%I?a`Rp!Hjgf0Crx-kYv8y zd335u3~bgZs-^&2ee{%*$``~mmZ|b7-OdM;x&89_85WPn4ZE;eyXd}RPLwo!xCoVp z+m?^9OGkOpPbj2Wz}jtG)t+fEX((gUYNdexZvXKu$wDb%athP%ZR%$JSDk+Rx?yz; z(lVCz3$PttiT2`{);Bvol+D&@AFM-mQ7WCGz|*=RE^tM0HcZnMv$Ke3H_5og6%tuD z#hp{$i0M;o57KV(c_zP+V2GO?!rhd2j(;P*LXj%-5hzM%-k_yp3y>#&z(f9LxstO2 zXd?T+BZYSw=;>2Pji-nmf9lF#Tqlq^+{I zPD}#w+vaz@>)yb?EVb+D-V;<`SF4-%l!he@9&Hx#xO@U% z`rzqaU$oxv>2%eeT)w#FD#g&j4zWchN`{FIcUx@qmpvFSCYa^c6iMUvwgN2lCG-o7 ztq!5p!7(+l42&lSa!uc@&;l)9%ZL()Go!Wmy-6Ijpv%{UOT-oFz|%5^sS12wTkFE_ ztLsSh>dQscrHu*~sou@4U~nYAW3*7I6#ig0t-1(?n^3)SscYcACph_IX!qx;)01Bz z@7tQ9NQ8@d0ApSN#wdQfz(0dqz-$TI0Aj%*t6G_MsJIPK{0pMg$s(ya{NeRl&}T|} zzR{w%;WkWV*A4{VA6+Z2lf{Wpi6Fg-o&UD7XX1z0%I`0!M_rH3fB_n4^Van-Bc?3| zPq3k0gQ9LDcmBCCy#qz~5X(697k8t2eJf`2%6Xq{9e8ptRri?CLvVwp^lLf?n3cs# z8?!4Rw^?YbBH<)!Fx* z=`?$di7>a-9mFMzDi}7tI~X~mrG2~Jd}IPvRmA6tRm*tBt?#t+SqZbPZD4(I^x_`o~mT-cH6?Qtsl-1Q(s(EGDQ1M zeOB#CpW`KTI;B^64m0FOkES506f5LNhPWBIiK>Suz1?}}0z%FncTF6#)^!UMJO_Jh z9!LzxCk-QjfDrvwUTm#Qj9dYh_ouCi){s@jQ%4s-AdQ7tW9|$VCPN8;FO8yj%-%}{ zjvOc1J(3Wj&i^j#Weor8foC8LOHEE2{n5Cb_DfC9sYx221q5k6&LWw6rSY!Sea$=k z)_$1feZar`#^c+U4zV)<{?8?21eYwbkL}FLA{$>#%kwVRFUrTVw-7*A=)7tk?zRvu z99my`uX?Sm6`ZMN^%l*|en_qcu%+I>@Y57(g$3q@YCq$~!OBuJSB%k8#Gj zQGH6(+E(4EoE$$=&-i+jv3R{^$IB3A#IID@!s$S&a1VA?PlBzoFs?|Tjt}laR)p(W z(J9;T3mRKXL#|3(NR`SQV^-ai?N^4Hg`W$GqA13V(*zEkXShFVT>FPbCuesW%!U|+ z(Z1HfS3MrILoXO$$gLSE=+=M2vq)lRCJxDsz4u#Gf0C)d(qgI2i=uGcD5*K5wZu;Av(M&{G#D{tVBw~#?oOdwU+Pv$HsU`)Mjj3C zLxpy&`!AQ1C(v@5Yw2fB#*M5(?0vI|87bKX2Ti3@F>P=g!a7!wNaXI=H3u1f&-K3EKgQWb`)_1G>I=9MJM+i!#+dfB}8OuQqmo& z^i$;4s3v&$-oBl~wqAY;8v8n{iM@4wUC4Rt3j$h9Mf|cm=mew{cIg559Rxgp{sgQolz$}Vr9b__?)vwyLzI$L&H1};MtPjnFSuBEF8cMf%jq-BkffujF)Ht zH&RwnChRE02l}kfGo!qn)Lyayo=9BL?`)VFI7Y8JamcqsKhP~}47S75(J;^YyU5IQ z2ArNX25uuB;d^Ozxga$OkwZ+7e(?UPcw{|c@&Ui4;=?zDBd|-Q0By*X!dUb)%Ffu& ziKf;Deduqk+Nz7rix$MQzRoPTlwAZQTtJmws4k6;(@uPpEW2PO-&a)G-P6Vp$kFw0k0UxkS@E$j^1v!Q#hfXZ!Af&!~6kMIm%MS;?osVUPI*gN-#yz8bBUXzlF$3rvC zKEMz@kbB}1C}SWckS0M&fHY4v{T$<{_dJ=*lFReDdrJ@@Vx4~xoxcO zI92hedCvB2yP7BWX{nkAEoxv!qs#b!?PCg;%FlFPGx8U-r?@y( zQTKROgX4z$y`#5c^pjGhA>~;vR; zL4Ey4c=@Kpq3Up+mE^TKVgbZXbjj0{@D(5X@jJE~N7QHAtyf_rHEHQX=gL-5;7<|C zdd)sGh~I|3exh&`er>F-A6NleI>ylfin2v%5zxxhKD^A4X+N=Cjs z_j>6n_xiF;>5_?z&NLzZ6x_A?9+8Y6Bj5U#j6booL+kTNn4$}$oX#8+&qAb7?iSq= zCdsWNVHHxTGe$DmEj((>x2Ev%@|VVEQPIt461o!oqsjO*+^V?)-O#w{T`v{Quxig@ z+l#4flS&@B>84lu0xjZNszf3VU=eiyA%NdIs(&xyeMi+T?mw~rGWIF8tF_mf$9Y&m z+c~g1)Jj#8R}}bevMn$}B{!T%Hz0mVTz1gZ({!VCrvj%9r>9rv2pcX@wcGg0=GXv#wG-+@qc zdnsCGDrY=<%)LgJR#ALnVzzS4VeZyiMj^ ze~Pkx*&B2n0VjQ)#QmKW8x>QORBkL>s>x=vp7~{Ky>9hW)N(12j++IpESLJ7Hz}|c zCVp*|G;_qrI>x+pey`;%O*DO=DmEgxyDvb9ucCWx$g(AzC#4W^rN8)*y!x_fpWiWd z0~FZ)WWH6H1E6;hK=1uRs=rDBL>){Vj6@ym93AWdbtC`rdzIxC7lqKXQn{pYQKe+_ zLr@o1^1^iZUx*>lK z-_`obcTWG;9`j=U7V?#b4FTH-l_)!h^;7ndO3QP6MBu)-tVTw82!|L$&tExMv!Rq= zm{sB(A|SC5rtaWdF}&51>OSfJpoCwhgx`9kTJn~VXV`nCI)%m#FW;rr*Kn+<{;OQt z$b4^W*0#0Y<(^zL#c)*5^%Sw>%d>RCSBvVDJk$yKH`+9u4lzE}XdKOrC7i0maU6~Z_jZd2>% z-3Z`bC%ML+#4q7{+9%C;C&?y!Va7B|JTeWHB`|Z>wuVrw23lVDN9W}~&cFBo75JMo z@Lj$b$mh`gkueULxWL5KJ#5rpC@0bqhZmp~iN_2sFzowc$C8w6iuShm^0kkO&!jtG z|0okTlAL{%d%DG&K5z6>37Ra5A<|N4C^IXu*O(hV$#X2Pj~EB98@tvGSZY3u>-5pI zYKdwS2;r-rm+6cK zit8t>InSaZU{HZ)^U-O@BndA-!lff~+!cRU%5(Zz4Ykx)H2q~kUl-oNlXu92r@TWh zo9Z>=M`h#6Wb;9k&n0h=sp>G>6DTUen+fatnR}SOM2#+jbC2){VrUybNsFL+#h@TQ z?qn8j0y(mGnd6O#yHxQND1~4{E#>qLa1xyXtl)24#=F(Kull0n$7H~m0VZsww$`NK z9BNksSq(YJMw5gd8UhRAi<1{MH8bm|DUU!V+>h*mL)h?K#0L^?=>zu!m!W~}MP7eg zJnB7aR}8P<#NkV69R!~bOP8N(T_%zPAXzt zFikfZD}lXa7_mOH9rN=3CidypBbpLnN=@HRD_oe%o~9zjBP+$TTXa|JyS$lcWGCv0 zm-$wxV+-aHr_?8UrTwVfoq=r}%D0vs0yIHxE#tQcw0NlFxAXOSr%>}G$Q-7&!>M8@ z#NCZ_(EG*xvdh|~aoJugA*j)PuS0z6CvSi(2L@+i{D$0JNDFFt!%Aat;}5h zqu=7?Wx<${LszF4-ZwOySJ0CX^os6w^(6udCi-$PAq2a0TX?00?Nu7*cLY`WJ}ncH zE2z=wh@qw7uuNQ;OX=$q=7Q`Md?t>~2otBnsMYI@5Hd2bGD8A4*V&g1@R=1OQ$k28 z*`WKZ>cw!yoI5RPTAdU#YNxrQk2zprBvS;Tq1z=CQ_Sd4b^FNmWwxrQ#8fcc^k9NH zCut356|_j=S7)xMAxd{X`aQ0R^CVQ(lF#;x?BV|I=5=gEInH35l+z*VwRI5^yay{R z=E_vY4N*LgK{Gq_ugTF$+mP^NeK&H?pwM*!8VFlN8Put&SiVyw%T)yH!dS`1cS=;? z%h4&Y+Nq03x)USdudY?6ujM+8i02@Iioa~+f*UX1_kIqwnbV9(<#ZOe!8PH7(qt8>1f86eiYfW`Suf@!FwRNS%sNu}~q7y&0xMbq^aQ=|z1RQbY;U`&|9WE`e zuRg-&#YXtkDiLwDo3YMYAwtLmpRCWsDB6;UIGMvkkydrbiHf}D|MERZ?Y(tM<#;@v z&Q;Oa#F(&!xMS)K^AT4%s!19NpHxad%Y(PN*;JM0T;Z0 zL?=o_=Ex|6l7M`iBy^F_ZMuHYD+UWu6yFL|$kCY-pV$YOyZrCf*)LTEK=YrF0a&9j zKQxos-s$&=7WrXkN>~#)MfGY_RM0E4u9vZHulD-Smc2fKo#pr1DHN+XBC_@zjg7v( zoj(BKDeVst}Q(u>~0t8Rg-d$COiU%jS@`W8Fwcg{J+1Bp>NkPNz=Wvlp+O zAtpm;KR|E7#GJpTz_VkA0u>MB_1o`3%ZyV>!|u5esv!E{KWVSf)}v2j!!E0_t#nc4 zTX2qKQ{51Cf)!SH=;TALw$iJW-eBJGN|jQ))K~18Q?Rp~Ox38wxCZZqNC0a7@it@d z4iXDM5RkEop{1W&$`D;mEaEhvsCm?a;z@$4`JnIVBL+5_E&qCVo> z#frjLt0J0YDTmvU%(>mLNW+}^g@aAZn@;w%0|VXQaYDIlq0&6)a+GppPfg*%(MLO; z2rdPo6b#6FKs%!fR96xWKt>7RA^trfDrPPKC)~yCKQ`*Gnm+Wb*&_MOlE(9m0upEf z9VCPt3}G=v@!E(lV;9uA3Gz~C=eg7bX9uyU21Q@poKv$oc^$TD_ZF{C;r#h4zd24F z*9N}~%Lx<6cQUM`MuZtR^pJOqeMgPfVq)^GQjTQ2S`9t&?KoG5^yy{+8${RauyqVp z>PY=4dv3)D&H8OLPR;cB4k=&+k2El^Y!TQP2CT0#j zr;ol)Nz%EMYH8VOr{T3+mfZGb4kqMwY)$>jd6(WZ`!;PCpJrx*u)p zRA0aT3Sct{;Q0Q5QB_xGBUdwv|6EH7QCW3(tAu{TKwqB(YNG1evCWap^5kO|EatS#n%r_ojk>#gt z@x_arLf(rPLW1ziov@)#Kb#4q;yA0nGQ!yhduK~HyHovm05hoG*VV9{{gci9HN40A z=!J+yZ;kS#`Ao!27gQLrO-s8f(iOhNTs<$rvXpXSzhtON7hmm!?eeSZ90jG>!{i2S zRGOEEklyg$bUWGipA%a(^RFUy6Fb2`JR{X?SphFr41gEh(>y3zBo*m<9NhErbm8NI z%e&7{R%H6{Zgsga#P^u!R;Lui2`1F|de?i4;+5mYLy29UV2HliMerecqd8fE&dEcm zz)7Uc_#&*@>%vm4eV@A8o&GS@(n)QB!^kf_5p46-(ggi6GZiUGxF?-|8ubF%L@W#B zRp=afFe5ti5@qIdXV97LV?&jW5G~hC9e=IwF<;4hGySm%bLgNdRq5hVBY0`CqAA@ ze`bheceE!h0|(L76Y-^qFM>lpWvu*mOw>=vFX^mVol2!klx6cHu6e@Y{uZ1NA$~|n zcdDmwV|ubJP~G#gL~?S~BqxzS(zCnR)z*DyKs) zK3zu=GY3Ui-Zb==Fl{b`LZ5PkD!@ggHMH9s)ri%Uz{GZWlQT=_aFq(;9kH53FwTKk z@+b!BTYrG1yW$-nmXx{_0J&9P)qGkAl;%%ky&j!l_IxhZQ4|zp1TsyGW4->euZ`fM zJGQ!zJ`_fYCI=%+bM3Xy&wn{t8NCE(txm8OSo#pw5RUv^L7%QukM)$kLGl!C%}>ZY z(lgbM6=}y|MRv(YJdQ1Yq@k}@nA}|KPL}G-RWW(S{mNcnEp#oXO@4QwS>{D6=%vS^ z7F4X_d-)W+rz~mRMUa(Nv}ykIYZ$c=r=FesMTr3=s{;And4R2Md^beC`yNQ}2-tL- z5cFo&pmosW{7_Y)np)v+;pMF`JCM7jpKR(fkitQGMHiS>}F zW5Bz$BKMHopBEmT2X+9KGWcD$lYqtc`m{h@xR2iBi9=X^k;9K)IH>2nM7HO3#tBh3 z@OZn&EFTx=E|_X}XN;xJZqO|jXkM*c?P_*AQrhX6p>%udY@z_-xoG3=S?}gNQ#uzz zs1eqj8TXJ>bR4v@v9Izi9N=P#&c)@2hKnXCqi(KHyR{J($dDhiK%GoP`y=N;Ja6Qr zNp)gkMCIRCoj@f;P<+MPGy8hmPdnqAR57}M zq6FXh1^i-w+0E%!S5t7Eje_a|lb4S-c9_g|h^XuQ^{H?thBwz0MbaM+6J!ml&i8|6 zFf=aCbv+5FIt9)A3Z7E+4p#=>(*cqa{YbFYCGkStUP||Byj(cM8OUT|g ze&|QmB-D@7N<>t%kyIrQS{4N9jts}P(WAwD53=t{ubVLVu_wwq*sUMWhl$;Z_4lx8d? z-$i0f#=k0;N3yI@DfN9|%^5AjRmgr}Mlcm$H$2XaQ8H@9MQZo-g)_x&Y4>TZ&cNgM z5G~3X!7L-ju+l5(ag|KprD5vnvHDe3LtkuAi)Ss|Ahoj5XhZVUkvG~HV*6Q&kl4LQO<2MG+6Wu^pN;?8P5qS`-Wp%CDkJN z3udXW(K3X_bu@VCoK6(Di?06QYfR^f;p{NM%g}4a@oDatdB;F*=ktQ(%MieJD+D~h zsjR=p_k9iZB$63$V-j6#TXL*CIphOG<+TTN0}35qSBsBn4cI(z^dY~u(r}|w z?%3nhOE3qdF%2gPvfof9Eq8aCXa0&P_@gk7d=;MW3)JFewZ_-M4HXWynH12GZM3qC z%HJl)>FUP1`e}0+lDWt$+o{Ts-i*A+)kB5un?!Mj-Y|lb6Syxt*meRE=YWY=0)*!` zH#P1}M#<91#q3uJiW~V+)e?GZW%91S{v4DcgdwRv1Zoz8Q)L+)rF!?B>m=!rwA6T6 zdkSq|2+{}9a5N`MSHpuZyC}wIqVOW{Fxe(1(Y(a<14H=4T=bZ7 z*yB+j;c_RMTc%FsD5l)jDv~DT-tA?%?ECbk#L{y22PC;`A43}Lw^Q^Uu$uI9WMLyPTK^VDbjb<#WmFx$#oV-uZ zdcjDYI*$G{5M|*cv0qB>AQew0S<0TGEr@fHSLaK0hm_{J5E-&Ek)x)eh~gz?0gz2M zpL+sb1)vWTKp!LE--lH2U-aD(dc*gzp<$Pa$Q3oJ-aTHU1rQ^uD;cS+E}mpSoA zYvf%U+;=Cz&XnR&RbKGG3w|FRV2a(|M>Ir~%wsf!gNIh=ZKh_?cP?Tx;yDf)(Jp6` z*Q#rIJVb6oI(t~Pul#XuW~_VJujYj)BFx2sis_^3^U`?v1N2Hn(lJQ?Q%G!txZ-3oL<20V zp3y5gUtX&|##t>)!NXCJn+BC^sQF&V?-fVq__T64UxRMN^1R-LSMrdB<%W@7wf4DNJp(Ao^5s zSgU~S4%_iy@QBsNSj*l!IE|{AHg=01OCUE$u~c0qFd9+hTEUcN$9A|=$PFt*_Nk<3 zV!2-_;@0@PP>e8nGf#H$z}VV&h4&ziGq-X02~+B{h5!&a!J+6zU7>>}~^MfaUN3Aq>&d#6Sf#8X-7581*vs z^J#Abn;Y=*C$WCCWBJwcQj5eRY{Al7jH;1$ExOZ*!%(E~1w!t&RqlXhd9G9mx2bnY zsKn}LE$wU^k$n88&|PLJu_gjjF%8E-Z?o%ay}wwOms1(d56ECtXp!#qYCkTUqFQ@C z6BIp%Qn;!kva7g7t!OK-#VzUc{B-{|ZB~PF!8!-ox_PRsMuqy+zh)lMd)zpQiZzPC z*~D#lc_2-4y#J97)nG+)El~wH61agvzM*i3esp(eA zV`M@;f+kVUpGw6wVm=RIi>DbePN{sU;oR3hd<``jP{+fbxmBN&4ZXrlf9n65$GrP1 z+=-jfykmQmS~2wLt%Gh5lQkX=E!uDo_j)HPh2S+lR^wtE%8_oPc+5tJF(x2O9hok0YlB$||*7Lq-e z%^PShVuGVxJwp-er>)>EpE_7_*Z}pUH&h!*dEw!;@>e{phhuU)gt-ofAT4un%3}0l z_|YJlj~bzG!Z{XlP$RPSU1=Rtk>BWd|e@=BKD;*&nTItDo#n5|}Q&=V2wtm4{?G1M4s{<$=K<{NU-`Wvz*N8MX4 z`YuH+^3(GPO^h-?R+7(hhS`PPCRr=Ywvvy&DLY)_odea5y%)0QbE z&X=s-3@lnA$khb-0I}K!Jb%>0f3tjFs(fQ>e@K;>1^X5o2ggl70SCeR_tt30=z9}2 zQX+5QQf0q$!u@Dpa2VlgTsuO?>R`B6 z$1}P><9FPDJc5sd2F)+%dy6U_3>}n*e6<|(6(|5Kmt$yk2AHJ|K%Rb+0{JOVs_s^f zfA&(2>oi-CA7c^d(b^ZaP%~7fo?Gz@N;#u0B)*?@E^az{-ac1&WI?XG2rR;i4Q6}f)}^%CE` z`G))18m|m780U1$!HSHj0O~;a{}fmku|@5yUPf^ejDHh4&`!#6;!{+$KvFO4`m=>3sZSQD5uRVs4Mhv9MBZKkd+a1V6=Mlxdk}iE6EV zK>6kgIrxihuVdvwG8pZe(c}-Tk}`B~14Vg-HyMU)s2f}W`}8rJWR9`+=nGU;rJ0Wm zf6gT_8qWmk>;$@G79yx;O7Ow03n69x6Ay8!!nQOA&vYCa@lVk>STzL&XUe2 zLWP->rh=7x3%~X21T1LIwu0{hc`Fp)%chuspr$c22nZp7ieLORK%1r?R}bZl?2Rn` zDIZK;RedLfJn&^fBtPi{7vd2HhOSci*F_So2)BY{o+2hv2TAXg$uow;A}WU)>C50k z*2@Dz@`JuPiiYgaFpAdKxy#oF%OM6G9oHcKt#OgU=s6O^tRTD0&|R;v&w3=#ISP-m zIz6feUxgaM_Dq+KHL_Po_?Lo*x&-QSe7q2t!KL$gb`zfWsw78;qrxGQXQs(D6uQ?2 zLb=3i1dAfBbf4)eh{=ZDA-Ge?Zo=4nWJWU2@5x3+n=nz9+&9 zSp+Xh$g!N^VAmfjLO;_T9k=00%-7Z*N{?FTCUeXeeN!-qXfj5kfnKLIkQmVEN~vHB z!&#|qRJ!vKb*Ay-oOiV5iAXh*>eK3?n+eWp#w>m_`z*3-qb%jRJ8CafZDM)BA;k_6$uPqof`!0<$;OvF#mZ{h0N&|oQZ6EhsOlSH#>u1=qRWM4O=fIWke zGticN^;k9g(GUn|;mL8RvyRzTx#(h9U;funj#DmsGgZ#8bU%EA}gWj5Mzt* z9@K_SDR}Im)JyVTU@vSCc!ScD%xoO8d2Jm_n`VDxB{DdIh~>Pw;2p>$<(`Nrfa~Y{Y{-K5LCY!{#(XkRM%M!UWCgvt=yMe?OEMiGt za0?ThfH^brt4}5`^COfLF=Pd{yok)_2bMbV+R|qzT;3TaJUXjvU@ilB_3V>LiV?)B z_j$_kr{<4Yv5N-_Gy+h>2=1U%OK0i|8@KOQU|sA+bwENGeMkA54!J8PLp-D7ksLYN z)X{zC2_cNtkb(@Xwi5)t{bJmI^qHf}`_`Za*h)W+!f1f!pFVTa3S#0~406({YNs-E zC!?~`Rg?GH%&j}qQ4LC;%h1WXR#8chfk~t9nvr8Vk#BDY);uGTBItUnI6fiEKu;qx zMk|aeCr>B2z4Ia^zieo9dmR)ID|`fs4hH+j&Uk>40RE6c_Jx1^`_G_$_R0JE)8BW> z`|-h#zoLL2X7ry=f9ad|(2oOxaR2%H@#Aj*|No(69{K_>iC?~0`Og=BH@^FOtN^_Y z)Bx~DYr3C*KYj@kpw;ix*)N^s9{TAYt?=$3eza=1gZL|(_|V7qf8YGyAOAGO4?!UQ z{qujVRQi30zZ&QLJ^kOe&iniGqJX}8-~KZFKQz+28`bZ7qTL}&09N#lmER!$Oez8c z0{79n12lpB74R>b|J_v!7!J5O)g9ausDH!#(}UNx;a!?S}4<(*e8bfpPzRFY5tL#(_Ha++o+j{TUm$ zZ2|Czft%3Wp|T@9fcm?ZG{DfnT~_X(s{#A#Ph|X4DD(goz|BMMkXeu)M!w%l1bD>2 ztupR#vrztw`%8(-17ikmHgSjDi24xrZ(2_P4;#2Y!yWVr!1DcxXrOKlz@WgL4(>od z1KPI!3G|m->H}N=Hw?JLz5yujKVsiyARoX6zH@(vjfM4R>|e5W4`2h|TED|)#{MJr z@6|ByMddrF@W+3Ix_|xwUNPXy#CMQfxW9w^)74^NT;MCWcevJgzr+3A1zccE;G3#< zm|=i+0RNVNzxCt83;HmkB&^;7dezpdZN| z0=<8w2pARkQp_Ey4WJV3-*o;x@dsob_=?6IBoiQ3_Gie4R|xoK!X0WXAVmy>`n!7y zz%vJ~g}(!|2YAUqfOplw53Uh#h4vjL9Uv0@N6d$34qUi=2Wrjm04Pvy0(knsRkwGj zV1O_#&`|#|t@rBifFXg4S??fke-8<;sSg4ISBTyLUNQe`jK3Ju2SI_0E$=`fSbqch zw-tR56S#u$4ilX1Uzq=@X9VUExcu)94TJr+X!nZ&f#HB_-|pZnIDQLvzY-1@4!9=j z4lal5UvR%z^@oKVxQ6HswU_(fsCV}KVN~FXn>*A!o`0eKV#yyy1ujpyL&f0x7pmDG zi&cP$1ul2EgT)hg81?~W44l)y1C0Xo-Ur&|_s04#2f*p|J6vs{hjD?E?Z7kuXP)nn z(}e#A$oIssDod@Nj`MC3nD((tiL3&YJ)W9B>xl4w7HyA;^aZ3LKcf xLlu&}hx)rP{jWp(T}bi{EK%W?fZknzQtAJhH!E;VhJnEz2z`OQE(w1S4*-qLB@qAs diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java index 8ec31a46d11..214530e363e 100644 --- a/src/main/java/org/jabref/gui/JabRefFrame.java +++ b/src/main/java/org/jabref/gui/JabRefFrame.java @@ -118,7 +118,6 @@ import org.jabref.logic.undo.AddUndoableActionEvent; import org.jabref.logic.undo.UndoChangeEvent; import org.jabref.logic.undo.UndoRedoEvent; -import org.jabref.logic.util.OS; import org.jabref.logic.util.io.FileUtil; import org.jabref.model.database.BibDatabaseContext; import org.jabref.model.database.BibDatabaseMode; @@ -136,7 +135,6 @@ import org.fxmisc.easybind.EasyBind; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import osx.macadapter.MacAdapter; /** * The main window of the application. @@ -286,18 +284,6 @@ public void init() { currentBasePanel.getUndoManager().postUndoRedoEvent(); currentBasePanel.getMainTable().requestFocus(); }); - - //Note: The registration of Apple event is at the end of initialization, because - //if the events happen too early (ie when the window is not initialized yet), the - //opened (double-clicked) documents are not displayed. - if (OS.OS_X) { - try { - new MacAdapter().registerMacEvents(this); - } catch (Exception e) { - LOGGER.error("Could not interface with Mac OS X methods.", e); - } - } - initShowTrackingNotification(); } diff --git a/src/main/java/org/jabref/gui/OSXCompatibleToolbar.java b/src/main/java/org/jabref/gui/OSXCompatibleToolbar.java deleted file mode 100644 index f71c9e72af5..00000000000 --- a/src/main/java/org/jabref/gui/OSXCompatibleToolbar.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.jabref.gui; - -import java.awt.Component; - -import javax.swing.JButton; -import javax.swing.JToolBar; - -import org.jabref.logic.util.OS; - -public class OSXCompatibleToolbar extends JToolBar { - - public OSXCompatibleToolbar() { - } - - public OSXCompatibleToolbar(int orientation) { - super(orientation); - } - - public OSXCompatibleToolbar(String name) { - super(name); - } - - public OSXCompatibleToolbar(String name, int orientation) { - super(name, orientation); - } - - @Override - public Component add(Component a) { - if (a instanceof JButton) { - JButton button = (JButton) a; - if (OS.OS_X) { - button.putClientProperty("JButton.buttonType", "toolbar"); - } - } - - return super.add(a); - } - -} diff --git a/src/main/java/osx/macadapter/MacAdapter.java b/src/main/java/osx/macadapter/MacAdapter.java deleted file mode 100644 index 9c7938aa5f6..00000000000 --- a/src/main/java/osx/macadapter/MacAdapter.java +++ /dev/null @@ -1,83 +0,0 @@ -package osx.macadapter; - -import java.io.File; -import java.util.List; - -import org.jabref.gui.JabRefFrame; - -import com.apple.eawt.AboutHandler; -import com.apple.eawt.AppEvent; -import com.apple.eawt.AppEvent.AboutEvent; -import com.apple.eawt.AppEvent.OpenFilesEvent; -import com.apple.eawt.AppEvent.PreferencesEvent; -import com.apple.eawt.AppEvent.QuitEvent; -import com.apple.eawt.AppReOpenedListener; -import com.apple.eawt.Application; -import com.apple.eawt.OpenFilesHandler; -import com.apple.eawt.PreferencesHandler; -import com.apple.eawt.QuitHandler; -import com.apple.eawt.QuitResponse; - -public class MacAdapter implements PreferencesHandler, AboutHandler, QuitHandler, OpenFilesHandler, AppReOpenedListener { - - private JabRefFrame parentFrame; - - public void registerMacEvents(JabRefFrame inputFrame) { - parentFrame = inputFrame; - Application.getApplication().setOpenFileHandler(this); - Application.getApplication().setAboutHandler(this); - Application.getApplication().setPreferencesHandler(this); - Application.getApplication().setQuitHandler(this); - Application.getApplication().addAppEventListener(this); - } - - @Override - // The OSXAdapter calls this method when a ".bib" file has been double-clicked from the Finder. - public void openFiles(OpenFilesEvent event) { - if (parentFrame == null) { - return; - } - - List files = event.getFiles(); - - for (File file : files) { - parentFrame.openAction(file.getAbsolutePath()); - } - } - - @Override - public void handleQuitRequestWith(QuitEvent evt, QuitResponse resp) { - if (parentFrame == null) { - return; - } - - if (parentFrame.quit()) { - resp.performQuit(); - } else { - resp.cancelQuit(); - } - } - - @Override - public void handleAbout(AboutEvent arg0) { - if (parentFrame == null) { - return; - } - - parentFrame.about(); - } - - @Override - public void handlePreferences(PreferencesEvent arg0) { - if (parentFrame == null) { - return; - } - - // parentFrame.showPreferencesDialog(); - } - - @Override - public void appReOpened(AppEvent.AppReOpenedEvent appReOpenedEvent) { - parentFrame.setVisible(true); - } -}