From b02eaf928d1e181d481c5759e93493a567ece3c2 Mon Sep 17 00:00:00 2001
From: Branislav Stojkovic <Branislav Stojkovic@Bancika-PC>
Date: Sat, 9 Feb 2019 17:53:38 +0100
Subject: [PATCH] sort blocks and variants alphabetically

---
 diylc/diylc-library/lib/diylc-core.jar        | Bin 250015 -> 250015 bytes
 diylc/diylc-swing/lib/diylc-core.jar          | Bin 250015 -> 250015 bytes
 diylc/diylc-swing/library/main.jar            | Bin 592193 -> 592193 bytes
 .../src/org/diylc/swing/ActionFactory.java    |  21 +++++++++++++++++-
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar
index 266505c9dad3f740b6d5f22bcbfd77a71dc079aa..f8907326e5120f937a32e03b2d0fa93d89710a27 100644
GIT binary patch
delta 4429
zcmZ8kd0da_7XLlZQwo(36{2DyKN@@nW6)+xL}c6+A=^-6pF1<$GE_?PYkSo%*~*p{
zr0rE{Q^=Yu<A#YbWA44?&SmU_$$ic_??3nc<NH0^_nhav@ALk$Kc~z7oGupr(}YPU
zoz7gROE#ohxbh@J>gaa)uQHlB0t7J^o@`LIuulLSMIU8`o0)QlbprDjHXOj7j|G^^
z^#Cz^G{6?tM{#Sk`kw~MGd=`jj$$alOyLGCz9WzYM)z&}|0*7d&mh&w#2p~aWEg;A
z0x~7_CMg^+z^uj;+}$mI2KdABJ$PSRU1Wd_)<+Rnb{k*<w$d{W?cR1pSbe1zsVs1q
zBp`mo(GmSk&LxOZANgSZc^7v?vqABIN{Z`ENMAPCfbN%idqnG@ju;-{_7=i!AG?_W
z&L4Fh!y`VmMVvNf2IB6|s9W{8RP5&Ou^;hwuk|?1vPsX-4))1JeBrwoG05*XICF_l
zfD7iWnd>O5k_}U5^tfb^JDurtEnK-DYFknk6pnqILg=(NLO(^@azP~OB!>000-b}a
zyP#dVb`9#e{B@rN_|I(_i2f%rSy-32^%IQOZ?i-DZh{`;<~szUWs()5LrOWIax1M3
zpiH?AY6&}MVf0?cB1F$!@twhc;ZP{54mx@p{j8t^s&_23M|;3=>N2Y+5$(3(Hq5Un
z$7Pp1PzxbnNvilBU|HoGP+eGsU6jV^KP_Q3J8#?SuIO~S;YxG0v+}g&F(loqwL!^e
z^?eb$HBQCXB($j>TR2|+o#SFFEqXcZk&EpilpoW2C=XtAG<xI+vyzF;g$(7b5A+XQ
z#dW&xmA>!$L9A=Z(3WpeH220C6pOh1AGAa6Y@+SmZ72Mp3gekS=3?CI=Qi{^{W2Ke
z9>3pCg1`7_HO^N1;$L7Y`L7Sb5&YlKsNLUVR>`^cgHT--!J;5deazV=B;lqk1j%_b
z_P|2kJvGmU9T7lg*|Ba&miA^NknHNqK0;FG#5y9mG=NzmxigU2n?Th|JqzGKeBIb7
zYak{bEE99~d9y?$`pN7A<_ww2-l50Uk2NBB;xC(8CCNwQ{q9|Bpxj*mH(GlzTh(O_
zTY*KXbJ=9fZ4F{qk>rK40wi<8SPGJVE@5ey9Qg(FL{CjPdxxH?l`I=c=o&V?0}NR3
zHA}#pQ5)GEVF}G`8^;FJ$mSKsb~A2gOgtgFsZ%zwCM@i_g-yf!`LRqzV!MqErb4H&
zn=VWdI-R%CYa_E)zer?(m{Fg^(vbwFF<V^J+6*Qyh;091mv)Tiy(}L+f6HMnvD3Ok
z%m+QEbJ=Y4Sm!fWEFXKEIUorxW=+<(F@5*Uv~)Ri3O9z0=eEWlN<}AiRs%bTm9NgS
z$4DMFY0vEUOUxbBhc~m0NRC}+?)c1pd&nkqMA2U#t@%g1JW#YC(QDV4sT%xmmW2hc
zp0HFT3C~$A65rRXJCX%&wWC-3$pX-0#ds7Fg9%@P<hdDlLejG{cV(~)FAM%Lde(K}
z=13yD@pVX^_Tauq#@X{@NPg|ZZz8F8<h_x!_2<#_AhxQ`c0O|M3C6H6W~Xi)$U`Vl
z5c+UgtPFeyPsmO+)$<H2-Rs7mB1s;>$0E5rlApk#qDJ$DxVrme_*WSEd_1qikgW&L
zBVEgzSD$<<b=Mo&Q>pvNn;Rh2D4%?P<DMG%C~_wA<yhU>m&Z|2S%2%PBW2MrEHVzM
z6`j?3Kkk8Pe3sUBNdTXKp1ir-h{QXX)YX<yJ{kw<w1CU~%B$ULAvZzd7{>R)Cq%7X
z0)okg^5tA~0Eg)+z6c{L)^ZQXHRiA5Ef9%X&o_4m@*$2pp^Ec1J{ZZ21l|wH>h1gn
zeljK+cmsMmCUbxEgrsu()~gW;??K;4|L|z@+47}~H!(iR;zQKRbdEn)YQIc=28({m
z;)juJ-^*=qtn6&AqHxdwUID*Fs?AAWgr0N7d~sj!=v%l=Hy~a=@n;ws`G~urXX$G`
z2?Y!P;3|@(?|Cccc((IF;3*3i2^e|FMIsHl>X+g7&&WabrpC4J`2e-pRM0Ww%|%zt
z&FUnUB9ZrJ{7mTWIZt@QZ=xEzTy((EcSHzzm88dfwKxku$7=Ieq7|$1zY$-<w_0_M
z6#huQ+AJ2pSjJmh#29#2tfPe|;OuBI3@|oYjDq;-XfYA+Zmj5I>>DGT!0?I@UVyPN
zVj5sejDSD7j8?H?3ZN|NV_Y9A27yr%Cyk0&;RuG584uWNt8j-l!5U&k`BtiUuvPd%
z(vUbY128g9&L&YRjRSliC*}gqi5K$$OEt9FCjJ8U%5B0QuvW9}637lu5TAp;K7sTt
zw+lb8=WQ3$0rR)hab9mH{h5hk73w64<$$g`#B9JQ4O@1IK(O@&(vLDwyv0EJ4oNis
z$|TY|n<RW7ze}=M2N;tq<^Z-PQ@uWg=Gc%zbr&?WPo;Q7D$RE)mHJquQT?Jc5eho>
zX<`<jjY9r#h3slY1cTpxC(XNlr&tK~t({^8pl3SmF*{u>2HP})Fg!y<fPFiI`ss}V
z-aTWahF6R<r$eT8&P?i8mni}uug5Mi88CF02m(B{i_Xup#8j~TvM8ROMf3ieMfL8x
zX<r$;Y0fvh>AB6^L-XhDq4S#WCEdju*6gKo_S#4IwT9RC$=f6QjoB~01kBw}bv&DN
zgR;pk&8GflIpm+8LvxkpP+zM9<X?J#_E4^&*+Dw*yn{4%=|QUNbcpJf9HRY{9-=*(
zA0|8SF!d`qOuGCCU7u-3XfMhUdXMfOp}o20%J)@Xns0MuTw-0Wyqgj`9F^~f#6S)6
zk4jx>|9MpQk?5BvCIF`8iAjL1dGbAy=#o$MUusyKPr7e4^e&M7WnNMN)!izf{N9Cx
zVTE#D8P6}IyjO)(?|w`^U+GUcM*UkgbUiNjBmG;BQ{6=kyPqKa;1hDMGG1^(?lZ}d
zQABb+8m1IcT11Wfpgb=UddPJ=NwX|FNxLaKNoV85G}8<Xvx;e!$HgQ%qD1ag)<>3*
zXhRA4JC{;@V5xjoGG16JpQS`zMseRV%1<q$ytXoVXJvdyIoTV^Nw=Y#{9RS53sR|n
zo=S7RQE3NWr|4PjJVj@Jbc%FFRFEB0L3KAOsLr{P^ujCY+(nf%&+AIcn^Hx(DOHsB
z_bQ6_J56(~(6Hn*?dQX3ichX4G*nanJDTlOLv?cL_^eB7DDR!-pHxeI(`zZ-R!jMV
z>gXL<Uq^a%b#fkg_sr|*4$P~kJ6u&SLcni#hU{<7(A|~)M_B~^(G4ODFsp&=_6GW9
zt!Na>z~9nH-{!GrDR19dx|>hV(w+7_M|hYp<2;!m8kTF=wTXT@!kg$S*EZ4BwZ9-1
zK%0#h=t^I^K%Zjgi((%5H(#W2?_H$2;g={c{t{j7I~oqXO!j6CZ)oUph5Q>dynKbm
oceqOZzqu+OlkC%Qm3|t!Hj^FNEY~Xi`OUP>_GYS^c}@8L7kRppF8}}l

delta 4429
zcmZ8kdt8p$7XJ3$rBI176{2DyAI<O^j6o^4L_{-A7a_Ny#@(60sfJ2PO7*HQxs{ME
zNViv|n__ZJVVp2AW;o}VGspchn4G=VdjC1+AJ4OH&suxE?|#1=$nJI^yPKKsG-1?5
zr!&>*S|d};TzE@l%BT+cuQG}`00b~+-WsWFVV?mwh(5{;R}<wH>jLIOHVnXyj{%s&
z^#IX)6u=hNM{#Ym_@4&KGd=`j4q_<4OyLSGz9*0c2Dfee|0*7cFCf*?$PFOG=u-g2
z2xLm?jgmQ_pGl1|xUI~81^C1KJ$PSRTws6=mPZj+^cY|Sw(?Od+P!Uyu=;W@Qkic*
zNkIIFg9G}ToJtTQKK8==ADrC~O$NmQD#<R_A${rKM0CH@+aX#Gb-?g&*S8RM{lwJ-
zaNfvP3=jX@265Wx8Hjtnpl;P;Q?Q$_`vJtK9_w(LrIVha9q5&T_`-V;Vt~)@aOM&(
zKWEHaJ;y;<v_?*y(et8N?sTTpwQ%KbuuVx>Kq&Tc45HIs3;rB!^ZDVZlMwQe1?c3g
z>V|gdn$@W1{MY?v;6JxzAo?FiXJTE#*3U3rzs(ly+wppgo9+;Z=1CTa_Q~ad%8k@^
zfHI{O)Z%x|!swm!g^1&K$8`n&`9r~|I_T(4^s|CasNT8I4($QQsmrXQ1hm_W+cCeU
z9G6{kPc4LeC8^>^fTfjhKy^VCc2OFu|1^iy?7C^AyR6gchAGX}PRf&-N04-<)*2<B
z)%Qj0(Kr=fli;R$Y~gU}DaXZDn)R~ZD;L{SC_kt6RPMd#Y;eyOCM6S_3mM8=9_;VG
zlIwIoDt+JggIM>Hp)DIwH22yW6brlgAGCvRMbh?ecM$$mh4GA^b20AmYdiWK9}dR1
z$LIHx;4gksjkDFh_!pQ;{_8_<1m8C_s?~eUDmmAY1Jz|=ECSNhN1R0>2{mRxNPaM3
z_srzoQ}e9Z5dmbDE$e|~NpChB$?m@FV<dHstTU2}1DH9ITLYP$5mdd@Gd~W*+m)TN
z1Y+dQGB9VqCrd!0pUggB&XB3>9eP}RSR<0hzOt!Bi+nVm@7}ff%iZ~LgQYvOQJueJ
z%dseB4x5a*Z2{~GlDuG6fMiYxOGfg~#Vi$*!@p+Z(Nh!3-l3;z1<OJbyqZn#1Opa)
z%i=L-<R*4Ym_u`$#xZ_1vU!D}!-U%!5>AL7>Xb;<goWL=uxXe-FNUc|Y__q%ROmP+
z^86H`(|H;^HZeQ(>jdVH8TCml4T*m$v%y8JNoVqc$o3z0YsYBb$MVthw`}$jJFPv$
zywGzxm(50xWj=Gk@-fGmJ(9p;)?|qr(_3Yvrpcj`xglg6w=w)wD!Qn%8dwfizB<bu
zA-UhAJ+r45nH#DPYi65}9BXB6_{@I4&n9$6(cd1d{zsfVP?R9itF6pf4g5FD#DZ6k
zSqhT)=d2cq_iJW_Wd2+2=oNo5KlE5I9)Tp$h%ZL++=M$K`KT**VXzDjGyVyB)^_8j
zNWy#YwMd@y<lace+VNvZe(S@pBdK@by^*x{=TY<^wyI9HUUKdUhL8|ut8N|0gD6lC
ze1B<-415ny$W}Gh^K>lT=gOZT**Tn#L2_vXKY>F<jN%J$b$3Ve^%(kU9IwNWjXTdH
zUGwW#9&eDk>kRCP)P3N|6Cu?gpL~DA-WvHRvM2LpSl!i|$5K&Qf6J*OWYMQsWEfH_
zx~la)+#S>SEUoQgKRy9Hd2_e{iDw|Gt1ZEN6b{m5K9~EISG(5&ZiK`kgztk-h+4ZC
z1Y0A^mvPYv9L6j8LX0e5!`&g*kiV9<KqO)v-)sfsLo9bh6{l@{Fp?SZydRQP+xa#8
zWK2xt4e05-ll!74D23y<UJX-tPx?mshDMprmM>+Tk>PPBAEH*Kas0Vb`(^MmSoBLK
zKa6DiK5mU;Wo2;{g#!-q3ivHjtxxhI^qec^i~52`-@>hX0P*;RKf}<72iz4sOJ4Iy
zC|LLhSCK4v&)YC(d<P!{p0ZF8kCB&LB+#HM9}c^FMh>bsHmrHi2dKryf{qzyD!OBC
zW*4ypiM&7KW<u}rbA>1TCaN*ZL?;}5N0^XTNqS6IiL>x?tTwL~ZCI86o%j~M)v8mt
z@I|tIvzQNK8E$M5qv2h#j1uDkXGe)o0b`=XNQj?~5)%P$$A~_LzR|)F43B8x0T>f4
zrUAA@3;3hUU=bsx0Lr31hIKJw5EwPF(x`|L4q!-`ae%$H3O8sIs3BIAZ>5TRTZK0y
z4T%*q0K;SDY!ao?SitwOVh-S!abg}|sfO0u#9zQ(u}$~_)@rtGJlUb~;w$ji$CJMK
zcHsl|-0fmIVE%SG&g<=@KQlqBM4be&4A5nVm<<@AVapET54Jv$^dk}}-jYcA_DMAV
ziX_rIn<Ts-zuQi+7BG6J_!6*fC)MkdX^xG_RCiuOyA+CtrO<q*QmBtvD%CGc6~UlW
zpDJbnS}WuaRmiSZL?HO>cG0}+c8LXG-`FLV1CCFlJ!YkeMPM7J6NaXXFtBf?Q$M{y
zz`JJ%*YL7|=Csey&Y3~|>N12M<n`PwCIbfV76E{#cGLNJrkD!0PbS6FGHKr5GO6Be
z5A7>`56$^z4?VY;dujf>y>wpFeWbfc!<v0`&R+WoztymHzq~!N-{=G48^GKHRL8SO
zHz14b(k$w4l1=`3*)&&aHubeQNd6@UX%FQZn&i-V=jPDdr8!jB<q*{^K1BN|Jw$sn
zJxsR$Vd__Km~{COx<1p6&|Z`y^d8+kLVI(`mG7&(G#hedTw-0Wyqgj`9hL8gM1KwQ
zk4jx>|9MpQk?4~rCIF`9iAjKMdGbAy=$udW-)LBzPr7e4^emA5WnNMN)!itd{N9Cx
zA%${Y8P6}IyjO)(?{-W+U+IrOM*Z6~bU7~fBmG;BQ{4p(txk}B;0d``880{?_t_Ge
zUPN+U8YUM}T3C(zpgb=UddPJ+NwX|HNxLaKNoV85G}8<XGmB}KN5v#MyhQF))`ypn
zXhRA4yOvVDf2n*{GG16JpQS`zMse>l%1<eyy!JAAXJvdyIoTV_Nw=Y#{M}Wm3s9+l
zo=S7RQE3Mrr|4PjIz?xHaEf$>SCAcDL3P(EsLrX9^g=7?+(nf%&+AIcn^Hx($yJp1
z_bQ6_J56&f*RbR??dQX3ichX4OsuB<w=~<ahU(<f@mZJFP~JPuKdF}brqxosy_WI^
z)zLe!u8#ET>f}7~?wQup9hh5Bcetuv1cBf74B6kEp}Q;pkFpT_qZ&jAU}gi^9S!u&
zTHYv@g1@DazRhFKQr`ZvbT=QLr916?j_@#H`VV9VX;`jd_a^%32yLRPT-!uf*Y3QS
z4{bJ`rz?H+Jbj9tE{M6{-+Y0_y>o%;hFzq*xQlePZ)rI664{$Iyr!Y^W%6&-@X}=(
o-~I~q|L%%>OtMeI75ZuD-b{9Ivs|n6=Qq<jJDRC(=2hYQUsJjE?*IS*

diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar
index 266505c9dad3f740b6d5f22bcbfd77a71dc079aa..f8907326e5120f937a32e03b2d0fa93d89710a27 100644
GIT binary patch
delta 4429
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

delta 4429
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

diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar
index c177d9e9ec68cad06ecadbe47c72ed8d2ec52f2d..1a2e41407f608e058d25cdf63c7bc9a0e4722477 100644
GIT binary patch
delta 4933
zcmY*bdt8s#AOAkrbDnN0Bo#sy<+^6BvoN>0Wm%0#wz<YC`(-7!+1RjhNuF(Pv9WY>
zDLqP2G-@a-*F?#r3qmB9@;m4A>9ybM_s{oz&gZ<(`*S(xbDnR`R+pTuE*4(nCE3hm
zq9)Vk$SoE<#7&V~21JQbkz39=^WW-sm?hdqaO3cS(2ql~FqA{GFi_ka8SNms>cJUQ
zGyhkJt#uWLamp9sNKQ!>T(_$d`9ELLqhwdz`Z`skTS*$~4C3&q<k_-CU)`C||EaRI
zzoq_sjmkqfjFR8yutM(5T%{z*IWos!?X3mJ5WC(m-|Ika`8=WL6p>?d?<Byaev>=E
zd{P+j!n~s-KBvCz6^>nJc*8twmJIWiU!Div_yro+eHOU@E)UuRdL5Q*v$5I~Id0Ok
zPG5B|7fmKb)vetW$7oNT>T6SJo0Nv{YJgd>E|qc*KW`ch^YSgxfT7#=0k+p8?f80J
z(hxI__l#nVV@A$km^YlC3q1dVw07KXR~c%_F|z)iIV(uYf8JVBh$KDs<!>RX$<)U}
zAD${WMO%wRPfVwFMjjC&RJO$!WhD&aSs1HrgoWIR@xVc7#iKKtx(FS4!bS&Ip$sg|
zeFQrg*bNjm^GJ-i5yA<u%o#5<nOXAefB9(8tumJVP~FQ)=%5E=QCB0yN2ulz8@s0o
zRpxx~;~W7_!?-z5r~<!#h6u@oFNKB+BY~U|A^gz_@|b>qK<|N)$#hZG_g;}5_40UX
zsRw0K&4}G7OoaIBqJ%U2*p1X3!ZBVABk-V*2SN5v6^K2z47(r%fO2esP;J948_R`R
zV0lm>ylKlVHI0HlSU!F&?BS<i)Y^#V;G(gOxCE9KwG-PzWqxoJPdIVTM+3zru>JT%
z@iP%(9$Z@;-(Y7lo$Z4$_f4R-#&|EW6+bd##yrsyL<1L!&p>qcVi9hKF)>)&3zo-A
zL>~uE9vdm9qv(rg)m@TWn@n$d>Qk%)N1co6!}6)MF=4Zq)tZyde;55=`}_mqVsLTo
zpm+$J{+J`qfu*`L;!lv<iW0FeZw}+o1JMVTNSzo2I$@$T3%1`-q)%X}7nLL#a(lS4
zN5wLB#uJt3Z?`$J&TeM}TSz*vv{q7fM=p83m*fo==f093dK)c`#5}Z3?bE)nHJK8+
z>Dj)7D-h%HSSbQxS?nj3!^X+}Qa=eC+VA)(`~z0Z!@c!O^)39vv!%~K)+|gK2mDW$
zNlg-K0AuP($;+M(4s4gki&mT2wKNL$J6pFknKIn|RnVJ?sJYSe7s<IT=T1sy@mg|j
zebqv}GrMjX(X$sh>DHI2yYc+6<POqZQl&VN(=Vh+f)gJU7D?r;_~1x|ltlR;pjPSt
z<W-L()r?zyXq5KBz+IBrtHLa+RXNs*54yCKeZdl8FH6?!#WhxUmrtpDX?P!bt-=R+
z@5$D@vyGAuWgpC^`^;|!M|LooiaevA7>>GU3DtBnPq~#5GD6<ffpe_`<kr@F&@EV=
z%pX`|X}HXKjST|6lLH~riyP%;uw0Ch!yv6OKg*pVt%a#_Fjz{{WB~#!OPATp$F|pG
z$_JsmF<0an1j_sCL)S!=-H5fa-Y;10s#|5qmPVgjvLi@LD3fzxU|S*o0vRRUmm460
z{f}jP9_6u9iaSK|KvPCRVLa@WUtv?BgW>@Nmfe(H8n}ybkKE8Gm`n?0J$nc11MBw{
zsy90*)F|;#EMZr5f2A07PJX1Ug0MdvtN2;)_;*fK76OO*Do>z9ujeUG;e6_rD0_jt
zb*a)x=H!%R$|wguc(qMwz}o+vaH}9zF`1&w;r62U+Dd9^^!{0ihx|%*Df1NwH9y(d
z=*cRR3YB4RSCV3FMEs^qhX}6iSIP-jPft=Nfn)86k^oC-Dat5_pvh2Nx^Pa{5+x9p
zHkT?rfPA7%=?DHE{i8I(saJ`r6I>P5O6?3O^{`hx;5zwtRBa`Q>DA^GF@ePttLR(i
zt8V&)hwN?2=&T+C^$-`e)|UJ8AE0Uw+=5}MGaSywF={dR3z(>`0`i^7>aP&W3U5_~
zK3Y3p9S*zlg47BiCx)t6Z~HJc6H>amTup)-v^GX<fDh4%o$ANX#QD3`86fDoPhAQw
z_WZ8?Wyj+QJfSWJOLdky!;xFY+)zWoa`L8H)DCisJGFauXO`PmNp~JdSo=z<)%FJV
z&AVN%x&zm|LH!-{j#!X9a30Z`d<Y?DI*=Vut7)ByD@3uzh4hEi(|eH`;Oy^D7K2Wk
zfusnssTxZ5g5XAP;tG~jUt$J>Y(KIL$V2@}d)V$fhkOH;OY=y7u#g~vz4vVhX#*BL
zj9~9+5hQ|8{wBFh?R#6dI!fI2Rn64iC|pB4@G{2V*pRW4edGVIZ22Ta5Hrr{Xn3zB
z2Oyc(8wvYxv2q1Pk*i=C6GH-VJ6X_|USZqqtl%Aql{9lbJcd{r^*Xr++>+fS2zHO(
zOZ*|cgt(RpI3$n<z@bM8p3J&b@;z`YGD#5}et8ZFhwXm3#2J=WoF}=^bt6kjA}l?*
zO=7XJ4;NZ&uVnv5PuuZl+Sxc&MI^Y+x%Gs7yIBtJG>~Q-yd)>#h$`O@0#8<*J#~aD
zZ_$-r1<pU+Xj|aC?oP|VQtD3Mg?6?cO)YzI!A@V(;rw5v{&^f7#6Dd5t~lz+-eJ8g
zj`rnfbCABz?c)y8!5r5fq{BJp9i$UDdL>XN{oQ!llZynz({bFG5Kkv@d>v1{xt)>5
za-5mO$Y}}Gt%dBQHz!aYhu$lZdbKc}^c{&Pm!C*Saiet-9nX<%AI))p66OD|^?TgT
z@ZDtk3CDHGOoZX}WIBzb#~~WPG3F2r;;0^`{v78Xrn5Qbx6FGSp<nX(rX#3x_Xz!z
z&j%l+b2;uiN*8mqNui54u1cW`Io767KaOKl=}eA)q|(ng3diVljx&$Zc^uCkqk$Yf
z(r`U84dbgyqqDeuoI!m#?lVwFIF7ph$B~zQoUOCGZPU>nl#cr@rPBp`-;fN<Yexp=
z+mwNNJ|~c8w4i+^?hnnx^@2={(=7{iVzN-@c^2yUp2WFv5_zppAqJhoJn~P`&$<6z
z*%<dv*>nb<*JLAabPk=R@xR6Hwa+4`?sbN?)z9SMy|FoswGBUwHL5sG=kUGb&d~WB
zQ_kSJV=n!I&sXQ-8CB-eulU^OPxPJfC-Pm+;`)ZOXn%AT&v?o?v>WH}?7HP4M&}{#
zMIN5bm-$$O!hG~Q;4d1&{lx!;`>oI8nJ+(&{wmKSZ_)+SIeGzW*5)GWth$J`FTaTT
z6AKVC3b0n~3$eE0g;=v|g;>*mm#7c-yZ#cMRplkroANi_g~S#lMNFUFiTOo%H*$&?
zpUpcKGake6Vipg>o5d_&hT|@?JIwI-W#*Tm{S`Wy<AN*5&%MI@uz8=WEDnb2uhJ<T
zORr)J_q&Gk@2|1mVD_8Wn4P^3eXpa=x7S&nnEn2B)E{$$)t}AdZ(y9}C8)o&1noCU
zkT>Wi`rmew)rIlvZ?d{F^eaWZoKklFZ2rzIv`4jI!!6XAcAM3ot!LfFxpNt-ADf4j
z(Wx8@%Fyqia$Mh84*czR(A}&%?AkHf**jRqP8DchS;3Bl*-I<1jKl7t+_t-z&hxuy
z_x%UcFj}zPJ=9xyk3BhTf89L{e`+O`HMtVQQ}1I~A@?z?%lA>Ye-&#7wr_V8yXFk7
zs_EApzpF;wnrig-aSgjp%x=`6y<;uLySx_Tx?PK98Sw!1_qQN@i1tMfQRl)#<oAAr
z$FTkp#!>SK<M6J-IL_3eAGgQ2Kk6}^tMN~>L&vEPo%AQwthH^Q&=EW)pC`!8dV(=I
zK4rPGE4}V1w#=iac(haNk$0jVYvlY4eXf6o_Qx&g`yAIZpW_v9X~6v(8c^?P177{f
zFYsy}c!4?5Mx4)T#Irr#h<1mUsI%rJ)}Z1gt`B*IXA}Jj&!+hm#xw6V;-%LZ*MK+d
z31E5deS<n$6UGzNgtaMd!n5&gMxBIaT(^0P>!EM)Os>C$TE`61_zjQQtwF;Gf(93Q
zj-WvUpA$4V>Gwnp8g!3{c0tl0ia<$&hAEabXlxHzgB!F{*5IS@T-M-0@KO*H6y&#7
nQ72SIUV*AX<98>BYlsF9N*U3h6F#6CG*%4N;7fg<YSaG<CwFsY

delta 4933
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
Zreju%G#w}51E%9(#V{Se)DM_G@xO@Y+xY+h

diff --git a/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java b/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java
index 262182a9..4495b622 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java
@@ -28,7 +28,10 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -723,6 +726,13 @@ public class ActionFactory {
       for (String className : variantMap.keySet())
         types.add(typeMap.get(className));
       
+      Collections.sort(types, new Comparator<ComponentType>() {
+
+        @Override
+        public int compare(ComponentType o1, ComponentType o2) {
+          return o1.toString().compareToIgnoreCase(o2.toString());
+        }});
+      
       CheckBoxListDialog dialog = new CheckBoxListDialog(swingUI.getOwnerFrame(), "Export Variants", types.toArray());
       
       dialog.setVisible(true);      
@@ -858,7 +868,16 @@ public class ActionFactory {
         return;
       }
       
-      CheckBoxListDialog dialog = new CheckBoxListDialog(swingUI.getOwnerFrame(), "Export Building Blocks", blocks.keySet().toArray(new String[0]));
+      String[] options = blocks.keySet().toArray(new String[0]);
+      
+      Arrays.sort(options, new Comparator<String>() {
+
+        @Override
+        public int compare(String o1, String o2) {
+          return o1.compareToIgnoreCase(o2);
+        }});
+      
+      CheckBoxListDialog dialog = new CheckBoxListDialog(swingUI.getOwnerFrame(), "Export Building Blocks", options);
       
       dialog.setVisible(true);