From f85b1a5b3336fd061cddf980c071ff70c9b71b47 Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <cpm@ocmland.org>
Date: Tue, 23 Feb 2010 17:06:59 +0100
Subject: [PATCH] Remove the TagData management. The goal of XID is to manage
 ID only, not TAG.

---
 build/classes/fr/devinsy/xid/Data.class       | Bin 6839 -> 6004 bytes
 .../classes/fr/devinsy/xid/DomPresenter.class | Bin 3666 -> 3223 bytes
 .../fr/devinsy/xid/FilePresenter.class        | Bin 3921 -> 3702 bytes
 build/classes/fr/devinsy/xid/Presenter.class  | Bin 21837 -> 20267 bytes
 .../fr/devinsy/xid/StringPresenter.class      | Bin 4390 -> 3901 bytes
 .../classes/fr/devinsy/xid/TagsDataById.class | Bin 965 -> 0 bytes
 demo/XidDemo.java                             |  28 ----
 src/fr/devinsy/xid/Data.java                  |  56 +------
 src/fr/devinsy/xid/DomPresenter.java          |  16 +-
 src/fr/devinsy/xid/FilePresenter.java         |   8 +-
 src/fr/devinsy/xid/Presenter.java             | 137 ++++--------------
 src/fr/devinsy/xid/StringPresenter.java       |  21 +--
 src/fr/devinsy/xid/TagsDataById.java          |  43 ------
 13 files changed, 50 insertions(+), 259 deletions(-)
 delete mode 100644 build/classes/fr/devinsy/xid/TagsDataById.class
 delete mode 100644 src/fr/devinsy/xid/TagsDataById.java

diff --git a/build/classes/fr/devinsy/xid/Data.class b/build/classes/fr/devinsy/xid/Data.class
index 2d7c4a661b8ee9842ca33ad99c0fc0436a5f6afb..c1b230c46ff06a0317189ca60fc526219222bb07 100644
GIT binary patch
literal 6004
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
Wk~HDF_#VII2jutpW8{sass8~27d&ME

literal 6839
zcmb_hU364e75+{#GdCG-67n-c2LhoLA-@gsPtwvtDi9h{F*K0M-z2$&fngG6CN#8I
zv8J^Ytk%B@wc6S$wXL<SFlf=X`ogl0`smWNe9^Uh^hsT9@!RL#xpOmjB59Y4wI=7D
zd(Phb`}Vi@IWxTf(cA9;ScTsiC{w6EobDX8P9{>BQ=L<Z(aw9~*|>p#!u+H0lkv`E
zJT=yN-|$guB&#qlF`AM0TTb<kDm3;LZS5_*?N%_e@iEWp#l@?4dtP&S=#E4xk=>+F
z-rO>%5a<~nwZbSzm5EA(4b&(soZVj-)u^h3LY;{qLIxTX78Nb`It-)UUcbPEfeMA1
zzC_CEpFBQnrFX}NlNK%YjgQ2WgYk4io}I}+_DCY55Ge*DtPn)?n3eUgps=L5rFg05
zy}(XenaL!%t>IR0gbGdmz1{`fT&dlOZ-utzzCywVvgt%>th<D79jLIi%*3a$Tp_4!
zD0I$!f6sW@>Ne0!9*QXL9TodwtU#6cXfx4{4*JLlEeb13`0&#sCbSFDL0N+P>ip0Y
z7L?veTB-)J@sVRY;}cHO+Do|YosAm<YZMmyaOIVp8nvdvSS|QgW4(zD*hsNv5)V-^
zRBo?Kcbm8ack($t%HX5Ty`J#xQtECQl!bShxEq_9M=NO^w^G^7)Ip?~p%pUetf!A8
z1*)KWIn1(js1H8@-Y7|gks20Rb8Rps0|VUcscTy%3Y$t1<OyO9a_Td&6aB<YIVmjn
z8q7oX7<8sYBcC&|3!mr4iAiqUP-3HhUrB;OBjd@*<0*v-VahIw1`%G?O2@N_@f1<S
zv)0(D(s=!3iiu^u-8yv&drjPm+eGOPn7AKbP@u|us+rXUqs+MB%p%1SzDW~vuMj4#
zp7B(cno(Hc<;+QyhqHY01}iX3{oE18c8r>^a9HeQ<LPW>Pa=CnlviTc1G4;xiG=7p
zl(bS~*&{M_%tR8$Dc#KEFp;p^Xr<54uH#vH?YMNC2~AQ#+xf_fd1IFo;@D!+G+IQe
z^D>MRQiJuFlpb?Zp`%3fvl*7^JAo+^2SGKI#LX2eFvSuY$<u6*`TqEE*5EC(*(E~>
z-2sIQKbgHPg9g5=P+Op&mpL4>(qWvzSLC3ZW_7ax(EAxYZsMzWf=bDb+e|4m@JJ|Z
zcKKC!Qm`CSXfEZ}zeOA<d`&dGik-C7CLM&rH^lHcg|1R-{D%EAwyST6s~rk0b2H;O
z|E@THT4CoLclo{hXXH=`QnYd&8T>1Kk(U(~)aER8JUp4@<HiyW{igggwy>Tv@dNyj
z=Ma0LYm`lRvHw6XyzUO;1-xkBM+&hb$rl!xxQIid%;yLq86UQi{ChH<oMg<UQtyw@
zVfLqD=~)rMt1=?TeI+1!4=zV+evAGYp}6~#nsWmDxrFr^uSM~R2`e?~QXnk7W#SE?
zLE*BDo+Z=vDyJn1L03&&!6{kuD;b@W(KQ(nYItCLGCg8#O~^H`Qd-UJQdCqyZz^S_
zdy?@?#>yCYkG-`h74`+k-<es|zLSEAXTRoEy9@!jlyVf1%O?LW;v3#-`8khIySPfp
zZ0l8+t=CXJbQSZjpq9gW4kK3(eUq=ta0@@{XauO`XFY1rfQ5)4#u?K#!RJMM;_V!Z
z9rJhbZyD!|*2}2vYkPx3+f-OjH!-%`w27#_%rOz<(-KC_GXqUnTEbY=Z>)pHR?cdy
zLL1|`=@>gp6hcskMAnwWr{2Sgo$c4LL_c4{3Ziexp>@V<iN9P^5v4Qms%2sm=JO`i
zge_>pHtl|?ZP>v=7q}grbSr&m2}3NyXSkOEeSkKDdQqHTWrwBa={y1Pg5T9$fmq-=
znw-E^GqANY0@Dj}Shp@139buWLPIPN3AqTmrb8+cY788D;l@8=fyNv*5ov!%0ZJ>y
z01TiCyP4rZ2D6s|@55T`C%}W)!N2!ogrmb6-gXL!0lM(w4m_FLf*!&<sMEKSG>FZ6
z@L7Ud%cF8D-v+Uf`q;)%NYk(o<u_;`Xh0d*&c4XIDLzD%Qu8%2I~-!BXhY<C-b+j{
z7X07DaDfmLiiFk~LQF7XI2zBPYuZo|!yzVU6I0z~#Egy{?j=Vy?TvhPxx8=BjJE|2
zyLg)f(!`q~hm+*+L4tais85r_N66u6a`-3?VH(HqI41A}XP?AbJf%6^$C4yAm(%ku
zr{^6`<?R4vRL=dji~{ubCCzS-e)ec~LoT}peYKPQ5E&J@Z9qVH=GRlrGr9IseFNR7
zD7>O7nFlTuREm)g+F76~q@l3lTUj!D`a9Zl7%KFKYAyU{=<@=b%SDZ>)n4x+GhJjR
zt?j415dR%uSx6(|MZ)p)SMHM%>ualv=P+^sU2OsS91D!*aI~Kyh%!wnJ4exLIKisO
zbOrQ$ERaJs7GP`-UP5&t(uX8cyL@fUzev`9%pP`$<@++0;T4wZt5}cMS<r8h&&#+M
zIgMfyV`MBYiar-bAG6#^6cLvHX`P=Y=H~#u$oRJs!6O=(WS|D+A7VX;H*n(LsE`hP
zkO{Q=@Bo)eJF0DMyM{AEjaTt#4v*z<w!p64GT&jlc~{3|x0zZurdl_qTE--GC=Sj!
z4iYpkeAcwKQR?S~I1;ESu{*Mzyz4Bo-!tv+YZq(mEv}0i*F}vh%Nk8UIrkYljREcU
zDaY*r5+{PGqgw&CI1lXW#lZf+gXNDN$<(=C>s+sOuGcyZ(U#29j;~32k~ERSMq>MB
z7pq^i-~;(5=Kas)@h_g-mgdp!XL9D*wI?IVcYqcuG~A$u`)wzLqa;CCZjcZJZzPZh
z{GDRJf8#0ocMr{Sp33>j-7eq;7jT0cL4$^F)BKF%cZ|EFE31MNIX!`YY6o`9=C4?e
z1LZnUt^<YdY57XQU!Z&>Yf3v6KuW_Fo4mX6Q|=D`a`+y~m*{3siQ2U&^rs{b*Rdd9
zq(LdtSU@^+RzAMp&SX8$?yM_Sgqg!jdQQN2>-9fm{R2et5i9Hle?a0dN2&~6Du`{W
zlD`1V!(LV80X*aa9&!N>vErp(fg$`v1CFvkO63M<b-AwGAo_VGN>2*t-l;3MD_^;$
z984G4G;9_;3U8mG@Rtj@(50&)s8vxNp4}8nD?A@w9mDG(eDRf6_!OT-;UX_7Vtu^5
z)FF&LU+|_YSuNpDi%U_jZq**`26i)viErsb4VoG`a7|a_7cmEszfy?8#@xaPT6F|=
zFZnnThz14yYYx-Xd=`;M^YtByg(wwUN<RFnP^s1+qSkr@5p@L-bp;W1D<JBYSX7Hd
zDj=$v2vT@enhCoCe&$4Uk_<^cbVRX$F8E-+;9oE1;!Z}h$&-yw7L8n?6u)}RiIq1C
zG1#iuN>;Wrj^6(}EBrF#u#%*Pq-U__^OE2xXkRqDV5k9B#cq#6ZeA6lQG*@GE>Pj(
zrnUHs0uQz>_tEQq?e*i;BEQZ#C`%uxxq>5`aEoO)hH7=h1F^=HVd(?a?n~YS^$PEa
zzIHS7K>cOGvkh^A5Kr6`V*Z3Hv>Sd;b$rcsp!z_bqN*Ooe05s8vwO|l4^)9W^FX~a
vmtOOBG2m(Tn#Vje->lc<k96sF(re1_YpS*kzk&QGmE6zX<+ron-W~fdC=@FV

diff --git a/build/classes/fr/devinsy/xid/DomPresenter.class b/build/classes/fr/devinsy/xid/DomPresenter.class
index 6020949377c4999cb4995e39f5d712b316fd474e..cab766948114e933137cb0c101ad9f14698166c9 100644
GIT binary patch
delta 504
zcmX|-yGsK>5XQf~+q+B7jglad;Hmh+BM+itrJ`b`AgPRR6E(iyMz9tC0h>W=1PcpW
zpFu2a1slOq?ENQ1oI9h<&bPBO^ZjPuoYR>7^8NS(pcBPw`$Q^%tilM!1TroiNryJ9
zFufWk^#>fv8pC3S&W)O24s#ar0#WLaQA1%K3-oUEnu`icSSH78u~)r0YXS!@9qUn=
zGwW#68l(@ikz6ZOV?)Q5!ZvmUtli>HVQGI~phz!PyI(gMm=U4dQs7LF3~{N>jCMRx
zLMB<lD6J|dZ=($^r}+Wnn1JxrB&MLT<{kKqaP9^Y2FG;#4z16qjZAmTWK5PYJAQ+h
zCki5SiLm#a;G;SDfR#*&K2_6U11^xlCF;4q52iQe-!;vy>%MCmzpf5r4zRz@Jz7~+
zpc)%c%+SN#L1+zM2wBLn<nJjXE|d{fJdsR2V6$7s<Q11^HPmsid78IJ5cfVwm%oof
eC8{_Np8iLo5aOFxt$Ze(dw!WDTkUdQ!`=_93{fut

delta 836
zcmZvZOKTHR6vzKJnVT__aRMm{L(?|+z?cUq#)TvzA})MHi%_lF`WQ2l7~3XwCasB^
z;3w$fB5vG>i_%?u5JExGmEgjKU%(F__z6TjcalcYEaq_Uoc}q$|2g-W`8BS6{<ZTS
zz%e|2r9D+H%;BnzYgk~2R-NX&RrStVP3uhiyv;C^JX)%_IosK&)xCDERkL${3yK;T
zZs;iCCc|=4JW=8kWAx%nXi{{!D!wW9^j(IS*I0MUPNLpuCTyott2?%ad$3iMg~ca>
z4l1I<PloR6sNsS5$Pa~ABxIFAh#&lT?0-vym=l%I%!xhC;Q$O%W2}s3D>CSg>o(j=
zj^|lbM||h)xEyCiLlEmaHt>i+U2_{{5-@Cv?a=Ia@HR8vwAAOpP6-Ot0!Av`!)5yB
zGd*1I(w_jPD2Av#u!(7kiGdPFkfa;cU=d4x-oP!~rV1w4N-;*+58zY{<Wp~P_!Hu>
zI|ZIKc@NgYYnbv-Wrh997AB-1ouPOz+sAT2F%|J5a-fsIOUz=+N1uZ#TaD0pLf3tC
z9u2G!T4tq*AlVM$G@TTx-aSRI4-cV}r6MWA2qb<Ys?r07$+0_he1+1AOsCQ;lkN23
z{kw;*ZzeTR(fm<T%XYhF!q`g?X(l{0Bm1uo``3pXp<QRPrqV~Vz)k*#q4||Nh~OP@
lE&`|g1sWreT=-yWV>GqlBmF1zkqVU$rsjlgk(B`2zX461o_hcQ

diff --git a/build/classes/fr/devinsy/xid/FilePresenter.class b/build/classes/fr/devinsy/xid/FilePresenter.class
index 079932293c23c4bf2eb68e136131a5a4c3cbfbc3..45e5f1fab8cafb8bbfa4128bf99cb35d491d349d 100644
GIT binary patch
delta 1071
zcmZvb-EUMy7{-6oJ?G5X&7sm2h0|`Jv}`E5rERE2vY-YPY-=e(seIJ0mED%bwOiY5
zDOg;zh+l~4ph@x47!$7e>b9}Qo2FL1F!A2_H+bcx_@3R;E6<$FJTqtB=Y8I1=KQhw
zpIGF#e}DK1*u~ekBj1EP#Q~2ed0x@iVw4**i@MJIrJKy4)g3>m*mx#AnQqUgM~2(`
zi(|Qw;b$gt`Al{!LMMkjUgWU()p|VDOTWh^c7_??nC2ygR|(7&+7IONS&!qmitu=L
zG(DCs79_lvlOBV-Y<Amw8hUxv<2Cju++v}cCn8M!E^nBtcFf5zq{*6Fc0*{8Ve`A)
z>Et}l@TSpDQ~dyMd5lm{IN7P(cyU}2YT0qp<!$q<)6ynWwIiUL@R;PRNXw_kiw6st
z+)yr?sqF2E5aXQ3dEPOz&e3fbMC)*NBwNwyQc~#S-On|4v~>g<-}88%8B?bZhd&6+
zyR4WrTlFS0qhsbreaiH>DeE&uz4<#-Z<gFab<J!E?^5ROk?=1y(Jn&LAd*OydAhaC
ze$(N_N)eK@%CdZ*i*8f}_3#2Ug5`*$Uk7R)3oYN47wJ8bxJTmxee)c-!_hLqyjg}a
zucWL+22S|aJg=v0-(I01noc>bzEkGZu{&%Cz-iU@J)^!|CV!(udq5Z+6)xWrj_BAb
z(f<YQl|<WrX1xsYAij8gmX<^X%@I%dR_g*&b8N3}s||+eboAW?E(S0uU8C%{)VK4N
zR1)G*Fo)J{Ep;&=SL!UMnWDfsLFbv4Hp2z3QDT;hd@JVP<Pvjy%o11FC=5g5nK-iM
z;IcUQVa35^st)d#EPKVvkgz^LOX6&Gt&#8e2)88GCb=QRpJ4MC8~79#N8~&}yCqEw
z>%Q<i8l}0S$;feZYPnx@KD>>v9M#q8QL!R?wnW4efgLH!w^rmg5YHd+tyMdGOC{Hw
zFw?bL_BD%^pr)rJv4qkl5`rgAlc3;M#8+#oU8|&dtrE><^Ji_t6M?AD;XZZP6?vjC
hQ+Z`|{XSBBu_`hyW58-B%6w_s9*XJfGOOXM{{S$%*pC1J

delta 1265
zcmZvb?^9G|6vsagd+*-MdIe@HaDm(%<L3gxD9zMj3XM^lWRMhs{o33GR&5t|7X+2o
zOiQh-eC&r}^{R2E@r79~OwRN&jCcJ3y{~`3m)N<>4%1A`-1|J=d(L^j&pF?7?t}V2
zxB6CAfBg;E!FNCT7Cg~j`W>F<1x4jVA~zhH$nK5hV$aS+<BDKQ>%e%XGoF}9rm}OL
zv&nepe*=1aC|-1UhJA{o`nG4Q|NqhYX{%268kXK;2lT3EpE0DU(W^#{&&N&<I1KZu
zP8m-|1{rbKLPt5H9I_ZwI7ebLvCd?=vp;z(;qW@PqCA_Jie+NCbjHUZZ#uli+xjn~
zr+1Kd91hc?uyg4HxlA%O;S;72n{l}?o1V@bPK3sVD3nU)Lh;0SGL?w?nB<5>Qc<n@
z>}uPkJE~~c{}|1>%VSE8mAvbaBCT(k+iFKS?vNp?@Fr%H*_;4ROY4};wEo*{sXU=j
zt?sRJ4ktOKgWiC5-r+s+dbfAD;eAPeB9TfI)3^CRVI7R_4Rvkr@=?!uhY$Hk7raB|
z7hO#+DYUM#x;NG|6|{4uUMU{mpi6qe>Nm8aR$sDew^)3ssN0}B53IQQMjx_wsD+;|
z+xN?=2Qcu+d{l(n3ha^hx%L84J-MkqUqKt~;u0qVyd=$c(SBa0Ot4IWteZjofr%}?
zm3s`1hJPWn#4C%uc87xn-jMGnWGfJhnD-bR4Va6>BO=r?_5MV}>Ihf`CPwb?s0)s%
zh;ftS0dIk+{B^oqMt@Go0;Z7oXG%;Pp4uf>HUCbPY>h6#?A2?ugp24djp2aVvBc@S
zG_QqKxSRis|LhXyT-eqwYe+&aM2vuOTguV%PE$V0G((&q$t+XM$$C=ydz$mibA>z$
zoZ$z~a*J~;a*<^|p+*i*vB_0rUBMMm@Z+L_D-!XkDCl}!Ej{$hyGxM4sdcoxhVo(z
z@gtW-U{lDx=QBRXOE-`4h1g`4*U?i#8N_%<6w5+cT(P)n$;4aiv}8!>ex!kN>DyOp
zedE4RnsTTq+%C$vWiQJwxBn*90i&c$dB9MrP23msjm-^x4N|LH-EK)i&au7NcNc9F
z<jzM^X+A1Sm3U~7THWeAl1EUhin=j3qp#s1e#~NSlHO$T5o=W+5w4XoY?R$)HNyq2
XyFDqRT2^n-D8G5pA`{4sBKr1U#3&8t

diff --git a/build/classes/fr/devinsy/xid/Presenter.class b/build/classes/fr/devinsy/xid/Presenter.class
index f9e70fbabe6281ca8167340ccd7a9cf2d4e1f4bb..caeba96b94a9658fb93d3890f73b05cc123c1dac 100644
GIT binary patch
literal 20267
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
IPIub>0yX|z8vp<R

literal 21837
zcmcIs31C#!)jsFGH#0Ajmz@X$0R}{bECfYS6F?yZiG~D8Ab<-F$v~pX3?>s6wJt4H
zt5&VrDsBZ8qqS~WheVWORj^vMR$JRzt6j9#>R+vYT@cLwo%`NQCJSi)wrVnW?sD$A
z=brnW<=*)07mw~Fq9fHaK2l60R<)Nlh1a%3IyRK9Z)qxB*dFc(M`Gc2ADK+qXNA^=
zN?Svb)upv7&k8rjn6j#B=2k9UQCGQe_M+MKwTqazf+?dS8tI6IBC#c**3Phj305$9
zTcfL2hufI~)zS9VrJ*&U#^!J-Dvvs=v|2ZnGi72}tfg^LG#XnNiZwIkR`*R>7i({c
ztVXY+C)71m)mO}4Q9pZ5b>)Or?Gs$4CxGb*RZVk4vCxDnunk(#2!@4X;nf?M)TvcW
z){Ms1mPku%7Lze)@)9PqBH9%8Qy%5}Xc*J*18`^4AvByRZFM;2u*+0DDTTX=)=)=B
z`Q!sGE{(8so6^WHrBODelMMk@w?x7<ooy?_?e(FRtzlVlv@z7WB-Gv_-`z^@49&8i
z3<}ybhO)tSthuFwX=L?*_6&l`=?KT_21qnNm1$R`S`2Hnz;m#^fkTE(nw+xG<TiMr
z9i6Sv0#8$PX-gB++DUr#>!vl9HbvV?=SCYl+n_$>16izU>X0p(v!SY~d@$ibHFG*w
ztqQk8v;$SaZSX^$#Wqc*5~l0^KP(K8V0~!yf0REcT2r)<>5!qNBl3eZu$Kh~6BLtw
zU3g_^%^K%mq=(zvqwTewu{E98fe{Cj&2*cNp<|hRYuclY;SNl6b$=<<-~b$alm6=x
zvSO~#nMMzkLcjfh7@?v1u+5GE5LR}^!Ww3nCJwQx!Aet}PP6C)9~}=slcS!{RuO_t
zvuO_S3o|5%%f3MW`*jVqg`1@Rg3y|Bi{@en8|Cz;(>$8*qZ6?o2kLH96`jOnV}=@`
z0+edgoDbA(7fDjN)0|h^w15tGDS!oc?PdgJ4ITrQ1QhUx5`xlraUj;vGa~|?k}Jn|
zAVK5VSfz#`A1&@@1RNj$hP8#;SN9FWBz2Pp?qQN>#~?*ZX_|bHVLn<003D!+ePjK!
zlui|BJdJ70!KR<QM7o|~(+WBh)&Tg_zM(FRGnA7+xz1QiYbmNA@0HZ#BOKify*-Hr
zo5HjTV_UR|iNdBG(r>I|dZO(h&`f9fs0AC-M<CH^)7jJt9FK(8WA^?S>)6+FA4Qn*
z`i5dBCR7T;>C{GRY&u5>c%e%thd0QoI&6wjC-4SU1GLJen0g-EDxtN`ru9P0!a%K2
zLhW3e&ZF}|O+(DFsdmF1nu0n9rf<;&I3OLd4Xv=U^>mR<7t`0lcKDpmP%D(BpFv8H
zS?;5au*CyU#hlKT)~0Z~(7D8>OX)J8+FEfkYOx<U|9$-vgi@+p!{w)M(B+~j6Qp#d
zP2Z-gzz&c#9DxxlNu`pokAtYVjFbzBYi#<C97!t{b^6P;UuV<x^j)ym9O|giI}C4Q
zIp&Fla9FTAqYk3$=++VKY;VMg9_CD~RWG4AIH_r&#F>TwQ@SKI1bytr&h~cbw+j(4
zKdFwzhBXQ2!nMJAisbkigO)smsh)*dvRtcD(TuIZbQW!4BC*ML*z|q6lWEHkxIA$2
z{ak_phrA#De-*X{_4zUn!bf-E4EHIIvyILuKW(L88r?(p`sfEthYw)xK;EWJKcxGh
z6SJ$US1hV+sAC!gZU-6)lkxzZ)s`kdJwy-tXdAq|L9-@36q|lTkKlkosj8s9r9-Ok
zpyA?wRYcpvfSB#jpds7+6sI1W9;F>nLm@xdqb>sO4LNqO`>n0l<2LQ2A3GLSD~woC
zV8Doh78cdjEgb^EPtcP-`UyDbXSdvTo1UVlU8g)8SuGI*j#-sx-yWMX=o#Saq{*kE
z;vRa|rst%yFWTPJ5(%{m>E~^FfnG$X7Hx;~Cshrw^q5C8{*q0<pqH7_AqU~P9>+(|
zRVQ=(Qar3XMN?iCIQccxk%PD4%al+KJv`l(_0XD*WXxiTZzwx81Y$S}q_+`EkdA=N
zq4xs^)oOH4=s-_Y)}w`ueM$7Gh;~K*QjCBp9pO?~f0yXZuX|KQn!@1ID=5@)q>ugr
z?gr>V>Z$e7UkBUnKJMXFxFF)7Hik0o7z#D|=|HL%*55yqT^lTi<dGTFmdfi8F!wLx
ziAC>=yun5cdScPv0h6#Vtu2i@B9++MqSr-p{$bNc;+qe51yI=<mXK*qr~`dlTQ^wr
zPwYxmhugtWqr|fks(xbAr}UXb4&jxZ5Y~`3bcscuGmV`wuB0SbS3i4EeO1kg!K#{y
z>cw*_gG;OC2Io~(R|ds`?H8^6Vu0;Cpao6XJ`4ImX0W7W7Brs~Xs|ILC_ae&)G-}I
zz#f~u?1N^lYC*gkt#1!Q*XImAKZ7?Wd7@I)A{ljBoQ7bcGa_MhFcuB26yG5jYYqox
zqF@a3Se%X(tc*5oNaqaB@^R(>oJkO~Ih%7F6m)l}W6lO>jrj0Pg+nkq7)SIGvp5e&
zB?4|RX)qRA9c+o<zsA<irf{%1*4AoqK3qN>+y#L(F=RY~`p8*~?870@oS>@>nnJj3
zO>Dyyivw7y-ssAjxkGNV#iPJKJe**3Rf2+}Pd*-<a58mnr*eH`c#S9;pi<5^Tmqc*
zmL~DF;Zz8d^B_QH=?<tsOfXo22(B;EpAf*uBk>7<o*^z<IIl>8k%K5M;MjVtNwgW(
z|5!A%#G1v(-S*$ahJkLtLG*55S63lLtBY-(%t%N)|KDWwAdowl>#tIiJW&T&88%Ww
zK4NH|YV#4|_9jfCD1^n+pev4oiWH8v>0SDp#mC^7LD^@DN7Eq<WrBOKm~ozgpqpnx
zeFwV|qH#LF?|`4Zl#jRh1fC83!MR8_4RHGp2sq`I&P?L`ltC3+I@Yv?HdtH<jhx}9
zxA{c4Q9S=Z=rvf*;y;!9`6Qm<<CAeNhwdROU0`z!*CM=hRXNEyPQ&>Fl%t<T8$hye
z+#vIn+B9(E4wg2H^C>njl0Eb#B~lNsCRnNweTg7?1K?^>MQYfX>KsF=h|1NBQXij+
zEgZmdpHnaHf}fZ3={BDsKA73ja&A~E&a^qiE8)R~9m6*pPKWlw`qtsvAwM_qDxcs-
zPG4IUlG8{kBLHJ<1>wH+HM+WBG2(Ai)@1S7U{*ena~Zxka&{!TE+`gSFwt>Gs^E0z
zan$BDVqVR4q4tQyfIYKveG6DKpu~_?OOqQ@SuiI$7X>4YroN3pCwvzzk>uO}xzsx?
zfJHeJ(1Wo9d-RtaI{G3jB~y&Po`@7ImY^EBfN;CT7hyH)1(%N~f!`SEXc6=dwN7b@
zHCc>M``j7h=GIo!FI!ltO-yj%;yKk-6~XZ(rKJtiDoRV|*3S(tonOD8I(WpCsloab
z5~Zb;HRFThn`5yxWu>L-)~%beZrT*Fw)Kljof&1YTO2g`coFqRY_5R6zyr=dGXnQ=
znql!};JPu?5e|y~IRy+ZUQk(6zoMpgZlze`%Wb}buY_BG(+>M0+cY>6m$1*`j+dwN
zReX()uO5(oOYLK`j?@LR7Iv<LKUUQwqpq|0`UI5KZRkKOAoUsiJ)3Xf8<D+nc+lBw
z*Zza~0Wpi)fFp4e0HJSXmDQEWg;{(Hb~~l5roO6v*@{J#^C}lr)>KsL)mwZUR@&F8
zV(#qv*|=k=sIRK6aeHirRA-DkRX3e#@$FE}(@&peF~aR(eIx5Dm)1KpB{sQSq~B%p
z-Fy%HQ6%qU2rHmMP#00GezzI@4*8IW>Ru*i=N2xit*ET4gV(X5s-~`f(c)A-5dy0j
z$0J|E57_*m9DQ%A4%940SgVeo1>e7Z(d?SKDp}m@>J?BYETMmuqq{gQ5$$f7jxMMs
z9LSOV9RJj<#-Xv+xO*%SmAkEwn|1^pH?z|9+*+cgRS~4Qu<UTCZLp<G+QlI~O+WAC
zT|P!!J4w)Ied+qP*3vbh_Kt9SNAebAj+45Y2d69AzQN`v7(s1%B)qOl-<3(Orx+Ub
zRSCfO?Bu6xewud!dvMPKL~20@2!9cRnzS5gPIP$2=ATN3Janj99f`^XT1B)?LW~Y+
zf6nHgN&BHG?XDi<4ljmo4b2FRJ8)SCxZcSx*!*H*!is39HQdn%iqi6u&A*VA04P<i
zUlWQnY0cWOD2%(Ca0K@b((4tQf62eXfx@~Io8=0I>9DV|{Bj@vnrYksL|v$bT`5;0
z^D%WRQiS{}1^xUQzwYDTVZfKl)#l&x8#ouje+nIOOtg;4o_1hwQya@g%CGSsZ2lwv
z37Q3%sKc#h8$f?-zr`R&sW&GYDRnvkCEfz6cj(?Tg~(rQeuohzd$i*8#bN_gvwvKX
zkRi0;RsNgJ?@7whLdsEdDKfamVnm<dEF#yTQCN!)F|R~_Q>RSz^GEzoAOG**=zVUq
zEqVEC^T+%NfH>6Dv>+S{!Fn;x?C-fG`50_|2iHtqVlj+s(Al(LV>Gg=Wp$@>SsM%|
zqK`7{-simE$NQM34BkCwFqE`!Y%*}M`3pgFu^bC<-xXRd*Sm^r#X4pV%l29dvFb=I
zreIU2oQq)H?4>~wKFXL}c`&*1y2d22`{<LL#!`rYhga41BjOU6;#YndkNDEb-^(`E
zCWj^ir2)GO7;jp+3K8X3#{r;d(@LD+FCPI!wDsEEBO-&o^c-Q3*U?g(gp@f3Yc#Yh
zxp_=eQ~HWb1PTwfXG!MV9ZNv_P=ZHaH_q%Y)pDO2l`8K(ME5DgxTE^CXb|@>jcTl|
zf@&Ouw5lc2G(Q~DSA06YNJV||R))Hqv(%vg-ZmT%cn<0?TTN8Z!Hh;2lvp_FG)(@|
zR6(B`@rV#Av{jKR1}-^-k{;%P;+|Air8BaZ^VAeumFkrN+{6#l*N%wc)DgBik|tou
z(tw4*h;)W6brc{1$5QZLdQG?0F$zg4xfh++(%uo%!8^?K01rruMh2AGs$9(gS-d0(
zx5ws$SLp;Mu8>mM)7=Nx^hY?|NiZ$BAC|~is!<!l3Z-bN*$}?;5u4iC)|Xx27D-M$
zfM05!txi;k@w|=Ap>_#0Or(1&EQR}6b7E_(+)~w2S}mm-0P)07+ZqI(Tj?4^iExmN
z4oQF*@LzD|8k_N21@dsWs~%T8qC-n;)gUoyHVmA0*z2QpVm!rhNAe{M{t)%xzF5*9
z!qjQDI$fQCvx6O|aQX5~s;baWGGZ>(kWEXdLFhLknp7YX8X(HA8ac`laGvnE(a~Vv
z&h>S$Jjp006%H%N6aP!Uu1T$}{r|CYkcp2v2*m>q^Qp5Ep`pIXnjh+DM(WD1S|}(N
z^UwPf_O0KQzpNr%weeK^qH5`RuJn8oB^9$(r(9E}%Q*-^kM$L6y;^6h^=bnMIoFrk
zsR~yhjFGriV_tvpE*G*L^6LyseGR)GwA6*rpPA#4cvTl8#8#N4VCWEAUv@$pH)7m)
z%&9Nhbt2A5i(pHfDN|Prbj+4>p}QnAX{J;Sd>|kKK=<PY6Zy*5f4NZ6cKEb&B&X*<
z2E2XsZChQXBdS=mI=U|0E)ud74w83<WdD#~s8`q8>N<5jpayUoUN1MeLrSp9Qr|<T
z8Kv&Pt?EWwZBhub(mFa<;!MI`BjB1;HB|5~^W0*qTZI=BT@m<ah*~F^5-PZo)%;@?
zoKabcPu&jFt`7@LjHEkL!ULbW6VR60=vQ|jx>8$I7w(nS-SU>e5ve;^{6rkyAK1Ku
z9|LSj0$OkwFTvD(a!-|s3o7-1tsYblK}4`lolZnH`P6|H`hb^)xS~`K+v-Ph>zG+v
zQ@w1(ysAZY^>X<rO>tXom!`awruv3jeK#rXJ+^vO+K1_Oxv^Y<H+J)D7uT<-nkyY1
zv(@9$A*X)_wE7expOJmYQWLG~Y;2y_5^inMu91&2;f&Sk3vCf4_)Geh+OvZ+t0M4E
zbtXj?o-^pG(Wekwq`bn=NomP{v~QqsxQ38Nh9(8bLtcFI;hQ3h^m99u^<z7tY`=&a
z-^ZXWi?Y!(2j7myr~H$V%iWawFpc1cY2-twP*i~5nVNV$hKvHCOd73Q2!rqr&m~cc
zPa)zd+)iWrh6*o2K!(^(2XH$c-_qz%nt&Rae;PiW!Tsj-V}3#>lMd@g;4qL90u$+Q
zm%vdj0q-^%d2-={XmvPuD3pT2kx2?B+9tUaCR3qH;S>nY6sm<qTwKykMSVn^HI!)r
zg-$1$LZ#>|OiZOCH1BDc!qyC@VLeAdWNCy4c`o^g-WN!su&B5sV0P2dWuAbiZw`mi
zxp)$JqMm0Kc2VS(m?twiPbM8lWqO`WJ)`V<rk>HnXah?-3Uj4NhRL1#Mf8@X6&3an
z(##8r_mIWaT~tt<ThT+6ifT&S8h=R-A(vaN7jNjjACFxpS_Flv1Np_+?`2T3Q^Dlv
z*v1f+xGII=BC4TU^v}?Y$cB$imL|J$7v-El3+WVm4}jhxj4(i*u%AXRDhwaqr}<!p
zXdmUE+zVMqosa5uEfxn~z*!vM;|lhfLad=^K^N^RLZJ|a?K^1cGHB!S1x0Z>y@x_f
zHC=QgmI$!iMQvqfVZiL6DC3g9eHYcshU}rS#cm~Pq_kH0*2if>Ll>Ra*OdFUI9<4j
zj!5afgTApW;OVAsZl`ahj=UmHS3BbiQhKNM*w6r`u4THZH(V?#VQR_GfhdUD@hyfG
zuZ2w4Q!bs4Gk5{c!$sKWuVdRcQUzT?^XW2bqRY|iO1hJ-p~um_o4%)aW|7{(XYlO?
z&?9<=ZbS(nt9RxG>_S$uG>Yy6U8y^aw&0D|CbUcg-J9rU@KHhM(k)PO58Vnnvb#>(
zZD^DI8%@46YrniAUh1Rf{e-6#ZP>KqKcf+Q!Gt`9Io8=WT7&6D!?Wc)<ZhM|ar;mw
zVl$R~M~Z@Fy9$Pp$rF*CJQ3N+6Orwn2uBg+MChkD&g|YIs25OBZQem!mu;u6GOu$q
z%B+C3htjvv-DSQmstZ`T_v-^vmKI3st1mAKr0H`Krw7aY0e@f1xPbo&if^J}0sk(F
zm!${N<J2vrEKL%V!1f8T9@@n;-QP{S1HL%@bjlAP3h<MUUm6GTIRQVH<L6^kor9nE
zjOppdbi0d|1k&>D9{QQ09{M?K`evH6F`e_%Q8+f>O*U$r5q*3mPQQZk796l`qs{qt
zzJE*aJzacNVwTgAgc7q%ac22GrRAr4{_VN$=;HBuIgvpVosd!kyei8GWbCH7fed#u
zcK^G}{7x5j{VP*vC8yr=ADFsWPd)a_cjL`~SHQr5;dg=gMB4xa+hH-g@e==07~h?M
z-(9c~KcVS3?iI8LK=4yQ>vMR!_&lC>zCbN_v=gD<02qEt7t-$l8Nb7`tT*TZdXpZZ
zKVrn6=~;S<eolX(_vk(L(3_lv*BZI>56-8Lcobe=l+Y(U6?vl>cucVrhWZ@TpNEGI
z7vR;xMz;8S?B~1K=6i8pu${B`Wgf=wq3vVb*MG(%xt9x64v#_jJyuQRpgNMrBf30X
zt>%&H94=HbE>Y)lsk#oIxAM_)+Bq9Ahx3^@?I^i+7A4pIp(GX;_7A1spadI-lGt9@
zKXrq)gkI1wu=e}Nhn7TXL9(<eS&ASJ;PlH;S8MZRLAsTYR4t@lK}GZ$Wao!e{q#Eh
z9>#F3Dug88MC*lW9Q^^(^rLqp{Rt%;NXTB7uxqD7%6}xAN1)XyT}+*B=`Q#PZ^0O5
z@V-PHsJV4&9gLzLAppxAbZ9TOJxv?KhkW$5Hi@u`Tk#)OI8RLGaJ25DfREl8(F>Uj
z-PuR?=<fSzrjMTB{qP8Qni`=#qcmL(j&Q#8LY5grPUldN!2((P=w#5_OBmG)fuw)g
z5c=wb@wjRp?8kqc@+k2uzMN4g7B29yMmVZQ4~Ar6BW_I?4j;UYG%mBc=+L6v_q4G{
zROBWqw5=$!igwfJfVG=Oz^wd__8u~eazAi~<QBp!40r<GZu+pHi;vnyBXa*YP9Fz+
z;#TDDg-?;_9H)J`y>ZfR1#?5H+mYzvS|{mJ2JZZUG!SO9%-==BVU@gjY{fAYlSqj^
zW>os~*x$ppqB1)G^Rf%>2v|ke++^2WbnT)E0UL6F`6){ma<=ptmh3Z3m`>kASyFw7
zRCiHDAl<QipuC%ocF9lAFs5gA(b#}5VCQFQib)w9EjDXoCg*47XKd+x(~&|Rk2tUx
z^jb!0i9HDS<$mDgqg+5Q0f*A?>7eLs2pEV@#*WqEyq$u3?m8O7i;@3ZM$`CoItF+1
zGk68f<1^_LZp8EW)zr+*bUB|*_i~i(=XOwy!HTcNMcz7kfzQJX7trf`5gq`3oj%}i
z&_2EtGhU8&RaXKBzm2Cw-$CZ$I-Y`y)MI!P&)}Q!=;9W<nYa!2`L}QcH<sT4e%{1)
zYd_~%8YT*sKt8^e#{eC0#84UwEJ8?xRzX7`A4-CTKt7ZN4L!Of80f_+uh$sp6Q7#i
zN2`U{D^Z%pXSsFv(%T$FYZ|2XCmx5$#!rt?F1S7vDEAUnAszFk1NDk|0`Shp_gp><
ztu`M6nN8Gnl{A?T2g+see45CUP|DO!;U$#4kMe*|_{aoajn3>v2;rQ&dHrERP|QU%
z&LH-2LEe5U(S4ps>&41#T|U?-bZ`b{e?bKTPCV*U@_vd?MP4H%g1xUn5<b||Jn=qR
z+)p@4TvX<DOm0f-$Unhfnmw&IX1+5du`y7dDbB{A<ZcY!CAu4fl57Vy1|`QN$tFl}
z=GCmYfuXkyV$X%)dLe-*R$&j9I$mNPAE|L75U`xE5dh)q=A*Pjr>-k@fW;5h7ZAwf
z=@NOQxzIo#mpC2beC#fIN1V|;B$V7kCX|kIC{+d0wcGl6AYI&6oKlTp8C^KVcAU#|
zE8;xMal<kL8F@ShT-~Jd0#+W+l@ku4nrB@$^;jJ2@c}bYJ+CY)kd>(S2eRT^RhAjB
ziZt~=rhrqmu;Mt#d*G`AC(@;Lp&$w7snbZp-w#;Xv*NtCA+<yQMbYhgQ3U#$fWu%O
zFCE0GOR9@y{k(h=AB*+#a#??zPjldjM+!K_d4(3x>+Tnkl4k2b%g-LL{G33JUOwvm
zfgD+Wwk#ilC=X=kXLfVrAPHoN1kfQNfo3fMx-=<)lnw`$fDkx{1oHSShwRkk${v!H
zLEQpbaw;@$qAEoqRm|-d=_io+i?_PS*2vo$=ZG$xBM@vQ9alJ#a{)=e2N=CcIs8W|
z;6Kxm{0^1zyR?YkM^yfI{3X$c_$!-_@b@nNq$~JS+&1i`@8JgXcE!}C6m3%;+M&F(
zNBLoQ@D5#N(;F&>{;cxoT{WCO#HE*s`>hN$1}^0|o~RDvDXI_-O%a!?5<W#8!KbOC
zIjpAhIqDcbUzPJlHIuJU$Md!71in$t;jL;eKcr6NM{z&0TUGOOa8X}Ui}?4dj{l?<
z^Iz36{s0#hUbRAHsWVl9YE+ZdYBg20shKLO>Qsk1L#;#2dXzS(3-Rw2>SA@L`nvj|
zIzjcQ%hXTQx7BmV3X6j~Qeu4dLIO?H3kftq$wd>ix@dxu3-c(sFprWry<Sa45XJ|m
z_i2qV7UihN;VcTIm#NEOuxvnjNQJZun@(5IhuVd;={hpF6RjC^JN?!zy@<NC$N^*`
zBuJD##NQb?b#DOr*YSGF!rP=Nyn)XJnqA9>!w?Gef0xJc`2zj?5P}bJle72*mr6Fj
zoh*GoS8ICN&<uxOj=BQI>2;X3EHN8Ap2qAaxPD>~_EVKM3-4&RHoi}+M}5}VUK&o>
zLs<mZA$Cm(z2l=e%H-pd2!1C#xUW74sSKh?>BI8<d#T_vQeV(0AFi+9s~-!h!a?p=
zA|_)nppOShY{9YBzXy8qeT=)qG#5p}#c1$QtUjf*&vZfsf7R-Erb8uEUKt{xqHdxL
zb*r{#PKxp0NvPm2KAhRjMbI=!sFZ39KyK{gJif3D9^l1gaA2Jri&eN=AwTQds&Bwn
zx#q!fW$EL>ZvLhuM|M*le(`SuX|Ac^7hxEX>X`1&_v=gvtTI#tKWX^65=DIHdi)gP
zM;s*izSjAqX_}`?!BgQb&gkK9!MMU0?xw@xmcl_3hZhCp-^9cPyxQcZ!+Q8!i=jv1
zRmp&i3LmElZxX^fu_{y(2_x<4jslPdV8#*y9T4rp;|9mXW4crmpXdr##4+*oszzdM
zuoK3bp47A6tYJ2LqPB&p=GV$Dm%1*xS@*kD_siq&yK8YG18uYOc#DJm=jfhy=$^7!
zSPhcE+j(m@-{thE)jfXT()wY7miQ@Bb_O^?9fh11-+vpn(8>-v+)0f%33>dG6f~^?
zW`g#@ZzI(O2)mmy)jfEuavv3_2Pvqw(G2wn&B5KxiK?5bRSz|&9kfC{M%SxdbgO!T
z?p9CIeSp5W+D$)J&(KfRv-FaB38vv?dSCsTK32b_FVt(Cre5bv^#<ptH#txJf%DZL
z`4IId9<Kh(Bh*_k9d9E;@dnJt-(Wu8=i}7hxmJC|XR1%QQSIke)ypx1_#%V(GDGnd
zhQ-$#e!kU6=X(sBw;7rIh%t<J8u|Q+aR|R^6!4qI82+m<mj7u4dA~7E`He$Wt}#K4
zG$yJ;jZ#%?Ox1@muARWrq&X-}<~vH0`HoTz{gUq}P3AjFUFR|rX76Eb4)Rn1{|F@?
z<d^4~gE{;Megt)C_}@@G#c=?%pYEngWNW(N*T-oT_n_6L9|MdZ#b*Y6L1Ar>(m9Qm
zYlCFt`;pqHWbl4uC0<9rbb)GI3S{&mAMYOu%K*g=8sl{CLu`c~A78bXM(q~>75Ljn
zlh9``Wdqp`pFD0K&B51Cfo_)kUC;s1jgK1w-HdX|FlPNn&`oA{(T#sCwiOHQN<bOn
zgzOnwxsf<doB~{{Al62*cU*Cza-Ne=cB=gW1l?6-zJQx-4)_>p@BWUjj+z}`myW|E
zj<4%Yc>hR}Yc~wQ>bSEh)A#jGI$yLLc|tPgQ<`xy<rvj8+E_^A47_(Yme4e#fsQqn
z(JbS1sx(5hz*tGOMk6gWnrJb;FEdutN~47$MjNd)qI9Wo4qaok(=A2^-D#}XLS6$6
zfLIb*i;|nAL&?q3q2y-iP;#?$C^;cf8r|lGL=#-sz=wM)$La7P_qI|y36i;UoCHhj
zTNQcs(cy3nda=Br(_4LZ)*4DHw>oD1X!tI;j&^hmewm4VCi=XaAFnAf<NT!j+EZf0
z`C0k(y!`rkNt|CUGk5T-%eM1xpn~v`<1kg|`DR(4b^EhKVz4Cp^xe<Lh=k(&_5$hp
z?k37ElEV9fg<W)2aUTCq9)Hly|LCHNYn(vtQw+yMd!10O%q$Z68abuV%L{M|;B-~M
zMRZl>LAn;XU42ehH$WVMDlVVoHgP?j$DixZyWn`s_m|*!I~kM<aG^)WrDPhHL#wW!
zOyf$*GrmnDjBB7>*VCcK4ODF01ns(o%8XlSk+B(?bUTHNJE2K;(|N|dbiQ#PU2EJ=
zn~Vo&i}4`cWo$!2{zvq<@d!O-#OY_oc6tdZre7F4=pExR`n&NsePZmS&y1gFt-D=c
zjD1cwA{3B+KG)jB$SRD7HkBezaEA`Hr3B~GtpmKcC6m^v3?-M^htg6w^V!(=Vyaa+
zDi`^aGMcUO)G)Y-=hNXTUmb#e*TSJ54!kp=xl%U*b&n_Oexd6EsCy?_C%8D1yuC=i
z`+RDo__3Vf<DEW!&Bw3$6r6vZ(NIpK<Safv%cnf}@r!aJ|Dhk9y7>1Yh>LDE7Iv#K
zHHCR<e2<!d44f&~h;m2bLEWStH5qkYNh9{C5=9LGZ&42-6hh;)AsUNyBixIU9z;jf
zqmDDEq3`Z~ikxoaMe-OgQMU0i1&mi{g7Hh5V*HAx8^5O6#&76k<F{02yauHBo!%QK
zNz$0Sw{FySM_jc=brdA1AmKCAOyrXc>|&jog_68lI7w%@Jh=5bULB7*BuV5cqO*Kt
z;FMnex47Ez1ZNi93zGCT{J`BqFTzE>;|`8=ygc}85LGn}iUY<qdFq4`?b=y|s67F6
z<Sx!MrsE9nCR+r#3ofR|nC|VOkpVN`t5cFf1esgZWo-0vzBk{qrT49r`|%p&cgT2$
zl<_VO#NQyG59kQvLpsX%n97Y$0j+!KMB{Th$@l_?p_dk$Ov_D0jiyO0rkB>5K04R5
z=xg|XshN=?#BaH<s_0TJFuc>Di?s1p0Lf}?iVfVJAFVGTOqk&#)f||14{qegsS1?5
z8ZL_ncd`=zgPgTb?q(5AjgZXPKJvf~>bqRWA0j}4^0yJL)SDn%gqL)gT&>H4fs0)G
zx1ex0`3vJ}ZWnN1mNDJzqUDA8W?WTH_vCx@&QxHWV97-M9E+bB_!*BMczIM(oTsWB
z^b4YRvQx}Qae-6x7v}>Yk!CPC-yFTA_pai&s!e^AFi(>4W&xQdE<?=mlw(eyG3H@3
z!91Lb%}KP-ET*Mq37u*l2|-VzRpzl2F^{8j%vrP^{Vq1=&?Tnx(!$Z$%hW=I(1i60
zUdYw<C0M;v%Arnm3R)GeUYgY+2-ZNTdZre!AV;;T!#Ix?_Ebv8xz3gM3UVQ{mFNU`
zOI`^Wi`ef+6zPS?@!CTW0Wm4A(N%ror3MRP$uSS*ZWcv{g34o!G<<`N)sjX^Pitux
zmF1hzMM^hk>E@#1d}y#_<>8#@Xvw=7PB@D2<-675YI9Z>c_Go!n|hx~(chEA@ignm
zFc*{GTtb=VQW|ESMu(WEQ@}if#+fT1)({n$jZ|Vb(KNG}W|}QD-#nY@%vOkb4aB^H
zR+#HjbT{Pcu0dzGLiEE!l*=*&n_Z=rs$~#j0Eu=<6q^v|ESBW42cS7dE!O}b5ITmu
z`)L>i1%>?rxdi6SeOi}sAM`0G=(nbhx&ovP{7Y1-V;F=l)y7O*P!ttFFSGrd$zN1}
zh(w*bQE@>Lly^(-U+_`e=PivCZ8tYUqb`9ME~63V<un%MLi1|9w4g&?t$=<A)=b3G
z<l#{|ja72ol-2;e!Pzf~?ya1Sgth$Tqsw0y!^NCt!JF$=XO?uUm4e?ge@epHyoqen
z3DD&p6Wz5Rjsj(=uzt89rB(Wo21?qef*?R#xG`l)wc4Gs8nq%4e_>JXX3V!hKQBq0
z?QXKnds9~DPtN9dXS2YaP}Yl4%`W8%%p}O0UdYIw!;5u}XDaD91lglWAL4X%NvF94
z@#all@;U^K;SfGlpLe<#Q?o<0EZeTm)(8!&TbS?ZQLT!0sWxc1DHaYdcjRLYf>3o%
z!$uG1dkT9Lo_KEQeFc!c11U@A*-x3Li|z<`k`I5J@%rVD>exgPIVB*5cRqO5qt<Ss
z<Mjk?oxWg`37rAwqMQ532UUsZLHafhT;N=$j+Iev7u`7ez>UJ6egm`&KAt*HzgH5*
z@9f8TAE)<gV^&j)XnPZ#SfU+Ab-wmH6RUwwn5Qnl?-VxZitH6}by2Zy`-bB+I;dOz
zFVM(SDMOQ-FD(&ec3v;7q!B1S1@(Fc@cdI6ZaxPb`57IH@;vh;I>~$)w(yt0k5{S5
z{0()OuhBQn*XarK5A=KUZTi&wB`fni&NScW9P{ry+We5Gn;-GH<|n)jb&r|*v~KAT
z1b<g0cQN>fcP0)A@6<;Fk04<)MS%_EpYK!ORF{CmVX&2#YP^|1!;qQ%7PN0M9tp^c
zCl6jyU60Gpn*rOI^q^D6qv^X&oqqcyP~cFz9Mqitx1qn&3ndK&6_oykT*q(qsTRh~
zeF1rO%)3+rn$+T%l*Gl&cqkQ6dnvG&()2A^vs1U1jzLD`iiAa`r!lQyLOJ{(Kv!H{
zxd2x4>bUyOEPQ?!pVQ6JN?z!gYO`ara|%aid(RZ(d_!E_oN7e%%RY~Xl*b~!$4|MQ
zbQ<N!qKTdyD)Qvhah`ydumeNo2>8W7Dmo6*6a(p}Bh+muDOixnm{iQ-C?sq)qvX5?
zgX`Q2l=L{Z4vS{E81QlQ|L(#C61bOoNwasTEz5SOJMdypZQZW!D(Y7EAk6t!Vi)mW
zhSBh3tTILb#WRtHdnVBcPa#e56w%S1Vw&kGq2oPA=*2ln(Anx<jp;<Q-B@B67URSc
z$7{F}%RD0K=TGV9=R*VyNw+=QLiXetcX7{yig4AiP5p4$ZZaQi=vMdde9V7xA>M=G
z-IrAh52~SXo7#piX5z~u_~J=?>Bbjd;>!+v@j73YJ*<BCAS9O!D_Wp-Vlfl33p?Qk
zPowGhJcdr73VhDR|157IKArH*tJ&#$!7Da)5~a`gsa?HrWEr3GYbRcF4E{w5$u?*J
a?lGRkXD&o?51{v{69Uwxo>qIjY5xb3B)?_=

diff --git a/build/classes/fr/devinsy/xid/StringPresenter.class b/build/classes/fr/devinsy/xid/StringPresenter.class
index c16fc92d2bab7bcc352940952de2868ff4be2dad..fae023afe923fcd12fe79074007a1ef092f15ec9 100644
GIT binary patch
delta 1286
zcmb7@U2Kz87{`C7ec$%&+ZR~s+$fgmG-O@3xnzDo>Re<D95@EriR%VB$L9FlCY0)&
zqkJn)F33qp^u{|e@kWBQ3k!&e2~iWTNiU6w_ud$daX#m5)9Iyolk@)1d7kJ0KhMYc
z{P8<Y?hk+8z6*5m@eTKAFsj(<v4vj6puQVy(tiZ!8~YWJ?&iKd+lI1xx4S&aE{~TO
z(2G_}a?rO;%pA<k%}zS(RfM_^<&Gcgad^ex{-NCiJz<7)*-EH=`giNmScYMb23lP*
zjChQ)UnlM7Qm-r4c6W}?Ow9Fkcls2@Va(%Ao>e%xnN04);pwR`2lW;EiKiz$-eO7&
zQ<J&gx!mMQg_Ud_?R6RFu;D+Vu#=;`t@~UQ$2^WRt$(qH-C2|0+lqWr-%t&De`up5
zS*PzgU9Ryw>5=1<{yDV6dPmWqzYR4wE_sF(3H?nlp|6Hh)@j8CeJ{8{{}~<&oi&8#
z^jPGS{>_=T4ar4aj<l=GI_&l-@8*D;4aE8h$_H+$tw_4P$P0SeOB7sMNXoGo*hZhk
z8nm4q1O!VXWQ{^#Jr*Icl~Z5Se4iuo+Z21T$j(n`@$qgSKjPy(K3?bJmj!=<XK>oO
z&c<aj+1RTkUNa}f0@>JsBH1Euq^;C4<Jq`XWTM2O_9c$qqFKC}+hl2y{Y=`5TlaC)
z;B|&f`2V;-ByLGmQ`}nOMB0wqRT^*2GWl%WF7fVQhyHa<S7CwoImc-};0&6xd?vdu
zIZug;+~G3cvB>va;U}*0fNMM~MVU1vqFgIwSxPzQm$F<f<prtzW+`fr+corK4Ly)z
zSFFz$<nTQlsrCr<RkXkX<|Wt?@p`$QgUwSSI6`EzvqBs@j0&?5mN5y-^I(OC2(F&V
ze*J%a^3ZAjMV)xB5c!uaoFs2(kkc&`D$Qq?NSoR5{Mm`MNiWXm?7Bq36Fo-^VyaD#
zS54UvoUamOguoK7Xl3|1B>pSe1|%J1tjy4T;a4(MajVfrYqU`w6RCh9@dbi%!-C9x
zRbgHN&3ra4qq6O(5*JLD+d5><&D5-_t@SgxDJ-`{eaTntsf5;48*BY*tf@9uRqLx=
svxK3~<C44{yKXDb$iVn7g-!A|3E8P4AFk?FvQ)mF$wKjwtN|AP0q<YqZU6uP

delta 1592
zcmb7D?Qc_682_F2zLrZns!lI^qZqQT?I@X3Og9%P12@=skx3~7Sx39k4K~~^NGGn7
zw=obAj+kgjj9-K=B-WR1S|OU4EHNsH---L+-{2?Xe9m2Sg|L|T;okeZ&-0w$^PJ!L
zox8Q4t@Zr$_qX=|G~q_UGwkkc!6pN7Y-aEcW~`pn;COq=O2u=XX@<IBL)XAqG@Ut_
z9U0F>Pi525hYMOfVAx{dMQmjl=2Pz4s{g3weQFc`)xG`cE(X0d(7tnXPjc5557uLc
zft}dJH%RrtSM6MS^stpXp3%_5ptK&bjvZ~&uvg%Yp6;$T75jKzs%HE7O{vbGzySl5
zXz(C`*9{y(AOA&a3H390TciD>>0DcD)TR&xX#*L&z@S;9d#thS$e@Zr-XuTUoHa0n
zVM>q)@tl<zXOMyoy>Sl)a7^%zFv!8)c*9<?>Ej08z!;yA_jxR_{}T*6$P28Jf1%d+
z9~XiDsCM%{MN-~0a0)p-q-<qx@q$w2p1=WqUkTJ{R#|z5nq@TSe<;oD95>aPXH;BZ
zSVm~xsAlyUG0i20tNasn!}5ca_)YbM7>2#a&uI~Mofourw(`qAwWO=E3liMq4sR%2
zM2w!7BSp0H)Qal77xf5IijsH*9i)Olo!AB!Ve$aIR{*YN$WSS_5c&#%c?{8Koqu}~
z-5;ag#=C7?W#c_I_SyI~!XLp9I40jhO$mvlKRJtD5h><z(4Q*eU=fF7a;SuXq$wA1
zWEMvo=P>#;0#p?UN9bKkf$^AZ%Ja}!OuB`HAow36cuZL=TVu*|I2lt+MG*N#$Xmih
z(o|+~IwqMCpEjEElQ@mDn8XaGa0Bn)Q=GvaihP6f_@1KkxQw511;61M9^gYfMbb>b
z5CS=ZE|8#a+k!3-Q=SABSs|?(7wFkYNWxtQ-FMJ~yaQh%GzE>+-;XEDXcGN2(l(0C
zlZDSvR>5;bJ^+2Awg?l73Z~+$it{Q>rP5`@BA$TsNSH#aAFG@IqRL;0ucAeZ@I0C)
zGQkJvWQ^%0V_*l3A-q-Lc*`G-%;6&cePwmNf|_fTq_pF%in6-|$>lOhf=DE)@;M|C
zI_`^~Q^-Zz25nFn^R}&XXsOhp_Bqr(tf6*7XP@09@3u#Mx7=lSxr-hOvt{`U5Ao{`
zzwVr)?(pm7a}=AnRHmP%xx^JQOJK>y&@8Uxh0VedQ=;1@to!eNytZcF(bc*~NBD!?
zw_|Cw)7NzRnvQ==djg@iX-^>0>Ln-1#O1|Ry39(&COnV#X{uFpbFq$q5Kj&jagDF`
LRjZu-T=?K0Q+zaQ

diff --git a/build/classes/fr/devinsy/xid/TagsDataById.class b/build/classes/fr/devinsy/xid/TagsDataById.class
deleted file mode 100644
index 444d7dff60b12cb4fc2d3fd2106588c33ee6d814..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 965
zcmaJ<&2G~`5dOwZn#4|N6ABbUp|rFlX}}U(kWv+iR)|yy98$u06EEpj#;)vj)t-14
zo&YYb!~t>UU3dk=*s;JOgv;*E?0i2nyWf9)`3m4Mngtky+PlDZ<f-z)bNfs=_MsSu
z`$CK7=N+ej9HDY7PK6z5<=QVrc+?Xogr!ghO1J|Vgv$5cboL2!Kv>xGy-*8J4}=@Z
zy!+u}@2vjgk}$ucJf(LDbM?l6klXVeX<`mn$}nLO7Q4!mucG%u861kCD+$%EKVkvF
zG90JLoIX+^VYT}o&uv0Jl)B>(9@e{wcUO30yRQS~jobf##@)6X0~3VnW!%6D+dPRh
z;b|8CdUz~Hx}9N6GmYsK!BDJU&D^B&+`Geagq2xF*#3B8zm=6w@r_xq*!@}=_pr|H
znSijBh0pd{z<us}dZ6)C_~8N>MlQ3NeLo6D@`Z{Yr;`07kK!2<N_{o<gpLBfe>Q16
z`)78hXECdl-8Q$uUGOI*+(I7nycak!P~<FofyHZ?Gf#LY-t)~%EPPH%7I`(f6u62U
zma)XA@}vkAR5>EPS>`n+IAFq9sMy?YUEtc=zd33wd^_P-o7ANojKEDc7mF8B;~Im{
ztGJW$_Bf7tt>*Rx?ta5Yul0#T1ApvoqJ(;e+WJjxrPL*^-%O|tY$fOijEGqpzW^GN
B+Pwe(

diff --git a/demo/XidDemo.java b/demo/XidDemo.java
index c6cbec9..8a35774 100644
--- a/demo/XidDemo.java
+++ b/demo/XidDemo.java
@@ -207,33 +207,5 @@ class XidDemo
     System.out.println (html);
 
 
-
-    // Populate attributes of Test 03.
-    System.out.println ("----------------------------");
-    datas = new Data ();
-    datas.setAttribute ("<div>", "class", "aDivClass");
-    datas.setAttribute ("<div>", "style", "background-color: #000000;");
-    datas.setAttribute ("number", "style", "background-color: #0000FF;");
-
-    errorMessage = new StringBuffer ();
-    source = new StringBuffer ();
-    source.append ("<div>\n");
-    source.append ("  <h1>one</h1>\n");
-    source.append ("</div>\n");
-    source.append ("<div id=\"number\">\n");
-    source.append ("  <h1>three</h1>\n");
-    source.append ("</div>");
-    htmlSource = source.toString ();
-    html = StringPresenter.doXid (htmlSource, datas, errorMessage);
-    
-    System.out.println (htmlSource);
-    System.out.println ("+");
-    System.out.println ("datas = new Data ();");
-    System.out.println ("datas.setAttribute (\"<div>\", \"class\", \"aDivClass\");");
-    System.out.println ("datas.setAttribute (\"<div>\", \"style\", \"background-color: #000000;\");");
-    System.out.println ("datas.setAttribute (\"number\", \"style\", \"background-color: #0000FF;\");");
-
-    System.out.println ("=>");
-    System.out.println (html);
   }
 }
diff --git a/src/fr/devinsy/xid/Data.java b/src/fr/devinsy/xid/Data.java
index e20a4ba..24ab8ee 100644
--- a/src/fr/devinsy/xid/Data.java
+++ b/src/fr/devinsy/xid/Data.java
@@ -8,7 +8,6 @@ package fr.devinsy.xid;
 public class Data
 {
 	protected IdsDataById idsDataById;
-	protected TagsDataById tagsDataById;
 
 
 	/**
@@ -17,7 +16,6 @@ public class Data
 	public Data ()
 	{
 		this.idsDataById = new IdsDataById ();
-		this.tagsDataById = new TagsDataById ();
 	}
 
 
@@ -35,20 +33,6 @@ public class Data
 	}
 
 
-	/**
-	 *
-	 */
-	public TagsDataById getTagsDataById ()
-	{
-		TagsDataById result;
-
-		result = this.tagsDataById;
-
-		//
-		return (result);
-	}
-
-
 	/**
 	 *
 	 */
@@ -160,25 +144,9 @@ public class Data
 	 */
 	public void setContent (String id, String content)
 	{
-		if (id.startsWith ("<"))
-		{
-			String tagName = id.substring (1, id.length () - 1);
+		IdData idData = this.getIdData (id);
 
-			TagData tag = this.tagsDataById.getId (tagName);
-			if (tag == null)
-			{
-				tag = new TagData ();
-				this.tagsDataById.setId (tagName, tag);
-			}
-
-			tag.setContent (content);
-		}
-		else
-		{
-			IdData idData = this.getIdData (id);
-
-			idData.setContent (content);
-		}
+		idData.setContent (content);
 	}
 
 
@@ -247,25 +215,9 @@ public class Data
 	 */
 	public void setAttribute (String id, String label, String value)
 	{
-		if (id.startsWith ("<"))
-		{
-			String tagName = id.substring (1, id.length () - 1);
+		IdData tag = this.getIdData (id);
 
-			TagData tag = this.tagsDataById.getId (tagName);
-			if (tag == null)
-			{
-				tag = new TagData ();
-				this.tagsDataById.setId (tagName, tag);
-			}
-
-			tag.getAttributes ().setAttribute (label, value);
-		}
-		else
-		{
-			IdData tag = this.getIdData (id);
-
-			tag.getAttributes ().setAttribute (label, value);
-		}
+		tag.getAttributes ().setAttribute (label, value);
 	}
 
 
diff --git a/src/fr/devinsy/xid/DomPresenter.java b/src/fr/devinsy/xid/DomPresenter.java
index e0f5e0c..ddf84e9 100644
--- a/src/fr/devinsy/xid/DomPresenter.java
+++ b/src/fr/devinsy/xid/DomPresenter.java
@@ -140,13 +140,13 @@ public class DomPresenter extends Presenter
 	 */
 	public StringBuffer doXid (Data datas, StringBuffer errorOutput)
 	{
-		return (doXid (datas.getIdsDataById (), datas.getTagsDataById (), errorOutput));
+		return (doXid (datas.getIdsDataById (), errorOutput));
 	}
 
 	/*
 	 *
 	 */
-	public StringBuffer doXid (IdsDataById datas, TagsDataById tagsData, StringBuffer errorOutput)
+	public StringBuffer doXid (IdsDataById datas, StringBuffer errorOutput)
 	{
 		StringBuffer result;
 
@@ -160,7 +160,7 @@ public class DomPresenter extends Presenter
 		else
 		{
 			// Build the web page.
-			result = Presenter.doXid (this.doc, datas, tagsData, this.webappPath, errorOutput);
+			result = Presenter.doXid (this.doc, datas, this.webappPath, errorOutput);
 		}
 
 		//
@@ -172,18 +172,10 @@ public class DomPresenter extends Presenter
 	 * Xid a file with data.
 	 */
 	static public StringBuffer doXid (Document doc, IdsDataById datas, String webappPath, StringBuffer errorOutput)
-	{
-		return (doXid (doc, datas, null, webappPath, errorOutput));
-	}
-
-	/*
-	 * Xid a file with data.
-	 */
-	static public StringBuffer doXid (Document doc, IdsDataById datas, TagsDataById tagsData, String webappPath, StringBuffer errorOutput)
 	{
 		StringBuffer result;
 
-		result = Presenter.process (doc, datas, tagsData, webappPath, errorOutput);
+		result = Presenter.process (doc, datas, webappPath, errorOutput);
 
 		//
 		return (result);
diff --git a/src/fr/devinsy/xid/FilePresenter.java b/src/fr/devinsy/xid/FilePresenter.java
index bfbb82a..21120f8 100644
--- a/src/fr/devinsy/xid/FilePresenter.java
+++ b/src/fr/devinsy/xid/FilePresenter.java
@@ -91,14 +91,14 @@ public class FilePresenter extends DomPresenter
 	 */
 	public StringBuffer doXid (Data datas, StringBuffer errorOutput)
 	{
-		return (doXid (datas.getIdsDataById (), datas.getTagsDataById (), errorOutput));
+		return (doXid (datas.getIdsDataById (), errorOutput));
 	}
 
 
 	/*
 	 *
 	 */
-	public StringBuffer doXid (IdsDataById datas, TagsDataById tagsData, StringBuffer errorOutput)
+	public StringBuffer doXid (IdsDataById datas, StringBuffer errorOutput)
 	{
 		StringBuffer result;
 
@@ -134,7 +134,7 @@ public class FilePresenter extends DomPresenter
 		}
 
 		// Build the web page.
-		result = Presenter.doXid (doc, datas, tagsData, this.webappPath, errorOutput);
+		result = Presenter.doXid (doc, datas, this.webappPath, errorOutput);
 
 		//
 		return (result);
@@ -158,7 +158,7 @@ public class FilePresenter extends DomPresenter
 		{
 			Presenter.addMetaTag (doc, "generator", "XID 0.0");
 
-			result = Presenter.doXid (doc, null, null, webappPath, errorOutput);
+			result = Presenter.doXid (doc, null, webappPath, errorOutput);
 		}
 
 		//
diff --git a/src/fr/devinsy/xid/Presenter.java b/src/fr/devinsy/xid/Presenter.java
index ec828b0..6f8b5c6 100644
--- a/src/fr/devinsy/xid/Presenter.java
+++ b/src/fr/devinsy/xid/Presenter.java
@@ -54,18 +54,10 @@ public class Presenter
 	 * Xid a file with data.
 	 */
 	static public StringBuffer doXid (Document doc, IdsDataById datas, String webappPath, StringBuffer errorOutput)
-	{
-		return (doXid (doc, datas, null, webappPath, errorOutput));
-	}
-
-	/*
-	 * Xid a file with data.
-	 */
-	static public StringBuffer doXid (Document doc, IdsDataById datas, TagsDataById tagsData, String webappPath, StringBuffer errorOutput)
 	{
 		StringBuffer result;
 
-		result = Presenter.process (doc, datas, tagsData, webappPath, errorOutput);
+		result = Presenter.process (doc, datas, webappPath, errorOutput);
 
 		//
 		return (result);
@@ -153,11 +145,11 @@ public class Presenter
 	/*
 	 *
 	 */
-	static protected StringBuffer processChildren (Node node, IdsDataById datas,  TagsDataById tagsData, String webappPath, StringBuffer errorOutput)
+	static protected StringBuffer processChildren (Node node, IdsDataById datas, String webappPath, StringBuffer errorOutput)
 	{
 		StringBuffer result;
 
-		result = processChildren (node, datas, tagsData, webappPath, "", errorOutput);
+		result = processChildren (node, datas, webappPath, "", errorOutput);
 
 		//
 		return (result);
@@ -169,7 +161,6 @@ public class Presenter
 	 */
 	static protected StringBuffer processChildren (Node node,
 													IdsDataById datas,
-													TagsDataById tagsData,
 													String webappPath,
 													String suffix,
 													StringBuffer errorOutput)
@@ -228,12 +219,12 @@ public class Presenter
 					lineCounter += 1;
 					if (lineCounter == 1)
 					{
-						result.append (process (children.item (childIndex), datas, tagsData, webappPath, suffix, errorOutput));
+						result.append (process (children.item (childIndex), datas, webappPath, suffix, errorOutput));
 					}
 				}
 				else
 				{
-					result.append (process (children.item (childIndex), datas, tagsData, webappPath, suffix, errorOutput));
+					result.append (process (children.item (childIndex), datas, webappPath, suffix, errorOutput));
 				}	    
 			}
 			break;
@@ -248,12 +239,12 @@ public class Presenter
 
 					if ((lineCounter == 1) || (lineCounter == 2))
 					{
-						result.append (process (children.item (childIndex), datas, tagsData, webappPath, suffix, errorOutput));
+						result.append (process (children.item (childIndex), datas, webappPath, suffix, errorOutput));
 					}
 				}
 				else
 				{
-					result.append (process (children.item (childIndex), datas, tagsData, webappPath, suffix, errorOutput));
+					result.append (process (children.item (childIndex), datas, webappPath, suffix, errorOutput));
 				}
 			}
 			break;
@@ -268,12 +259,12 @@ public class Presenter
 					if ((attrs2 != null) &&
 							(attrs2.getNamedItem ("id") != null))
 					{
-						result.append (process (children.item (childIndex), datas, tagsData, webappPath, suffix, errorOutput));
+						result.append (process (children.item (childIndex), datas, webappPath, suffix, errorOutput));
 					}
 				}
 				else
 				{
-					result.append (process (children.item (childIndex), datas, tagsData, webappPath, suffix, errorOutput));
+					result.append (process (children.item (childIndex), datas, webappPath, suffix, errorOutput));
 				}
 			}
 			break;
@@ -287,12 +278,12 @@ public class Presenter
 					if ((attrs2 == null) ||
 							(attrs2.getNamedItem ("id") == null))
 					{
-						result.append (process (children.item(childIndex), datas, tagsData, webappPath, suffix, errorOutput));
+						result.append (process (children.item(childIndex), datas, webappPath, suffix, errorOutput));
 					}
 				}
 				else
 				{
-					result.append (process (children.item (childIndex), datas, tagsData, webappPath, suffix, errorOutput));
+					result.append (process (children.item (childIndex), datas, webappPath, suffix, errorOutput));
 				}
 			}
 			break;
@@ -300,7 +291,7 @@ public class Presenter
 		case ALL_ROWS:
 			for (int childIndex = 0; childIndex < childrenCount; childIndex++)
 			{
-				result.append (process (children.item(childIndex), datas, tagsData, webappPath, suffix, errorOutput));
+				result.append (process (children.item(childIndex), datas, webappPath, suffix, errorOutput));
 			}
 			break;
 		}
@@ -322,7 +313,6 @@ public class Presenter
 			NamedNodeMap attrMap,
 			Node idAttr,
 			IdsDataById datas,
-			TagsDataById tagsData,
 			String webappPath,
 			StringBuffer errorOutput)
 	{
@@ -352,7 +342,7 @@ public class Presenter
 				(attrMap.getNamedItem ("data") == null))
 		{
 			// STU: do default action.
-			Presenter.processElementBasically (node, datas, tagsData, webappPath, errorOutput);
+			Presenter.processElementBasically (node, datas, webappPath, errorOutput);
 		}
 		else
 		{
@@ -411,7 +401,7 @@ public class Presenter
 					int childCount = bodyChildren.getLength ();
 					for (int childCounter = 0; childCounter < childCount; childCounter++)
 					{
-						result.append (process (bodyChildren.item (childCounter), datas, tagsData, webappPath, errorOutput));
+						result.append (process (bodyChildren.item (childCounter), datas, webappPath, errorOutput));
 					}
 				}
 			}
@@ -447,7 +437,7 @@ public class Presenter
 	{
 		StringBuffer result;
 
-		result = processElementWithId (node, attrs, idAttr, datas, null, "", webappPath, errorOutput);
+		result = processElementWithId (node, attrs, idAttr, datas, "", webappPath, errorOutput);
 
 		//
 		return (result);
@@ -469,7 +459,6 @@ public class Presenter
 			NamedNodeMap attrs,
 			Node idAttr,
 			IdsDataById datas,
-			TagsDataById tagsData,
 			String webappPath,
 			String suffix,
 			StringBuffer errorOutput)
@@ -481,7 +470,7 @@ public class Presenter
 
 		if (tag.equals ("object"))
 		{
-			result.append (processObjectTag (node, attrs, idAttr, datas, tagsData, webappPath, errorOutput));
+			result.append (processObjectTag (node, attrs, idAttr, datas, webappPath, errorOutput));
 		}
 		else
 		{
@@ -494,7 +483,7 @@ public class Presenter
 
 			if (dataCore == null)
 			{
-				result.append (Presenter.processElementBasically (node, datas, tagsData, webappPath, suffix, errorOutput));
+				result.append (Presenter.processElementBasically (node, datas, webappPath, suffix, errorOutput));
 			}
 			else if (dataCore instanceof IdData)
 			{
@@ -518,25 +507,7 @@ public class Presenter
 					result.append (node.getNodeName());
 
 					// Build attributes.
-					Attributes tagAttributes;
-					if (tagsData == null)
-					{
-						tagAttributes = null;
-					}
-					else
-					{
-						TagData tagData = tagsData.getId (node.getNodeName ());
-						if (tagData == null)
-						{
-							tagAttributes = null;
-						}
-						else
-						{
-							tagAttributes = tagData.getAttributes ();
-						}
-					}
-
-					result.append (processAttributes (attrs, data.getAttributes (), tagAttributes, suffix));
+					result.append (processAttributes (attrs, data.getAttributes (), suffix));
 
 					if ((node.getChildNodes () == null) &&
 							((data == null) || (data.display () == null)))
@@ -554,7 +525,7 @@ public class Presenter
 						if ((data == null) ||
 								(data.display () == null))
 						{
-							result.append (processChildren (node, datas, tagsData, webappPath, suffix, errorOutput));
+							result.append (processChildren (node, datas, webappPath, suffix, errorOutput));
 						}
 						else
 						{
@@ -583,26 +554,7 @@ public class Presenter
 						result.append ("<");
 						result.append (node.getNodeName());
 
-						// Build attributes.
-						Attributes tagAttributes;
-						if (tagsData == null)
-						{
-							tagAttributes = null;
-						}
-						else
-						{
-							TagData tagData = tagsData.getId (node.getNodeName ());
-							if (tagData == null)
-							{
-								tagAttributes = null;
-							}
-							else
-							{
-								tagAttributes = tagData.getAttributes ();
-							}
-						}
-
-						result.append (processAttributes (attrs, data.getAttributes (), tagAttributes, Integer.toString (nLine)));
+						result.append (processAttributes (attrs, data.getAttributes (), Integer.toString (nLine)));
 
 						if ((node.getChildNodes () == null) &&
 								((data == null) || (data.display () == null)))
@@ -620,7 +572,7 @@ public class Presenter
 							// Insert data.
 							if ((data == null) || (data.display () == null))
 							{
-								result.append (processChildren (node, datas, tagsData, webappPath, suffix, errorOutput));
+								result.append (processChildren (node, datas, webappPath, suffix, errorOutput));
 							}
 							else
 							{
@@ -638,7 +590,7 @@ public class Presenter
 						// Manage a Hashmap.
 						IdsDataById data = (IdsDataById) tags.elementAt (nLine);
 
-						result.append (Presenter.processElementWithId (node, attrs, idAttr, data, tagsData, webappPath, Integer.toString (nLine), errorOutput));
+						result.append (Presenter.processElementWithId (node, attrs, idAttr, data, webappPath, Integer.toString (nLine), errorOutput));
 						result.append ('\n');
 					}
 				}
@@ -659,11 +611,11 @@ public class Presenter
 	/**
 	 * 
 	 */
-	static protected StringBuffer process (Node node, IdsDataById datas,  TagsDataById tagsData, String webappPath, StringBuffer errorOutput)
+	static protected StringBuffer process (Node node, IdsDataById datas, String webappPath, StringBuffer errorOutput)
 	{
 		StringBuffer result;
 
-		result = Presenter.process (node, datas, tagsData, webappPath, "", errorOutput);
+		result = Presenter.process (node, datas, webappPath, "", errorOutput);
 
 		//
 		return (result);
@@ -674,7 +626,7 @@ public class Presenter
 	 * Recursive method that processes a node and any child nodes.
 	 * 
 	 */
-	static protected StringBuffer process (Node node, IdsDataById datas,  TagsDataById tagsData, String webappPath, String suffix, StringBuffer errorOutput)
+	static protected StringBuffer process (Node node, IdsDataById datas, String webappPath, String suffix, StringBuffer errorOutput)
 	{
 		logger.debug ("Enter");
 		String TRANSITIONAL_DTD = "xhtml1-transitional.dtd";
@@ -718,7 +670,7 @@ public class Presenter
 						// Log.write(Log.TRACE,"systemId = " + systemId);
 					}
 
-					result.append (Presenter.process (((Document) node).getDocumentElement(), datas, tagsData, webappPath, suffix, errorOutput));
+					result.append (Presenter.process (((Document) node).getDocumentElement(), datas, webappPath, suffix, errorOutput));
 
 					break;
 				}
@@ -736,7 +688,6 @@ public class Presenter
 								attrs,
 								idAttr,
 								datas,
-								tagsData,
 								webappPath,
 								suffix,
 								errorOutput));
@@ -748,11 +699,11 @@ public class Presenter
 
 						if (tag.equals ("object"))
 						{
-							result.append (processObjectTag (node, attrs, idAttr, datas, tagsData, webappPath, errorOutput));
+							result.append (processObjectTag (node, attrs, idAttr, datas, webappPath, errorOutput));
 						}
 						else
 						{
-							result.append (Presenter.processElementBasically (node, datas, tagsData, webappPath, suffix, errorOutput));
+							result.append (Presenter.processElementBasically (node, datas, webappPath, suffix, errorOutput));
 						}
 					}
 
@@ -820,11 +771,11 @@ public class Presenter
 	/*
 	 *
 	 */
-	static StringBuffer processElementBasically (Node node, IdsDataById datas,  TagsDataById tagsData, String webappPath, StringBuffer errorOutput)
+	static StringBuffer processElementBasically (Node node, IdsDataById datas, String webappPath, StringBuffer errorOutput)
 	{
 		StringBuffer result;
 
-		result = processElementBasically (node, datas, tagsData, webappPath, "", errorOutput);
+		result = processElementBasically (node, datas, webappPath, "", errorOutput);
 
 		//
 		return (result);
@@ -834,7 +785,7 @@ public class Presenter
 	/*
 	 *
 	 */
-	static StringBuffer processElementBasically (Node node, IdsDataById datas,  TagsDataById tagsData, String webappPath, String suffix, StringBuffer errorOutput)
+	static StringBuffer processElementBasically (Node node, IdsDataById datas, String webappPath, String suffix, StringBuffer errorOutput)
 	{
 		StringBuffer result;
 		result = new StringBuffer ();
@@ -843,30 +794,6 @@ public class Presenter
 		result.append ('<');
 		result.append (node.getNodeName());
 
-		// Build the tag attributes.
-		Attributes tagAttributes;
-		if (tagsData == null)
-		{
-			tagAttributes = null;
-		}
-		else
-		{
-			TagData tagData = tagsData.getId (node.getNodeName ());
-			if (tagData == null)
-			{
-				tagAttributes = null;
-			}
-			else
-			{
-				tagAttributes = tagData.getAttributes ();
-			}
-		}
-
-		result.append (processAttributes (node.getAttributes (),
-				tagAttributes,
-				null,
-				suffix));
-
 		//
 		if (node.getChildNodes () == null)
 		{
@@ -876,7 +803,7 @@ public class Presenter
 		{
 			result.append('>');
 
-			result.append (processChildren (node, datas, tagsData, webappPath, suffix, errorOutput));
+			result.append (processChildren (node, datas, webappPath, suffix, errorOutput));
 
 			result.append("</");
 			result.append(node.getNodeName());
diff --git a/src/fr/devinsy/xid/StringPresenter.java b/src/fr/devinsy/xid/StringPresenter.java
index 42ada00..74b2348 100644
--- a/src/fr/devinsy/xid/StringPresenter.java
+++ b/src/fr/devinsy/xid/StringPresenter.java
@@ -87,13 +87,13 @@ public class StringPresenter extends DomPresenter
 	 */
 	public StringBuffer doXid (Data datas, StringBuffer errorOutput)
 	{
-		return (doXid (datas.getIdsDataById (), datas.getTagsDataById (), errorOutput));
+		return (doXid (datas.getIdsDataById (), errorOutput));
 	}
 
 	/*
 	 *
 	 */
-	public StringBuffer doXid (IdsDataById datas, TagsDataById tagsData, StringBuffer errorOutput)
+	public StringBuffer doXid (IdsDataById datas, StringBuffer errorOutput)
 	{
 		StringBuffer result;
 
@@ -119,7 +119,7 @@ public class StringPresenter extends DomPresenter
 		}
 
 		StringBuffer htmlTarget;
-		htmlTarget = Presenter.doXid (doc, datas, tagsData, this.webappPath, errorOutput);
+		htmlTarget = Presenter.doXid (doc, datas, this.webappPath, errorOutput);
 
 		if (htmlTarget == null)
 		{
@@ -156,7 +156,7 @@ public class StringPresenter extends DomPresenter
 	 */
 	static public StringBuffer doXid (String html, Data datas, StringBuffer errorOutput)
 	{
-		return (doXid (html, datas.getIdsDataById (), datas.getTagsDataById (), "", errorOutput));
+		return (doXid (html, datas.getIdsDataById (), "", errorOutput));
 	}
 
 
@@ -165,7 +165,7 @@ public class StringPresenter extends DomPresenter
 	 */
 	static public StringBuffer doXid (String html, Data datas, String webappPath, StringBuffer errorOutput)
 	{
-		return (doXid (html, datas.getIdsDataById (), datas.getTagsDataById (), webappPath, errorOutput));
+		return (doXid (html, datas.getIdsDataById (), webappPath, errorOutput));
 	}
 
 
@@ -173,21 +173,12 @@ public class StringPresenter extends DomPresenter
 	 * Xid a string with html in.
 	 */
 	static public StringBuffer doXid (String html, IdsDataById datas, String webappPath, StringBuffer errorOutput)
-	{
-		return (doXid (html, datas, null, webappPath, errorOutput));
-	}
-
-
-	/*
-	 * Xid a string with html in.
-	 */
-	static public StringBuffer doXid (String html, IdsDataById datas, TagsDataById tagsData, String webappPath, StringBuffer errorOutput)
 	{
 		StringBuffer result;
 
 		StringPresenter presenter = new StringPresenter (webappPath, html);
 
-		result = presenter.doXid (datas, tagsData, errorOutput);
+		result = presenter.doXid (datas, errorOutput);
 
 		//
 		return (result);
diff --git a/src/fr/devinsy/xid/TagsDataById.java b/src/fr/devinsy/xid/TagsDataById.java
deleted file mode 100644
index 1d1b9c4..0000000
--- a/src/fr/devinsy/xid/TagsDataById.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package fr.devinsy.xid;
-
-import java.util.*;
-
-
-/*
- *
- */
-public class TagsDataById extends HashMap<String, TagData>
-{
-
-	private static final long serialVersionUID = 7818145931750600119L;
-
-	/*
-	 *
-	 */
-	public TagsDataById ()
-	{
-		super ();
-	}
-
-	/*
-	 *
-	 */
-	public void setId (String id, TagData data)
-	{
-		this.put (id, data);
-	}
-
-	/*
-	 *
-	 */
-	public TagData getId (String id)
-	{
-		TagData result;
-
-		result = this.get (id);
-
-		//
-		return (result);
-	}
-
-}