From b0b1f5fbf2e281fdc5d197bf11e80a926d2a9592 Mon Sep 17 00:00:00 2001 From: Andy Janata Date: Thu, 11 Oct 2012 19:31:17 -0700 Subject: [PATCH] Fix @Nullable annotations. --- .classpath | 1 + WebContent/WEB-INF/lib/jsr305-2.0.1.jar | Bin 0 -> 31866 bytes .../socialgamer/cah/data/ConnectedUsers.java | 3 ++- src/net/socialgamer/cah/data/Game.java | 3 ++- .../socialgamer/cah/servlets/CahServlet.java | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 WebContent/WEB-INF/lib/jsr305-2.0.1.jar diff --git a/.classpath b/.classpath index ad0feda..e4bcb01 100644 --- a/.classpath +++ b/.classpath @@ -57,6 +57,7 @@ + diff --git a/WebContent/WEB-INF/lib/jsr305-2.0.1.jar b/WebContent/WEB-INF/lib/jsr305-2.0.1.jar new file mode 100644 index 0000000000000000000000000000000000000000..43807b02f35db48dc302b4ade0c72b2141d65cbb GIT binary patch literal 31866 zcma%?b97yM*YDHVP8-{{ZQHhO+l_5BX5*w`V>NctHf(G=ccQtSH^{2oR9`-?u^nNdj)= z*~*Mk0NknvxKIJte{Pi#kd+V>QBtOr5xtQ4GAb=aLpud0MMF9MWujh@ewJzNhvOF^ zWCv<->2YxtpvX5QV*=CTB4rUIWfZNl$@o{rp5SMp1FfN2@J=6C*28J4aa;Yin8~YXc{zkhoDc)ra=CeNg!7qzmAleY{i238 zuB*v`uP|epSe|=Nez9W77tzXRGC2Zu(RyH@EZlaEzmY{Hx>lCcWQlZZkZpAdD!W%5K|55uuXdtAGC&sjw)1i;RdNiI*6a;=1Vlr?d3W-w$179KS}@ zBV~x=ToC{8o0O_hVc&w#y&yH8!_xM7Fq>?ZFpbi@>ov5xl~${r-B(cHlQ)g~qhmhI` z3{2J0n+90#AB+5jIExQ#m<)gz9)OtS|Att}!pzph_#enCvcNwfYxbi=>Y_)4VI4bf zHmbSf6CllkvFN6l1ozll<+Y7ec&vlm$`5D=34;uf9!X#L&7^mo;C-|MimCmf-zzZH zUCiHU@gZMM1uc&MtWxYb&oWeIZf=%ie^edX+AF?^vXF~K@yMT26N{>f(UaKTKAqkc z-(?|rHPFlUk(}73%!#n(p}+lc7E9D>-w_uDBz*_hB4C>OT|)9PPldF}L2}p(Ou*9} z4Nu+IxO&iN6U5rwbH3e1s3g8^;K4SV21^%TA2Y+I;!O@$gctN$7T*t<;^6xVQ#JXI z0VxI>)^^}8Prbk)d%)-EQ0vsRRn>)}Vt5y^w*SD_bGN`(uLh9bufdXTYQw`KRys_Z&f$XN`ITUby!O-QQQm5=0w~ zoHJn+$MCV++}H1h@Xg>SeQFd!ji$DJ!%0MX@a@6`J&CNnP(JQ#YTNeYol+D&XkT`{ zPX=Mb&X02!vwWCB4~u;uFUv`zWB?zWYKe@E97*T-(CS&Wp{-#8ZZT8NhSO%knIhBc z*cuHDQe}|FHb5dGHf21E4uaN8 z?67#j3xT&7^x;#Qd3v8WX5op+r4&>6C-vharIPya!7R>6fN2x;2qyPw`jF=F3#3)k zT})W@mC%qJYp#B?4EueW6b`^LAOOqY|H(4KCe8*Hw$A?}e;K(~`LCWgMn>Mc$V<$^ zuzhpCZh*>&!`}x+jy1t)oIJwZtv+Aiz6E(y0LcGy9}BC6S;o!Y7p|vUZ!ZY@NF0bv z_$F*?m?SO*Zunh63*=JfAxRVJZ@I80gkY{ui|T08RT-rLq!VdFk`;tZNbHtHQ58iV z&Ofy6u@n%)lIGb_N`06<@?GVmH|l>nJr^cTgkB0?F-tB>SlIV+!wKj;jN#Qd9>l2c z7v4`JD|-pj71IP$@?E>_aBcSRpsnG{Y_v#-vWR^-UCid4k)dw%lxMcB&^I;~*LFL3 z$NQocu;24_PG39#jeY2{tw#PG;?UVRk&XxI?U(#;b8i6Js6m|-DyRGtATzqGA7J;7cs zH1Gi#SKOU^9Z6`W!FGQfR){`_oIbd2zE$6RY_C|oJY^xcqh|qjIpPO(G!~fc!LgeS z(^k?YbWjov)KO3kMiSTzs_Xn(a%5hRux+B<1x|8i@eg~kW@(prE=>vL@AiX8O&rQX z#TXy3QnDMrME1&*e2%7^q8r3opV9TVw68Di)LlW%NaPi&r^c?XP6?J^JU`>@@aMl3}9@tw@E zvJIs`#R8|8<&T*Z^=e0<)yWVUKOw!H7!x@*>xHP5^>&p;7KV~GlxbH^{jVhQlaZx? zy42(GfmTC%9 zZ^yuIrvQUqJuUQ>Sk6e`8q=q23**lI9BWZc6BLnXWy{7jFS>FAA`d5fEB&F_YHb1) zhmeo^9^?&poj~XbBu#V?JmPn;8Qwy=xNCb8H-z|aMAvCy`-Q}<_U{+Lr#2}_e3~*6 z+V;EQ411pT*D_E$IfJMt?G%K{4^`iyO~ zn?vF5&17{{cN`2GOY{byO%41wSxckxL6y%ZI2#z4IyHBX7g7V{cFO{de ztLHaspeyhr@T}O@oQufzmOAIT6v*VvQTe6CCfG{Uaencf1OdsCSLYI);%ZVTEi_mZ zC|S_f?h&=+VmFkk2pQv1P*n|-%-ou|ukr|)$l?Ft)F(>If}_3ggQrOESLCgNg9#a6n~TNH|^wjMR} zej`<^i1`ri0Jd~u^+QUx5C@w2sqyr9)e~1kbu)?}?1kS}@U4eY-sU%*MyxTXfNZFs zu2eMg81|2NIYZ68`B3RoG+;5$`QPxK@AKD;%-E;f%p4D4XSB!cS(1H0K6h}SvghvT zHU)r%(iZEZLe$7qOFhyu7%vS%t8zF%TB(~s(}(cK5XGk3{c5N4JL;TEfQ>i-;fnH4 z;Y!xd*4D%fkgK|y{2r@xLx^*^(*E5_;l!@mi;ayxoQ#U zlC~5gCUlkPp%zq4rkLwV61W`8@8-H4)r0eGdK)&13*>;)8Inp#;Yke*W=SBdytvPC`P1CO=&;dj+KtQ<<(JjtFpYajgS&eE0T>) zt&CM`r?^7(d89^7ou%OB#guAq%(*XbNRAb97deS$H;78UqZo z7h?{QtP>zVZ7o}5G^M8^3gE!F;Lh&S?PY9r2r@YJ3%!&^AUQ%8Oht;#f7q}pVvrmw zHcKtryiYxul1M&B$tQaV>~1?ISL`?4eaqT{sY2d8S%|^%8Mxz7-I3qS2PTBK_?!e)bwX&X5D5 zKBJac!PWH)WbYn|U=ZiKU=(Ke?>>R#*n;+A2n>T|1B@h1-lh41S(cPaxF-*o<=H}t zV7naTXk4K;rPCM085T#u;@O@K+3dTfHTC!mjMLI`iC-oxJ4yw|E>@aOsJI^GgR z3Mzrgch_R^+4n?O&DD9N4%mC)eP#^hLsCWV{z-x)Ntdg&((xNe8-{Wo^%RdB^c*2f z+&g#<=fLfPF3WFf=jF-?rCkJJsrG|qTcV#MU=0^*iJTS3r|Uo9R(D_gcGM#oi~6Vm zVw@Aee+d5{zVlCN`&z4^W)a$hDZI(eJB!Dkie{_UL7EH(Rd_=}J9-7wFGcqWAxY0^ z9pYADfQUhmaN~nTNw$+I=h4I90hT}0A^IX?jSapLK9xRdn=wy3RUEmMjO|oPj#v)= z?I$Ts{gd0m=|rJBL&+)}z59_V(_C*0*1Jb-e3jcJIt4B8Cb}A~E@I76W*7vQ0QYZD z+V5$TWq^mvd%-!S@uv6GI{1s3Wo#%m_z3;l!{=YweFW$PU*A@>=BLYV7VJ z;6+dQ+k#kBG!dqHKyjcijwDo0*@I3iRaFRdv20_1nXibSuxvM!G$udtw@Y{l^W3ai z42OwY)@fAeY+dW~#mJTns!wNbx4jzLh`KSelqN(T8aqgT@V#mG=MNtQet}0al~XrH zH9{rmtL=k;0wEG7G>EaVm6=0p zwE<+{Ihf>(#;ipNp6>}Xs9n$%;cocpzpxb{)A%i-eaAiF+!|*4hU>=pHL;t+vG|fd z20dzk|B@Fnw%fBR=@b(lFB%kVK11v=Eq76yLd}Ur$D~=i$a_#DR?!mnlhA@yi)G=b zX`JKRzK3G;Om!Hdre2j*-xVHY9v!N&z%W54FF$7JHH;1Ig^#DJOD@M1*i)5|DvdWvY64=ET&RGA51|&gn)q; znZ(m!b7=;U#t10$M+_R+7~7|@Jn-MKAo%*@nOMUip$H&k=VTmLm*;rAmaq0vA41wg zTwt)?LIbOQ5<3RD15Phz*h+1L1%?LQkmF$l)`AFY?8F{1)56>gVN}kkg+P^T8@oaY z$hz>+%dd`dCa<}>5uYw=%w8$xZ`~8=lrobE%2IEL|nH6k)?a}C6tRb9= zVVD8H)3c_JORtW8@%pPs4W>ajz-8sOhEB5EG)ABP#7Zn5AHh&=wp;U2kwhK_`M_D& z&9m_Cs&9FbqQr;`d9mvYd#A$nlp3GEA7+?@@ch(M?dNN@ohvq4BP$Q6ppaCuI^Zh} zSz*~b9nth3E?XhiE=8ZeKZd;F&>cied|$>0^7&pFU=^i|iW{zQx4^%mrQbirhX$Zs23%}^LM!KL;^=5$ zY+-9AW8!RXXY3^7;^Zu0>uP6ZqU2)#PsJJ%*CpFak2t{hZkhj1Z4q7mO+<`vb~+_X zxMXl1a}E8cVTzU(*W^Vc9~N+2|1d#z*dzi)n(PU;)f4ZMhx_MSQ2M@zFd_sVghAME zWlbWI&4S3iD#{89;nJnt#24lDj15KUrIKA!v$SO`ITw*kSp%vVwRvU=k?Do;ip%yy z4U`zP$5sQW+CO+-P#$Y#j{=kO4@1{0(#&f3?QlsoXDykfzr@1&$i}9x zZ_cqI=%cy#+_AFDzUrniafefK(&>-Xy4dTBg9LAX3-T-86O(>2YyesafO47tgje3c z(ZI$8&;oE0a5Q;MvH?mK^bj^NHE^+Z{yUJw$w+~`c3qSYmhV-r3g30*k?n0P%}A;t zT2~$H_bau^l8}t0e3Nl_$$;?l=abAzG7NbOCrz4ogYjL0x9d9}khcD+P;YN_7*D{x zkY#;vbuwwdOwO0BaOjb9`~q9csJZ)c>luDcorX|HLNItjD`=JvWXTns#h=p};zA^4 zXzd*j(DkG)_DAu$?MfnW;wg52D6ZL$v_H+8$x`RgMRLbpZaPZes9LhfCyi|zv~$KU zw|1vKgl1$_S(&!X!+gj?889HWZ*M2qXvT6gY`;U8mTHug1n=0b#aeY144CgZ_46&| zH?nnDz*Fo|6O+=}>H3O_SZZJSxe8jf#0$+TYog_x{iD-tS{a`ZB5O?qjT%x@?FHPg zw10?t9>4apZU7hIA89+<0VM0}A!Xw6Pmq>*Z8G}2Pone<80qf2b%-14AE+-OH8&LQ z4@8cY!f_sUl^S__^mnijLr4*x?KO6F{hrB&XLmyP5hzC9sdn4&TYo73*1r?v2g(6GcJ(WkACg7^9dvMVQWx}9Gf}1eim^E-;Fw)GzX(ULl7=^?v%li<=KCJ}ix8WzNSDe^E z*(KU>81K=vpdBZ*kUe>sNA2rq7|}bneK^;3hn=S?3Ql!$uOb~{&|TaNYd3Hz(jIGc zPVOKmzY}GYRyW>Va_Gpau*{&+*^teaS5vZ?ehboeWUtbwXLl44shib`-Ac#YJlZCR z#7WdbnxV5WUCX0@2KNBBpy^)jUdU{>g@xv@MyA-}0pCkM83QJ?V~}WZVj>88PzEy( zGrUy4d9{jU@r8l-IpP3fT6$ANLq&Um=fmx>V-;%=Yb<=9XEv9k7<8;CLGvfqjv`kb z_3H-}=L21lN^w7oFQ0i2!nA7a6HUEzTT6M$%E589+ylWt5iokE9SGNVJ@sq61r zjrI5NTrx!Ic3AtJSu_O_IA!b7!#3t3+w^O8CavnDcY3Bg+2lyCD)fKjgY@KZatO=l zfKe+HAv74M3vs-*L4vw(m7)Kd=NAY+%?zHYU8E>h1=mFD7Wjjl7B}7%xP?F>MRd zV_^8kza8q*2>2!*cBB}pmG2e~(Toxq`BW|l9a=nE;gX(^M}v?BIYG0?obS7|TyD>h zx4?qKs97{y!MMDPA!KelsEez4wRAx2Ynw8Ub!5!sl87fXQ~Q! zPgk65pifl;Co}%@v&le9K4UPbz*o_(R1zRak7g?t<+iuRQnuckdP8DM&L#Z zTEdF2v=!1EI35INqa7$s0 zEsRhS+e(`Ydq+K&EJ>joxa55>33b7UWW*@i+HaZ2zO5_uliuxA5a9 z0JRJ3K$n0%n*1AuS@h%}VLDrGFG2wnl*hpj0Oh~MX5^C6f4e@%{W?vq6(%D7fJ>U) z&~=Oo3rXugu$9hibH>Yg{7YRs#!qqf%3ncD(w zv0QAR-2WIbiDs4&0S7Kh_c0?b&&LBZrsk;|=%%A$9^h$>E>yJ<@!4jqTbLP1t(<}c zJHM!0%>AfFHfs53RQQPCh*CF{CQ#z*HrLX^jY9scemVmbaOgbmQX$35)yn4fIGYR@ zct))PuX4QIxgdCBFWs|#NN9!`W8U!ySrNG|{v{-2_R3P8yJo?0pZ z%0U5G9}#^tG=U#^48GXJKMQd{ju)usEzS*ZHAPTg4{oaP{4;$XQRl89{eYVxyRvYz zy!W%+W~BVrW`yhzFJB#rH6Hf-gJq$vw~5VR(oF3Yk?Y8b_*1YveDNLTjj|!O!NEz2 zxBLmHn~Y#S23b(tM1z4~txfjy{Mpk~VP?&gc;yVz>VEz)rmRb7a0eaOD*3~yPSM*i zi9Qtg_@x(<$obm{J7g1QxeI>#w)#()hrtrMz{Al=62=4je3J)@yY|#@x&=Ng8>*dwb)UzEjDKO#e7)N*iOnEa3*l1NG=A3UX}>j#5kB-dB)7V($b zNbQdV);36ze+K^7kWI>&L zfl?Wt>-5vaT50ok3@f}!xjWY)wv5RbrgvX5-jT9Mje_iWPjoYANw^ZqpFO&;dU_B$JN94m`LyKP`(U%_ zRJchPm)B^T&S2pHT{v%vgHx%R~&;A&p#FcIE(=}{x}l( z4-PeR6WgC${@D_V{n_~uu{*OA7Wld@DFG=(R;`0E87$l%g)l!RKSe6z)^jO+xu6Zm z8c=IPLt4^;CCm3oUG}f)U&%xmg%E`_35HF2o-c8(YZ;|aW@1>0&6jX{nKh%me_u4t zvd%oNO;6>^QkJgO={gR96Xiyc@25r|KX*(s?H6Kxm}uQkd%6*6uRGp{9gIjK&a=Rp zNEPZeDP|{gP60>h>*1dBbrlg@WN^^0bqht%jm@1?&k-5Ytffg<$4$Uo46B z2m!!&GtI~NxYzOiIM%dd$wxDzO@r&on5CxSbVRU~BCb((uP^ayL4B1R3 z1MlYo863C;c22(LsP>**!fvFnP;dA-LqYV%e`3@B-t+onc4=g1YvkhSXkzR9+sYTr zo%T5_0OcpZMfIns_ODNhxfnPan-~lJQ^dx}y%w?ktNQtXwTzvOZgFX1&)Ty?sK!zW zxKL!eoD@a^sgx=TEyJ!12tI$j5%wz}Y;o?x!_o1Rj^Xi}iJf=;R@nFE_lq|U{H5c` z!|C?U4j3}C+F+tf4v1~iD`#-|xFsGb_G(xLmEY%?SqF+l+P?NDA=UCr0j$ZOnS)~C($N?JNe}0dBrIow=K&c$r4Avlui>h z(9_|wE(E|fzXjU!MoL>IXBJt~6uRlEfwg`9$QC@~NvifEDrmQ=s4f{@Z`Mg@)Ip`w z(cy3Lh_T0HYxSjWnM)_R=ydO%Jowo3WYc+^ z6VbC#HB;&eDmb+7?S@s}-9vK?%_p)M;q#c?HafuSl-FV`&L&XyfAsv>_6iZ=^ksH_?q0>~0$&9IjE**k2d%2)!?X_Q zSyHi)j0DP(>3bg*1VENfBFn8F0tPZnoQ}stkC$tA0yI7)Ta%iXte-pi#aqL?lQjkE z2n+9gCvc8kNzR*91xAD&J%u(6V>R;=hQ=|+P7w4!8^^jkq6`3J;XYZsu7}R}A{ee7 zB7B8RbtDwTFx%UalPLwP{+5O=R}`hLs9EnE(VhW;_c@GFmZt@mwRYIK_{o<^k1<#81P`d%J}WOVFLNz? za{Lt|Qwmh}W05|~=q!^S?W`t}ENKyp=`ez+NpT9q_+4J$nXL#ro(O5<$e7XVZ zYS2ju%zVIP#Z|fL92p`evQ~IW!1lzqo~EswN74j0;Z+}ChGjrE)tdp(P5n=Q?|(xIow=7$$)Il!i)o!E(j4`i%|0NyG<2s1*B^uqXI;~!>mt;>*H`T3 zJ-^^szw{&BArE#AY@j+y_=;;Ia1vC%EdxvG*Y4BOnvNukDfW~}%f4^@1iEfse_>l| zjN&KlH*U>~g#<}6jKe(Db6nn3OXf+PjeIoZojWCRg7s^5lQzCmH3z`*I=KGhbo6g5 z<_3Uv|G&6&zt)AJFCW;$$=$btb=m9Az6=XXizALveh+I5AgE`G;HvLdyI2EkzXn%B zEPzDFEI&(hb;)$O<>~?1PO9vZXHjV*E>G}wnt9t%qqHU-X$}&mC5U0^SPJq*)23zV z$rz-h*kxY`Ky2y=wB)Er8#Zc@+`Gkny`$bf1n!E4QVUB@3PSt`wEf1N@h3xFaEsFNxFtHzW)>`fG046H3oE&ekCiPw<=RzM6jdo-V+ z?i$%AJOn9hHQ#H6B!&ytlxfCq4c}xPiQlX~%t?N<(zyh=SD3PXXVEy>PtTOK<71X~ z@qBg<4pdTO@;USk8VDdxRhSQ9VZT`p%5G$j%**8CNDa*nvITw&ng zBimg|j$$tiab0U(9{xowdbCvp(_W_@hEEwe9zC+$MlgQjQyF_@@&pL0u{#-&gcasY zp%*TrmMbo8b4@viVX`O&Y`XI#W0ckE$`25G?%tOeL83R~by{qPo`@8>Z}%8144zvM z1lMookjiTdw#6z4@QK+I9v{*K#RW1RNRAWW(QCel05f7QeY6B~%&Lg`=%{OC@Qf6f z2P8r+f+K)2&-dG+>Kh2)9Dq^i|No5g%LpYp{_hdWW$)bmlxl~2T)F-ft~R%q zrg=!9t(6Ygp1`z=rea-NolNAD74GAkXL1MCK2P;YA=30OOea#LKX<~6mSr-cjkUN~8h$({9nDNrWC|R1cYH+Lkj}$Xd*{oGGUO~6dLZ`V zAuxCGq`L<8E$0QD`;rS7;?4$y@oPVst>tsTB}!EfSkU;|I6~_}Uc!vK!=&}|@RQ=S|VCnh#*br!Uk! z|GAZEG(_xLhdBVXVgDVGci${Nf|79)Zbwtr_Uei?wEY~G!m8OrVnK<;V;XmH^G#oR zprsZ9hL8ORKkbvP7q!JssKcwY*49ZLA--NzXxHts)D#YMqP`A|4HiyR9Y-c;va$B5 z+nMXV$607g8!YYI@kS)Ow(K1UOE6~7yy4-XeXh%SoD^;_i1#?O+e535oiwU>_<@dP zk%1(o;?z=T0i1L$6(+)ZB1_MpbNVg`3%vh%%jU04l!6qDR0aT)1F+76|6ifL zmg0XO;YufV)AFc12%4ICSXlJi_D-B7K{5urr(*b{_T7Eq)U{Z_w|j60^F>LZBO4Ge zi~uUzJ2xt;KwwBtRUU5vT`fpNnLbz6d3wUijB_C7%t$Dt5> zG~yH-c2Q86j7PlX7gJml!eIhtV@AagOxCQQX2jUG0xaotO*kzad48>Lv+XqU;9li! z_=+6Vq~@owYB7&7tCl=pPifGxT-sUu#j!wfr6QrPC-V$5-{=^&lDF58^dVQ#r0rqe zFnrE>p&WtpLDeqxgp2uuM0B;VQvyjzP`99u`u5pGi5rpjicZ6+7o_xg~ukEJc` zMiF22EVo*$+nSn(FVJ2ui2kY8$`8wGaHt)l8{&1jW zvseya!ns_Ychb6rdB2{uOCJYV&#+oU!euJ_sLDVeO9pOhFpMx0jwK!*hiU-s5IQ_s zy(_#TyHJFYn0^?(nf*jmaTH&%v5RZX)xJun;{xobETsk3YNh0CFjvK40D>=ln|A3S zx~8mI8B2-wWgXL}LD*0#cq0O~o0q^oW=+fxc7Y<)*cRA8^CVDDPnbVO6h&T@PlzXs z5ED2R(^j6DcBCdelTi*!gn{Oz3ctg@sg>0)baFV&6|OnNje0bLYtkWgBP0=_0r~9E zH)J}}s+(!I1X2oFfjC0aurxthoDm~|xY&p2E%x-7C54diSPExf@Del}5|doFtnY~c zG-W^fr;K6^6!rXXU-93b@>JmyF+BV$l}D^b=V%48BW(sq&<)_@gnyFaFK=hPz77^0 zD+M1&j~IHxBa+&(2No{jLrQC&q#rd}3$I8)Lm)yj(59tMjw$qY{N=tFG`$yU4};d; zNI%MDEs2GIpq$+12WN-{eM!#9w(2|>X4s(pgp4^m1Rqk%!xDJw^WmFq%x4% zSj>|tD}xh01pxQ1f1&NYrg$bLdo)8>@4-~E!qN5#jMZt(K*^FiI)TckK79I!aojx|9R}c zr!+qwJbvtTFC_THH`V)dYL5N<25EXe9;$T(1L<*^^eO3ze*>NR^j8q7vt*q;I zW^J=*eNWaJ+QM!1l;%77ntG$6mhxnmAE98IlQVM@NNz{RG~nRq*M_aw~h(w2l5R|9$n3)k(^ zzLb3-m!+lgHB2#g|2OGbCF#=a0wi|~u)`nI_MbNR_q$Yo$xpyGh#pbohPR(uAkzB{ zE52c)N~VAK4Ebmo69Kb6k#TeMhp!!>sx;04oG^6Heg$V%3fZ;9?)_|!Yo(2~=2Qhl z1Legm**KWG1+-!`dYC^jr&HjksL3q%89Xd3aH)qpZP_2`sM%bKXfJB|s)@N+Fu2Y` zsn5Sfc&^;4MfB@szR@-y{;VeW-E6dqA6LzE^6-U;WCX>uFUEaTL;C3BGI2D(Nt;^$fCi(db79qk15Vr zAl0{Jf<`rF$UuaBJ^FZcRRSO3Wa#rC3%_$Ceu;+8&PWH@51 zP`Xa!H=CIw%<%QL6CzHqe{`X*$TZ?MD_{PVE?#e_@}{-dduq$!?XfS}{BX0`@9t`e7ZZ<{Aawq(;^x(ARi6=zx&T&t2Ux5j z_|tLnuXitKUrm;+*e$!lkJ#}*Rm{d!p7I?|1rf9iIgJ%g0DJJjp{{1B_ONlKbYrzm z7t4?h3GRyl%~89@$(YtV@?3k7({Q-wx8|@~4Usa~pq5JZ7CvI;%oPG^+I5v|#?&Tf znJpX|Vdvgr-JSKSj$Ci?mXWdQ$ltC6`p%ZBRF_7r2I#cfg{Hi)Id>Ja1|$xH9#f8d zX1qiM4hDCT(O)pn*L134(l2PnUs6{Fhs6@28l0DhsM2>tmUfE=n~5(&eBWaeT~-X% zi$Q!vTBIl*t%3$NvtZrhr-*#fW_)&J`W8$iyA>vla!_}h94a9ojPFg0rCOlgF(lCt z`JkqjAKCcFlLEedef(JSLdB3vnRUsevMMR_Vyjr z0PFVvPSro|Jp8>B_|x*q@}sZEY5N1!b(;7PA7Z3pGHx6`KSdRL>v6Hm!D4qU4BCE| zQJV~2`%;jNhpCxqv#Iy6DI`pj;m0J3BAR-^iYP>dx#h)h`Qh0^$fDGYHt6Jji)$h~ z|M~h4-*e5~G@(0rS@>c^s2ZZ+7g)Y?k%~}E8o#W?Jo1>RzRWY{7%lSqq9<;V2@vACp#+kV7<}n2Gf0vFQo5J;IP=lJJOA9lSAO; z*JmL>hoIG%;kS$NjsW-ej3Cee(L-?WtZzNlRUnb0Ultv|Lp$%bruXm_W<&>lM7Uirqp(RB*)31aEI;< zkEj{U%;v?NP<*ff)t({FOow6wa{*G)hCptMviIHX!YF z@Ly#$FD75~IwThc$cpt(LFNCs*ZY%0yo@b?L&$65@Fw3Lh*iU1`7H&S%-oeeLIgoA zjaO78qT9#BB)nSw+I~) zF#y_zfPJO+Gt+ZR7u|{1Su>Lu=$Ii5f(XD2G*8Sj!+5vRyD|E zP!I*N3B|rIEv27vCVh0rckf2&G&7HiMo(seA()-gz*~_lp28NLvoZL$&5D>DosG43`ht@ zoVkXGf2ZLC@&_=`g&$5}ibjz7JoFAGE9Hzu3FuIUAq+?Zk@s~%v5!)`^p#*hE*e0d zz(&z!jiEXqCS)*{1rcQQ5DO|TvcYVPoi=h+wyEH|*~t=U1XmfsxU)AkhLieoTOE`U z22W^K0+5YFt9R+A{aQuF{o6u}f)Qp(5#O4t3$Jnl>kk*P!JV?%FqvHULM%S+7=}aK zsD?dH724I}(cB2Tlzy=F&p!V^(&H4YA;rrV*1M{`)hinLSSzKr)z$H0+>p3r`bmek z^8J-7<@uKc8tKoH~GXs>^4e?{)gs*4KR*g(*rU<{Y z*EtYe2pc`gmbg&?GvEw*8)+ZuM> z(ckTotNYeyJL5v650ik4w@NgZ$E`16AJn`^W*%i?Y$8J$T#j|%-Xg)AaXw{p-aS%H z+M873*IyOEW4ZP~wwOF8iMz8FlPrs!JWHlFBt72l+Qor6zISOfauhz4ypdRNs;EUWe2EhPje)IW^3yLlJzi& zV*Ra)7>#`htc?j*c5e=lfs9GX6d2_`mY59|bV$|9c>lS9s3C_dG3Nz`hTq%wKO`m$ z@5~UV661*v>?)21Cp4%tY)=sM%ed>QbEv#uKI7H z-SFgXb|XQ{YHil*2t6R-O0i@F>|sjU9&E`kzpG)23rZV?mWQ~c&bwRowoTTV&tB07 zH=mmL2_+213?yzm$b$*neOQN{FtJ>pYN*G6CJ z8$r?K&g8}qifv^|Hw83Wjj>@)#JV^ubvXE$*Ig%BpybNsZ=sNnaZhqizW3*Q_XMuJ zt9GE8M8{&Fv@+EwrZn@hW)du*$T8_pPIeI?Rpj+TbCZi#pjq|n?$oFt1kMl_7RuTB#NkqYFLho1_(aIJFOXTXBYn7>85>8YIi_z0Lg&#U0Vl29^5g3QtouxHUYN3 z;DVaHN9dBGvjSUR`~#x*#`HWVgfw-IDtUoTfK3TEMx{EQTT26nby$J$@@bVT$H1%{ zr%C9WUT~s#$cG8$OuVS1vDg7l;hja8mf40H`|tHoWq0-k)}3x&PW!kvo*z>C$94`B zw)aUO^uOmMBYci*Eq)pH|2U7dhuIrD4>Gc)P3Ia`m`b}wT4(1TH5&Rxj2D@!n5t0| z$&JjBuM)mSLDQ+ZkS6M0ChlYgha?1w+UnWFqtF`8Y>AYMHm8uKQvBrG+Mac)x8A|~ zr+U?Q^y2f_*kQ+IE#KjFdvFWYXmbJ&Oq`JKcdK-A!SRl5H)s~+Aa8F z)$z}2>Q80I{yfb@Zk{4(9cJ+GN#}NZz=WatTCflN(e5EBC>fsHz)(bt!dKFrPO@t8 zCCTG*)?n4ZHL)OMF>#OylUW)M*eZc_V4JKBgbU=kxPuF{1ILwoR`vc*W9J>u)%VA7 zn`C8_y&_xoCgDT&9$zaVBeF6QitH^jvNIwhyNv8zW@L{fLK&G!epmhK>UQh<)gS56 z<37*1XTIuU#XSoH$@E@x!T_+}-iywKQ=* z%Q2sopqV$)&I&c`p%yiJPExzw{JW(V@~3kjckot@?jz3|$*1^ACP|!pA08#@4%xrs z57u{&jDK6;ZDBn@pknmfKnM~R^yuHkjfZ(g=Geb8LFS|acI(ph@m><6lBclK@i@5Oii2uMS zwGAREz^1;U>=SiiLj1l^A?eww0YvvXj&ps^`&wbo6fcBgmWI_hb1&ns0XouS0Uk$d zcEvs3%?aS$eSmj|J;49@?#FbS-?}}bUImpKr)@{fzkNGk0@YbKkBiG&4KY+?XF68? zY&UjSpS7iCjuMLi)wDEwb?1PrFU3LCp@sLko>DM6qk}#v(Py7BrI7IZ+ZVJvn(bCt zPVBX&O@zqgv8-MmIom!{q(9{)c>kkf>H*4!YX@u2Zg)fluMd)1nHY8Wa(P-1(F&;` zHWvME?1ya`UTFxclb!DhcL=XIZ z^!7K;AInDfi*)mQ+tk}@XWZK*+AYm|m^!LW zs~*A}eswR|qnKiYNrdb9U}8~(1|cJEbPiI69mBGuVV3jm#mUg!qIX$_%7>de1s1qo zhXe71zV)Lw_v(=5i6UE->e;~b z>-uN+T%%spuU>L|=55UtsM4K`(r%d}wv^`EX&|Ke0F>gcc-|b6A*)Znfn_C^s z_4=fcu!MwvacZppD&E{fTD!hKS&=8Vn8_ZpKk^V&^WofjV{Su)&?cvyP9QXl*@s)`QqzG@H20rDV6qvXLZ6%Zvn7 zdEXJL&neNhO-~F{cWgy&E$91abp9bKW7R~JId>SLAH}tjvstIZuR2+;t_XDtB-g27 ze58DB5p-g7M|ES1$SjV8o`hE{W-X&9qS^J5b-6kn(&$PY)~r6Mj%n+gE_&36f@>um z?z0q%bT;m>1A;h#guMEu>b1HO{IL|e8fqWng=}PY*>Tcz_gjdj2vLUwcC^XnT#+$e zpF}LGY4Wd-Sdg#j(bW{FZ${5EF}SGXSmmp~qmEv}x0cbkedWfu=qpDNeo_03xNCd0b1+B=XK%IqJj;#v7tDtC z8=jX8!v_@njI<1vbq zH!xNB0UH=r2Y+m;fEwB#Q)L2}Dhs+V9M7m@(m7r^ugH?mN=MRYe9Jjm-gfEyXpf!r z(BV``%oD|XYWVjk_g_A6=k47#{PI@3iFf+beaU z=>_u}8XFomE~G#8FUA{GloiXAr7rPrtR$tC_Z#LG*#kT%kG^zYH@=llDpvma2r&0>;ICGt@? zMc;bL`ieIO9sSq~P6n6L8D#I3Y;f+WZ<(l@gt3NePE|SkpoJ&lkfcp_bz*1(u=Yc9pw+%MUrj`8#z86t$q6C=i%cu1s!5ZfhIZg_yr4p7)l zP&oC-Z@p?PFtcE)FfZz?*A#VB{h(%)ku!Mu;Sz@jZ*ulIE>8wi#AgPko!WB-4w?f! z=&U?9<))BcUuBK-amDQwcaUItXsob}E3?r_S+!tpn3=fIm&JESJ*jOjjAl_Il}ISY z+R|gjomD6vnH_2IE-zDIveo5%p-A@KicCSQ)CjnL_sS(zZz;q2JnJ*_?dzN=Uz zm8x=o-Jzf5?^^6P(H^6BXzOXfwgV@rx$X@_A9EIXT=gNKSfh4=!Fr~Oq7;+VJ*I8?SAx$(wuO<&~Z!S zW_RVPR>1s_`lL~)d?k%I^%;rGM=B2wW5pd5UBx)39;lfmWeIi8pjEE4OS+tWQfeb~ zLA1vEfn-~wuIyeMapXv5u%6Va0uC*1lR$b?D*sH8*_l~=20#jkK9kB`9mGOnG8DAi zo%y7g%vGgB_!UC*q?sdW=%+8HDLl`0N&eyC;G39bthK;zj=J#A#xrSk?R!aS)rW1R z_QXaXmH4%lrj13*3xiMjU9svA7~@0i>Y-%C>~Or-B44UtC49%n%A||ZDx+_{E17cQ zRfP9>Vn(S}I_(o$;cu6$IU*+C-#vTQ0o~#w<7^f;%4E5%ju$C2Jte{BKVF(Su3P1_ zo<4*RnHo=ACS&9E9XOpsH)G=LN2sijDr`?OxDP}z%Qx3azBIgREXUtG-X(DAl*IMY z4gnh19)U6&os$di_G$3lmTf=TJs-Lt@S73G4}U?P@-|<`Ea}7-&UzRfVoJBSIxa?bw+kbhsgIV z=D76<%GHSEO{<8E_H)Y;2cH?AAr1ma8rf3U9!grIasAWlzg_mRA@qrl#YLXK>Fhhq{WjpYPW|Amr5H=UiTS@D374Ti_9QjI9vF0_22Vj8!@ z$xuE3`Fp8*Du(#8#$=y{NZzg}EHihyj}ctMOzy9xm_zqAxjhzrR61)XLQfOz4%#b1 znPAIjoF^%SFdtYgj<{kbqC~_e2P^h1PB5fxktD>zxFG=c0_xUvV>B} zol(1Y`CsbxR(iKW19SH$?TR>U*aPVzA6YwD?`ljR&qHw3chA=g?jnG`3jz8LR)zu* zbbsqK^`GZvBU;QP4z~WD>2X5d>8vzQTm-`N=5X@{12eyfE@LGPpf*KkSBRJK&K36A zI!dqkc!=dJieuu$d+BR5vD9bJNf&9G6z!RA`Pf|>f zYMU9lnI4HNCMp5WEj=O=ZDB<+v;Z}Nm41Fc1#e1(X2UZFPV0;Yf^poJeqm1DLwT81 z7%49~hOAp!>So9ngRagm=IC~e3QOqK`-C|yvuOCL&3+0zS<^;bM=(OEGSM*n37M;M z`2ex5BTDf|7V}o4ShaHX^Ew)h7C%$2fLfGkMyjB~?WNBW?|UjO19)!*#eI!CSstf8 zBupM{g>&7nC3`_`E-7U)RCKRu^-l6vF*h&n2g&1Ism$4d@7cVlCl{{;z27*vy0s~$ zsx?$F|7M_tcARx6@0hOss2liXPNTjBxQ6or%(a;w|>z4VE2%V;7hOON-sl5 z2Wpl`zp=H8MsaoM0H(tWLQj|4SNA=cyK1I6qa^bySy4Ji%6Q9arZnE`R>dgYdI_gDsy9y74y{q0YvYnZM#kMa`nt5H$w5UC z|8_)@MA|z`t?2DKyT(ZdLxOPhr->=JFEW|mTM8<0`U>6>yu1Ep-hFS`O(df0Rx5>c zF6xjOaZ2XlueY{8EAx{aU1Pecv*em*0 zN(2-nFOiqt>uQys2+u(4o;DD{^-S*&y1mb|(nD4_rRsZQlON&AllBtr1?}__QZW^| zk@ZFcrmexlJikRGjGDS1!&AcL^lesw`d|H5UZ6X>X7bPGrw&IF^2%yeYJXH122 z7~=yo&dD`)JZ2w%tGjnAMtnilO;EGsONsEFnVy80#op(5?(4b^$nilmOy+w)4=>0M^Fz?r$1ArpWK&ZeJ zG&&WMj!1~|K3Khg7)WM~n`qMMY#n@*V8f?47?=8fp4F>Aa=BHH@pY{1osAFy{5<2S z6Pi^9&%FH*l`LFmvGjK?OsCy>Ai@$g8J?9sd3bS~>VjU%5abZKL^g0b0cd6c zV5CDx-av;vzjx ztA-yxynjEDs;0pzf~Aq-_Dn*cK1HYw`GvZ*GGGv zvmuH&Y_Z2CNlg=@uMYQ{(3&89^h+!-8Atu7L#&{IGmPY_uus_@WhPwQVDXBo3EP6f zWeMrjl#Le8J*~U({f1^L)L~?0vv{1vF-G3G@nK`iCfM2**GNQb$$ZT5yD}MEo7AuF z&PF8%bj`l?yM;cfU~e6Z664Iw>gMI-E#4f%82K=ursCC%oYwS-#9KCQJ)xn)S=D2K zZLgxb`N{}1>G==zw;E*#hfonNEZ2!%?S;h@Fmo#;_AWX53tXEOSiBb;%=>jad+*KE zdL-u>lhr8t#jZ?C9NJ`=6;x5E^yf-Y>qDa%VBzcSe9R@O4$AjZg~L{N=X89Yd@V zV#pzzTCuOa2++yJz+C!|K^0(Zz)>$>*XTZ)O|=Vb??&i}CA{-dw)!ZvvqMq^djd$K zU6zEzw6>;g9-v`0B~*x&l>x%@OCPM7M+Q*)$|)}AL*PSDoB7;0t^W$Kwi{&nTifWJk}HaC;yN;jdWGrN1JjgRh^b8D6Y zi7i1VrnXYi(H6AVcsrCb6m&#|eB;Tg*TPcn`=(#la}T-8Gay13D6UO~?^KN*EO>@? z^(Cy-n>Km+$-U> zjem*#!Rg_Po7U+j?!4tJ5~UoEZ>#rydV78k;wBcfs_{L_bZ`gg2-q`$Z;RTuc!F<} zD_Z$Tp5ebE+*=>n_jEI!ax#)Bsd%`FXT5&<9ETz-?7GKW! z=Hp+BT+2{dx=|EXauL1MV#-Wy=by^^FL~}awwa+eO8Gu_)uQvmYs^s5pYBH@3E<5{ zMsI(_SK)^@oURm;MU6UgT17!_6NUZClPS&YQ|u4kDrY~#xwg{p_pHNQoSZcFq?TNv zA*cRED))>ig-dhXvzSJabq%(K?u8Fdx_4dHN+-k%IIoT}mNN?qyDdf;aOkW)u6lo; zyZsX01H*#5&7}+YhP=;hKlvb3xQYWzL}3C~mbDV{GX2nt zD(4qHHJnta62*Hn8Kr$x@@5)GcyskeNs9t_adVWK?>~C*Chz9t>Ah(TCCP;nmC6c9 z+&d;0{EFXl%-W4TUx_Fn?m5h2^HPYrQEPco*#HiSSMF4;0%eVhPB0&0Z@#wdo zx4L}40OrS|@K?Zme-sHR%jf9R?&qV&E`&K=INS{`-w8*B7XiN>b^p6bQY~1O%D`Bm9rR|DWl9 zyFvzvgkIbMB71->3Lbe}dJYSP-Z=q6tpEq(Z%|O94NHSwvjEbX0nh$#v|shlzvilg zzCAQ`J&5i)@vrFbF-TA(G|M`ObUF!xJf{2odsU$ss6lQK-ru?K^@OHQ26+gAKkxwc z5`;+MN;sxigXKZfJ%YSAG8i6A@<-_Chi2XbiH3l-=C?NZE-!zvwwBO@LLfIAa4^Ag0YCk* z^g>{V{JupWskgrW9Bt9nK9v!OHU4{1*}=RSy&lO;7`ZL{6wZS$fG;s?E4go|Fe*^z|_5llr<}v}{uYeQ6zrl|=(;?*FyX+{#$M>J3E+Yk! zru;_!W}`#f6q@nl2PMl#>5mLZ{tqY;nk@rFngN$P!B-1$^Vi%NP$o3d1jzIRj;G+6 zzxY_-XD2jO0*E~YI2HZ__J`{R(m&rP0yHN8NDlzMX8!~Ir^f;o4~?7$@%2C;{eQrN z-^#FjXb?HbC+7PT|Jx_vZ?q#9I5Z9zq@@8N7r)i^7aRWQe~*s{xBy#_7Z0Rn|0D1J z+Z&X4R6}UEC`dfIWD}lv+=7Q=Lc=OSrmP4I6ExuAV9PM+FlGGRW`!#N8dd=o5G4awz%i2*4hIcb0CD~Z7#tYB03AY5Av_3j zm4gBOW&T0+;~**c5*!IslSAtS73_i}Q$-lk591Q9ouF!15T&LBg92?!C=5<%3c@Zb z!@zzTgRnCMD%}KO;wpcG9kVQ`%iIjt3PFf;>|-7~V0v60`>4 zxKO1P$PL&0I~Ozt;kZ!c3&_>h`8)SlTM&*7RZ@WLD|&xtA2S8vz|doU5KN^H1OESM z^N%cUa75^dHAu`d_%rdR5eJ8ao^FE3ZlgaTf3@M@sL=B^kQ#aUKT&^}aBy(wDH90a zHu+ERpB5Y(9eTV0(#K8z6CE_*;P6nVJ%~3q{}cYF3tvqU9qsOEd F^*>duxeWjS literal 0 HcmV?d00001 diff --git a/src/net/socialgamer/cah/data/ConnectedUsers.java b/src/net/socialgamer/cah/data/ConnectedUsers.java index 23499e1..947f28f 100644 --- a/src/net/socialgamer/cah/data/ConnectedUsers.java +++ b/src/net/socialgamer/cah/data/ConnectedUsers.java @@ -29,6 +29,8 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import javax.annotation.Nullable; + import net.socialgamer.cah.Constants.DisconnectReason; import net.socialgamer.cah.Constants.LongPollEvent; import net.socialgamer.cah.Constants.LongPollResponse; @@ -36,7 +38,6 @@ import net.socialgamer.cah.Constants.ReturnableData; import net.socialgamer.cah.data.QueuedMessage.MessageType; import com.google.inject.Singleton; -import com.sun.istack.internal.Nullable; /** diff --git a/src/net/socialgamer/cah/data/Game.java b/src/net/socialgamer/cah/data/Game.java index 0fa85f0..054b608 100644 --- a/src/net/socialgamer/cah/data/Game.java +++ b/src/net/socialgamer/cah/data/Game.java @@ -36,6 +36,8 @@ import java.util.Set; import java.util.Timer; import java.util.TimerTask; +import javax.annotation.Nullable; + import net.socialgamer.cah.Constants.BlackCardData; import net.socialgamer.cah.Constants.ErrorCode; import net.socialgamer.cah.Constants.GameInfo; @@ -55,7 +57,6 @@ import net.socialgamer.cah.db.WhiteCard; import org.hibernate.Session; import com.google.inject.Inject; -import com.sun.istack.internal.Nullable; /** diff --git a/src/net/socialgamer/cah/servlets/CahServlet.java b/src/net/socialgamer/cah/servlets/CahServlet.java index 781c2dd..4fe98bf 100644 --- a/src/net/socialgamer/cah/servlets/CahServlet.java +++ b/src/net/socialgamer/cah/servlets/CahServlet.java @@ -30,6 +30,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.annotation.Nullable; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -49,7 +50,6 @@ import org.json.simple.JSONObject; import org.json.simple.JSONValue; import com.google.inject.Injector; -import com.sun.istack.internal.Nullable; /**