From 0acca63ccd02ae63e8779ae9dd269a7cf52e23df Mon Sep 17 00:00:00 2001
From: Branislav Stojkovic <Branislav Stojkovic@Bancika-PC>
Date: Sat, 9 Feb 2019 09:47:13 +0100
Subject: [PATCH] prettier variant and block display

---
 .../src/org/diylc/presenter/Presenter.java    |   4 ++--
 diylc/diylc-library/lib/diylc-core.jar        | Bin 249348 -> 249348 bytes
 diylc/diylc-swing/lib/diylc-core.jar          | Bin 249348 -> 249348 bytes
 .../swing/plugins/statusbar/StatusBar.java    |   2 +-
 .../toolbox/ComponentButtonFactory.java       |  16 +++++++++++++++-
 .../diylc/swing/plugins/tree/TreePanel.java   |  17 ++++++++++++++++-
 6 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/diylc/diylc-core/src/org/diylc/presenter/Presenter.java b/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
index 912f7451..ccc145c5 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
+++ b/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
@@ -2592,7 +2592,7 @@ public class Presenter implements IPlugInPort {
         variantMap.put(entry.getKey(), templates);
       }
       for (Template t : entry.getValue()) {
-        templates.add(new Template(t.getName() + " by " + pkg.getOwner(), t.getValues(), t.getPoints()));      
+        templates.add(new Template(t.getName() + " [" + pkg.getOwner() + "]", t.getValues(), t.getPoints()));      
       }
     }
     
@@ -2624,7 +2624,7 @@ public class Presenter implements IPlugInPort {
     }
     
     for (Map.Entry<String, Collection<IDIYComponent<?>>> entry : pkg.getBlocks().entrySet()) {
-      blocks.put(entry.getKey() + " by " + pkg.getOwner(), entry.getValue());
+      blocks.put(entry.getKey() + " [" + pkg.getOwner() + "]", entry.getValue());
     }
     
     ConfigurationManager.getInstance().writeValue(BLOCKS_KEY, blocks);
diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar
index 6772b7dbe12b58ba8f747d4cc0b1a6854c09014f..451e3b51be9ecac34db3b1e4a3050eecac234e47 100644
GIT binary patch
delta 4327
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
byKC}&x<>x_YcyA*Mw;iUM#?+UD180~R<8ve

delta 4327
zcmZ8jd0dZK7ysRRf0VRYD?+?7*_RhtQ?DgNWf)}3Ru~M!@R>1|_N1hG;)#;9Nel5)
zkFAo(l7tyEya?mPyhgT}>@xS9^ZfI^{_y>tbI<vnbI-l^`4yI86P99Q>FXto76ya4
z!O&ETx9rL-w0PGB`M=`IoB;e-7l2^aAHYdCD&D=!lz%e|-c(Z_vA*DS;6uTh%DV%E
za#w(0=BU=C3hV!=puFNeV9`nR1n?2PAb%5q%ut3K|1aU87y^+Ujcx$*jC}wUV-J~U
zDmTV)z{zH%jX<Y`)qeoqS$zcW8|#Y<u);P6ae4F3MzEFE5oouyFU0KXHl*U;ZnS{)
zY$qr5pYLQs+~7PG<Ii<*Lo{=V1XSX>{tV%P-L|5;zPkgWZBHj$?$_%*Ecfc&%M5VN
zz-zeNZ;&0L*I;kN<RMh8WLP{_^Bu7V@ukOV>?UyZE3{{fO+x%@`~pP3iFL4N)7Z&f
zFmB~kCt+=&jrDF-Ww~zxGZ?ON<?d`dQ<2}-Sf}Gm+U-xX2cd1{zaDj>=e4$$BQ<5L
zu;GA5zFjE*yR1pI1pUh3FEH+T=q}8Q4)2fk$~W7ieJiRvuA9dQM5|b9#CCDTfXelR
zT7V+u8mL7jPQog;cg#n0-x=8y{1-B3qpC~Jub9p98l!rXd<V2UAD}9e3Zv1kJzR_N
zrNwgCvfF!FKA;kN>=%H*<8MKA?g^}-oGJNa)l`lq@mD)TwZUNMtJIWqQeKokfuP%E
zwkY|me4G)a23MBj06t!Li7h_AbO%dZzAUeUTo1i^8rMCqKSSH~#ztJ%ZZ;6!Iw7o~
zTGYQjyDa1e!!@H)uC!8YtDBfo?{2`HcE8nP?579a%s{j2ABWI?yRHPUX!5K7LQhIW
zeI_jTcug%me@9{IA2TrBvjOFbD%nOz*Tx7olVfd%ngJ~{EajWFSNDEkc4}Fsu+@HP
z#0ua{weaRF8^)*gY|WY@@o-@MkgRcJ&PY-^uqH_Mbz)XXik+DQbf;bI$|gg5T9+Q|
zs4b9t!&nl=taE44NX$mD&lqFw$v&W`krz9Iq{>?_dUq0w!I<S!*ce<Yn#L|837^UG
zgcV%p;-2vpGlaqLl^WNa*{klk!l=gOibmQTf3^@~&&+2DC^J2Pxua*-V)g+&>Qa`5
zWbij^LSyJO@;eqq!YxADcw|Z8G__$Ew^v`}3!^spduBp~XFsw}m{_-wd7)=W2-7IB
z|Mq_C{*veVT<u#gJE|=ZO|%XXtO4UYM6vY{ulkPS|IkjwuvM7dKaSbq>?S5M`A}pd
zw^V(rdC4pnJ=6BEderbvXJgTml*PV8&(nRZE2i7!vvx=Z7P9j&`r>kS1w*b?uqQ}L
zEA{iLzQEj2#;TgFLlSj`x#4+TxW`5|fiA3{u+y}w$DMYL_mkt8qQ*^;<FGj*nifA}
z3otL>B`ZVHrJl7wGW0E*j%51>HW|s22DSmo63*#dY8vs5=y_$%yTWVM+F9`4=<&AV
z=18X7avIR37JNK<?Cp2~l5=hN&q#K+=WUT3@5n=txH<EUNJ?G!F(g0q;4hFY?Zby6
z$@wQgh(-Md@VPjc6R!L_T<SZNpTea-hw=UBNp<IiNaU$)NAlQ{M<7|@#g`+g_11OV
zC-IT!37^7MB<-j3tw;)Ha#vJ-G>coq6V+bN=0+qR=kVR|-O!Tf^ASjH2XN6CJolIK
z`REzFf{%b;HDV>d3M+o!@}L$#ZiVrVDAN$myCLZo$vYtN+RT5#*Y6a~E70>WhWnz&
zbsLu-W0~$5&s!mxqwr)TAGY(;NXn9U7LveZ-V(c5pUO4V8IZ=0!Eb~1;s7s1PkJF=
z&>lQyHN0hWAnoq+SGd&d0q=z#k9s~D1vkIp8WNB9{3gaYe&jCb8PmX{fD~O7@_R02
z<_P%@ztOX%{aANJ{(OC{2Ad0KO=&FdWA0jW5rCn0EJS}F{K&<wc{}TUQ-k4=z3P$1
z+h~Jl2uDj$n-(Y<<5v8a2zm3R=hiZDwh@r@RpKVfY*-`K!uMXQ|3Ua7@!Tl<p_H1l
zNeq_PRei8YxC1%|i9UeSg2X_;Z9!rb;DHd~sJ;vm9U-Y@u<*d3VBrOJX0U)iiq!kT
z!V^#?IjUnqgbNt)VbX{R5l&!8nc;wSA;Jw5dWI5WMpP(em_o&P2>Ki<ya9c}WN#9s
z(lAJ>2@_KRzX%s|03&sL94@AT?H(a~0TUv~{zJEiM~bh&pBO3iCEkk^69Ic~783wB
zY?j-RcyTl7cZw3<fSnK}76X2a5?=!PZXwLvBBq1gu!ZXRM(h4)(ti;x`<LtPF{GCi
zBgTULTZ~u*ICZO-0+_#*@*B2N9}{9JFGa_vv9#{Cjrxn;Ms@CPqx=DJVm9a`#)(OQ
zkK@QcJf7^hcrgR~Pvd33a*ksX#9Y9f1hE9Lg+g;&t%wB>cSFbFiDD_(xrtP-AyN2%
z?X#UQZ9Db(LPz%<R8QF<CPUosJH!~!@1qJoz-X2Be_a*hVBIN6u1j2;ME#Z~QGT<X
zG_NH)WuJ1rYA2mrr(M+l`dxCrQt#F-(jAyAQO3n5%Y90JosQ#DXx~{W@;S+M%iR>e
zXt&gpaizNLkSgm+ds!;^D^g`Y(stNG^;Yj8|HVCW-_qYUjc{3-+^4k5(`3I8znAh>
z?4`U5ducun=`_FP>C%>QCFxYpHiL8*Wze%J%%FL_&7k`~DpSr&#>ZyTJ-w4j^K#Cj
zH@P&6?nQ}?HrX`4`Po$WaJCo;`+k!xMgzL-)9=qd%D<|kT@LB`>$oq6?(d&Dls9BQ
z#RutFxnK4x^=xt}Ze}j!XXMhkKFg*0Zh3^Ud32tS@+hx&KH>NIq+ga#_sO<^?oB`e
z=@sZ$UqEqJPRK9G^aG+h6c0Z@O;sJB;j}qOn_F~{nlkD5`5-mnQ%Is}Azi}zg(T{7
zi2N%LQGUrGI;>`g=~6B_OzQ^^Q~c}06gSdDk2T&zcCCqYU5=1{?Gef=Jwo-Zi>S}p
zMYQ?sB08*hMYQ?x#iXMall^-!<qgs(FH$4D8jbed>L~Ry>nO$LA0^%TqZBv%7_EmL
zqrNWdXn&mMv+y{r=jr(BIMp9<g8UIDC{GR@58L4+`RAS_f9^@D`~D=Yk1Qeo))Kk|
zH%ds)xm5NeFY)qHIai70rSy26%EU~tH<XcmyNn+1pi^Q#_)|`ad4QjFdqFvUtS*;}
zK=2PdEkDW<(@s;IsGvtVrGg&$K^-m5kR71oDIMFMCI8y9@<&4I)SRWq+_{n-@5V~u
z5B|HA^r#1%laEc>k>|uLz=!9kUyt*Yx8pp;Jv~p4d&C981RWphIOrnzqjjv+v2PXi
pA5um2Z&%54l671z$@?U6?Ip5LUy^f`woNt7b3rxb9jO++e*+}Z)q(&3

diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar
index 6772b7dbe12b58ba8f747d4cc0b1a6854c09014f..451e3b51be9ecac34db3b1e4a3050eecac234e47 100644
GIT binary patch
delta 4327
zcmZ8kdtA-g7C(FMDD)y!6y>TZk323CN?ng4Dx*Oj<y9CA!|<6g9=#uWs80DsNqXze
zQOE0)L>@^pV}>hXT+B5h&Ezd})>^-R?)A@it?ypzyVhQN?_WoFhEaHik-m?o(CMjA
z=qVJInk0RDZlOtX?BbRhr6aQf@ME?BA#5Cgm9S8HIp`|?&3c0SgpC0(=aT^z@ZkVq
z+z}vzSx9Y}!tj48C_DHFShNx&0lb9+z#al^hSFK*{}LXHNf2VK;{vckXEcCP2UJwG
zI*A-`zHW6lpiK<^1Mtq^Bd~7_uQI?o<3hxZeTM3Quk0U*{y?(|%x)Y&Dgl-=1gz&<
zSs{OUhzfC+jR(eGvUNe!wTl8&CfffD;X%XVk?tIBj%Ym63YW(^yoY6nQ4YF*{u6HE
z^4N){h@MVfi0PB4nr2E8R`Z#981a?cR_rEdMhE(fJ<<^Wn!O6qZ*CjxS>-X`7UMQA
zuo8xr8V|324f+Lhm_pIamG_sKsw(}y#yZwZXtzHtn~1(az)sYOUD4kVbaFNsp?~7r
z&8TO)EmI%(`j9V>e;IZV^I{{$;d*Vf8Txl)hU2<koIo^4FhsOWtO8WtN^S+HRNe%&
zn3Q?A+OmHoqU(XEUcg_;U52W5g})-tio2tFj}mkAhn7*5c@?qfw;pfB`06Sgw(5bp
z1mcwmr+xtlI{g+@m!H8Z$_tuL1~8hGUriN_3WZ{fvPm;U*<Sq&f?8^fQSwFYEW930
z^|dJd@yaXYUtYV1tz5rO*CDL=Jg&RndV%YXw|C>Z`c4<&-7|C$G5`8(x0)*yH+7V?
z%6>}Y#vZE7`@1m5^0!uu{q$%UUJm;|jv?RDrokT4JN^s4GO{xlS{(73T6+18!m>Z+
zV7hx3%2n30-4L#xDcBN@m%zMfeBT^>g`$_4bmRjwm1=T@vHF*8tQ5{v9npv7!yeQl
z`?Ef1xS6xDXl%1!HfUrFW<Ag-7{UzDsIp<^(4D&3p3TR4wj<a{V_+UkVQCn%!<EIN
zp*x*@#uz<!_5qo0p6mh|4PJ85`}0^F#%%OuGjXYMA-j%7#1d94@XV@4Ce<w#3dL7a
zVjpHExfTf>DX~a&Q~L+7)fjtWB}+z`MS;u}nS*QD2V|u6EDH^%Z`hpf&}r0nEQW+l
zLI=3zX@#?-t|{D1YA+EwYNzj+3Kd@b$Ub3W+ivEG%%o7Jro?fnV|V<eJ=d4gm`-g+
zt)-%edT=D`!uY{4Y$wD^KGXR>)aT;Z7R(-($V_o|b5of1p=cYqE6H0ePG?2PEIiCQ
zQNt^nc_5RP$G$}7c>%M>bkh=MiN=Hqb{R%rRm*N*$jv(T42|k~`MeshFc*|DXk<Ik
zh`GUB@Vu@(VAFa)7lzN+dD_*}AqQsrX~*F!CHiW|VRS<Ds(QgzVP4=XR)dCZCo@4~
z@>{kDjnofpJ{r%u*e*2IaZcyb)Qwvs)1k-h;l8RZd-74pco}d#G!_|i8qhTpJ{uV`
zQ(lV3r2+hBG!6~o1JO8b%|p>}vEjSXsJ7#$(D-2lZ%1SOXg(Q@!hiB|Eb2F&FUP^0
zapd3O(wNEo94`Gig&##G)0J1Cp*^)!G@iQiNHjKi@{MS;ddWJj^Y}DmB7C`o#-K$!
z9*xo^+!2+ZEair1yk5q2(D>-j4`EFDN<I~hmOw7>PCi`ES0XcG6Q2sfQsidd3<LA~
zmIs@FaW|Y>qfA!>ABM)TC_Wes&uIP=?$0Wg*CF#bj{6|vxR2w<SnZy~`yu16<mqU9
zNag3zs7d2_XauG6zSzaiOs+<q@mc&7{B2OTm+=Z@vMcziLBQxX@xFb)uzbinaH;nr
z?tqM2C!c|W(QmjK4Y&9F4#rq~<aWr+?BX$CR5lCzo~!+Z_8-3Yr3-&-yP^H_^|chD
zCv4Qp?&2ZlZr2lmn0v3M80U>2xrA+Rm%i_%P&_e{+_LxpwbNo@f#0`<L83cuC19PP
zn}2tMxCnnP)!AFb9hBL%O>D=P)cJ$(LBoBw2!K*j;U3|n{T(Dd+9O=Sw+R;Tt3z5C
zEG7W%3l`G>%R+^P^eR|bgVQ%exM5I;@C3{a5%8l(dKe<y0kugM(#%j{2ToGB)`<%h
z@CyrMoB`WH1^mX5Murh$MobuGsKUf-So|C&ya2t!sW+|C6!4qE#R9-DB7{F+l#EX!
z#6s|0BZUuOawPeG$i8!w_zL)xDAIorCFX)ZDq73|+!amRxf)ISLt?}?s1qaB0)C7U
zUjq8<CCuF`7J=Wjm+JY%%6u&8x5rZdu5qN77AHI){<k=>1#m&U@C7W1r~IyX>SIm<
z<z>kDJb~6-_ECSa`>4+SeUv{wQ7i+UlteKP@M$9P&Pn7aCW*zsKTo25XC{l~;1?!~
zb$}*Hn&VcbSOxxV8J$zadhm-<s9sl!@CM&Il`t!n`fQicbwAZp?iceR?)Uv-Cg5mE
z_yNXBwEtU@m<7I78m+HQqkgN?D8Kgsn%BAm)Mvv1I=3MQssEh^X}@<5lJ10b!lZQC
zXPb<(GRV)%&^{+^J^e!zx8@M(Rm;A4Ce_`LNqk)<^<#dR>TNwt{MEy>?}1r_8?tDh
zwOQ1!`4P(7bcFJ*9HIG`XVd&PW|ObUrh3LXq`M}Eo=rs#&Estj-Jj{XG_QnQx~KPY
zY27A|-sJi`x)&N5jq*u%Wj@t8o-d}szTf1F8GtSY^8G2G{AL+V3rROX#)3ks|7RiP
zO*%^P!7|n#rGAZyC~ip+<>wU9xxOf(`Yy$U3B@#@C&iREs)X?S64I|Jp?MmY(mVr8
zNv~AK&QglIaYp+kSyU$Ae_m2V88y{VM#C9UPMcd(PEDy~{9H~=cvq09R6#?1SV5w8
z$B5s2jPf<d=&*Vpr^8%xoYu>aQ~c}W6gN#pk2Og}eyfUf?M@KC{RHJzpP>4NmDK05
zO4@vWB^}ngO4|JFD$<dv$p5{H@+PV&FG@{%O={YAzmwF@(vuWda*}jAPg0!oDOwLd
zMSWeD(d;zMXZ2}XFP5?6G}WJahWN-cl&2j!e$&m*62JT`@kM8;?)$T}K21Y>yoN5p
zZ4K$!R8v12t7)#a)%19+YQz#a$6Yn#x75&Mop?^H1U}=OSONH1_E*)?$Le~m2m*e>
zdHN`4ou@caM|1P7qeosYW6ulZ2g-O(#(@`!-+qz)NHkrf%Qv*19`EjY5dd}W*V8>1
ze~BJj)FrVL_{W#1U$@JYxBoK5J-<xnI`s-+vW$;qoOqS^SQ%So9MeGkhc;0CmIgW}
byKC}&x<>x_YcyA*Mw;iUM#?+UD180~R<8ve

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

diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/statusbar/StatusBar.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/statusbar/StatusBar.java
index 7f7d9fff..d017a70f 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/statusbar/StatusBar.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/statusbar/StatusBar.java
@@ -310,7 +310,7 @@ public class StatusBar extends JPanel implements IPlugIn {
   private JLabel getPositionLabel() {
     if (positionLabel == null) {
       positionLabel = new JLabel();
-      positionLabel.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 0));
+      positionLabel.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 4));
     }
     return positionLabel;
   }
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentButtonFactory.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentButtonFactory.java
index dace3c1b..6f9a1cc7 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentButtonFactory.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentButtonFactory.java
@@ -28,6 +28,8 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
@@ -105,10 +107,22 @@ public class ComponentButtonFactory {
     });
     return button;
   }
+  
+  private static final Pattern contributedPattern = Pattern.compile("^(.*)\\[(.*)\\]");
 
   public static JMenuItem createVariantItem(final IPlugInPort plugInPort, final Template variant,
       final ComponentType componentType) {
-    final JMenuItem item = new JMenuItem(variant.getName()) {
+    
+    String display = variant.getName();
+    
+    Matcher match = contributedPattern.matcher(display);
+    if (match.find()) {
+      String name = match.group(1);
+      String owner = match.group(2);
+      display = "<html>" + name + "<font color='gray'>[" + owner + "]</font></html>"; 
+    }
+    
+    final JMenuItem item = new JMenuItem(display) {
 
       private static final long serialVersionUID = 1L;
 
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/tree/TreePanel.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/tree/TreePanel.java
index ab5fe433..bc6547f4 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/tree/TreePanel.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/tree/TreePanel.java
@@ -44,6 +44,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.swing.AbstractAction;
 import javax.swing.Icon;
@@ -669,6 +671,8 @@ public class TreePanel extends JPanel {
     private String category;
     private boolean isVisible;
     private MouseListener clickListener;
+    
+    private final Pattern contributedPattern = Pattern.compile("^(.*)\\[(.*)\\]");
 
     public Payload(ComponentType componentType, MouseListener clickListener) {
       super();
@@ -699,10 +703,21 @@ public class TreePanel extends JPanel {
     public MouseListener getClickListener() {
       return clickListener;
     }
+    
+    private String categoryForDisplay() {
+      String display = category;
+      Matcher match = contributedPattern.matcher(display);
+      if (match.find()) {
+        String name = match.group(1);
+        String owner = match.group(2);
+        display = name + "<font color='gray'>[" + owner + "]</font>"; 
+      }
+      return display;
+    }
 
     @Override
     public String toString() {
-      return componentType == null ? category : componentType.getName();
+      return componentType == null ? categoryForDisplay() : componentType.getName();
     }
   }