From 5ce3d6d4b345db2660a4b0fc29fe1e7b11623f51 Mon Sep 17 00:00:00 2001 From: Branislav Stojkovic Date: Sat, 12 Jan 2019 10:46:50 +0100 Subject: [PATCH] consolidate case for property labels --- .../AbstractSchematicLeadedSymbol.java | 2 +- diylc/diylc-library/lib/diylc-core.jar | Bin 251310 -> 251309 bytes .../passive/PotentiometerPanel.java | 4 +- .../diylc/components/passive/Resistor.java | 2 +- .../components/passive/ResistorSymbol.java | 2 +- diylc/diylc-swing/lib/diylc-core.jar | Bin 251310 -> 251309 bytes diylc/diylc-swing/library/main.jar | Bin 489095 -> 489094 bytes .../plugins/toolbox/ComponentTabbedPane.java | 42 ++++++++++++++++-- 8 files changed, 44 insertions(+), 8 deletions(-) diff --git a/diylc/diylc-core/src/org/diylc/components/AbstractSchematicLeadedSymbol.java b/diylc/diylc-core/src/org/diylc/components/AbstractSchematicLeadedSymbol.java index 1114580a..3e593cf5 100644 --- a/diylc/diylc-core/src/org/diylc/components/AbstractSchematicLeadedSymbol.java +++ b/diylc/diylc-core/src/org/diylc/components/AbstractSchematicLeadedSymbol.java @@ -70,7 +70,7 @@ public abstract class AbstractSchematicLeadedSymbol extends AbstractLeadedCom } } - @EditableProperty(name = "Label position") + @EditableProperty(name = "Label Position") public LabelPosition getLabelPosition() { return labelPosition; } diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index d01d01600a0c54eda9de2ac0214ad3f67ee0be6d..c4e6906a7ffee42373a93b7dedadf6895037c5d0 100644 GIT binary patch delta 9022 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 delta 8839 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 { this.power = power; } - @EditableProperty(name = "Power rating") + @EditableProperty(name = "Power Rating") public org.diylc.core.measures.Power getPowerNew() { return powerNew; } diff --git a/diylc/diylc-library/src/org/diylc/components/passive/ResistorSymbol.java b/diylc/diylc-library/src/org/diylc/components/passive/ResistorSymbol.java index 63365b57..264b7e44 100644 --- a/diylc/diylc-library/src/org/diylc/components/passive/ResistorSymbol.java +++ b/diylc/diylc-library/src/org/diylc/components/passive/ResistorSymbol.java @@ -77,7 +77,7 @@ public class ResistorSymbol extends AbstractSchematicLeadedSymbol { this.power = power; } - @EditableProperty(name = "Power rating") + @EditableProperty(name = "Power Rating") public org.diylc.core.measures.Power getPowerNew() { // Backward compatibility if (powerNew == null) { diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index d01d01600a0c54eda9de2ac0214ad3f67ee0be6d..c4e6906a7ffee42373a93b7dedadf6895037c5d0 100644 GIT binary patch delta 9022 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 delta 8839 zcmZWu30#g@7w@?@D8i; zlq{pgAZrYtHOZLINPOqq+cX~he%Cqof0ldhx#v00bKg=^^wLuFTKSBi>RM`QE!EV* z#%yclNal>$*5ecWuk0b&BJr0xAXzPSMWT{iN!S?W6R8stbJ7QiA8|&qmh?cfTC!3` z)#%C`E9(ijv!ib4#aEEkv@05@Xm2EMsV9;y>h4JXqwWHlnM(Do1ZjKCf);4`xYZv> zF6n$k^rCK=gmkCAy*ko7qX<49WRk(H-kHtibf)ECit_X}wtQZ0o5^WJyJ1}an!P8d z`W=2os$AZ&N_Wl}7w>?X{nZ9bYHCA>GAO`syHg8gd`CrQxI-Yq)7QH zCPYe7PTbukyxjW%ne9|+mmX*lH!QR5mBSUwJB%8zXT13jBjbNPVU_AQp~Q8TQ|r^Q zwr_LRICVdGYjdJWiAm9pl7JDaNq644)Z9tkVRkb#;z!?}`_ucZ9HDCPh^Q$tn^rvW zq~GEE=YtxT1yqLDojj1SZtwJA<1VeMSgSv}dgpU8s3)12;XnK7|Xc7pkV z8-`o_`dSS5`_Yn1$3GfJ44Y9~h4qHeG9e$D8YddUpw*_g}|!=MUMpo<8r8 zKJV_IYr54M_Pz|GuJ4#;G5S&UJHL|D@H)%Qd>zZc8V| zT8@j{a)ph^`K+F*D7pWjAlQ6L`0Rp##WUaMzL`1b{_N+Wd)H?Tc`<+I)rB+GRlF;B zG^y{s6CRsPoO*7lTez`2XV;L5fV5}pkN9+vr-`@CTC)JAn z_QqAWyX9E=d6+DHzT?rs^#5Fa=&~-~EK>hiW`{ejcMpv1X&v!m_oIWG4yatMYTu9R z6c_$q@0r#m))5=?gVv`W=z2^y`S(T79Cj{$`^5cT2d}J&4R#xqlgyKPPQF{I75dwv zh3#xFTv;3X_R5Ue?GHcfJmb-kl$j5 z*JT%17*DMUHoiaXZR+MFw*Bt=zKPxUG$v?*=g#p(PwU%+&-$s=vu?jE4Grqz@+mHH z>yE_Y>8Flp|`Tvhk4J& zC3{^Tk~7h*`z52^%Z5zy2}_zmA4nHE5B9Uz46y_ z=LLFG;`3Z0&GUa{XX~`CC^h$mNfye*`+mhL{j{$muiB1rdwA6s#dqb^{db}nf8-34 zocUAJ|1jlraI!9^<5RMcDs|HCA$gTnf!@xhi)X;-1Uz#vU!1jG8=p1lOaOnz0*h{N z>s}W$xc31i=6pW+BCG=X8!v6*)a2?t9>rhf&?f*lt2~BOd7S(wN3Suz^Hr1| zZ#JS*!!76g6e&(nsd4w-m#TqQ*#@IAh@_edaor{!#-+%mSqIoVgbWQEi3ycbI5T*zw3RbA7D(H_C!b{G<9l#h^5oua?@LQLv+tqg$xrJ}y);OHS+V;lLFoeX__MT)Gm9xH zKM|8+o&NS+i6`WaaM1JJVLsMeMnHHAB5g$yIyA}D4BSAK#C1--$ zl6joD-<}NTjI$$2O>#K1*^|_9X5~QAhckJD zNjhINWGD&bNx14o7KjRKQEXzi4n8M-l| z8jB#cTm8sPF8kn5BE<2ZY^U$l4UXTP)qR%CSk!r{t;z@>{kYnjz^28=PA7vn5;KD^ z&UE^jL~-U!DCxl${(Cmj#U7wigb{Vl=*=au*dARcQaAwLLQpwvvmsnEDk;eVRha;mC2sC3b zpPERFIrB>r*~=NjBjg-sZX6{^oLQMljCd3~GKh-%8Fhl>;Fpc6LB~ZxQSX>6NR3)oZ8@@o9232upt%6#Me&`<&`+69t zW~;Mk1+`aIXj6Z#;;Kt|qgUnXQ_7<%G=yZ~iY3PMKb&zhqyO_lq~kO?5Wlok!Lz9b zSDrtY!Xp95>jkv91v1%7=`C)xZ3X=WyS_@XhWc=3QUslfTVVO?X)mmi|E;I}k@ng^ z-H`@wpxu#rMp7$QxPdz0_50ngrTq(hN{(f3F}--^XY zQahX!MZ$+UIH8*a<({W*0?#1axQPx&dVLf1M%sQegah=a&C~;pk~UL6q>Y>D6r=%B zf}W0|Kj7SC3-v)dvx(+zq2qCG5Dk7&Kbnq0dMuibMEW5bA_qEjtMD7QmCnYw-ZnZD z>5^@94ALu2)NVVSfb(VB#X48E3%Q+A_zzV=+#o-#6#k5N&|x^Ax`WO`TDgOcL+ZFw z*e}~D;<&g|*qQGVbk;5*&)X&9YsthqlbNtT!Ds;bF^CcKpJJ#l<|#LZPDE<58{z~S zwwnebt=LUxA?>>d@&z<@kHA0gp>w$2UV&c&`tNr+>#>gp*y3AwUxnA?DrhwypkRBb z{rm6W>bLv0&$Usy##*rGJrpaEHSD8S#42w4TvO&A3pX=>0%HL>6%UZIKha`wvD5|O zD*#Ki?0GEhhMTe557U;+b3g5DgKx7N163~PVNpkDOYQz$Q|;jDZY=sArHT*lhF=3E zFHmYLQ|iqg?5CZ$rwF~oE{h>_mlj_u4QK9gO-g^i|6V5+JXFJIFY`p$syN!!7Gv7< z-q1A~goQ9V%9I|aDI3!qS$w?6f_6M?IXhiho^IvrGeUy?g16$9a4UB4UbF4+59Sa~ z3dHOxbE05j@lffIn>4f!&0=%oshKi9OM^W}$B?D>DEO;TX>i6y<`|=k&X3MX0LKGi zpB6I5<5^$=#oIXBlmJHMds{9IoDj32(1yU z;}XGIr;=mUiL@3CBopt4>&1z8O_!va(nf+mEg04Ld17`IUFiW=ZFf~Ig8nK3F94iH$ zC#}xaPH!bviKd#GgKRq)FG16SwK)P-=n?6Hx_>Y&w(pw(8V8rBBnHdr_J1x#oj!V5&uiz|I=ni;shRzc)|znqa>MH+F)s4&I)pg zftA+48OTd!ID>CQUNRm>!O-b5o2wz&vz13_YaXX|)`E$%!0I)eoV-5#G??!(YM~5o z)N0P)OZ1^oZ~=pRgcfs45zmK53P?(IgrreN(q+q!3CUKJMC%JlX^J?C2MBgEK+ula z9HXuIHkxl85R5!&@0rgr+7nYAc?>L5OqoGCHDq}>fdaXOG|IjSw3igJasUOpR9w$N zD2z#^hPeWh>Y60lX&^b+=?lrt zPLKkhG?9WSC{FL%EVf2(X$Thd5a9hZNCEbee=kOGIg*8Ri|MC}4}sq4VCm+GmPRbV zQ_^8e(rGKcqXSnBOn-#RoeINDX8zP$=;x%<*0}r?bg~BCW$5HHfPDGKs@ORfAsgpm z$Xl5nbI%a1Y*GeT>ie@!8PtSDXEa%QWOrT?39GJy(MGni4m*=UU2)CVXjvJ^&Sp?! z*7i7*Aa42JE8EvG|93hrV#H>GD%vkU4)zOY2r%s*`^vyYJ`7gf4#QHm^66P3yDw%z zr8XWHhoOA}oJ55RiN^_Q&V$Hy-BvUa9E^t{-+1r2LUqFlYK%d|q5b6r0=#wt+6aKp z5e!_^1TK{n%s!JEp`>>vNDeG*mKd<*nIe!#l*FxQmMGZoDv72X zE0x%214{g|nk5=6DhocU`koTv5vM>LuR^gA`%NXa{N|g~`)Z(!+{Fsx*e{>d^< zQD;oYUG!p8z>c2+FM2uDkOv;~bkqyZK%a)aFbuMJ5e=cpw z;F_<_QgTFiIVi5a-YizIcRAt&baFv*;bybMjxRa5@B6Zr5GaKqU-CLzl`ED^K}+NN z;y~}@QX_sKWu3L2Pzdys-q#1R?V(T&%cCurL!Ky=etF=eyuMjtiD`&J(Bxw?*n$-` zsaK<<`m>N|=TlQ2Z4d2Y=d}0ZwIlp zfg%3_o@*q`;*5yVH)hAI+Aetr(PGr?WZSx7+H9u5TneZe-{JNj=K0ow-cxwF%AbV~ z7DC^_lIVU@m|HUxGwNW87vC(?o@Ep?-5Cr+T5l}_g<=?OWwH1%sj%rw|60h}U-)kw zuuu7O8_0YMsXIR`m;8>dMxdYvLta`{EWS{b)}=y7sjVYRD1_%=v?I~@`fYD;1{8jC z5elDNh$b6;Mx5IOlq9(eNhD6-h>jpV*F}KUXPUYcfB* zp`<0-eXi*hzhmco^?s0@-Z137yU0uE-#jOxtwkrjMhOsprn11z_Q6Km;4Q$AqNe9k zr|RnK#o%y040-!GG)Aaq7Ex2Q=Z$)Tp8(-!EfZc`Kc>EO_XXRL-vssAU#MD7giUy# z7m1mC9)egDASCdkmnnDhoyVJbZJ~m!zp0`pfkO4hd1}p7$=+^etza!p81k3mu<1gz zW3lL9{fc3!s2KtbD;AsBh+v1Go52>Wu(+w68v71B{1Hm{&u<=+lk80~|C1-PyTEVI zo)@4V;gfV0OzEdNgjs}=Dq@fD-k&%%_Z6F#S^aj_fy=7&6@wA+{<3apHn6 z#P=2u0~XvQUV`F37JVVMS^S0dO%y*{(JXGuzn}9TWZrlMvHL@1b(cMcqnK|g9gJbc zl!E1!HE3zi;@6TE?0zX!21puE6128iV#KT~MXXaVg5=RIlyqe688Ks9%7mm0B^oh8 zqE|-kcpUl%*yIve|0N6$Ssb0&=rZxE)xI*Y9J@!XcCQS6v4apkBj^yz5`KdhtbZ)g zlRep>;ByHS>h}wUy34dR+jWWJ@0BbCCEq7}A$bE5e#e=ebI{>3q$C-NMSk%gm-vPL z$jic0&}Hxxob-hxEeTpk+GVljd=$4l(kyPz*YJLEA!IVtZ5#LvK)%N1qs^+VnO+Lf zly!2vy)B;}RdoeycfgDE+ z3#|!PsV&+sMM>isA$f3)=(7B);x2j{CF$pyB}UD+&Q8C9WZ69-Id+feGj9fWe~f-q zozc!iklhH_fx9gFWi0+T+7FkkLGwBFXzs)uuZey1y$0Z7b(V3BnzEznaF%$-$}ixBEd3h%gaSUFa&v_+4=bk%)}dS+V4reu%(R;&{HneM!M3{1pn?VH zQq8aHs|K~w^}o=vses0S`}`r(aY`}lb2e0w{574$d@JCGDpYb?rLSQRf#-drlyCfn z(_(Ond#J8}<=UAwOIkA1N|7ArN|0Dh6OzD6+RhH$E4r0cT?Y4da2JrjIs#|YT?^rL zxOFzw{(4j8;7gjxYAfk?xTsAPw5vZBpuP+aOA1Szy$&Y^+XrwpP$(d@ z2*!$_U`7c7>bh9;U;W`-l|WD!sZKBz1bkhw*uQPck#ZpT7O70&kq3o2N&+vME~1EN zK$*&5i3H^W^B@Y8wH!m_po|t1g7oE*JVao-UqJ@}O6ud;kgQNCfuzBSGzL)r#!4AX zsfodP2u!7E$x{w$vxc}KD5|Z*Or+E}>drI5U|*%PsTWwmDgaIrSn{TaVWEtmgIu~l z)N#eFc~Y>QR7nnXoLm101GY~;P(ngPAxp!_Y{W2_0X6Vg62S@!*msMMCEOYEdSL}$r3N)^?(j2^hQ$j$PY-H-;NVV>#y%dN z4i>!S(+xN&#QgOZoE-XqErjnuHb0BuYtV<)GI%lc;c6w^nuQ!3hVe}cIVS`R){%Wr zg$>a>FfR;nQ69+(EV#pIS_)7I0VtS0EP_xaCK3b+9EuhW3dBpoR9F|zSq|cW!BS2F z*CgPqxorq6@bCndvPGI25zhhI-j_sJLj97+AiSV-!}Rcr0)#pY5Y^z!ZE6oMM^F^NI^gnW$S5T}_yy2={} zLqd3Fq*Uf?^f1_%$RFpzlUULg@mmNnXfW&>en;2Ph=_$)Bp)EEAl^5v2rL^&_x>ef zff9;E^v1kQApRk7ks71}moifeav2c~O`W(61Utk~xP>5vX2ad@h!W_785#*K&6aW^ zWDy0(smqA8CK$6IuTtWlF)iXE$Zl|Tw0xFACZfR)q4G#ND)2+94w5hhXHAhC&|Dm{ zMWP|*iF3#ZC|YATBsUaoKs+*lki76SUXvPpr>gr1dibn29b)ZW@nE@UG7}x;`u00Aa{+}#_$cy z;Cwt^<1t0C$vfvW&^N+$bk-i!P^^skwEsNiFLmvFf#bWQE3Zx{aNYEM8&H`qRN3RBX%5`F%*GKhG zGnv@C*Y2Q^=SFO1|;XsOFP?kk>;G%ote%}-_K1{RDoM9MgB~EcbA_U7Y?(T zZ$_ZA2Z2%R@|!I8X9kSVzI`cz*MBsKsopoQWL*^~z^w8V)X{B)!fl9KPd}PO zgpDhNO!F_0z+Vx4t%&m{ZgqHc9~L9%SU(YpcxXI7wu+f1=XJ02zxynFHAZ2+bi(QG zkXB6nivx3qO2Jj(w1ZW)k3Wxh8MmzNDZ|vb4i9#b4g0t)3*Ab?6`nLo8TMPWLub9t z=$x$gB0sqEeZY;Y(% z{T>KyPm=!m>M-SLH}%c>wL_Nfx^33u-TkE@N8%^ScI`v5pZb3~RPKq|B>LK=_=A$C zmss62mHJoJZsFIF+d}kSms)KbG^O)Y><}#kWP%2s;Z`1 zwNaoSQwaFh{d)ZPx$oD7+pAy88YtxOc?{Q1*x$Ojrsi&PHZQD~+4xgnpz7Rdle>A} zBQ0N@s>uEYgaEk6^D+ZZd)85xog42e(0txpE#S;$b*YtK%S8C^d!K)q_pUsGI>M}| zFESn#g~o?05o=;Ug{*s> z!&lAq^~E1c-Cnw9QfMk;bw|orB}h!2+h(@rg6plD#9f9YIQN{{m&^N^VhI7t=%i6OFVDY&=CP&GnEUtb{lB3F}wn01;#pL@O2#KWfn zCLB$*0HULBapMcCoJll~0=Xnb@Hf`wd)&koZ)nLQIu`cQcG|0M-!f-mJ{39eq1s`Y zJvob8F7UOic_c2%4sCkoOgKt7I9Rdqo}VSx+C~OCK5I>D_TufME7yWmxlJ<+{A{Oj z>D3my6@nFCU%E5DZZ5j->o>8Je%>1x_P6KbG+baPJWF3~p*;TLv4Gi%yqg)>gQxvZ z^xsF}#7bWdv__n3@*dtxO{0!sOU<*c^IbbF(=EK~AlF}tQ`PFdw65nm zHaR&pHr067__N`s@ruaZm+o~u3Da|Jir>EI*L*TrEWRnV{`zplaIt_}Qti?mqjRLf z+i_AlhBd*MJ^|dh<9T^A$FEwwst64}pP6P5?f1dHNjAKA&wHZ0Cg>z*sIGvk%!kOJ zl+US?PtF;AS$g-3aw%qz>4S8{)%!Q{bXB@;9z587zNW|}|Ak%G3%6)1vQ$wObNHAW z_Hf)|NjXy`AZ>D7P|_038H0>-ko7z+)cmQ>6K5*{r3&p*haLgFD9@Yc!0;k%$Y{any2vog+-O?D~(r`e-HQTH_RA-PVsx>ZRTg3@$HN}bBivbfz=FhjU%)5`0$2;A4w-RMI?KD+XkLdnlZQJ-dFjK^a zy{yK{Z_v5gmkh_w`dR-TMecO;BemC-UZVE_@5dV7W=)@MRIW(`cTH?GZxpxj^liwN z89DI>&zjhVAf}j%LItne+@-p@kf!(M^HNu#Y6CED_{odBE+NX6rG9WyE;V}8 z*VxO+OY(kN(Z~F2dqbn<)jlf<+=frIqQC83O}OQ2tTkJTv$tH0LK&u4olWQ8o!%OC zY8Ralxtw}zkL|-IUHHJ@uN-#Wz3`sLzY^s*ABEBh%WLV0U*(_f$*8G*RQNNbvw@Yx z)N*LzeTb$-vW!;pUR>6XXw*Ae>R$iy@MSm8r^7Yj0?LhY+^s`j+U=8Wp!Lz$$J^I? zHjI2VztdiQID-?$k(aZOxLOU@){Ba+OxK;8jj(X4ZF~605mu(TT4{Prk#tI!p7hc8 z2YFjAL7LGPFPl~JT7zWGV_OW5Sn{rzQMYjZsO!l6%uymtBePbZC2Pf9=Q5M<0^|4? z5gc3G(ZG}{&sex7vCgidKHYq|5n2s*~(5){V1Kb1o%-xI|Q6Bh|+0Ufy~BF28NuC~GeHUPXDv1#jk}7BR;0 znOwt_@Lbis^yLeCI6YiLrzWo1ZnZuu`1NJ4kHU0xC)6tfgE;Rq-KgeEWYf!tknD@ChMh>0 z&WYYLORqAjHja7mHnE%%KA=*~5>f$Nf_G{i>#J*Dn^sn>Njs7=)ZD|lq;5WD{$+ta zS^l{2b%k@r_&JfZPkX%gjdT6miN6)BlrE^J*>x1U>DAtBI+;9h#MyKE*JJkYM1~jg z>nzPS`2b;D7Uf5(fj!wZ6#v_CJ(dsI)y?~`;g^dqsVbi$L%jMuwPZz2nkdKeF|4^h zUZX=_!dkkFqL~Dnje=(?d!5h_rktk`lR80R@V?iaS7-I6C76~#vc!?X?V#!6Z(G2bU2V)C<=-o;xlyVLqkKCQcREA0%IPufM~|FYh33 zf)WhGLs5@apbt`=Pbnp8>TnH~P?(3ivz7x@&F}TWQTBQ4x zDJoxdRlKgmv^8&75s`gODO#)%L76@fAB?d-qGETWLnKcro9NSQy9 zd?!{-{f_%d>!6tsM$>iaFi7x45dBZvK2_zyc;*vNsvJKX?YP0C(=SLoh3}I_Ir$+P z7`N=?MAxpHWByr~6o#@&wxU69te94D<_ z&PTqn>^D+Jo_T*IPoC^VZmuctXYHDF4&g)tZ-(REk^f?7;F&YFU!H$jbz`%Pe23CC z0;jjmTu{8kT4bQB_y&*J#31cv7dc(a{!CCbQK)KQOQB>wcTO^09X?P|f;L zrTeI&lm299%36e++%`+zh`WVCq4uqBKGVs^LP&A-rHauj`c9_xO@Nv+=jZE%&jJ*H zU`o?vr?(X_zdlST=Lgo$hPOSPlaGPtqR>vfiNo>w_Sl+rP{J8k)Ci_%x&nCalukyzAAA6hcY|S37T+Ku)X z_e;OUB_2^X7RAKU)T*h!kZpFjYaub_;i0sqA0*I?DF#F=(~Mr&2U?9>+zLJx!dXCd zq2v8>PrmUXR_V>_-p*bDhsI>{ZzAZ2FxFNo#tZhBcj~V1NPH1Cy8eraeHz7Ym zVL!|Hy&}a%-G@zQU#PMI83FR+dED4y14H&qv6;Nx>3xx^a5hHWP-wRP)K6gVBVmCKZNe!RN&>CD^U zhp{-+ug?ZwU){7hW>e=D&gOWm=M8JSz`Vk>nd53D(RYA>K#zK{Jn zvMv=k=NjMnKz!i-2CdmqKebPEZDVc0Z1v`rDK2{(C*}~A8D&GyUi65{_q8eOCVw{7 zQ!}XqS82UsvaDgQFXuA_n9KAqo+%nB=QArP#vXOKO1_DSd+^pUQLFijQ&4VxX;iyU z@?@@8gK)`&8QHL=t->vnVx{J|ycIDofkn|d8$`^9Cuc6D*D^4%4O5*KC1 zD`7MFGBuhX91(%p=932YgQ8_WasN9+C&C}1w|p!_o`nul4Jwf~&YuYk- z_bb1=yv}^T<#M<#kC6@ge99xToN{%ae3^4Mg};8ie)egl%yW+83ldb%$i3UUlzmr< z9Ip;uPScMSxYjoD&Z~1Eadyet-kC)zEAYd3!%O=s@6il3bkE@5#+h;)@>EUrs{3&R zgPE=GLKMa}J9GU{84<6G)n(e(zZ0W(Z4eAUyJ%F$<=LZi z$8h~vycJ5PCsTmDkL)y}?Y=@KS>eUE4s(X-jRHNr^IZW+#7k_K4zoHKtP8ZKj07&` ze_Y}XJVmciEt?v1(VlFDR>#F7h^9dur*}++Qv3Odi@}bj#C$h;Vz;-2*H5LJei0lx zCGiHHNWI8sP&@V-zi7l;ErZPuDUI2lCGy8x9r%6d>~OA^J--CRMwbvP-1?zA9APo? z$QGTJ({lFUQi1*_^N2c*V=j>@2M(q(pIkH8@4Jngm(DL4WcnZTJKKfweQ0MlT!^EW zU-y_cYGalYL|iByajl4GY!<8)G*&Jy^kEx5{mk^V;INQTTkF$W+4VXK<=aGt+831u zPk6*BSXaE=f5E%pBBesde3CcN)xiYz;AV(~;uRJ7e0c%m)--j-MxhU0UO@(SwAm_e7T8YV2+@gMp{(S*qIWQ!5G)iaPBA(^8|T5qTP)hLYx*y`dY#Rh45u z_ip9AK1u2Eo?)zR%zo7uG0Psf*vfpnK3Ux5j=+O^Wg9L@0>^tz;+mxVYu;Ng^{3#r zr|BNJxfU*j3bfvgKvQ;{f`5JW!hPM4>(n~pmcag%uDli3wb;BB7vJ{Cm3PH9>*F5z zpT}1GIMg({E0d*E?wYfXDBBUCY#)VEQ?G}@~nU6sr&eK%RT_lk~r zn=a>AZq~vtK0N#;V{M{Qf7^gr-^}03>9v)(Pc!aq zW}HG@o0kpZvFD33>qEou0&eW?zQ6eJbHi?d496-vONdD2o$>Jx<2>1$-mNW9>CN@> z1u7o8z@)8StJa=&E*_|>qSEq6+ha02J?2n1d#&K8?56qv$%|JsF`h?L+a=Eh7BP&& zsA;pzrVkD9S6VF|k~+A{Ub)OomxrU%aF@h?d~KMx)Y{i@xuf_}qUrDu)tyq=q_zl= z1g(VFw_aHd(Z6nJqETw zUp4uB;D_P2Z;nc_bjl@+)vKt=q{yGOO@<1iLTS|3bndL=grMm6h30BjBzA%)vrdqu zb(qoxe9I3g6f)fLeC|%)g4{_qfh`8&zC{laAEgmn&<0^QF28mb`^xpsHkGu`PXaH*$1UtW43cFxAMx-t7z z!>1YFD5{L`QRTrmla@7~0*RE&HEhy(rCn4|K3@;nMBYGs~wC+FG>?%9gnmwNCvOtS{a^_j)Oj<*t-*E?wrXnqa-?4lRFSnA)lIa6{qEn=+m8C&&jBtLz32bG?;Ubhp3am|{Eg z6KcvSzH?pbER9bHig!2O8ea60U#a*~K05SE79GUQ=ARfs)0+)@K+>8J*Iu+aUeX*- z#xRt$;?0N17!@2`U6-8vmN5G59m(-vY0Y_E_tk^hBD?e=i+cy~rAM`+2idX-Zyt#G zo)}H(r!Z=K8Tdh-qBQq>^F+@U3C>%~kZpuqFe3f*^zu8d>Vp8I$WL8uSBNq8b|e?C zpTX=Nrae0yA+>VbK1R%yF*8_XPB(Bk!ADY&ES67X{6kGRx?1JKE2q^*YII? z>3kxHK4`y-W+86Xd-p;m<>2nka@A+Y=>%LJh;7U+dq(FU_ik*KG<2L~pUZ5S3*KIA zF0Y-V-SJzFpcMA@LK2TiU-(`jWu?e^iHd)g>PwtWe%H>BZ98k$u}lZW2Tv?xu7=M^ zd+F64yuU&2`(-Y3jidC^^-SGldK{?@_hDObWW%P$pyqQP?kKVgvZ)Ti9K$^y;nV0f zO}Dm!4=Ylt=}%WFHGZMLuCS48WnY<-EV4H*Wzl4_i0%BIOKi^uM{H?avmAX+A3-fxbb}kf2IK$qFQg$mF587`#pFTgO_u}Pm z5o#J|^ZVTUo^t!?$7gR4reh>b<+|;9PF36mcE4$0kU9@raiN=di(~_*~Zts-VL^s&GBR9kj z`=%ge9X+&Qi9}@TU}Sh>GJVSqFta zB!qup+4WR^^sBwF21Z`HR+LxX2j8;2W#SXeHr?X)VBY z`8xME5{a)iOKz68U7Haqa<8*stzx1(uVZav&}(GDXpIU*lN-LoMfDhQC_IxLSkYDv zv9-DyuQHY+bHDUiGcmv6i`}rCS0ObGiB>?nk5*M>^Z8J>>bHY>26g(PtT!~&b(;BU z?-lPoPanE+zv#43&BiyX@>mOZ-Rp~Vk7KWID?N)ybl=*k+18n)m>~^%e^PTqdUk>_ z07LYF^PFXN-fcrKG(XPpY0?KxZ&OwAj0msr_mA}2ahZsB&-Di*IgV1?WYSCSvgpco zJ)hCg@)!3KS&q4P%6U?~%zMe6k8CmSQWq1=wlDF#hJ_|VA1?awt|#?;&X#J-ncgOv z3vrx5(kHSqpI(3)vPRFR2bQa6>M35e(fcahNOK{+&_Jk2C?M_=GoA1klWHdqjeF*|DL?O>KwqkN&Lw^wvRrO3TSGmLIg@t~<2B#$W3j`n zLHB;3H&yDCp#FOze-qr;cc*i-W*yR0ddoI?Skpdz>6S;vJYKx(!godGv4`vc z`PQ@WeO+A)%{D4DUcGjM(gR&9lUgg6OeXJSlXT{79*c_CwbXGfSp+=S2de^=ls}5o0msn0Ts6^tBf0(b+Qs3%yLLv;|v+j84lyKr(5&( z{*a$%!sp+frDy$ZigF_92=>#tcr)zoBa`)#9?mjH(y%Abyz{2ioED~-zwmxCuDx>`gOg>t3t55SK74p6*OjwEyZTWHdEpv}0d6a|PFdm%U-=+ zlKRYfXwlo+nwG1w@woge~6vGC}Rw~`|rk8^HMLhA#PC^ycn5wVbS3_gC5vO^nRTWxvbpBR(rf)R@OQwKJEZVjH|FRa&>^4@+?w( zrDZlP62C@`+(^Ev(7<<%I07NMB8)jsD=$sV6%^I(&r5Oif;zj2v7qbK8?4F;jkx*D zOET7z4o=!15>n2=%fHYVtjnR!QZo6KkVRjSNqs`q$bPpcfJNY`_-oU1h-?PE%D{Z< z+LKC&v=l?E1wJ9hxO1WBWEj@sKL+u21n3@{tJ9gAxwZ3QD?L^f%YEXK?nBJl{wU8Smg#Md!1y)3L+;)m8UJf`+lWecO3SITHng< z?p$UD6kc?8wtbd4ZO%^dif!hqe3Z!}LoN)_z%pvl4#BIL>4W2c^?vECMrR($Pm_`e z^0~O|R?6^qye|{HxQ{Q#z3cmtyl)cE8yB7YozK%YJzDQbzZLQGCHZEM^W560cuBeo zEVl+<2UWm7IXiNHtzll^yCB4dSvsmIaQ=@bC+#-|S z<1tkR;Z@Z&5*uk4(3yCN; z=w{Jf?yI%pf{N4-Wv zmkbq^Z^Q}V6A}PMoiJ=*jKHh|{;+Lr1f>MA@Qgc=Msd zAkCrx`W|$hFjo~FLpT(?Hd^qEpA`l>p$wS6#9w3Fia@ghoGw`6mNV*TNmj5xnfB;V z$Q|p1)`2bynuehXH|Y8!(8Um;PX>Az>RmY(eF91(rT~2b(j1ne1)(tbE75XLr5qa2 z{eL`P$Zz}tU(r=;e9Oj(R*ixL`R2!WTem@g1PECnVA(ri;~t+RkhzT(0k#6L^g!|)niQDcM$@%CJBgu#yk>PUT#(l*6gmWYJ*Cg5Y`ZscuyTr(g|b1yXe3v zVXQ4E>xHovphSvb-9YIrg0%={tsFOIbVC65Gw=b{9GcTR#}rzAAjy(%Xgfi9@vQx(TfO6`$JgGv6p-P2NV|rCWE^(>^o)uMspNSfw z{XmU?bDtp8B>n`!Z}YcwP$%Tlq5iw38ibr8H3&IRXke|u{zWwjwY;K9;M>(CjFpKN zK~`%K_(@I@YJKh`!T!-n0?w-ad#tnx`FzsG`hvW6I)r}Pb+D#jn^c!z@1{%WXH1t6 zho~Ob9Kf`nJ^)#+e;NdkO)FIh`z_VvSsH=@3p}!VGLf#BU zggRX?BG@k(5ynB^80+@W?Ps9X7;DD~J`U-OUA!r=FjyNo3?>iz=U>^yH-NMWVO>R- z;2#+(m4LY^mK)eI#*zX(CRp$$Jum|zIn^M-2e6xB=^)OW$Q)WL{QLbH{+A^}|4_op zF4_ZTrdS2gGuagHxqlDPFu-zxfBq7KJoP;);m;{yFcV%FOztnw&j7U<_9Pb=^0DYB z>1q5Q&$wv+8#3`Aflp@;$qdw*VZk3O03Bxdo)lgZ5UN*5qFi$<7ew^W-_l?((Z70| znEGQ*0r;9@$sqfG&I({K>A&oomI?M-%SbwaU60W5H2x?7VYm5*i3s4dAe2qf0*@4J z6OgytNX9?G=7C5k4B$S4Wd!1QP{hD%3oQ6@2DU(CANdC%0g5mvazMorO9usq(Tw#g zqJqKTJTREdU%|Ox{&u1TPV4^8sC2v7u?9a%U+_N__}j^X@n24vj3`<_Snjuzim&UM z5&lOLd-(UT(qBCp@%(Y(1H4ZW$`E-9ANVH!AA}uH7eG-1Z-2vUAWS9l2WA7DMNk+Z z+JN9~YK4bwP7>h%?JB_?4Nwgtrn>(^Qg!hKQ4}LM!maVJf-wjS0QlV{GvFLTKzu-? z*n)sGSYyErBrpOhWvvLxa4Qt$pJ9};!6Ph=1jNx1MFFHc5r{HDB_tmg5MRC{=X%GpJcX#ReS|+jG((k@Eo!wr2Pq0niLb1l6C~8 zi5*_)Qbtggm!W6?_4B{SzTN-)y%}m4OjqE)6Xt9s!G7Nk%L0Y}CIO?_g`XlFWd9BS zY8%0Hqzy#{l^M!G+CYZ-6@FQ};OWKxO7|9U%^nN>_6!)Y$4A!H54qTz$FJPxOD+;f(X<29|YP?5If?P&65PBu_Klnv?SxIlu{Uoxz>}Lppl~%Z6-WL<8H2D1HF{?ckqTJOo0`9KRtdXDkmCuA%MYTq6A9 zRK!pUuDS<8g!UGA9Kth(*-?(WjngeM6{Wx=W!$ZmK|3LV+i5r#~^m-0Lj@|!2 z3;>-wp+-XPcnCK28**|dEP;!lR(Se<+G#W$^!5X}-hhzY92$TJ;a^QsXbkb6?`?#) ze#&)g*&ci$pW}BDf6tM7z*!Hh0Z3BofhQUI_-~SR53CSWmw&$6{r9z^z4jjmIzZWr zkVdR0o-k(n-*~4dRv03jsaKJDh!3b2AJE_PXMguU4)lKrO}+4hWIz6mr+fXLDs3Z| z%!KhHCy3vn{JmGY@bfz40^j2MQ<-#WI0q69%Y!e?LrX-lVkW;{&Y32dMhj z)QiOavF8Rxuow(b=s}nW+aO&4#UGd$kn+LuLl0cKcUw0u;pt59bbp7pMD@4*Khbsg zfa{0xH>`jm0i1lX?I3d7*W?RG~CRjxSRV zeuDqKiF*XV{eExau)OS116c7l&azggdH+Ou< z1^AFv{u(Z;lYi_<07_j9-JhQC1>k!g)%hD{`7@f#fp~bw7=+mXQ4QK5{o%S=&H*@;qq z?|a{U`+oZV`lEC2d7bk*=Q+=FpZna$^S<)+c+%J76ejv8G#LrW5fYL>vrGy>WPn+w zOgi*`9|!dRCq87LSr!fA6eKheijas!@@H+x09g$PGU#@VaEogu&H92Mg>Jtilp!I5 z)F9f*LV^X&52|Pbn18|%Jmnxz5T!~qj-rJTt*8CNgDYqSl(7FgQcFzHAYDP z#zFyVP$Q%BAk>n^C2uMCo;B11Nfl@&VsuiOz0RG9gk8umImzz#R(f{9Cu)QlM1pT*LexR*_;V)^>M&Hri7Stw z5|Z|;`-*Jf(Mkj(=%fTtfWH-iBY3GEgcoFARs0k|4+SZGjj)Fa4yO?+P&eUKw-8*k za6beoCnK;Z5)vOQm>`W}1>briXz_(;Bp;m2GXP1f5;GYR4Rr;coeDWl9133qvzLR} zNk~#O!Avm(D|lTMV8hGMAY<9#6h-}peqsnI>VT&l&}=!aNC1?TKvLm1#gR;KGGr1+ zAGikLI)n!W;%?VN){6LU5pKWfUxKteJi^w+sa6ClTn<|9Sm9=kEi&r z$m1|W@dlC{9wK*tAj{wj6ATJ|Uh$PjP$g6lr#2JHl4yJkl}1gNcJQJ?s4nP{!LOY} zUB*BcVbUo2qtHdF7K%77=ZsNb;Q=~mgTj!(DSc1p#c>hJa|;D>ZlPJhfGX4xFxCUb zfM;?;Nx}^=^gwaK4GBy{1rqBb*vD;DOYrKz{Pki0Ig(KrJojZ(7m^eja}tZ!h8pmn zlTbq#oJ4I|gXY7#r<6DqZk@XJr9`{2`f`dO_u1EJMV#Ua$^EUmo`!Bc6K2x!W-L-V zTnZPTm_4%HwT_SSbgS^cvl`DnbbH458@nY(48mUHs_)Yys77QemIBh?eUUY$0SvKxW7>XimcEzr?w5h_j^GfENjsJ^_CUHVS;R=VQB~xCbd{{Bsy6RY-* zFUva!F?JX<#TtA(vH4zJh4Za$9Gjr>6WQ*2N{iP;wr?6Gtytmc zR6Ma)C67ByD<0eXsD5y{_vPmUWdQdmXT5?$-|2Z+<@3Rl1$8sP}PUOGCcvjEwg|^KcjU-S6q~3#pBV9O?xm zJ59`+8S;l$5ASX}?bXX48Z!SDdwb%bZuoHNd+2W_Tvz>OSJ>}(ms^L)Q!2C@r#gm` zFh4aPR~_8)=ZbTZx&OQ(e~>TL{{fi?UCAv20|sq9>AdH4`D}bu9>Je-O-L^0k!8k( znbTZAfrqK0_fFq7zEzf=Vptw(uA4YHEC1->t(vuv5A?UawF^d?*qNr@Ut4}!TT?6( zX6P=zkJH6P+_K^;KQA(9&hSd|}WQdc4TyCRXE`{WhGNWngBI zIs4`~Eya6X_Rl-}JmwF{#-4KbA?brB?yYJ!-@5gx9aj-(N&4vg(|D4?+N_YiYe&hi z2bTT%oV~t$99+M~H%6(A=4|oL)Yenh7U>wj$e(r7?E%vfiI^v@6V+#9cUPsp`ciyc zIyDn5*kGqP@7QJfzKK70Y~$TYu*;O4^@ekv(nvg>+-O0dK6SN~r7}}3yXt(=3yb+o z0Twg5Bttq}c2$+d#?H4e?duXUN!+ZTr7>mmzpXh0YLv&1uYAg2mYbs6+Noa3sr>aZ zS4b)#+BL=aLQaAqx$VpcY0-7-=I}QM&1bgmqy0BoEHi~3a(`tzkG$-E4*Sg6w?MIg zr|x^7gxRHa=S#e_$igX3pVl;}_J6sfw;Nb)+UDMn zac3A`68S#2yrXqPIk7abF(_FkQ7mIuwOZxq%yfmaqIDZeZT7|Hh;>TTuI_!{~XW4qE(egsF`8qB2 zk#kKI@}4HR^AfkqYg+F;u@3XIm9fIUsc!n{(J7@L!lc(F?NBSEy<-~Trp|Y+h`(y3 z(^^Tf_pC8{+=1#aKFx*wVxM(tP1Mt|{HOrdjJxS5SM!CSid~taN_GE~7kww#kZ*;r zX?3EWqo%AyFKkIzoK&|WZJDqdXG25%&sHvUy{S-mP zJMBv+>PS}m>>T22c$9d_acYN6KE&+B`BXPRtEtsPC1~jAt=&wPYwjm(Mqck`Ug_=3 zVDl>Y*?(DUK^x;m_T7{w@7)E-+TM-~J)g)E*Kl?Bl{C*;-l8Tuxy~OkC8Uq_H+=uo z>%3t>?_7D>uES%j5Zaz9Z07kH^6E>BW-MVQyrO0Ay-pSC6iOE6ys8P6mojAbkcW#W40c(`QcH3U;78dAdRNc*wC=BgVGB&CI{VCJP1aUGciHF(@%*H~4Mx z)XwFt?rW$0mM@fQzH9LLIKmh?J&#aDOAA3_^;0olB%$AOyQ3AI|= zRt-r_?5uU8mi!lzi-iwM0E7_1DUF ziF>XsvKlX4ej5cR}3O2 zrt%=<%w+)Rq>Yp*$bt7&`kIvl|mAq8O=^vfD zo3DJk<<_T?H|j})QajbH32|=zrF}yVURERK9^y)VYvrDUGb{WbQa{;jb4CvzoO`QM z^>L{F75NAJ%9-u15%$|3MfsxNyeqR3As;C+s<*Km{fuLze&q5-HNf`A3O)xBJrKJ zsUNszx(lb^7#4*u{gxSf)RW|3Z~R@bQ+e>xFOC3`u$ee#Olab=RVYchN1kg`<{IEp znkCXz0>s|p8+)rqb)`%W;1U4xAU(rTvaBc8n1r%)BDPJo}B*8>Mw_!U-nPTmS!|8 z^?j1Zd@~Bh-QwC0q$)KqE;lmi5xrL7qI^rwm->}~k`ZN)kD_W-PJy&$<2%WpM~A!{ zT%O;?4%r7p%nURo1*s26;xE`L<3ido1&F$~6T5R*h3XikCnxp9nO2>^Ql1`as&-k}z+PhoMre5Z& z6%Bb>qcKw8KKav|=He3lq_6krrbg2qV{qB0j%+rKCO7dn1LuR}A9X(j`IcBFN(M%; zR(`ki>1jtCX1*qeR6caikrhoH+lqCys(3p6-Rw+}>CDl>5$Af*M%EeoH*b%!>OHWX zcq@`M>~nnzC)wgQcRFJ7^Jvk-#!l7n#JJL?6{gnIS&Xu8L+5J;FUq#CVz0>EwjZXh zPbPYrCLI)4<^*5Me;05L+7j6Rygl&p1}J#`*O8vl?CsN%hS_;y_VK~eBRtY$n`tv? zuO(43?kwfEJ^0u1jg;);+gg*k?A7feB`;v^M=@ob5y7!*%LEI~^}2`hXH@-cDWKXy zM_+9R>`?{0N4KBAoMN5vj1e%Tla zy!=q8m=qCodi?`qXV%OfOVLa5O=R3PrY(hz9fU)7@%12i==dO~E z%X}m;h+^OsXcMJT|G*oAB|VsqcLhOw73$-#$yqSFNB|WFa~W+?XY%;NIQSC z`Xr@!fS8?}N@(4S?YOdV-Fir2qb|;zOK$z?zyY2X#6>a9Zv-HO-_12y{Ps&r**BWz zI8?pzJxTLr__0Gl3-6tDtuE~&cgI$!jjFnA+K47nsa9qw?p z9_8xe2lC8OuQ!T6iEDA3l5?iDk6RlTicS^2_>HlB#8&vcT5A0~-{!M29fdRj^VB4~ zJvE-;p)2n4gx}Y1h7FkaOV8p%_Tnvuq?`+4xrXz2sg}!UKA4-+ziWQG`BA3-^Npo2 z7PpHzJgP-G#_U(N$qYstd5%4$$c*->7osl_cu=im)4-2;KVCQ;P}E%%deiAzq)`Xk z$8(t2XzaE3*=L9DRHs{+)76*m$MS`3+ce#JdAm?n1Bc&`PiaglTKcvlAM**dyJ)l@ zMG+Aq_kH8++A}}0x0dHkzPofTb}rq*=E#mc{#|?HhBMB*b#{1rWnBnl+CKjy>BaK< z$SW@FfAN3p>-PjT0?t{D#MpYP$#XU?uSdrRJsKpwP+cNbXK6I?ed?$O-OFx{fC z>U?bCc;U6WxYd5W+Wv8qxDBrt?Kig!iZwr(OBUB0KEQ=#{D^b?@|aISKu37}?8o=C z0yyt0@0xGElm2E%ox&Znq`>-NwlQe`h$r_wmf)kcP2-5?5AMm;`_(5#TRmxR*J}8h z-P^5dHc(ZTbLU-{w$%ukck_XePn1OmLTK$uicEURy9rW;hc|zowg_FSjocowXwt~z z?!p~!{ryboBW^}}W4-PYt}sd}WZ5UYZ$t|9B06r!zBO+SHFQPm)t9_W9vIo#CsM-u zYUv)E<-V3^?`M%AAKD%&?thb=x<{@0=wjgKi`*?1%I8y4c%uTsGK20+MEL9k2Yln4 zUDXb}bK=)}fRvAf7GJ;bOqudtHWg;H$1MDDRi_GN1#eW9 z)}Wrk7oK-fw=nSbRvMmKw~(;o)=Ud+S8{_VO#m!7U<@3?n?68Q!TWAM+E6U;HW|YJ zN(9~=(-=qP5%;-fQ(}*RR3s$FII=dp37gI)z)?Ko6e<;k8&f^SlEl_-J^bT^7eo5) zv(XZP(W?L6RA3I7gf#=UtS_Z7oOfcmqafiW zfAOW%JXJoc>yj?z6TG`D-9kui7oDstu2_+T+39@qD=$_3#nySXZRlLytvj|nK?hT* z$31r-zcb9`%a^4(9I}-uTbq)9Ht$U5V^Qo5DfcN!IZ|s5Tm?%}64z4k}Ja@JoD8au99hq}Tc8xrdCiHLU`_llao#_t19N#>j-sJ2Y73No);t zDveyqANp19p;+Vj_HJVDi|x-dL$s2w;#`f zZ*WYMb`rh!;U$iYHC)o~_H0@n9ir=%r-Zqp&2-je*6qSq#?t8?ci;2h&GMkXX>b4D z@>sZ4(sAQUm1U0$mQP4NW)(K~kNHRwc#4@lg`zA|Rzi%QWX3?AiA|H8)rd8VZ&s^> z+=f0xN=lAb^riQ7GMcK-yUEzt*qU_Z!h(r>uWmTab;Ic_oMm+0g0v{bf@z3+wt(!W zbwVs&OWIvBucAfBfAT3-LMrc_OWuuIuSrevO34Q&lP&dpcUTqKxE<*Hn7tA`SxKd> zO>HfrJqFR^V=Hk#3=Pkh0g^$fUQ;XgcBB*5(p!RNDPB%JWxQ`eH)A~-eqV#`xGVo- zn_L--AmJ^yXShf|GP~0cj5p-zW(_(LlN@SE4tzhJ-sL?i6rNy67xUE7FjV53vSH|b z={d!njaS0q-jYV&y+UQEi%S;9G;`S}HH%lKp2ig&KT2ab+w06iKeqDZUAP5>*Siwt z@u%0BC!Zd7)hw@`Ezj_BJ@Ic^&_`)UJuCTt!1_AkF5mV7>B)FMlE9C=d8Q8a;F-TY!)|D^|? z>!-6$FZzG7CQomXKEXOX@T>CRpsqkU<@iYIcxd9-laAk$Zz@^6ZuTbYlw0iR$tRM< z&<9wAGVQneJU?-zcaEQ|CDy3L_$KeZQJCr*EmJ^vGp$rv1Y zHz_jV;jNpqdeZKP)d^!S`^#m`kTDX_ku2?0`8w3PB8+xKA_)IV9=2bH5`%@_o zMn__D?%%08`{udt>u+DBm6H1uRtlHDtO`zilf6_>T_W5^g@XEHmi2Bml%D=>Qa()28w>hQ zY2Pvo=3Y6EPL=l0WYsUY#(ReKSU|(No8pphJClKFQ6B*K@t^ z?y;>CrPQx9blAu)TxSnAj7j}0@Iu5->|53p!~WG9#tJ8d`r0dRem7uo>@LQ-vz--n zj~jS+e5X7z7MG^%IIK2d23$C*K5yEsCfD7_xA!4PiZyiXhnd$0TpqHOA|01i6%1_lJ(!GH%xS+~j+4=yvdh_B+iFrWDwMLB z1}p1UsRH`#)?4?2rbjK;Nu%(=9Z5H(9wuD+$gFa~JXffIQa$;Ge{%F=;bF(94-CpEO~GBhbM*IYtK#eLCGMPVnMakd zDtTw>nk6B)wL+ z>1ynLSj2m>hnY9*ZrXTL$watrCPlvAet$lp$_tY=%I#2rZJf6uQ&BHk)&AJ3lUZ}K zqw7*d*JH+SFV65vhkX$dbvez%D6hzw!N2J>uX<rHyYcb836-cqE>unYjE1pJAWQ8rGs{$`SK+;j93R{GO?CAe zH`u;q@1`$wgfsqj^^=+IN)=0qnM?Z+;McDC%Vru^r}?h8?9zvq3(u+f+clA8Ye{xj zX`j8?&CbCkU2~`3?p6r7wlB%?7B^@73ekkl?EAE9b1b*~;z#e)MoH_YrdI#Gptkpl z7&rW>;3CO|sMWe(`%%*&Mz_Bt7B+LX2WVqw5=N&G3o}>Ke_68ay4Sq5S}|VQ7Q8y@ z5m=`0ezQ{#=QB37@>x3VAPqsTqK|VKa~gGe)3D{Fn)He9N4~%>(LD3SEaA{24qJX+)+88*Y`F^3!6A3`|pxn#7OnA!#OL$DUP3X#4`Z(ri3#9$PcI-Bn~uM zsfoIAZhXMzw1TbF#C(C6aqojXA?Gu%w6u#Pxi7ZaA2WZ@dwV6vI&JLX2N_dFaeqCv z>{B&MgQsezn3ors&9~0+RkBAhxN9$MCPqE(T+4fMx=Irzbz9bayFkCJ{J5>ZkQ5&n z`P;Ir|6arJ7d=4(27w8Ty+!-b>3hsL7B``>Wpy*@zQ}BPwi@I^@L6|TtWFxcyUiG~ zaygQ^K1+Y?n0a;dm#;&N1*_YYH#>y#m$Kq74$+n1#!rUH`QCnT?ygShK<}-Bb8_vq z(c=8i@SD3gMti@B%v5gtaFA@2lnG|V>#?ek^banH!kU$>~Atz?laPppLwWsqO8ey^-FSa0ar_ggz`t``V9(4N2&ShX_pu^ zqXL~3x!W;6ki#V12j|ZFn2m+#-Yap#J>Pp}@Ab8&YMI9Ps}UQs?ssZ44mLS&xtC9z zMhtpQZ(6)hzReV+;I(q^jA3Pgcn;a!W67b{VpA`#uOU zi=F~0d##t8-h#Aom!0$@sb1>uQN{@`M#TP%IZ#t)i{Y6~RH9F`Nj2^{5v1NzypecG zWqZPDqwG@GyECh24^@_VXR$9KA@$+PJf>S{9 z#@)J`&JeI+^5weWVtK+@79;XnDxU23Y2Ouo9HdMyPz{f7(?2B5nbZk>)jacrck5zZ z>w`DxZmH@Q{Dun5$F43JTG2iiTKM7e`tx&Bl}XKUI^@JnzD@Yk4Qr{3jPx zoj^}J`0@s z&A$ISF4)uda{)_rh{v6BWlz>nYxGa?9JQlCXwfE`O#Zf00z9QOyjI+L?fE64-US%8 zXQ#AhDel@|v;N8}sL|;BtWn2Hs8H)Vj&4+A=RU{!9pMO9;dub$D-4Q1To z%chj8X~J)H-DVLuuJ@!(yb`V@N|~G393BaTu`@>LnW|?GA0I-~$oRY8)9wX1*Wlf< z#_#e!8;HhxYHkN5+qX6Yk}el(_I>5O|i zh4n6K%28GP+O>O=uV2TpU&tsMP+qmISFpX%>%;r-#@BAHj!O^L{q?^pMV5by%bLJM zU)>tg)OL6)8hIxHzxWk9pAf?`e>GxJ8MWRUL(##so=WR;!g-HF`4Tnjr7zlzvfotx z``W{MtfMsHeW|;fs4?jH*24re4h5fj3lAM`KSnr6l?0w@!LWfiE;Jc<-5j9AtD?~& zu#Z0$y#{YjIWnR5;L~8%T+3-YvJr12gTeys7 zgAY>vx{l_Ao57KfmW2NK7g0<(q*S zfz2eDELLr_~5>NUyNMgyr zc5i?I9Q=hjf;ZX0^upOO|HK5s94WsrF~AY%03grVlk;GPBvu$Ni^1x{;AH^&4K|OZ z!Un^djicB}Skuph^@TN3$FMwb5_X)}09Z4~jdg@IBEnc=JM%@cUtq7Rl2~Gu0U7Ki z*yfrtb`&0ZE}GaV*nL(D%K<~b4Y5y;!mZMyT<*3Yj2$j`?6793qA~alM{GQ?&7zNN zZ5;@!R7P58*B1go0!WUpal!h*g=hA~O2UKLC>%>X#M=;w{S60eh{1Nky%dPU5|4jI zM@Wk^=$+BOZQ02)ZG7=t44|A29i2#0HWI z5b0zDfHROXP5{t{B*9Y)l5~OqbhaHd7X)k|StkgXK@uqhctFxe2(W`>pAg^xNj_n~ z8j|tCfGs3vg#k}Uo)H0jA^AXrh*O9X`8-7dCrIBf3RppsQ;f(HFGl2@6C>KmiWBin zaiV@roakqK67Yun+D-zFkUVw@aE4^;DWd(vDWaXU1W|$#ME@NLB5rt^m}kvtA`iVJ zktbA=$TRupURsK1cjJ#-lOnc5M;dU2;@y=d=1ndG*hBZ;GDQ1lGJqF!FD^^07bpwY zBS#K!ht!^OM0iAw2+PR>=OBHNJm3OJgaY6O+bIC&Avy6!YA6!JRw)w8O0PsrAE!j* z`KUznGgKztKU5~-94f>zB&ZPm*8WI4Rbu*Ws(;F;Mr=l;8nKz9YJepaUr3!;z9e-b z-d(IHsvw8;bgLrMUh;duB0AuK$Oq*!$ zu1$>dN}HI6kPcu9;TLp>1AX+*J+Cfc0qJ9P33|dKG@?u7;nE}4Az6>ev#m$0tEE0M zUb8;2-3$iAI$baz+P^m-_JfWg;PJnQp+USMV0!|Z8tDyPeW?Kwl2%F*5^0kE{a2AN z1D-Sj&Tv3Rd0+YOVhOXvWi$zi)c@L$R3s=@fe1rD1nf2fpyT=Av=L#d0c#*7C&*$9 zFv0%WQQ34Bg!g+U;m0Zh|M)xHC7K2q1JJ7xOg1L?@7)J!OaNZ!uVZ|0lDb}1h<<7k z5+m;a8-D{lY657&K~Bd+pPDB8fsKRi|F(pDfXJsefT9EMngG!6Aiy>gLL|9y2;l&! zr%(WRNVtNT{`YTfBqYNBq&qQ5w0ANESm0{H+X!HSDIxoZ%S3E_nGnUnk{IO;VOs%d zxBj0f>}G$8vPjz*dy()LJ=GH=B$EF`DcuBV^nnxL%qEKIZ@#z82u$H5V1hNk1g*|U z!6`EUdQ*ez5b_=M7a^|OK*GB12qEgmodbE&;0{#6pXB6Qc776mEjg>>c5>LZbd*?9Uw#mjIsitpPGOfkTThcsC?;!W&qc$i0lUt(&$P= zez+2d?w$lF;DPxx&hU5XaT1aT$|NKw|LMbJFy0zafrz`U3GU;UK{Xpd7$ma+m|)Lm zs8?rR65j0P|KDic0#$APJa?^CZYm!M&&>?sx%v0GW5_4+y|MwI^&7ZqLkMDAN^I=) zQbK1u{xbp%Z3)P^3L;Wbfu;pj+==bF4~k0)!>v* z=}FK`5gssC8WIxGe;Qi=Ubh3FpO=BdkbCEIFw+hY1R3m!$%)$&l({byo%jjQ35KEJA@42nCY= zCnYj)!-2R;P;ex8e)~@J#5oe1nGY#leh`%ljsPe8;13^!oYrF|At^ikf4h_8@UK4> zG;ji-ZvxQSi9piA1e!V%+C^BBGyffs0}%3%9YQ3*BIwh@_{8h7zWTrfjIhI2*4EIUw{(qkpyVrwByHQig*drb2fon z;UC@31Pw)|ED$LIglwc=;sFT!Uc7fnkm<|$tFemtrX&`vt4UmNj`q_;TWTTwu zX;6is1W#6AX#PF~hVBHIrRpzCCv2jRK+>ZK1L_ELxI@G!YV-?FBH<0$K$xrleH)m7 z-R^)q6yz7g!rDS)F>1lE|4*-hP96j#rR^_5n9w}{7Pz7GRxD-ajD(R!m^mc=$=l-L=sAw+r} zbnyaYKvAzh12g5OrDPAGj{Ss1z`q0N0qE=n=s}!!y$GH|A0bap@Us^n0Jp)%G7+H}&<4V%AmPRD2T;H{)V@h+ zDUpX5ET&?KM(K{yLE9R_Y#50=>J<$Eg$`B zO7pihZRZIjkC-5Y8+0V30~T;%kHCpRWk2pmfQ63zh1nrx9Hcbigp{YiA-_MpxO7`? zgpyE!Y(iiB`?l!L@&B_(0=SP~XC+J(sf2O#Zq1QCIN23)#t zbJO=Y3E34AvQzx06D&1}q#J<%{l5ij2qeTD(fSMXL5VO25tQ48;Hgl;XQPl2mih0y zKN3P(9f=6xTbdJm;YsYxMF{b9`HPT)Hlf5(D<4ciD1C`YXfSXBPWGqbehCvH*)T$~ z|Go|hb0Hk~CBYQRW&`rCjQp#l09PWh^q^h{F|c(A1jqabE(#&OrP?6G9rqU@2M-C8 z0bI}aXJMb;5Y`V%v?L@V|CGufJQ)f=zqkeof4gKuW>!M($KkJf&`bfKgOmUJ-B0L} zei^hNgaM3jxNIt!z$`*z9SHXSE_7l*wJ<;hCfyI;D?CD2&q(kQw*CIe$-eF{ oDJj?+Ml9=e7{G?O3w{p+PD9y>gcEK%LEUh|2Ff8fVH}hEKU6;#D*ylh diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java index 689300ae..cdc44c6b 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java @@ -64,13 +64,15 @@ class ComponentTabbedPane extends JTabbedPane { public static int SCROLL_STEP = Presenter.ICON_SIZE + ComponentButtonFactory.MARGIN * 2 + 2; private final IPlugInPort plugInPort; - private Container recentToolbar; + private Container recentToolbar; + private Container buildingBlocksToolbar; private List pendingRecentComponents = null; public ComponentTabbedPane(IPlugInPort plugInPort) { super(); this.plugInPort = plugInPort; - addTab("Recently Used", createRecentComponentsPanel()); + addTab("Recently Used", createRecentComponentsPanel()); +// addTab("Building Blocks", createBuildingBlocksPanel()); Map> componentTypes = plugInPort.getComponentTypes(); List categories = new ArrayList(componentTypes.keySet()); Collections.sort(categories); @@ -152,6 +154,14 @@ class ComponentTabbedPane extends JTabbedPane { recentToolbar.setLayout(new BoxLayout(recentToolbar, BoxLayout.X_AXIS)); } return recentToolbar; + } + + public Container getBuildingBlocksToolbar() { + if (buildingBlocksToolbar == null) { + buildingBlocksToolbar = new Container(); + buildingBlocksToolbar.setLayout(new BoxLayout(buildingBlocksToolbar, BoxLayout.X_AXIS)); + } + return buildingBlocksToolbar; } private Component createComponentPanel(List componentTypes) { @@ -193,7 +203,33 @@ class ComponentTabbedPane extends JTabbedPane { panel.add(toolbar, BorderLayout.CENTER); return panel; - } + } + + @SuppressWarnings("unchecked") + private Component createBuildingBlocksPanel() { + JPanel panel = new JPanel(new BorderLayout()); + panel.setOpaque(false); + + final Container toolbar = getBuildingBlocksToolbar(); +// refreshRecentComponentsToolbar( +// toolbar, +// (List) ConfigurationManager.getInstance().readObject(IPlugInPort.RECENT_COMPONENTS_KEY, +// new ArrayList())); +// ConfigurationManager.getInstance().addConfigListener(IPlugInPort.RECENT_COMPONENTS_KEY, new IConfigListener() { +// +// @Override +// public void valueChanged(String key, Object value) { +// // Cache the new list, we'll refresh when there's a +// // chance +// pendingRecentComponents = (List) value; +// } +// }); + + panel.add(toolbar, BorderLayout.CENTER); + + return panel; + } + @SuppressWarnings("unchecked") private void refreshRecentComponentsToolbar(Container toolbar, List recentComponentClassList) {