From 8e7c815d2b4d2b73096f6b71516d88b637df664d Mon Sep 17 00:00:00 2001 From: bancika Date: Thu, 31 Dec 2020 13:06:31 +0100 Subject: [PATCH] Fixed some issues with exporting and importing building blocks and variants --- .../diylc/common/BuildingBlockPackage.java | 3 +++ .../src/org/diylc/common/VariantPackage.java | 3 +++ .../src/org/diylc/presenter/Presenter.java | 24 ++++++++++++++++-- .../src/org/diylc/presenter/update.xml | 12 ++++++--- diylc/diylc-library/lib/diylc-core.jar | Bin 341027 -> 341036 bytes diylc/diylc-swing/lib/diylc-core.jar | Bin 341027 -> 341036 bytes diylc/diylc-swing/library/main.jar | Bin 753032 -> 753045 bytes .../src/org/diylc/swing/ActionFactory.java | 3 +++ 8 files changed, 39 insertions(+), 6 deletions(-) diff --git a/diylc/diylc-core/src/org/diylc/common/BuildingBlockPackage.java b/diylc/diylc-core/src/org/diylc/common/BuildingBlockPackage.java index bf69e4e6..0466025a 100644 --- a/diylc/diylc-core/src/org/diylc/common/BuildingBlockPackage.java +++ b/diylc/diylc-core/src/org/diylc/common/BuildingBlockPackage.java @@ -30,6 +30,9 @@ public class BuildingBlockPackage { private Map>> block; private String owner; + + public BuildingBlockPackage() { + } public BuildingBlockPackage(Map>> blocks, String owner) { super(); diff --git a/diylc/diylc-core/src/org/diylc/common/VariantPackage.java b/diylc/diylc-core/src/org/diylc/common/VariantPackage.java index 32879c60..43dac280 100644 --- a/diylc/diylc-core/src/org/diylc/common/VariantPackage.java +++ b/diylc/diylc-core/src/org/diylc/common/VariantPackage.java @@ -30,6 +30,9 @@ public class VariantPackage { private Map> variants; private String owner; + + public VariantPackage() { + } public VariantPackage(Map> variants, String owner) { super(); diff --git a/diylc/diylc-core/src/org/diylc/presenter/Presenter.java b/diylc/diylc-core/src/org/diylc/presenter/Presenter.java index a8702158..a609e324 100644 --- a/diylc/diylc-core/src/org/diylc/presenter/Presenter.java +++ b/diylc/diylc-core/src/org/diylc/presenter/Presenter.java @@ -3009,7 +3009,17 @@ public class Presenter implements IPlugInPort { BufferedInputStream in = new BufferedInputStream(new FileInputStream(fileName)); XStream xStream = new XStream(new DomDriver()); - VariantPackage pkg = (VariantPackage) xStream.fromXML(in); + VariantPackage pkg; + + try { + // old way + pkg = (VariantPackage) xStream.fromXML(in); + } catch (Exception e) { + // new way + in = new BufferedInputStream(new FileInputStream(fileName)); + ProjectFileManager.configure(xStream); + pkg = (VariantPackage) xStream.fromXML(in); + } in.close(); @@ -3048,7 +3058,17 @@ public class Presenter implements IPlugInPort { BufferedInputStream in = new BufferedInputStream(new FileInputStream(fileName)); XStream xStream = new XStream(new DomDriver()); - BuildingBlockPackage pkg = (BuildingBlockPackage) xStream.fromXML(in); + BuildingBlockPackage pkg; + + try { + // old way + pkg = (BuildingBlockPackage) xStream.fromXML(in); + } catch (Exception e) { + // new way + in = new BufferedInputStream(new FileInputStream(fileName)); + ProjectFileManager.configure(xStream); + pkg = (BuildingBlockPackage) xStream.fromXML(in); + } in.close(); diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml index 2b6c717c..bfc2786e 100644 --- a/diylc/diylc-core/src/org/diylc/presenter/update.xml +++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml @@ -3418,17 +3418,21 @@ 2020-12-28 00:00:00.000 CET - - IMPROVEMENT - When editing component properties, group Length and Width properties together - NEW_FEATURE Português translation added (thanks Pedro Rizzi!) + + IMPROVEMENT + When editing component properties, group Length and Width properties together + BUG_FIX Rotating 'Neutrik Jack' produces rendering issues + + + BUG_FIX + Fixed some issues with exporting and importing building blocks and variants. If you still have issues, your variant/building block files might need to be manually updated to keep working https://github.com/bancika/diy-layout-creator/releases diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index 206838f849c836834183a6407f5cb8cc1ed702cc..58c6332358e406e15e3c70e4ea6fed1cffcbe93d 100644 GIT binary patch delta 11218 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 delta 11627 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 AdH?_b diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index 206838f849c836834183a6407f5cb8cc1ed702cc..58c6332358e406e15e3c70e4ea6fed1cffcbe93d 100644 GIT binary patch delta 11218 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 delta 11627 zcmZWv2V4|K7r&jI6O9ESwpgNg!l<#JqOogYxu}UP zu^U8VFBB^ZiW<8D-}<~kiYuqw?u zNS5GLubjUO4J2Rj?k@$1_X_H1SR=W~AZa)tg^KqhDN?+>NCWZCp`H#y#*QBrp)qWj zP3j2tVGj{fXNip=Pqq{`isky^9Yh<8_edI{ z+Kv(L92zX%r8I;a+8v@SCW1Jm?`b9oXPX9+7^A!G2LW`mJ1v0SUJmP!IO^DfT7!0M z;L`J*+DbazJVR88qaohQYeFRmw%fNq2i^g*{n@X5B}cghX&%Nf3tcdhdl&Nc}tJJWsprT3Dcn zSIb9|K+IdaAmQJpGZN$4HX?$xtNnZ=nsi!@#EmW!WWnmz{Rs*;>vY@HhckUogV?&RTmNC=w4O=v7KavET8WaQESn(&JKc=wDMHWcTtkpB>ZiqW}PK*`&mkSzbd0dSw;bby~SaSLn zTFU;%SF-2sPn+O(U?8~Pm*{j+hS=ji2CwrT$t22d)r*38=BfGm?{g;k+1X5aKDbtm zR`tiEwrEyADdb@K(xq3vIq243>s&pUcCX^eU{hxukZcwo9~7sG`KOOf!F2sO(I;Xko2$ptk?V| zy{Ug=?!r5lPUfw+uv35Vq?O^Ud9Qy9YaKbgrF`kP>G@B+EP9uey-v>F|3CYY+s=9a zJN4lG=g)Sw>22;bxHNm@vHrJ?Tv!t}MBgj5VTb&Fi2>=y0$O_Pu6=GvlfLHLTGk-5 zccnCQsgq_;!tePlYEJe&TdO<1>0(NPRY$i6&*Dz({%fG?>n6I2PG`5ygJfm%D47N?E2tMg?dhTA2E%L!9@DQjzh*r4$?{? zWt{6GEkeq}Lz0p5^Onl7M>X0PJ$WAVu33h}RW7WVw`9)#d`GQ}z5S)7DEp+kggzO~ zf+Xy+#^u3M2jo5olP)54FiP5qR6=dg6`iqOP@6;jV7m4sV#Q^2lq{HS3(3qFQ(qc^ zF0X1RwL;;>)&8S@g7EJk+=@6?2g$J!0zdd6P@yRk9G#J+W;x3Z8aau1a5CwnfD;>l{)Jl*3{w0iF!kSN&yp0R` zOL`Q^h?iy{ zBvtaKBEW%-7C0`k)9Du4v84XsN;ZK(oaRU??F2i-aoLh|2x~E6;}U_LAS;%}drVr7 z7U!*yo+346m4wsExF}OVF)e1`N=K^oDd{hy zs+^Nt(T^?1dq4F6U1w(3inxe;W|}GX#sTN0>gdaxqg8jgfQ0?0jDtj#485Wl4_=gD zAL1F$y)323_CUo>Twn5{8p!*=6U+)mN$#vfub3GZU6&f7>_4~QWF%6!q|f-+r?A=! zsfg3)l`olzEyfs7AjP0`+&#$(sZkH5Z_(?}KLW#?z`iZt{=JQsMKI}v!9&J9izWkO zqatRHG481}50wj_OV?25RHufUZ$sU#;bP!18y~-t-V%|_X|_4lI)a5Z>{%Ej^SmV# z)#aVk3#}x6lv2@!tpn~1p9ylwqJVonNCrymmdQ(`w&+Pyq>3%cZb|reZE4uY5E#1# zVQb?hFXL$|(ikU+g)Nzc{wc>@+-AXMG*iOjH@1d)?sp)IFf$#U$aXaQ!IkV06ocgx z$bxOa)w`Z#Byzj>5;gRjRmnKSy4E1Lts3_Qk+uTc7fOCc=IRKNh8{S_w)o{El;x#b zmVPnB2?tNAMLJO4dyRkABS*w8YMjxCJR{b;i8s1c9KH%XcV=BrNiG=_GDo-;mkjuwwju z26=`V+nP!&6t2OHbI3hmef3;23zJx5A-Q2KF!^UvjO)j|>hEL1AQS#(I-MW0|Cu-& zo!5}oSfc^!hy#jE+Vg78I1t+eV%3Bgi}!$qyKw`Vg6XQhnc#tx*=;5Fh0|}hl8)jl zz}RLVd59A)azE*aIhlTdz^=!OyZR7;Esj%-kC6dLtvXI*ariW@KTC!nW^tZ05xT5H z4#^P;-WQ0glc4I}Cw^%7s|O?qsaX$+4^kTo$wkcClp^AXhF3o)21S&xsNc;HGbmwo z$`-#Pp=_bQqBo9zL+nsx);pMRVvzI?!~v--rR0d9_9n`QGX)?uu-WlYXNX^KQ=OAUd97-aV-iX|D_p?E51gf=IDd*wIJZeb8{aqlF=O{ap zDOWf4SS`n+^4?7OFpmD+I=KpBv$Eve5n@6Px1#Ad)7r$?#dPSb(>+{CbUrM_Q+730 zv!mgiV;a=H?mPG3`)}ip#pflKlc$rm&fGJ)C}3sUhSG=2%BF8kcz*kEY4WFY9^WU@ z2GBP+J?4+6URd@mlV~F>&Z8+b7ach>ojRg(`N`BrEFhyai^ic`{9L*l<(%hJ{DLvQ zSwJ_6j~Zj<8tRVRKh{=gcx<2nXs^Xas&YP<^=7Gl*d^*7wv60M?+Ef(s|lTa9QXjT90RzjkrXc3S#pm z`1Iz;%}cblAl$FR*LwJ68pJ0L>vtLQ!ii;D;4%@pDls)z9sN=+O%SYBc~nefwj+m@! z=d1zuUr}KT4wdTHxlvE(iAEa&#weCDn4c2=IqjO~bLlr5g zKx!32T%7e&A&nQrvqCyj5OI&7D4cch5&c>aUXSTuL8Md=4<6G|0_jnt5=V;Ev^W*h zE+XV%oZxo$6{|j*JyEOE^9dllC|OTb58pgdliBI1nxBlPw6&1QeMPeR5 zFzG+)Z8(|Z5YnxqM4V)PcZVOI&)U!0%Rf4upn38S&x*gSlu;S~!TRG7HT@5a47-R% zR$O#s3;v^GpJzXF&Z$etDZS*#3W4Lt{Wx7vvu-vRivqjh6-MEmm2&bjihsQ9$bw5$ z@$5}W-|!2qr_ieFYs3q#pm^8o<_4duF0AoWb?gH#VQi1<72E*95o5PGQ>WVoE1fRL z4NjUGV`Fc!D1XV#u;!*6OLzr_cz9D^fuX*IEb29NXTQCoP69p6QKcBs@>kTs7i42? zyRYr{0(^V|Pfd+!9~Svq?Qo-CgKD1_T-C?0@P#$2@&>}>>SY@?B%K1)zu*bhsQ>Uv zh_lky)I*H#@dk_--lCDyZ>z9@U_@}na?URw(6bG1sJ%etyeL!E@b2QQCW zH4VO`Cc#r(GoU~7e@kP8SL?FvU5CP1DjpthjZnS=YyO_PF*`>|ANu*!;la3^c{`yG zsC55AE!hRtcDhJMuw6~#lDj{O z!d-%!5IrNWc!S?F@X@6ay;mJYZQfHyk&PA~K3wN_Ts`2?23pFRy@x%EPlvJZ!J);$ zsJh`jbr9$Qj@}OAs2eMJPhG^==Q}O=m!Cq%eBtJAQ7GE@19cY$`h5TcLu(`Y(+BD- z41BuA(CMmboc~Y{MQ41Z=8@q^i6bhf-#qazxQ5i}N+Fm)jq1{dCRGdePeZtPY4lO8 zLC25a#my!rzPIo#lcTqrn@|gu`;mGHRw-xAY^AbFsh-s@rM80Au@qQWJD6B50$tA0 z5nT|?E>-8D>)#D~90Eu8!xN-&wjGnoXkDS&unbf?^+MI8GFnv>?SIY>6H*|~sqpw} zR9CZK%V@aBqv?(X>}!Sk_eXnh?P9_F%GEqXl*3R9d}FrvKyT>l9k?Ft-_2-bYlvlK@jefj~# zlSGdP$Rqu^;wlnSMFQ;ZM2@i*k_z_cVBRDF8h{p(zj82qDuC`Rekz1hA}QD{$~b4v zbPOkks75*yK#i%0rV<5v-g1uKoQ)`4_uw4;bkS2ef-MY1`PB~#kQF--vAONs){E}6f9+hN#0+$ohHM8<5!u`Ds1~I$%@^URp*O2e|9GF{i)(CwCYnp&#p%lu8y$P zeY!NN>}DsnmMYllSOVLtw}79m;0e(9mS#kI;;zYFQLya63eU(96AOFuRE}o-Ezk@z zMbCa$6mcuX&T>wpQxzO6j*l6DdXp!|Zql7gr1}qion#y_)3%dKmNXTP8kw zVrLF$aUP=H`I7Y)8^GdS7Q>%Gk&EEbE^4m=4B&~mV!<-a)rsUd#$oXpkUb8Mwqtd_ zXOhRktu0{iK@SmaVWD6%8pP2Xj}gtVP!qX>qajZby=#HXiM``!-g884Ur6SfqYvM| zK3#-WcIN;aWU159&A@FK_WfDLs&4I|4lUu)wwqxeQPjJN;w;K$x+nut z?e_GT#a2}v(+T}woJS}C~I zByn`P6`~ug)W!V=M|HM{M%of{_RdPN^5>cObmdlg=}d7zdANkbssEKVSZU#e=pt*y zNf@xclwC3j0-OMkzh>IKa7EFZ)~d_Ay-J&zy^Rtf@-uY%tH@YT>-0r_TC;c?H9w1N zpb8hOvTn98gOA&&i!+y_ZE7I;T@7OQMTyDJwcV`1upS=mn%T~}+A8?@nPLkey$L}- z_t~m`=5RDU0#U_IaTC+Q&koRJhbAb9?CIo9z^T zaX9}6jFCOC&)X|-BVw;O_==NrZ2Qr?eGXA78~BbjvsdtwIN2UlM>XZDo@`Z9V)g0d zty{M{dJO1a1}C&f)DE!2bNOk_i5>HBfYr}G5o$VssnV9{+d%jqfllXWL2DCg!45gV z~<-!OGZ9Ce)H8I;vLc1(ltx4=4Ut@MztP?~3w=9HA$2 z4|BPdyl#j(J3)as8sWsz?uZVrKxc4tWp6~`=F?ULDiZrK?saztqa{Ofw1@9j?75R7 z{#gJEa|Zotaj2g>m{_v-IAX?@xheQvllG10oZ(>L31l}^Gt)Z{HYqu=Bzv{D-sbj7 zhaxLt7})c1QCVRwz_J~Mtf4OI0!!hjRRW@L-D>%%QWrSuH(;`@oiFcuU2i)I zJi7fwy(h9}u1Y=@=uy+F|)}=Cgcg2Zir;;kHGiULN^yjP{bC9*rO>q@lQtexd9Xo<=W$>>>w7oKY zE*JG=d2VVb{+)h^T4t@&HL6y*BYQJDceNw82Nm*u1y^-uQ{X>%==l8FSW}lrtI?sq z-PH^ia05NpAv$9nv1Yy=YH;Bm!1~_?WWjwh&c9@idP2|QA@A~lR=}e@%TfJS6RNO! zTZuiZAFXD?-xK&HpZJvdZiAWB-&5s}=KRL{O!|~%dMbV*nA9KI+Esyi?14vnN(tQm znfzO@AXem%7@HsOK<(~8&(XHIi3dKD@93qth?NlVIQ>pHkk5t7^C(TS(%B3zrI|3A z(PvS#BM4oA%Yq1vP_1Ju#Y^$a@K*EV=M9l8JuW~tz+1svxnz#6IE&~X-fBm<$x+>T zj(V_x_hEW>yFe7?@1ypera+M9IiK-o_$a=@A;(%@yPa^<=`5mkx;h$%oGyGO5B8iy z6@=23yp=mof$$S}8f%oo@0*kYSfr0ym2ti>e(VDi%bG2I06*@U_}4jq>O7`u?gywfrC3^a2IXDwP$|p9=*S7UHjX2#-Gff>3!E335 zc-x$ddN5lH*_K&USDW;RBY&Q23^yL}0hOEdT}zbjS{;@eFT$Xb*bkxLYZ;iXZYlx4 zryAwSMcvp6PuYfr+@@9{wq6a7`Uiph1(5gG$X{dm)z#@x_A$EAY-o9>p-|fO)zpt0 zbzup9viGM=<)mT$L<9J{27=RGSUCllXp5Zjx+zHi)Ti<`TvXenq|c}U zheBQ|uNsiqr2fe1T0`*>Xc9+Hd~HH4S=rYx2ybE{J;hthPi8^pe}Ir9HR0Zyh)S<& zD0p4(7YL@Vd}l(Pn7)Q0evx2PIV);DvUUclsW<&31gV5Vnf|g;rYuC!h~=^+|EUP4 z)ypY?2djb~`$1ltrJk&LkWyO&G&u-{I*|66{yxwbtaF_8%z&)&Ahmh<)&%ssjL#Hy zX2{yhE=DH2^hQ%%xSH&(sGloz2*SQ)l9!jeG#K2E2yc|5=s8_8&zf7o~uo^ zEm^N%HIUK4;PST2&sdu(Scf<(aouOE4;3u?5MWKsGO;XJ=Mcp~9N*7$TAbYjLxbl<%l&u{={aO7`b!IJ1 zEe*H=$&7|IqP-=UIG&9QgEgHTs_rCfL&5WW(l_J(G;87Bi>|D+ad&%Q75TMKf6nyjjRB>L^&kbYz38 zbSO*#Pw={yCg}ETM!3>a)Y2>a+r>*@Y<^n>`;_S~E2VrMHyR!tK4i?G2@@(G!ICWN zxy3nvarltdF0_ILTrZT3jZjZX!R84~uEP-bznD|=SZ0Jery33H=~*2F_|NEGCNFq} zHm+rBBcQKYMXIaQKT`3OC~F+4M2k4HM}+;e7vkIks@l_FDElc=2^D$z6O?4H&6L@0 zr5>#RW@<0KK!kyvuRGs+0Y{N|XldFL-y;?krGyKi$vRh?e_#~upmxr=vFTCp-N&2O zjwq;x|2~!+1!ui{xZD!xM~*JvZ$cFo6Ad$&uQ#9d`I9$-)d1+e+M)X$rY!j|^<#y8 z3byi$?R}2a0yzo?Q*A$K#D0xd`^lqdh;z>g%5I#X)mcc4I!zkH08GzP7JL?diENjz z?hXyoyc76O16N^+Xm^uEY;}whBO>?s>fdqBFz!r9Q8i6z4zXu3N*yz&OTg9rACGYT AdH?_b diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar index 1ad287e3f500c04a8bcaf1939cdfd75c917a43a8..419646223e3db4e3702a4bdbeb67b19684d73afa 100644 GIT binary patch delta 24733 zcmZTwcOX{Z|9_Texc1&7d(R>yBV=SITXsYCNTr@oW~7W8Eh)$jAi=Q*GE>%GqVywAArb9~b0)e7d-*d1+&Bvu@bio>}&oI1j;NZbg1 z^bZl8!B2-I`ZFPi5c9b4O6czzye9e^i8n-ltMGd0uLw~d-kgf3u`Oyuq+|$dP&ANW z#^jcV9rYmU5*M(WXF-yO8%wKSHG}_c!k`Q5S`& zBm?xY!Eq%L0`pQv!Rqn zN}WWsaZ>FdKL-$Z+ULD#b_$QfaS-9C2^LX!8iE9C1I+*8QMMq9%LJ6I%6AjJP!5Mv zafP))C@7nFp4)mMdd1dcR%sd+8;#4vlrQyuE}LD*NEfMTZ{-Wm>z7rY?alJ?aU}P1 zUAB3%eX`;DC$F&U@i8r5dg`Vhb{*gFXy1YQ#+aUcJ#{-1KQ#V~Anqp?q>}k{Qw*;2Ici+-uN50My7{2db*!J%(%5u9&PbkQGc{AZnM#RwZ z{yAPjdVI6XtN>%+{fM~w!05;t!G^<F zs~6rJ+&r}Q=DfqeyUprcvk~eGErFYF`K{PD+I(e3RJ<|HZhrSS2IM7wYgep-;NVQ> z-{_jGLTHFk$E99ME%2fjtH)MB-jAeC9MpBX7ekhoNsV+mmlYsrCuqLwW~-8oh42-P zv2Yf_0(B?3{#zC5cT0`d9GYKwOXw4yOzV2}9|8Jjy&tJt*0&026=p^Ko)|b7AgOiA zOCo%O-`(rp&n5ykS1IsxwC?M_I2J(nv5Ri1ku{9k4{g$Hps*f&UqcUI6{HxRH&o*o z`Z~h3a3(3s568Nus+=cOcF{a05#K`E38CECIoF>r^)0pnaPi^fhi6*k4BCv69nO@FthM`;c*@67>Q=&pnYut!O|M)IpVbk?HXa|< zxTd;UKK_w$Ld~Jcv)&^@^r%a=s(M;J!wJ1S7XtSrYm5BQ{#ele<;ca1@K19m0}95Y zGJUxtGoA;q_mFp;IqW4J646U*+aB(RX%-myx8H}C#%ad zMikiI?@;f4+~(l(IX6-uJ;uXs?bEhhIoqbirT*%-^|bv85*Q(b`&49Y9v^|JmR^eQ z4(n3xJg!)KF>A9lTiDO4Zxllre1zirY?fwek<7UZqTU}5ue;D#ahU}_CdIamBkhcq z=Z#)bvCpA}*)qwMcdlOu-W5aNvS*Bt%6MJ>!fSes@uopBj#L>J?o5}j5BiD?4Y@Mk z-D`do_RuQ!T6~=Jp&gu7yFb(uCsP`BZ`L2VGW~VWSt2+6T7ybt@@YRIwaYrk1+Hs& z4?Mqdjla~4;Qr|K<0rTF52fEPee4N z*X<2;%>GWMe%ZG+UHkPlZSmf@1=3yOKCW}-g6b!B>nDkt-TryGXmSd6yr)oHPNZvf z3C`>ZT==vqfS#@30*zTTSN>_}-FV(>TF>yD>94{gr&@0xk)R(cC`{;YCJTmf{QNmD zv*Fs|AnA+&Yuoo8AN0F)q#MmP@o***P0buTV}12SG*<=}D)i{>N>zCGrukZyHPyA= zL%WFTY4vyg^XH$^e2dLh^|7qkuaLLR!u~N-Cdz{3^S3j($70gZ8tuk{}%snfj*C^~M)ntLM)_hwSCW zbY0VW?Mxm_RdtC3i)MZK!s5)o!!}_*o0TV=wPu~0Dvz(ZpUn=@`_i6{cOkn1#hxL$ z;o&E&&m}(?cU~%V?jSDqfP~67feJyt@qrYVQbSn$ZY4Yb$ zUF*Iu)!Jhwg*t~7giQn5jABZ&oiaRR-mM*IuL!vRF8+Ad#@+HeYvJxP$#)5f+mw^4 zUxvq~_D3a1wHqA^H8}k#_PL4B9j__r;(K(ry!1qpNuIW@T!ZEayM^09nZ1XsQdKu` z2QR!Mv{55yQ|AC`>D3t);YiWX}Muu<3m4oiovm>(wvv zpcke|7WM^sdG_95<$<^he=9y6xXf1gWtDwlAbkICa-?&zrPM;*=Kez*Y=EoxhFj?oFJDRoDosH>B+Y3a~#R} zpR(Xsn^#h?A-4kR*?w;AtTNzzt-tVros(2gFEjOwRyoY^?dMa|lYEuiC>E_W9oFjH zsD#(AUkjyXo%C*=4fc*XCrshDd1%*_&%59L=~cVIpi|zlc1MW9HhF3bt^-Masx|vI zk{e^zZEw49<&qk^h<}xrw#Ik6d+~P)h)ymF$1FBHerDaV{#v;qLpgN)TyfEG`ZpWr z=L*5}lS9HH2GWKGD?dKcuC~2&!B^A7@Y^pz${Bp7WU*OkwQw}|DqbDNxAP&BUiCz+ z9R2Y_G7od26f071CkE6d^fh_krtKil>a3Q>s;|NI;ls~4+54`iysfw@aSsa3 z;(0bDz_N{WU`C%Q;9`@@jNsa5nkEisB&E1y8a~D-C&4%~yZz#JNa)qtr zs85og)Qx?<`a+){H%HyJCO2xkZFt^xUHcpDm4DpPJnHUw+Sje}?^pgxE?p(8_3d~i zkLT7I_u86)Ro?1*v$h4^7+&$KMlC&3w%^Q2H?Upl`+Z$Ot20i$VV-(&J-0if6j6Jv;hPX79T1_gu2S)5DbwRYz7;zEup}&)&3ZbAkT@@z|kb z8Mpq{WsI^qx;(Z9PC5)IoNTb1w8 zIb6?e7^7iD`0#<1b6w&>5kAK=b@dADxsWVxY*js`cbeOTnGOBjGjo z?{e^^-b{1k|H(sd3((=ODA}HVv-eEa<=+6%x2(e71CU_h9 zr;Cs5Oige$3QjL?a|v>{rfz6j@Qu*U)^61q@i71GYgC@KmM)ZRktFEX#ntncmYQIC zyCMrtc=+HP(WBv7m~UiBxti|b-fih_)va7tGGC7CJ}BUKS>d1lvSxrQB63E)^6u%} ztB2O=%re+!ZX|SYO=td8e5u(w|G6$HHQ_OrWMrizk$fs$LHgsodH?C8!$W6NXLEmj z7#-1X*suJsJ5i~fUQS%&Ru~#}OdDsOC~F)d&+B|Ty-{eyC4e`6#E96UsHmmgy4izR zmCLeCY9aIbmk8OwnIfq^B__Ll80rAy7YakD=68(NugxwIlP zM3KYdWdXrFD!PMZT8^*fy~`FhQu3jb&J{xM6s(+bwkVqCudtb6`{vI``pG3?Q=|Rt zuIcSpjyCrU+P2tSsLB_%sdFw>De!ii$n0~xSl~}q@8C~$KFg*TDMvRT=m~eO57r>U zBad%scRE_WRXRssWxdez*^+3iqobLx)#+|7Y~@+<@$$z&#kVtjMBgBl!#sb7S$>E| z+^yuhBb;ef(s-gr%#;8cW9J2AGJcQDUT+5Dzn__%#okH z>u(wC-BJ5HP;p-AyRhXE;i2))g;Z_pBD>^`9Gdw=egi{=1u42!PW2$C!SqDF@kcr< z7texnk(|@bT$$i9^B;R$Bn*B=4>Fu?HXM&VX+oclOMkOJk8qXqbya%i6JC+}oQKy2 zE7%_D60{%OzUY@0@RcuUNLVlY)wPgv`L>40^z7@58V^`wRscI zZqo&4us$aDcFSXt7{bZwey$m%hyieKv z@r;A9R^;4i&!g8(&L4Q}e)Dwx0K;-FS6X&_z3OwlO~v~H@ zKH6dCDvN8dXGP+KpOM&`fqNp2^theceUjr7*)uGfUV)Ah{yFP=jUI?eJZNY2D75bJ zC^A20`^)m;1f?Nw^w!R|d$=c+WT&Dve{JO1(A^g|c%o1v?ZmmXT@9@ZYd9Z|?bg-u z`f&f4oi}%6+8w3Aq$5v%Zh3!a6Ia_!(xtIoM?*wZpX_6mBZmITxEvA^=p1hNm|j>O zd;4Cq)Go_yFsUbNtDc1VjY!x~Ng5C0Kq#R62 z4OyaA%bvbd!*A`yc>3blXz7-Baikw6Dw8ZL|Ex&)Q#rL?IIrx3@EBzKVx^%N?S#q4 zw+Z_X3yO%s!3!5GHZ++yR5+xb$q9*WqF;U&@ZiA=UUoJ1cVTk8_o{1` zTwQ9v%HG#e=@#mYSpQJ__vf7&->%41gnqp(7aVn`EV!rQ6|bsXiZFa&WaB7T%<iX*j_6cQr z<;hgI=iKN$Ai(9v{&M>@*$pXTMYlM+A{mIaes|NSmvDFoo(CKUfpKx zmNWL`l5Ilr;Nx4z;w~j`)OqQ!{)?4&>&CL4`W*54K?TW+?W1}w^M(&9rnBS(4-(cT zj|a}r4V2^w@>Hj+dF4L6U})(}GW)RAonVNgmx!e{>3mj|`hAM-LF!4$yK=u`>RrCu zi+s|9xnK{@6t|)0@8({bj85h%orz1 zO>z#)tX`=3c)D$8)<=x&LYq zZ$%Wnb6aN4!WkR~CyrOQ>FdLocN^p7-V|b7|N15Fs56-ye{$5DpsuDQ`DZhHjG{4GCHyS6mRF${X1gOvfBew?ggZ*Z+3RP?&o9P`sKvA z@Z<69V&M}fm0X=yx>TR@^+*m;%W5$ey=!5kdx}4ke*V)@&mKir!rxDk;;&xsUh!w0 z{-K~(gz{d;9S_WE9?C1RfA*R)84V4B`m!?YPj2VTXs^}y^Hr;F%rS!SUH+bL%C!_) zc=mxPx1(zrrs8S$5*Jc>?JIX6KhDXZE%gf5EeuSIo!rg^>Q+^u)U`h2A|>5mLA)#U#$NaVGv=eYPm zjJ&hkcf*@nbFWe*4xJB{J8)z2TO~**aW`5^uUFlY<>%+B)-1e)tE^7{^wR)Hafd^J)d?K|HyO+&n5Nht->|jFi*0Tg!4%JvrU3+!xb^R&xPmT zvc1so(dNrol)FgUS-lb2?P`7dS+4oJX4GW<*r9qw&P)G%%?KT@AAeuKeZakFBwTCa zV0~=%l~Uz4Cz0c_9Tz3{^V=Q`b%8GSKli%Z=kDTjpR4jgW$34r0>Ta4Hs_trbDu_{ zKmR<}dUci#V_2uWM)&!a z7R9ZqF@l0V@%)GK`x}3=N(HB@UQn+Lft30Qk4+T|WXhfgzo6F8l{sqKS?^aT-TIJB zN~7Fc=&CAf-E=T0Jjz|AAYq+Y&RFmhYT3~qKaWSh4O~S2UTK$8%X~b5SI=6@(`0c& z%PhC1566E#?zp~Zg{#ZZHDeBiN142*aXZC__wpDX=Y1Rb$h2GPob zg2;%D9 z(KCQ&Dci!)Sz7xx(mvq%>~Rx^yf}}_U5zN8eE%~6ZMPtxvs+jzbGot4|eZAW^$tJNAU5XFQV2N{cTab zCT3L?`sG`Bcl47Q2Uy*X4RSQcC0^Q*&yo9bkhJ%`-M-MUimr$&?BTCFd?r@OzKOnP z)i@seoG|{E2d^qQjiJ^V;57)R!)7(Y%{l zq;d`%pNYK5;?{IoD77yV7vAAAte3#upP|?6lOWoky|d*`Y)QvVRBv(w{qEk`RsDyj zn~1aGI|Nxirz<8~S+E$%Zy%y*k@qS5NK&v^W27eEQX8Obq;S6J!5MyE?yRA>$52GN zCODxTSev0Uq!uM{Tc#>?=dV}3Mx4`Ghlk8-AY2XQz0z?JKkUWAS{QZWR^k z&z_ZzJEoOZeM+7pZ_hc*It}s&iS~%fmyt@5U_11~ka=qvNh-}%e=XX3_wEOXm z!1^1+vF#eeMpG-jOZF!FyjJ&q=NMIE-XSA?c4liwg7^Dl=^gs=!!?0ug~dvm+u_e z{YTNriF3$$w~)h&o)(vHrbe!VN#zqg&VMLIK6HG~qqS{1-+L++2t7|4TQ^6aQ?Yc$ z8MAgDskxM*t0f!witwZ(MAdBJbU{EQPT;|o>5fuzS^zCSkF4ZwGZ7{{@g~nbl|Jfd zR=jiVCO^6SqrMw%gj8Bv4f-j%A6)tQ)&ZW>LFXQJi*x3GOZi($PUud=6sf!A8t+YC zsV}B%U3sd5`wh>a=FeTlh+Sdv%1j{%I8Y<4#@cc2_T3~ef8O1;O-G$?Uf7e--(hts$ ztn22lxGwo3CfechpJ8IRu6Af7vPVVN6; za~_O-(vUKvnZU2?ygIw}jm_Ow4Zj}@%~|mTK5@=Li`BDSHpOu#&cBWA%rA~T(Zp-8 zN`>{Y3~P1q!lxD54LeT;R6VT;7Th@f*g2S?=}HeRB^j`1eyw_5^L$4S>6p1~{Ns*2 z*F5j>*EXd5G3|Ke30-d_$EClp%RXr$**(W9KeYlsmLjiXcXUo&Kb=qEugHMQqgxR* zpF@Rwu0u8rX|cX+)x2}mwqF9PE$XE^EFWl(2>zLRR5KMSRJA&ukP&?Thj{6+w0l>t zUb(xbivHVB=ww9OPE8xDfGO^SIu{f_J+Ij-IPvw-8^4tgey2x;mU|9b+cnpnyqWjg z_P#Isr_w<)Kh=uglUkGNQmuldjfcx!{(NB9EIxDb2w&Y6*=u}d;~%6dzFb_l!KYxT z?Z%$;8IPY_Z=ZgWZXI~aP5Qh2{;dj8{K0p7aO$?H;u7@k#EqSiV)wVUv{-X;@;@8B ze@W~Up>wx>3As1di9eFwo~u`{j+)ZW3QeXT z-g4DuHr=UJnSR2#G#vMG-FM@gmixQHulIZ3mp`Oqp4Ju9?_X^`~t$)mWa zoBJBQgeO-fat9U*vE}iQwvHt_zCCg5_gB?dk0oMNoi1LJt{l^Fs=W3@bW;y3r*GB>%{*4BQZ&zS#7X;LGgMJzx53Nu}q&t#nJ%rF8jhAW-*aAW-%4P;ya&tuD3eA z!YgZh$c6Sb>gKVW=xn3!@RyRECJKoMtekU8%CA{BZ|EJOMv4qJ>3-p`nmRCJpsv-P z-A{{qXWo!hv**ZW_e?9Veg3!N3~f3V9$uJV`*eKsHQ_tO!QbfHzwC<@mIyRG9&v$h z;3WRT%05?h`7lb}jg&9P7@J1}cz)N^H+Ht^{rs%Fb9Gg+VAyU1p>yvgc`7;Tb2H`c7i_O^k=oo_j?LvJJHpdrs+W*J}!UKlSmI@Ubjy(Ty_D#UlrHi&?5x z5U&Y-y>zSl_V)_g`r8>TQx`h$yCgMIozxwP;TLyR+I)R`PXA&VuPMFn{PR_?BhKc? zA;Wvm&Ip~25I)E+_0Fc@h4L%u&GP$NG<=^u=uhMu573oU3=E4c41Vkp(swjr(>h_U zM-zu{7A}ZOw#99{+`+5L(N(KIRB`#NkBhN+!(_%x3GHz9MysP6)4rXLcNVu^0CiB0 zM~6#_8=rpobkI<{pro7ZZc8V;2#WWkT$0M&A!I>*$cbw&(B7rL|5)UDkAOxlZ#(FIylFW zPZjCz;f?jrj`#UA?x6enuAqFAU`UdN-C^R%r$yleb+mU`(^ysa@ z)zq8~kuQCOkK5OVc^36w(++*w8LOsuP1xYnhWS%@SewD(zt7so17N*d*}XHf$+GaxNdNulz%W8npk&on_S21LrxF0EgwA5Swnx( zbHQLOqeHpto4ZPeLxYjTWX~=mfiHhq15N+>esr6n{UCj6KG7v~lotN*uz$No#awWB z2;2Q2%VWnLpH35w7!7W}GH%k-zAs4rN6nh{eaBjTgFk9CXTc+K2^TmuS|0Q%c9{34 zH+EZe-LngL!L2pHdZ;{?!@61$67K`)gB=sXWc7%M7XN-q2NH7htat(0$Lm zOLSL89r?;bQ#%iNtu519S{&AFDGfPSuZg9@!7CPY%zocCO8=^n87;HV+&)FId)@D5 z$v`eW=Qx*e@L#P9E1DNZjCvbSzLX-*yccWoEEB$Te{hA9hK_sviRA0-e3!z0pH99` z_o}#6!1G?L)is1?CqMVjIEj(j4xhS=dU1N7>Dr8jk$2U%QVA);AD;WM4N}dwKMUPY zADPLk*UW33EZx|Ta~-kt3fab)I$a%|x4rY*(;lup?w68AR2^w~^+z*Oe5^ZlTG|bN zKB5g~AHUkWsaCjC=T$ss&D4O=j<XXka%_Z%5 zAWb)}7rW72ddu`|DqDT>`zfWrzx`GEd)#8jT=q7tX15Qv@wbp>H;NQjy?9yiP)ka- z<#p4jSF;bU;L3MAEF3-Xpz7*e%*}Im4+-21sx{TIiuDZ09^b-0GE{Y3a(`Okp`C_% z`bGG8+rO$@>Z@xXd!aDOh5Ao7#~M-&OEU%}rn-w^l|LC$M*y#*IN=_XXowdLKSY{^^n!ayLj{L{cg> z`tF`9Z9)8>nklP~lov4GnrnX%C8XTkV7ad>QruWorg8TyEgU|w*+%H+>jPS>V)a{z zC!?hg(*H^g_8opwQ+D&6Xi1}p^#|_6XU-f~Mui_(ONYjr_<#9%?AgPOM|Q4X10MFw zoO-C=S$pWLk&jm9w)(-5z&a!U4d<=t>kMY2B=X*$u6eILK}a;3sokV+>067_%{RWy ze`AnnuGi$ai}Q61=kNFUgdpqHMmCS<T)$g8rcu&vl*GWY0g?8Vr4+&41%CTuV<5TjV^XJtVjhgpv^Rws~fxO-H% zMu99^n{cq4#Ev{J3q3Ss+D^dXW??^5l2~3z9zR^d0rA&HXFkFnrdedO5>XXyQhgx5Ar}ztwzf??Ae=qTOOw6cE=g4 z;osRLhziS%46~vQ+EfG9==}KxZ7?np@Ml#+ub_QqOdiJTQ&F1yF?=Ko+A2DU=fu#;^LTp< z{auBB%8FWgB}3lY2i{Qj@WNWh@QUyQQHaLixP>3Z7=JY5UqL8i^pSugePAqBkzpqV zs%W7o#18KlgG3opJ@`?qcho0%W2{fs19(G>mNtY}#1we^IM?@-g2O>PFuny?VwZr} z7&DXjHx$&($6xW-3&$Hj@Ty!WNrOyC#d>&?Mi6C3X)go_v7BgYgFK-MLR$-31Y0q* zWoJ*Y#9lJ4=;){{)dE>OtNB#)8IWMFELN6O|&qWAOR0a zLsZ5<0O1#!9E{gN1XUqaDQz#o9P5k&op1`HeTE4%%(dUe1UC%bbdtc2CL<%fl%Rkm z#<3&pAwZaxh3|xCnB%+3S19CyI9IZuQ>0J&Qzz zVj0$=8xZj#Xg5=w(EU{|9rg21dhH(<{ zE~Xz}MD)V6Zaz-jfCcYL4Y7h3)$iFxT#KP6I*6P2QQG%@;smCDc!>BK)6y_Y48;1x zXC$9JBZR|A>A?P`BxJ047~bkMgh64Nemzv~?dd$!Dw93#z%Adj6HVgwd0F0`e=!y-jv2Q;T~%MKRA`ma2E zix~RU8onaV!VXIsf^bg|@a&9JqAYLmpv-p4scH-Oxfy_aihwFTEyZ#f zLR${1ET0LeNMe(92_IM|uF1gN<}6Z-Fbx(ZZj`6Ughhdfwpz?tUUQ(W5@!}N4Q*ZU zV!6+PYLKye8F(K!n9m&49xvdXjWNW{sPkueibuH*2ePcfblnSKQN>z6x3TQOIvcl} zMV1|Tu+BJ<#?nAWC46#Np3zYKeL@-*Dl9nM5F5O|4D6XEL@IpS1Wf9^$5>WkE@)|q zZXE(|;VA;>vu%Wh@%ALkUshCs>7MUDKLH0JB3yczf+-j^g}7kVTpBAw?E=dW%t`r5 zmR%C4#P`+3mj*a-xXaS$q(JpOy3azz-0geCQpAEfxpR=^BNmR336@P*tMLm<2o*&Y z=UK?;n|Ov63mHslWP}e>$PMCX%TbQ(g3-<^kpE(>3S}}L3(h4q@+wi(7vB4;H#&lC z;~)pRoB>~GFkOz!#*nfmhfq*e8IEKyOA+;Noyo_sR+20E3KpD*=!~ZGV22y!S?mlP zx*n2ZBzcjmsaS**Y+T-e{^rXpMd-zPNQkjJh&;xLvT(aDT&e^+vOn8@ZcyRX){rox zGM0QD8?wMXWG5_57#ZXuEWJ3W9t;+sc}fb|Ua{Es94Av58HdRHoT$&G$H}L$k@o*0 zVKfT{YC8#?*XT&2%)83SV2MCFm{Cstj@d}MLEeSM>Q5cnl?`>$YTEHS4&=W+I`?GY z!B=E|+O_*@FF~tOPtHz8HErYrxA40Lm(4AW;37Eq8 zdG2ek!9woJ3O634Dl-&zP=1k6Q=5wWuX;-1aO~@_}pQtx2ld&owO$Cg=3 z1*!@KU98=6EMxmX#;FsrQxfV(zb2IfKJ5)oLyhXxQEYuL*Q7dO5t!GZe#R7j(xB) zH$)uHlZG9)9DQl5@U%2d2h{A|%5I?fkQyE-FG_VaLOM$d8O$AfqU_oQfv+84U>Mn|c~z&K65!U=4z+cR;+bdKk!_(?S1Ps}7-+U=Bu! z5XPuL!i|U?#t;V~cp{P}h>4sHr}1FsZbs6mn8;e^g3a&2#BOB8augMr4ueD(90@dL zD&qIjn5pPZr;TFH?Rr4EvH)^>H4%1lpvl2f5#aMFGnGcgV&D6o^$Z#8D>)q4S*-dt z4PvyX(`2wtemqRuh%rWAmd%g?jPo3r9X`UD@ zu8hWq(GFdr`C+u_Dq1PlwIR{zGi6|F7h}U#4#WpoI0oWl^xmLd!A2nSHmwFrV&fK? zE2g2ajTVn-<$OrHf}u@MY0Vg#`hq5nE%O)0XpIlKW#)0)*z3{@i>!aB)=wkW$; zEtx(fvX1d1G}z!M>of|g=CR(yM8^tPy)e5Lr&)W^Kbm7mJ!DNo|C|oKNPzT_(=$9u zfYu^MELedEX`l@cBD4~Pju4^MXyYLfGC><$B*+$R_>v$iw4qFfMBx?^q=x?2R}!=V zZJ4t_&i^rr!nG_A`p0|l2n%F^`U}L?qm4K+6RlnDNUkP6>o zgQQVp071s%mJktkNI??FIH?~r8(jg`xL}ay^0=jc&Ls`Pe(canDTL|Xj|Q!FFvpd^ z%B-}+gFBaGu^;wlha}-=>=63R3{SHIOU?)L{0|zzS>_NMD!*8P0!G#@lV6dUrA1U@42*QaP5 z4KC#bPVLSE*s8q7JXUyt6G96iFgq6jL<)fqDzGaT#DfNFJ3@@Ul$UgA6`ae@(2m!c9DoWS(y=AH0{F$$khyd~W=Q&`|BD^V|wADSto@mBDVP zyUh8DMvVPMqab`c9%B2S>ew_N#83FyjNnRn8Z8vKZUr-7mMaK7Yk)drcnp`RlZWr} zFq4d(7kG2K0~7z&Aq0o=GX30*ApV^Qq6jzgLOkdwP_HQdC<5Ud1jib+WlH7X&%7Y< zk!;i81ERDk5D^J@J0B#25_1t^=TDUQ0JKr!1VX$>fJ=oSLHH2?FTCWwdm#PCQ%M|- z%?5{4U1sSu?9UIOe+Uep<_GdWWl?!hWTe1J!p?XWF+BlF?b%h(vr!)RJ#NoEc2Kp5#cvQGr;ohl-?jn zD?^Z_YnE~Sh4I47Ma)qcc(ytfv!a#)ygDw-oI}+JG`D1XY1SAW)h(Ku32o4ni3W`o*)Jr1FSac!O%JUd?;5?oimJnqQu9_%-epg|T z#uYp}yyrhC6M>%8VGyXG@}th&nB#8D1;ZdF0uI>AocYm=u`0FT*j4b9EDo{4uHq0MDzyWF(uNixv^)xTA=Imr z7!}lCg-}25_1pb^3(|5L499XmAAdzy72z-mh!15wXs?kx3i9Bp?7y=K_XA-yK#dPb zfO!duxA5>+ybLTU2}wyKi#*#mLxUbRFgW7>ravg}F7ndgLz2w?l}Z9Vpx}#PG(iFf z{8^G2tiK2bO28OqBE{Styrcjb)Pphd2`T2V-bTovI1DGfCMd!W9SQ6(r!>Tey0ug( z#^DT>4O4;Rk^nDEmu8yIkp{|+1~9QTV4*~6$CxrY+ojLFpsaac6C6C3DFgLn%sLQ| zK*Qv_0_Xw7WsJ-r0}AT)dkIw7L^QQc57hcmHGPK^Q=-8)JCXMBqo)1JtwCasUI>Zv@kV)8&{MdKw{vQaD1^gKw%c zeGMu-n_UllZ3eR#EP0FnoJ;x)OUgs*(7>z=mRg?#mieK&hPAGQY$ihgw@IsDs;&MTc| zi9A%O#9SdAlz^(2dWb50SVEr&!B;@`pmA?NAi4np>A^h8%)MbIGAx(^6gGf$*J4>` zQZ`}^4JktqoS+P0c~z_ov`o1zLgrisMicqqEM?{vfa9=ijsq*7 z1(*p&%Z#jw!-N`CAZc_(S-J=Kmz5<6V_lO((& z8uQ>cKUl-SBDQ>-HXq0MXMr$kRr;F|(FIh{`4s=1SyyT>R&OK? z(b~y3uqFZY(dz&8ag!-rqYbIUmvxwF)T0A>rm_y9s=;(^=1QTi3#haJq`wj{xWVCo zcj_`1i5vtn4_buyV7fjt;2#mFd?yMO?j})Tjg`#(dBbVb=^G%gqd{JS%v}8ET+-8B z|FLtxhgUKcomvSLJs_-8JOA02dbcnd{ea#O&;#sJK; zb~Mh>2mUn= zU{r94C4_20Q}r_f;f5C>ZrFGj1n{m7({Pup-bt1OoSBOOPiI3okrr2n-_lD+G5I{U7|ldoo^0 zfd9|s*uPWz0PJK4_7g-&i6Kw|?#Y&n03~ejs3Ft8IRpo{XG{2QRq#Fm`MgHueT)EZ zrtv>GxKM*&WpETh@oEGIH*5dN^I%_Uh=0$vh{+Xm;BX_-IGo&K<|5l{3oN|`(v?P- zUJ1r%wty+w4w4+?_~Jk3lEBp*suaC`D_XS(9WC`S+kP7>nfHes5Wj})H9$Uf`P#2bN4{eee-8a2Q0Ge1!84oCXYEK`mjq``~&KGgdYT+<#=lbbqDD zz&Hg6xPUcad4UAnVqyZZ=Ahhwgsj*ccn7XDG4j+G7B1L#6VtnO39aF`fSv?!4p{y< zuLyImgG|saB$YewB!hgh0ei{vGrSfYxenCv5G%LWfd%0(1&&$=>B8(5;HZXl>=K*e z1ajSA3Pkmmjf-T0rtBt7(^_$VI?f4}!Ja%6SEhb)OuW7k*&@37`h2Er7ua z<^O?Ea%VT~?ZIPb`F0*9Luv?Zu)#&;~h#dwOvurS@6?51n ztN@l!c!S! zKDY>c9iV|(y2|~xw%~H;e}qD9n1R`E1N4<1UxfJ33`9*0B9M96B1DD34KD<%gSwxEAKzj8Ipbu0SYwn-fgb@OEPfk6B>ct~ zae3Itg$X&@18Dz8466D_7J-GqJ2P}DK4a(JOb3%B3w$*$F9jCEkL^Jz5Xk~g2OuBF z3j4c)QsP|-xR;f6V$R1CFN{buFu_E@m(B9;v8`MPzdU@Biy{m=g32lyir)PF(N3Ui z1OM++tBZe;p9<$Xf){Zbju5s>e@|iMUk8NX|M#^33gM36YXJ#zdiw9}S3wyjO6K3Q zu%7sG&D^N_XwOzVfu7l@VK`ll!i^ofkxrjLpw}80Gzk6!75IZtkLhDn6K7CjLu@Zy z+~aU&%T}dk!$npuxXu}TDIxsALxhF_&>?5AQd%wJ4>$fFekB*?CS~gatk#$A66Y0KDhH04zVl@7#*^j2}EG5Jc0=eJ!DE3e13Uuq`a#ULL@H zu8=vZ4{tE?>-KeeYV|L(4)tbYP!9i>X_rHf|v2M(t)$YtAiIY384SNZu6mn)o!?5%Y z;@`^!o;Mgj@+tym@ql>Iu8Dd8RSAQOkTOcmLa01%F)DZ+A&u(p8F6mW1hZ(0{ofF~ z&0?&FW+^=ICvY@H`M*8SKAZ`rw=o#I<$Gw~UzERqiz=`b`vy;7^bQML>H}hr_kz%; z6|jUCpt4gjsu`8azZ84-eT)k#U}KE|d-?JddI*<#L2FSbisk)BpMrE%22L+uV=Ted z17d2A0u@_h(611CZ(uK09fSURxPjGbJ3Q3W7m(Qk)GaTPm1{2Y^TF&s%Q(9suA2OThK zi7)f~QHM}XoiQqHGjr3I+6<_dz(s@)qzy-GW}Xr<5Gwl)jB3AwN?UgOh9vxFgyY&l zjAN}ID8D04FFh>z_xQwr)&%r2s14+7kVF?8pw5YW45tRa;en{nB zTD_JYz5M%;arDu0Np{#Vkm=6mK;RDa`hW0ZKtVm3rv(QiZ!%|rH_N-HII_skyo5uB zqQGi{@LF&npn<$!UM%o}wSt)U+>t@R-sl`AuSuW@!1Y1QL&cv&ddV)ZYoGjoQ&a!X z|L}_kGiRYeFi-{V6r4iACJtWdh{F+V%w82E&>>+A>JA3ug*aF)Zho~DB=<=$X3EQ! z_ge8qRth{MPUC=$LYS&-Lx8GA@I*2cl15(bNTJ_4sJ^9#J^xN)3)w|}^py{G)PLVw zoP~TPAjgH}(|)fa#?PSw0)jl^S^A*L*#hhjC@T;N>^cAApN2>05eN^lz26#Sr6Pd}OrbpVl^@Puh49S3oCB5khsa zz^HT!n(&gqUj(YKT7!ai_rgsdFgf3zXukVaEyOE5Xy%#u!Z7_ir}6O;cG1}V^xj92{Y=Enk`22aBX_`Mi*h)&~% zb1nWi#rA~*S#LUq-wtOU0heA@{W}=zQemek@FxRtsWg6cTv0cdo?89;by5KPM=-xm z$TKQd1TbQ2!H6yY+WmMKQ!1Vdo{24%6QD@on)%U1h!f5VW$roQ2y~+egN#prIlDM< z&=HFZKmD~1gl!INvdb4z_7jUjd}uPE{=+jOFIa$U>w#;_PX%vn}%)AY)H-eCf=mtcWA3+aY!c0kB0lixE56!cPXrOAkY7rMlT|uGO2$XjNgTPBM z?9~!7YE6s&aa6BT2fyiRH4G1;94v`j`^K_5{I~xQ9@yX; zQyc2b0|f5+@gIyuOzDkRD)RAK1#V)N?^8WE`0*}C4EEazNuu7o(>{Is57+|bL2#F| zf^sR!s>#O63wQ5iZWeEL0(%=c79lqH00%1{{0nUUXpU9;@~OlCT{>V9TAq`RF!-PR zVqXnQPw@T?0Y5*cc_;z<2q@eI%#E!=h~lsT_!rt~PlVcMf>0IUQ@fa-oHw*`96o^& z{J*^d#vp2KzGC`?N^U!_R>3Nu*2iuTt&;9s+|v`PpkB)dNuBZpNvTc$@5#jmZa9L+ z<|5g-_?H3WD+(B4sP!svo!@lLG%oGw0@YAs8=+YPGy=G6aJtQ8 zpz&~%>wvyF3Xd+)tRMkL8z8HGv_g(4|M-876!gghZ>kW@(Is$`EyTP4{e zMTMd=(*HcqbH9A_`+L1UUr+D-exLVwpL5>l_@19vOPE(V zU&^-s!}pR|7e$i^tI*$81U>ZkVS+09`!+!h{oPH_L2NAJCaU7m4-3+J0{S7ws>Y6f zI0#?EP(MVwSW(Cer8Z{tBS-Bd9~)qIIpX8-`zsR;#}04pWfD!3+)XZXvt-BE{H==c z>pSUwaJ`Ui_^XZXfc<4hrCcjhmg!+bWdIGv+YbjIy$*i;l zF7@5iNWaRh4+QI9TRFO@#(iJpKB78uyZH0d6sD-*IaTH@@WxTgz9UTM;=q|O zi-&@rxuX+Zy3c&{Y~ejsx=l3s=f{_3tWhQg;=cC%)fuw#V^QTA20W3axzJgup2R=C zcP@U;k)^HAZb@LSoK4*R;B_j_Oo4sa;Cfg@ik+ycaOKY7mcnk)dM}QVk9Y7|Nj8^? zPsN1WnmOzgh6c87wa{0HuWun1*n zP}le3x1dA8?`XxoADBdwt8yj_5(imXBIFGMKMxkDN3A!cHom`oJ!0RKPD}YO_7vL1 zL7%CJy->J#@{ud2e?*2e9ec@7ot1fNu}60-d2Ddai7Q`w`4+bZ%J#E0Rh60>u61)+ zZOS4rFXM7(bI03bM~zNg(p%!;nd-2{Eq$ZE z){&$agARN46IR!0ZrT*6ueNJTREXz?R~{#*l&u!Q)^_9gV`Z1`1@8|ue*OMBrvtu@ zYdZeWwnyZyso34$Xkvc`%oX{q!X(aLz0)G`?N)9Jl;%xNjIgSV&dC$L5@u!i%HgVZ zu8&1V>P$cD+@qeiUK8wV=a2VBk{e!meHw@2$GqG1ueGYfi7ZWgvPk#YQ)vB1fm*Z(Ew*Dt5{Vd}#wG@ADH)TnmTG#e`}$-bHhjP2?L48$G(Tk z7$+W-F6F>Oh=d7R?t zDwKEp0&VP7%&R9C_XJC+4y)&=D2f+NS?BSWdzGwScWi^_&^ZQI0;i>GIgv%+Dv1JnUK5Ew{;E9{K6K95^;N}qR<<+UuWO=tL7S-Is*{DWlOhjJan)(;n+PCxo`+||lbuy>7X z?O4icTaS}EYSLXrnu>D@;g+@?bC2>I?(WZitSXf<+CF3@pR!i#d3O-chHY=iv&nSI zO)u*G9)9Wbms)#7^CRAqh~itaY$U(j6Un|3CMup#%K9;@uE4lQmvi03+e5Sjg;Q_x zq$QYMX`G3&e0hFgy~OKtS5BXA%v^mx_Oq7|d(+3c?OcO$4iY+UKgu1TEUixQ zXq(x!9Iv^4lq6;TbW4lX+`0Dp&`HnYGjrP?{LWWDl7D*3_@K0}&+XH8hC}@D*r2wr zkK?S=i1!1plGAMIl+S|(d2{Bvk)1Tdjb0unBr-k(cyH>YQ@KUBG8Poy^%k*bXbUTh zmp)0SSr`^t$fWQq<&>uD8DD+1XJ7b9_2N9(u)g{2)K1M;I#TnU0VOHpvh}BSuRgb? zQO+hu>QT)qgX5{ScN>izR6gnIZ6{gSCO6rw%HPeoO2@L)H$J-D-ynw)dXY90M8J(+@Eqjf$?+tc%^V=TZ;Wd`=%+8eOuH~K)^Nw-~ zzl)o0o3Yub5EXaQ@$oZ9Hsf;EG4AM_0<4^IW`76G zbaDSEgjaz-=X{w$F_ljAB;BR}|zPBl|IGAA&Pcpoiw)=y<+Is;b-SUy=+~wvs zXdj#kXhz06$BK#tl}_^D55eEF9%&!74JRIp?R;=>U~8?lNQ+h~>%o9;SvODL@*m^5 z+c1_V$u<3xXXK@QTkv-|%TVp@p9~Jj-F^X_;&~MMz^9r2bxX)=tM38c+ym=RoV*&; ze9EmW?X&vX#>;m;Op_~!O}Dd7y^T5^yL*o+EhJ+*IX)&=DwDmmxsQuoZN|Dj!lA(X zB2MacDsS)0jYm?xmTi)A?%j`dF>Bc-cVGUHQ)8 z&~bO6%^xhRPupxhsbCN(nwI^jdh=%)W+}7F>!P%eTOU$BK73zLl6xL6zVUwm*vN zl&%mSG~4}6L1=(!kcoLdB}KBXVYc!pcZj8lqPTXW{?r}y3WZO0r)u=p7xT|3@NMlE zn^sO-;Ie(rHsw8KY-yq_uG2WQEneypr}5*`RL-npe;)Pv*ZC(XG`Yn^Z8EubI*@HD z+LgHZsFtNkJWWAxkYn(mZ&hvdW?7NPr}9I89Ah>Oy>d|2(Q<*yj&&+ED)U*9&y2=- z*0?C*INOx6K}jj4>g)!ms=EF@-NxL;T(+r&efl^}Wbp756O@@S=N#jokZfb$ znfQa1_1b0b$DFx$h#@I#8zmRBioR>)ZJ#Rqt%c@tr3p4{!EZe$Xu0g9`1Tk)auQ}E0yVM zls~dg`_W?$@Cco{!m2gNQuWgL)MMkO0^8DJR=srY{0*LMl^XBPQ!NWO++;Q3heb|# z7wU%*YgVyNXr~JYRL0s(Df$ZeDauUoYG>yy1V&wB%H2p~7Hr$xrf4bT;BonkOS5pB zp-I!x)pucQo5e}#ma_)^?rpDG1NH<+SPD5MRa#Bm2@I8%aFgeJSebY=;*^`&pFDZc~# zdB?t_RXn+Tb^2A)?(I5X4=7mbY^d(kV?eifZoJq+jyhYJI7OsPy&iP{R*= z@SnOHw-d=3AGIbd%7>!m6uM4ben-!8>$omd^fi$~^jpklwGl0vm_vm3PMV$Mn!L0f zkLq*SZNAcP#sUfse9J0W!Rv z8_s=v@VP%}?po>n4SNZ5$C+p+!o?nC-|V0FEQ9FnZCk#6`Xc$${p#=aW!Lf?f26W2 zc-M#8xJB1Lf*y{TAMv0``~I$XaSRyQE!Q@?Rcds^FLy+>;rsdM1^j5WewkR#`HUS~ zK8IUvYrR$W@Wa}k9jhO`eolKOUb=15DYuN1J6L>nS_jmy>iZwbnNDt-hT=LN-TgSC z8e9LD6>mcS{CInI*XYyT(%%9;r&Qh-9oU(@lR4$mMti-qXpstKCv|_C{ll-UqFbL7 zI>q$LY_{cB4;uTF^{)K#z3qPW-yqqoKUfY2NDA85T-Tfk7yK4mQFgC}7H~p2aj4tV?@L&4*Q~&Hlm0^TJM3cS-I6hi)ufuiIz%;L*7^N5(V!D^|aFEiy#AwfSfB zWs`c*b9WAA7@1@w^W9ZXJ6EP1uML0iaeK|NAe}KDmsGO$cCz@+cSl>3rC$y|==u3H zU^Xe`^t5IP+}Ss(bjUYZ-owsR=yakA{z!jN8{L<8`cGzL$@#TfYE0vnCOdW5_&2W3 zPmR@EB;3q=pPv4~v3$Fm{$_ud6cgIDo=l&->M+e)AJr`GD~!r9L9eAX4_m)_7`Nlu zRKdA0X(8vped-q-_M4wO>UzL-aBq;ANa=YS?_V$8UgWzHILt=)xmIP|d*_@LON-|R zCLQ@F9Xihh-rf%0Z^&&J+t@OTlhDvLP=E5rEj#O2>?P-1dn>W0yvMwi8o#88Y3!v{ znG?>ocF`~F%{i*U_N6i;Xye1{JKov2?(n#zm0rWI_hh=E@6n5zjLXHXKi(+Xjj5?c zH$T1PtVC=tmt`$bj?elq>>lQ@sdLD<#60LIx8;x1uX~3coaJzSoHPD4aO6x{R7+-5 zi(HM8RKhhyW5JBSw|HjP8NL!rY29*#buf|E|K(@9$*zy>6+T)q7fj6qU9U$*R{SUl zi=+LetDh}&aLL_i;PBO2SM77#l%MYSgPi^Y@ ztxm2(-yatKIo)<+;)$HVNqpn6Puu^__2#7+aNjv@@_xg_qN)65!kV!lFT64CvS?hL z&ZH{s{6x)YA7@=e|8TIju<`xj^QL@tcWE1cHuUpF>D~XU=RB)?rdfH*iPlAj-)Ud| zs`h!#@;m1KeV-INQ%=gon*f8E?0-)8{Lt9vH&ggO8Sn(tSkqIT_zi4Te9mmKIHPr zzLK(PyAJD>;vgMfH-mjT>CT=HgxYqUf9mWwbn2;d>(I?j-K@KJ-wZxqq#2^q(ebv~ zFG_S>NZdJ-Zaa2swlx;>k~hBI%dRbav-g($M~@uQ_)_0roE)R|Z^FdRWc+c^jH_HY z_Infce1|yA&MBgfS?mRCjwb12UCi9XdM|So-#gs=^}D z+YJV?hko<#&)RhK^yQ<91j8HZ>_h7xcX@PX6ME!l{b@qcu30HQPwo$Qm`>l6ey?_Z z>)d6*HJbeOn#4J|%xgziON#lQYrQtnUvr}B!il@kdqdYe3IB7&-%Sgw`u#e7WI6A4 z8r=Ih^M(Vfv>mH7#m?f*u}C(pC&8%?L%a0CE(9F7?$O#|-;{bVKq;$8m3{s;NkHgj zl)mDo2i}`Z(`Xwg3sA$o;o$Lv8J+>>R{_w)Z8D{5ryKRNuj|(C`Aj@ta!zfRhP+wi zm}#Ey^Xlp6E!%P}op?U&JQlMn<%nio(K+pJj%@|&+ZI^Io}b_vj*GvAGa~Tr>e%m zk={y46%kE5Nl7H0o;&vC48QniKtt(h{+hM>5eI9-xBw`;$E4CkJ^Ug^ax(V&CebM#c@GZSVW?_*1{doTv=W7wq6IC*< z$MU@2weH+}<3N7|EkjR`t(bJ#k5Z&pOlpXUbj~_Ad-Frnnoq5Cv${^_!6>Ho?cXT9qaXd?UVM1QT6q0Be z>>Ft#y5p@o{7PBPv5Q(}`$50{qM>NDSeM9?Up?fAJp_SBF$3DvtsLIjn@@%`OG-mH z*A08Up?pqhzWbm^voE3HnBl%R?l9NYU0=<-5+tY821%>#uM3f6-`GfPJ>X375b&xx z(|Ob`u~vp%J=}QLt$ug$VoqT|26NLgJQRC-K%)!`$fG6|LBC)9r3n}H*N|0bQkT`WT9O-_VKuX-mq)< zr=eIESe{~2{5*8MsjO96UZ3@1i%K|IOa6Gv^}=Q;Rfn?Sd51K4sziMDSAJWajDZUk zd#NIUHQez-Z!J$)UQCR8ezEyghmP?&i|v^YD?i=6wKXq&al{iRWa)1cxlu2A{Q!Rg z`At3D%7RQN8jx&cd^- zZ;3@EdiSROj`_U0cHxUy|J`93ijRM`3_kP0jI-Y%y3IAKO?q;Uy+8k=7EJ~?YG8$)t5^z8ooMjvFbrjGjaDjqUv8rBcVZ~V8fly zUk<$AQ>z*JNjXKQMtXY}OcFRpJD5~-?L2ER{O~Ya6CYox5?{uC^1R%*-+teFI_&V< z%!2e0FOv)Asrgd@A_Lz=S`)gP!o8eqi*Fbf1j&SSl55^mJughK*GIxYW>iKOl^8j&flhProCt9awqCwsoyE?O*nVyfz0*Fjn=|Lq%I zm%1!P>{orW$y+@bQkl`bx*%pmAbl#wsc@0_f=yrz>k*1)eTgFJkDgo!Tz_smb{|t2@L+8SHN??}3d2a72?qv}!VG#@ ze)XH)No1ckG-L6eWUJ)pi<_UKnMUDij(@$16X&v;^mbuNJ|!IGb0$`y(QGpBMtnh& zf0T#)$;dZETY{dlkO8Rya@H7d!c#Px&UK7pb_a!|%qe`73UwoW5hKx*hDQuE}-V^iEj5 zaVuThlaN2=q3TBWyFaJsal^?ke@@k-P-9SYCQ|fD_3`M!i6O-qH_@U+sO4r~e{Z_Y zw`+V?tW}yeg|fcgNg7)F)w$a#`z&py%hkl(`>b2JxXF6R?>K)$VOL^Q!hRO<>p7=i zmqXzX_EYqC*3@Nov2|YWiHj)z+FAUy_I{V0p;I)QKv3>hxB?O|+Tio$#T2dX+?a^duoEvwE4lxiwfGWla_p93hPcxsffFs4 zS>m@*($k1aUbZ8lLhpOhyy8Zj*JK=^t@hX|m!9hDP~mZ_bzR?9MX!^3lMhaC$MwBT z6FK!bZqd>>&cbNptI@kY#gfr;oWWs+8&cgL9hLc%qjK8sg$UMFA->)oqxj4z>DN~+2Zsz{Xp}uv4cgUN9 zAtqPr57X-wC^l8N&2L-!V+~K*mZ2##}T{tZuRj==O{j9SG}aX9_89b4Zojs&EH~CykZ<5 ztn_|!DrZGrygsz=W_s4Xi*?W{eHH4I4E0Xd;x}pi>I1pkzP&CD5ZEyB(j$Pb=^lKI zu!@a#>c_V?rEf%^6E0YK?|=Cuy4?G*SXuS)KNcuaTigpuVK|5mQKpywSzIIbFTK>**+8?)Ovbx z|EJEMdaUn6jbl5s-R94(Z*TD5_};T$+;dUv%riP|$XGC6Ch_NFeP##mud&YR(_apL z+I=G{pt`aAo?FR;tkgiaW4FyzzJCeJuNQlyH2F6y&RmET;2ebTV=b=>kIWnrblCW2 zeOtEn;FSecB_QACA_wDF}shz(#w@rK|AEVv#_w7hJy5^KA4wie( z&f#gM>~2Uq>t8W2a5cVwI`(~o2m1jgchifN@~QkzR}*ZHrOuvGaIwrk{zUO=YQL+e zv&`%Rf`)=ras1&h=JtA(e!(hkmPzGG-jWP$!!xpLZp)TfsM`_Lg!x*>6~)6JyI)~_ zmO9YIG+!I8?IX~cw?9)(udb#=$4V|nR*{>}vC#S5aa!=zLlQnR<{tD-y9@nwn$KUc ze0#tD_Nz1JNx_{r_M8abIrhNNr>3vSer8v7f|f69oDCbkJi_!wxP$%F!Hk#};`>xx zZk9{k`l#V@tNfLS$5U7>^g*IQQt2M$M^fqC?l;=R z+w&s^52u&K7STfVPP-J?b47DU7j6>^j`oH}ijIE_)lB^?d(r#>p^9C%>eAVFBA+Ei zPV9_=+Vh4>#3oKSRzcg+373v-@OPGuGUcwTn*Muu{JM!I*;8VjrCU2`~h&1&Cd;o4b4AA9Tj>(0&D9eiPYna8YNM$zVl+gsTI z`Is<*Vba7_VXJtV1NBj2u;9?TZzoorlIpANe59zZ+H~!9rDo3qvHb0SKX&}d{X9)8 zH+qycGQI2jk$plm@lcEGJ(;|{X-s2!AKcaD50lcWkAJ^F-!ig|dqL}AOw&O``qqiPK>FFzZ26LTDNK4qb#1cTSB=xZ74MI^pg?`lT9`F2$vNTE67Y|phDKYnvn@Y;dQ6C;wtj@56K-%Hilch_yH`lQ4&tN5ZR zNZGl$>$mEY!Ls(aRDX}Pe4H;nCs)QTib*ux>nLjAQKht($@bqUlDS=YL8@jvaq2Q9 zImz8R)jj^q_5B`VHnW!!6gIx#D7e)3dQ87ACv%;1AoFcGrr^7)?$DUurfyMlY<5$v zUCitF)ZVjW^SjA=DL3~A4m)i7Ynt)ane#`O!1lpCq4?HAv%l*3+wN!Nb*k?QmJeLJ zEBtbjh-qum*#bL~gH%Ua_r=&i`JP^auh%tS*m#~NNq_RB&E(0A{m|EMTxqQ{=@Ze;Z ziD<=whUg;e^LyGoiZ+!g8RFuOw|m+pF7B@lJ!rP;Y3nZsyAMB}uRHYJ^+nN)>>jGZ zW4*wl53PLZ+tL}a_ zow_~b*^L0BYa^dCxyA)La&l?L+xT{@yUi!7u;o(1%%}+$G)p^KdYPs%qw?#-A^ZV9 zM?cn90)4K9JOp?AQKoCg`BP==>pwl0IYa+W9eTI#a-iF4?X3=P(aE!6>&*nG-$Xg6*FVvw{59e_vRS--_Q2Zvlp6g4 z5#B)VBLm6d$H#9xG^2xmxze~?XyM{xeb2^O44j{4{oQp#E&a+?NR4}#rJRa|l{ zXZ!1RYClip@u&#(kIFik4{4_^JY2;Qv5;2W-QIJIzUc+%HdM;qF21sFYvmz5!3Klc z6yX`+eu@1H)4SXKrw%Fd8JM51eCgrT<<|e<_NhGKJ$9IaOvZXZvk^2DD#B z>A5}sL|4O$XocSMaur!moi8a>MB9X9e@{rFalzgp2d+K#d+DCpxciS5KkYC_q)1vv z?&Cm}CvaiO&5cg?EiUyH%azN}s^r9Ft1DvNOjx56zv?fplbaQhqYVU(?%D9b=$qAv z?$g;JnflC%gY6Ct4}&{Ky#3s+yO`JpNyvPlb;sRROuVb8lBi;9UC7h+RFLjksS=dA zSG;or`_%i9JCW=&Y{G2*clmT_6ZW Nq&*sxKJl&Oy(1hAF#IRj4}$W5>6;gj)HD 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 diff --git a/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java b/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java index a9eee8ec..b3584c76 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java +++ b/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java @@ -74,6 +74,7 @@ import org.diylc.netlist.Group; import org.diylc.netlist.Netlist; import org.diylc.netlist.Summary; import org.diylc.presenter.Presenter; +import org.diylc.serialization.ProjectFileManager; import org.diylc.swing.gui.DialogFactory; import org.diylc.swing.gui.editor.PropertyEditorDialog; import org.diylc.swing.images.IconLoader; @@ -856,6 +857,7 @@ public class ActionFactory { try { BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(file)); XStream xStream = new XStream(new DomDriver()); + ProjectFileManager.configure(xStream); xStream.toXML(variantPkg, out); out.close(); LOG.info("Exported variants succesfully"); @@ -1012,6 +1014,7 @@ public class ActionFactory { try { BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(file)); XStream xStream = new XStream(new DomDriver()); + ProjectFileManager.configure(xStream); xStream.toXML(variantPkg, out); out.close(); LOG.info("Exported building blocks succesfully");