From 6b80a2a128c87cd32d2ef85d5357d64bd8ed07e0 Mon Sep 17 00:00:00 2001 From: Fan-Wu Yang Date: Thu, 1 Jun 2017 17:09:41 +1200 Subject: [PATCH] Shared trips now serialise story 9 --- .../java/utils/DataManagerSerialiser.java | 4 ++-- .../controllers/SharedTripsController.class | Bin 12335 -> 12347 bytes .../classes/utils/DataManagerSerialiser.class | Bin 5873 -> 5873 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/utils/DataManagerSerialiser.java b/src/main/java/utils/DataManagerSerialiser.java index b7be831..6705e64 100644 --- a/src/main/java/utils/DataManagerSerialiser.java +++ b/src/main/java/utils/DataManagerSerialiser.java @@ -140,8 +140,8 @@ public class DataManagerSerialiser extends Serialiser { trip.deserialise(); } - Reader reader5 = new InputStreamReader(getClass().getClassLoader().getResourceAsStream("serialisation/trips.json"), "UTF-8"); - ArrayList sharedTrips = gson.fromJson(reader4, new TypeToken>(){}.getType()); + Reader reader5 = new InputStreamReader(getClass().getClassLoader().getResourceAsStream("serialisation/sharedtrips.json"), "UTF-8"); + ArrayList sharedTrips = gson.fromJson(reader5, new TypeToken>(){}.getType()); reader5.close(); for (SharedTrip trip: sharedTrips){ diff --git a/target/classes/controllers/SharedTripsController.class b/target/classes/controllers/SharedTripsController.class index f4c7d5260576203ec7981d64c59496aeb09f3f98..58a1abbdc0d5cc04fdac356420ba3501579e729f 100644 GIT binary patch delta 2689 zcmY*bd3@Bx6@TB^&Cc#GlkBoU;s(e834}mcxdO&O0)$%*2_RI&EU+Yjm|zkRYIQ5M zt*y1T{Z%LdTNM!$ks}aJ0ozgoROn?zzykzD5kxK}B;b2VOh5f&zw_RkH}9U`?8d^~ zg^@$IcI_pieyZ4_mGF6}8f`4<1HXl~Xs6L$BhDfhe6GBu`&p4lxOi9Ik|w5!yTgru zMuLZ;(7~do&{0%6X(U?I7Cwz6i`vVYY*D-z8vXszctlcUuX8lIAXOtxn63idG}0|f zL3a-_&_k%6BF=Q9m#jfI?sTKK8-2uSUkm-vUm#0hfWSZr6Dk zrLsOGP^M9C(M&85^@rtPh1jhWw#vdnEVA$j7F$??AByouqwym=Ch)ivBBJqQi@ca; z(R@51hL&0p`~*)*!aud}GyGgEJ>@5d6rmcw^pmrh`jwwm@ZagdJf1~kRiynnf z;CB{m{9dT%Bp|NaOf2(r@+&MI@KVqey+*qOUf(I{R!b^gyCEAxQcDY95 z6$?P61iaRwXV6`8S|{wQQqI>rSdZ7;*x<$+Zfuk@n7#va=nli_|7dkywsuRSEDOU!<}W$HaX{l8gCjU<@DKb`4Ezh^%C9I{6s{2N-}czpwABCLU5)=5yoX~3?+Y9kIDwM} zAK*iSk8skC1OoOZzti3v+qdXr902)-mX}vmR#k)+j0;y4m(Qv6x^T*e)4Y7*gVW#) z&Ki7*&kW9?4&IpB1U1oquFaF~ zd(|YP3UF+7ir?v&tftthahaHEPl^lUK6^*pWlXDCAOF1axQoJ7Q$wW-!}f@T>-NYF zSG@eys#g5fs#f=dx~1EtNojUj$32)~_vmyD57;S*JuuTAmssw65R}?97-N#W_L;m~sW}EQGIK`21IxfIlolWcx=l9?-4dv$o8MoPhNNuFwFe|0cNT%t?8lSi?W4)A znm#G3T%HIyD4IXf1@?R0mPV>6CSxlV*3zuENjuk)(~%X$g4wk+rw5y87X6VzHR;dKwmPjKk2A}? zmU;&)_AzSl_+dRlPtZyF zfZXisS^AK6k(P2$ZG^V7a#uF<5pRQrBbGj9N>KsdrBh5f=n+18nm!>XEu%N-49lYE zET77!cBy%2pa2}Q804Xma-iu`<{SBG)$~~dC2Km@NU_aKlBUnw)l>U=QtfY$ub$Er zJN<&TFxGHHC)hMcMvWQ&*ARPlMh@oNFJyEa$ekIV*;3~MCR*C!3^-dG5fzAPQ3wjv z+z9(>#@Q+7xv-!Rt)egK0_XTHyNcs=B-PS+y4bq+70V>UM2fma^EF-4^ff2bNF4t; zCi>hU#VN4RH6+J*8LY zF3mbhE)aX?;?iSWTqmz-Jz9!uSNAH8Za_50WXWygvk6@0^x*$I@I`EqRs>TcO*Z*S zk7X+gUO0H|%nv*GkB=e`+VVf09Zr5$)jeu_UO>%KVKtlQBbW7fAd$yshhQj%wNRs4 jr~*vJlor`9T6dprrJiY~60jV9;GdXTj^|scKVkWIS3gSW delta 2660 zcmY*bcYM{=6+hqm#{IotZjzT5lJEi~1QJHbkSRn0VHt)DSwhPS@W?_!LtG!KDM(v8 ztd-jV5!)&XD4Rf7Vbr#?P_4AZwjhY0$PfnzDiEOOBr*N;kN3T2-E+^nzx(#i+B~cJ z$elg=iKv$OVm(q|K zKsRIwl`Y~N2f4D|H-%5_!4Ce3zz5un)_+ zK%hcnp-VIH9Wk%ujrIUqSEplf6uyfm1)h?Gt2MqS=Phw57UeFLVX5qT+Ql+_Uy}QQ ziyz_{aq^=Oc_iT){3Jx)ChFM`n+y|^=N$Z8wm+}2+@-~c6R<9RfnN&sD>-CTwcxKq zoN0}V7qCjQcrip;*xzDRh#b^tycEF8SS|31r2VSPN3PLW>q1GKKCE-;S!B9+46h0M zx|D8x02{E;!6pZr9c+<3TP2=t8nqhRLBT~OMYTuOY`@F=LX90fueM)cqqmMDuDukP z0_?0E615*uyRb)NuR%TbSreVD?*1O906Cmga1qRVprEb71D zutuGslQ;s3D=T`mXx`(wi{?ZYL~_Se%#9fQ6>l26g*WY))YkTGzc0hkRvgm!o59;S zYVddbLw5fYw5xMOyBOh)=U_?O1N4gQ1U1}6mG6*!4g2Jhjt!TUI6pN|<= zdrb*&sgP<-;I+2IugR!FgOTxQN3b@5IuFBdok+ z@G-47xQtIUJ{8ZO8GMc_23G~X5V(dbpf>i5O0d&oTUB3=)%Y@quMED%4TGDwWzZl# zL;qKR2~q}0_qM?u+%<}5o1wL|PAeGfQc5e2QC{UU^g2hN{G1re9HRnE(MH;&m1|TK zj)TZ3BPCAa6YQ~YtG*zWlWA16iZLoyEJRb3`$$#k{M^b&apdvbaYa>Ck;(-|1y!7( z&9u&_kczj1f^Fju8ZCer)y1f;qRhk_T6Hrj zOJy5+nO4X8RgR%o8;M*)YZ{4rST7au3|jC6r>wf$qrt>}J#a*;o?KJa%c$O}k5Tuk zzCmh;)vBLSdFno``Wuz61{gI^6|i)WR)cvNVpHQ1S`Rg97*CzLU!YJ8H*}n~fii7c zN|K!umykR{VjU?k3Wtn(fVOEh#;9@XLAyL|nKNEZFlr)>uTBYhJ(JXAo0gc3hwRwI z2&UK_iB~bTc3sko%8pCE7I2CqRg;V6KN7Kn+gy*~&r^-!&r^+>2I_2)9B&t=#@q6? z^_XtEw7ZTOc1gRibyH$|Vl>l^OsVkB0;M;ONMUNMJ(KcQ&myB{E4~6TGJVkkE}{$q zLOB8uAZjplSKt;k@GTjSV%w|z36#{vrq%lc3&}%K{1F~xk9A&J-N%=?oo3h3oI09Y zN0Hq$50vK*`*%|@XeGTQR0-%H`SNsF*HP(8@~^#n*3-uc>+O`^WFH6zn(YgPYP2uQ zbK9+?fVYpcmb!;sK4nZDmDkbyZ-i~b-mq)WcgaAxjqWid(fq2@9MB0Tmv>REp7u~5I`LrJebbxm7 zn>URD?58)Kpm+J*tfwV(l1`DsXFbRAJ*1@;R98(q*|-zCIn8R&FlwOpnNl=?KBY5E zdFU}Z!r^>CURp-`=tGwII5eU{ic2p*1BKy{#h?Ip*@4#d5w}FsdH!ACworRb7jILH zunm-|=~AnklyH+&!VPkQyz;pp+p(F6?*BSsD>D0|%x=hR+m~B2CcC-N6PRf3i#P0T z>4Y!rYc|Lgs;LvpyPcbKnJWn@qE++>r=#c{4m*+8Laz5^`m9CwIm;xa6!P7na!pq> zUFB$ROSBi6=y8KoQ=nhaHJg_;zx#Fil6Mnze2*CgV delta 29 lcmeyU`%!npK@kDIZ44Sha@!d+tvEL^C`htzz9^!=1OS=-2)zIR