From 753762227007a6346d547e1486e03130212b05e2 Mon Sep 17 00:00:00 2001 From: nicobo Date: Sat, 10 Nov 2012 16:39:11 +0100 Subject: [PATCH] + traces --- .../dataprovence/DataprovenceFileHelper.class | Bin 1638 -> 1915 bytes .../dataprovence/DataprovenceHelper.class | Bin 5339 -> 5578 bytes .../dataprovence/DataprovenceManager.class | Bin 6276 -> 6479 bytes bin/dataprovence.jar | Bin 376824 -> 377162 bytes .../dataprovence/DataprovenceFileHelper.java | 5 +++ .../data/dataprovence/DataprovenceHelper.java | 10 ++++- .../dataprovence/DataprovenceManager.java | 35 ++++++++---------- 7 files changed, 29 insertions(+), 21 deletions(-) diff --git a/bin/classes/bma/groomservice/data/dataprovence/DataprovenceFileHelper.class b/bin/classes/bma/groomservice/data/dataprovence/DataprovenceFileHelper.class index 134c6a169acc7d3fc8bd9720204830fb6206300c..a45c99a7081b5ae78118481fd77c6cc33ef27e8b 100644 GIT binary patch delta 279 zcmaFH^P7+B)W2Q(7#J9g7=kx)?O<`{D9H~lDay=CXJio3(DcblEKAhSNz6;vhlpCU zGq^A^h@%TTm1gFoq!w{7xG^#)PQJh*rmYa2mYI{9mzbMs%f;Z#;K9Sd&cFd;dGRoK zGx#tvuq750q~@hCGU!g+Afkm~5!6I$4hBC)2F6&B&Hx?;M+T?K2UzSFnK%DuNn#9h zVqj$81UlZCff>kRV36F+;2bIBx}CvYYYPMKHU>{2Um&rK!G8l#l8J#INV0(y>M;la U**p+U41x?oKprDQAXrrp0A%PuK>z>% delta 36 scmey(_l$?@)W2Q(7#J9g7@Rk9?O>VQ#%jaJwD~Y=5+f@E0~3Q20QX4>wg3PC diff --git a/bin/classes/bma/groomservice/data/dataprovence/DataprovenceHelper.class b/bin/classes/bma/groomservice/data/dataprovence/DataprovenceHelper.class index d83a6336a03084836bad64d00b0653287b0fa6bd..78c9015ef1f0e82332ab94bd144dbca7232dfa0b 100644 GIT binary patch delta 2280 zcmZuyYfw~W7=FIpWzX)iAS@uHY>ObUHzX89K~_cZ0(e_tSwR9_0WHg&(zL5% zow1p;W}Gg=)X+?%fY#Vp)98$oV?X-SRF+w3KXROYSN448EC|}n?m6%Kz3=zD&-Y%w z^S$SaFX_s^pMDNtKK@W(5GYX_m6__B2G>a49TBqNQGu-9(7vqNV1ICTq;D|P+a6jG z>e(HNxDPzz*M6ROWFcF@9D$_1NVsrsPiJv=VMAXy9E#YHgSi569ibfqVF9 z0_hLp)eLm?bc7-{G$X}^O=wlnqW);gNNq!@fGH9Rc1YV6JGNq*YK`++nh~^P2in#0 zxR1;|cC5kLGXe8KA@}OwA~T`3w{>Je7G!GZIQmd{`HZbN(+7wNc3lQuylJv z{i}mdgt+#rfX$!P+11k@itMHSJHu>IL-tl-Q!m=nqMyJF6B}ZYcN`9{L!3j}C}w-l zVz$F+z5rv3(bv>s@;9}_6*QfP%LuP;6uDmiDDu4pqwtJyuMs{z^H@T_Nwjn%z=cQH zCOLe&F$V?6X3OQE6m#LHmsgL8f+*%uWq8>MYy>H>6JXFJ8{!FGNZB5<*$8cH6$OOesV3)&}Zt-ljv3rlG&DB8iTw;AIY^b$yH&hOmb!Jj55>tm!TMkV3Xn) z7H!uIR6P2+U5e*XAuwsly}u(@+mSg;RJ{z@WCRpZn~yji#)@Lh=G%!9@>s|oEuE4L zXJd@85v#ET)g&5+20Tv5fEx93Vy%(WqbAPCiq`qYQ1?FKjKjW*5CNUI-A~e&kY*f~ zx>Uxn@}zXq45`oklIcjwT~-%uoh7?;#sVl zl95A`6+A@$02AUu2Y1BH(=t+&lpf`nQ*I<76V2NK3b_m_VR+drnKUapxu641h;wIT^^oSjzA%NC80J|%gRgz`uv1W`}t zN70EeLna`V=cy)G4Pn^v{~$?0vxp}dULOz9JU~ww(CH;gZoY^ji*P)T`)w+ToH_;irDKph4D_CXeb`UjS^PhVr-)?20X$7@GDYg?WS83$khzh6 z_D1eG9301Uj>BU(B3p+q$BTS0IqI$C#k@hY9VKGBy2;TNl>`Ubz`$+>+{54zHoyQp zTrJ|egapb+VJ(AqFmxY-AHhK!=h{ge#t^j+a1_IQkKhHI#Y^}SFXIYc#WftmxAgpu z`VV*o*SU6+Yqz=fCtj0Du(QN+rtZots8uOW5mq;+8znyfhYW%K}`89kqt!BYgPpM43evh8uY2TPKCyA3ikw}kt?l&__ z*I5Ds3e_)CQ}*-2$W?hqw-Z<1?M1Tqj-Oa}*#WZTH>Q;TrY?KN@UG)Gy%pq~=$E;E Z<(@(s-eTZW8WH`YP!uB~a7**P{U3naiJbrd delta 2032 zcmZuxX>3$g6#nj;<;_fAr)63wwlkd;WXddMC{UH9SeD8*rIxjTPzE}b7MxaTD->mv zO%Q{`tBD~d5~FD(HL;-!xN8&=BEcWV#3i6HQU7Sr-zt9hJvy|}wDa!0=bU@acfNDZ zy&C;4oPYJ7cRvI$3qR`61ghm9u1N!-T1M{&!nJt#*?R$z>2^5%~+B)JZ8tV4%Om%j(b)SuoiIvJNGRfB(UDV25b~?CObP*=@tS1^d+*4ttV&yHhT_PTLA) z`vz?4jH3zXAI*8pbYe#}7w zds=a7rPqjQ#U`mXtfu+_!g8?QbGg$nPp;2fYU3QpSM$m;HPKmr-P$)!`DBXc)C%BFZ8#>LH*GqaN&cliG%&3^C6m zxcMy50v5W4rCo^0oY`X3vS$`Cjm4jVV>z>4fo2vziB%k*1Ue{v zj45ZRd4`jFmysjcN*$q}Iua5@3;j4kCLiE!mNNgIx z>Uy%(u&@t#vA~PNShvwU2DEdx|BMZz=^a{H<(kBlfQ>9#6K7`=+rEj7zr_S(wS6cH zD1=9_6=DO8OR5+a9SII91Fd5V@QU^qfRJ5>=&e5u$a zwAvtFo8WI%(`Z3z;Y_ADiMz<}ZgSgZLYiaU&O!=XkZ3yJAhsy zvEv|~O%7jb9=hkZwfaa^?$7vD*KNR~|b=J6Rj=c^V?@@wCg zi~`xih6d6M*umhPY>0gbql=Bcj}6|<4(?%D_p@{dXwi$~1aOA3vp9@C9K~BWhJLOC z)C}STKE+8~<-2tq&*Lkc#y32FkLPfMvY#mXm9pRPf+E4d8gs^ODHi1W1p(14zb&Z9 zY$Xu&_*fHv%Y1wU0sfB9SSOAXb$xLCg&ZB#w^=l&4#BPYpI}>`0dBL8$BA{kd`ICP zuNbv=!*020zT<~J=E6PJwT|;T26XbFlPT(T=>M-LoNFe&Yi#W6_;Os$ZWe|c74_Cb mDVgm{W9G)2?Fla}a(LfKmTr)GZOoIbbh*?C+@vQBKl}@fAV*>V diff --git a/bin/classes/bma/groomservice/data/dataprovence/DataprovenceManager.class b/bin/classes/bma/groomservice/data/dataprovence/DataprovenceManager.class index 0ae32953d1e78500609623e1b4109cd7a7c1ed19..eb72846767e95d192007f52ed2577fdffae35c20 100644 GIT binary patch literal 6479 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 diff --git a/bin/dataprovence.jar b/bin/dataprovence.jar index 05312b7d5ce0935fe9d48cc76735aab0d0eb220d..1810ca45867d9a2178935fc55cde865171edd9ff 100644 GIT binary patch delta 7286 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 delta 6929 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�)Yci*zPEKdab-q&Jcm`XA-#&2OnK(t2Ph?hpc?yK&Z z4oO;%Eh76OJD!`q`>HH5y(bPZ8gW3>2J2N3PaFMCid`hsG_C47706ItR_uUOdKQ7! z(_*c0pu!B$hsmK0_oB`ma*g6d+QWlIZT&qCxpBesHx8_Km?2u*{C2A-PPZJMgbhtq z-wt$ti3OH^r*`Nix~`I`XV5##IyM##?FsQd4u@}#Y+Ng(Z5N>x3l<7@(YZL2SQm=C zL;oouVBcmuc?)}t7vcBSJi8VRdX%}-@y{&vHf$q;CLiW^ydm}FJ?GR~mdTLLc5J4` zz<_t>o=S9V&vpCFA&MJLz@~h+Z?YVN#i_u8vK)oAL+k$JU=Wq?J^-Lo08eSIh{1GWPSdFz><;DOSBEDVeFfK(n8106O9$ zU6joQ^?5^ZJ(3zTGRUSCKjT9({71F<6tbOFO+HkBQE*6YuoI`)TMwb!zb1fPCUJ$k zSP;`nmkUDRUMletD2l=Cy84PdEmBpy5r->I`Cg4)@KNrx^37R|B2pd^naG zm_5E$UyHc43JW_el9J3Ff+pgKloJ5#kdc=eH_3Be=OkqFGzeiz7^d!P(Kf>z|@| zqbZAcxqz`JTB&{iiAA<<2kEE_CYshIeXDf0A@RchN$5${)Ab`O-TSSj0;0CY`yV60 zP+v4WC$Wj26xFz1jiT$rsa~|vexoy8^*N1M_m^~>=n#U9Dbsf5i9R$J9-kX!KvNpQ zf&M+Oq{z2cL)}(OD}RQGR^~0Tl8ju=E98eX)dX;vTZ*r1Y>494^cemLL?B%kJU&G~ z?KOD2;gD+Qf`*_?K-TY8O*GwP#BumaJb>o$;tK8X!hR*e zFI*R6{4`6h@-_i$E?WY8fo#qd3oPCkCN^Dv3sE*mUIAH~)gZUa7N*F{5J5bkAMw$2 zfmVg@Q(Wg2l@HLgCaFw`@|Cjbt*nlNGWC5X=^nU*;iIqCQ_fmkQbR4Z%fakCNYX17 zvX|CRk;s^P#mI)KEm`Ys>|%%lrQ{I8~O z7myrKL-wB@F{UP!53{CZ7)y){^tn*rg{dTgoXD4 zLGbD7@GvAzcmdeSKXqvc4>K`_XNAdp`KyAv;bE6O@YJxBzY4%L2 filters) { + logger.debug("new DataprovenceHelper({},{},{})", new Object[] { + rootUrl, datasetName, filters }); this.rootUrl = rootUrl; this.datasetName = datasetName; this.filters = filters; @@ -98,7 +100,7 @@ public class DataprovenceHelper { protected PoiList getContent(InputStream is) throws IOException { String json = readStream(is); - logger.debug("json={}", json); + // logger.debug("json={}", json); Gson gson = new Gson(); PoiList all = gson.fromJson(json, PoiList.class); @@ -148,4 +150,10 @@ public class DataprovenceHelper { return Arrays.asList(gl.d); } + @Override + public String toString() { + return "DataprovenceHelper [rootUrl=" + rootUrl + ", datasetName=" + + datasetName + ", filters=" + filters + "]"; + } + } diff --git a/src/bma/groomservice/data/dataprovence/DataprovenceManager.java b/src/bma/groomservice/data/dataprovence/DataprovenceManager.java index a354f02..7410400 100644 --- a/src/bma/groomservice/data/dataprovence/DataprovenceManager.java +++ b/src/bma/groomservice/data/dataprovence/DataprovenceManager.java @@ -59,11 +59,11 @@ public class DataprovenceManager implements PoiListener { "MonumentsEtStesCulturels" }); } - private TreeSet pois; + private final TreeSet pois = new TreeSet(); private final PoiListener listener; - private int count = 0; + // private int count = 0; // false -> lit les données en local (fichiers *.json) // true -> lit les données depuis le net @@ -103,12 +103,13 @@ public class DataprovenceManager implements PoiListener { super(); this.listener = listener; this.online = online; - this.pois = new TreeSet(); + // this.pois = new TreeSet(); } private Collection findHelpers(Collection tags) { ArrayList helpers = new ArrayList(); for (String tag : tags) { + // logger.debug("DATASETS[{}]", tag); String[] datasets = DATASETS.get(tag); for (int d = 0; d < datasets.length; d++) { if (online) { @@ -124,33 +125,27 @@ public class DataprovenceManager implements PoiListener { @Override public void onPoiReceived(List pois) { - synchronized (this) { - this.pois.addAll(pois); - count--; - // quand on a recu toutes les reponses, on notifie le listener - // ("externe") - if (count == 0) { - listener.onPoiReceived(new ArrayList(this.pois)); - } - } + logger.debug("onPoiReceived({})", pois.size()); + // synchronized (pois) { + this.pois.addAll(pois); + // } + listener.onPoiReceived(new ArrayList(pois)); } public void findAll(Collection tags) { - synchronized (this) { - count = 0; - pois = new TreeSet(); - } + // synchronized (pois) { + pois.clear(); + // } Set helpers = new HashSet(); helpers.addAll(findHelpers(tags)); // lance une AsyncTask pour chaque helper for (DataprovenceHelper helper : findHelpers(tags)) { - synchronized (this) { - count++; - new LoadDataTask(this).execute(helper); - } + logger.debug("loadData(" + helper + ")"); + new LoadDataTask(this).executeOnExecutor( + AsyncTask.THREAD_POOL_EXECUTOR, helper); } }