From ec7244042d56efdf1d169d88a201ac3a20401b97 Mon Sep 17 00:00:00 2001
From: Branislav Stojkovic <Branislav Stojkovic@Bancika-PC>
Date: Sun, 17 Feb 2019 09:31:42 +0100
Subject: [PATCH] wiring analysis improvements

---
 .../src/org/diylc/netlist/Group.java          |   7 ++
 diylc/diylc-library/lib/diylc-core.jar        | Bin 258064 -> 258170 bytes
 .../netlist/AbstractNetlistSummarizer.java    |  79 ++++++++++++++++--
 .../netlist/GuitarDiagramSummarizer.java      |  32 +++----
 diylc/diylc-swing/lib/diylc-core.jar          | Bin 258064 -> 258170 bytes
 diylc/diylc-swing/library/main.jar            | Bin 605771 -> 607070 bytes
 .../src/org/diylc/swing/ActionFactory.java    |  10 +--
 7 files changed, 104 insertions(+), 24 deletions(-)

diff --git a/diylc/diylc-core/src/org/diylc/netlist/Group.java b/diylc/diylc-core/src/org/diylc/netlist/Group.java
index 5843691a..5cb3f844 100644
--- a/diylc/diylc-core/src/org/diylc/netlist/Group.java
+++ b/diylc/diylc-core/src/org/diylc/netlist/Group.java
@@ -96,4 +96,11 @@ public class Group implements Comparable<Group> {
   public int compareTo(Group o) {
     return toString().compareToIgnoreCase(o.toString());
   }
+  
+  @Override
+  public Group clone() {
+    Group g = new Group();
+    g.nodes.addAll(nodes);
+    return g;
+  }
 }
diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar
index 7a98c1fc6cb66d9b1ad942bfb81a352c0576127b..cf84282b7302563fdfdb041268010505a7282cd5 100644
GIT binary patch
delta 6745
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
PzU~9oAFw!<G$Z&w`oGbj

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

diff --git a/diylc/diylc-library/src/org/diylc/netlist/AbstractNetlistSummarizer.java b/diylc/diylc-library/src/org/diylc/netlist/AbstractNetlistSummarizer.java
index 42034bd7..6bf2dd15 100644
--- a/diylc/diylc-library/src/org/diylc/netlist/AbstractNetlistSummarizer.java
+++ b/diylc/diylc-library/src/org/diylc/netlist/AbstractNetlistSummarizer.java
@@ -22,9 +22,14 @@
 package org.diylc.netlist;
 
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.diylc.core.IDIYComponent;
+
 public abstract class AbstractNetlistSummarizer {
 
   public AbstractNetlistSummarizer() {
@@ -44,6 +49,19 @@ public abstract class AbstractNetlistSummarizer {
     return res;
   }
   
+  protected List<Node> find(Set<String> typeNames, String nodeName, Netlist netlist) {
+    List<Node> res = new ArrayList<Node>();
+    for (Group g : netlist.getGroups()) {
+      for (Node n : g.getNodes()) {              
+        if (typeNames.contains(n.getComponent().getClass().getCanonicalName()) && 
+            (nodeName == null || n.getDisplayName().equalsIgnoreCase(nodeName))) {
+          res.add(n);
+        }
+      }      
+    }
+    return res;
+  }
+  
   protected List<Node> find(Set<String> typeNames, String nodeName, Netlist netlist, List<Node> inGroupWith) {
     List<Node> res = new ArrayList<Node>();
     for (Group g : netlist.getGroups()) {
@@ -70,15 +88,58 @@ public abstract class AbstractNetlistSummarizer {
     return res;
   }
   
-  protected Netlist eliminate(Netlist netlist, Set<Node> nodes) {
+  protected List<Node> find(Set<String> typeNames, String nodeName, Netlist netlist, Collection<IDIYComponent<?>> belongTo) {
+    List<Node> res = new ArrayList<Node>();
+    for (Group g : netlist.getGroups()) {     
+      
+      for (Node n : g.getNodes()) {              
+        if ((belongTo == null || belongTo.contains(n.getComponent())) && typeNames.contains(n.getComponent().getClass().getCanonicalName()) && 
+            (nodeName == null || n.getDisplayName().equalsIgnoreCase(nodeName))) {
+          res.add(n);
+        }
+      }      
+    }
+    return res;
+  }
+  
+  protected boolean allMatch(Collection<Node> nodes, String name) {
+    for (Node n : nodes)
+      if (!n.getDisplayName().equalsIgnoreCase(name))
+        return false;
+    
+    return true;
+  }
+  
+  protected boolean allComponentsMatch(Collection<Node> nodes, Set<IDIYComponent<?>> components) {
+    Set<IDIYComponent<?>> extracted = extractComponents(nodes);
+    return extracted.containsAll(components);
+  }
+  
+  protected Set<IDIYComponent<?>> extractComponents(Collection<Node> nodes) {
+    Set<IDIYComponent<?>> components = new HashSet<IDIYComponent<?>>();
+    for (Node n : nodes)
+      components.add(n.getComponent());
+    return components;
+  }
+  
+  protected List<String> extractNames(Collection<IDIYComponent<?>> components) {
+    List<String> names = new ArrayList<String>();
+    for (IDIYComponent<?> c : components)
+      names.add(c.getName() + " " + c.getValueForDisplay());
+    Collections.sort(names);
+    return names;
+  }
+  
+  protected Netlist simplify(Netlist netlist, Set<Node> nodesToMerge, Collection<Node> nodesToPurge) {
     Netlist res = new Netlist();
     res.getSwitchSetup().addAll(netlist.getSwitchSetup());
-    
+
     Group merged = new Group();
     
+    // merge
     for (Group g : netlist.getGroups()) {
       boolean needsMerging = false;
-      for (Node n : nodes) {
+      for (Node n : nodesToMerge) {
         if (g.getNodes().contains(n)) {
           needsMerging = true;
           break;
@@ -86,17 +147,25 @@ public abstract class AbstractNetlistSummarizer {
       }
       if (needsMerging) {
         for (Node n : g.getNodes()) {
-          if (!nodes.contains(n))
+          if (!nodesToMerge.contains(n))
             merged.getNodes().add(n);
         }
       } else {
-        res.getGroups().add(g);
+        res.getGroups().add(g.clone());
       }
     }
     
     if (!merged.getNodes().isEmpty())
       res.getGroups().add(merged);
     
+    // purge
+    for (Group g : res.getGroups()) {
+      g.getNodes().removeAll(nodesToPurge);
+    }
+    
+    System.out.println("Before:\n" + netlist);
+    System.out.println("After:\n" + res);
+    
     return res;
   }
   
diff --git a/diylc/diylc-library/src/org/diylc/netlist/GuitarDiagramSummarizer.java b/diylc/diylc-library/src/org/diylc/netlist/GuitarDiagramSummarizer.java
index 95e22b23..15c23e18 100644
--- a/diylc/diylc-library/src/org/diylc/netlist/GuitarDiagramSummarizer.java
+++ b/diylc/diylc-library/src/org/diylc/netlist/GuitarDiagramSummarizer.java
@@ -35,6 +35,7 @@ import org.diylc.components.guitar.P90Pickup;
 import org.diylc.components.guitar.PBassPickup;
 import org.diylc.components.guitar.SingleCoilPickup;
 import org.diylc.components.passive.PotentiometerPanel;
+import org.diylc.core.IDIYComponent;
 
 public class GuitarDiagramSummarizer extends AbstractNetlistSummarizer implements INetlistSummarizer {
   
@@ -74,32 +75,35 @@ public class GuitarDiagramSummarizer extends AbstractNetlistSummarizer implement
   
   private Summary summarize(Netlist netlist, Node preferredOutput) {
     List<String> notes = new ArrayList<String>();
-    List<Node> jackTipNodes = find(JACK_TYPES, "Tip", netlist, null);
-    List<Node> jackSleeveNodes = find(JACK_TYPES, "Sleeve", netlist, null);
+    List<Node> jackTipNodes = find(JACK_TYPES, "Tip", netlist);
+    List<Node> jackSleeveNodes = find(JACK_TYPES, "Sleeve", netlist);
     
-    netlist = findAndEliminateVolumePot(netlist, jackTipNodes, jackSleeveNodes, notes);
+    netlist = findAndEliminateVolumeControls(netlist, jackTipNodes, jackSleeveNodes, notes);
     
     return new Summary(netlist, notes);
   }
 
-  private Netlist findAndEliminateVolumePot(Netlist netlist, List<Node> jackTipGroups, List<Node> jackSleeveGroups, List<String> notes) {
+  private Netlist findAndEliminateVolumeControls(Netlist netlist, List<Node> jackTipGroups, List<Node> jackSleeveGroups, List<String> notes) {
     List<Node> potTipNodes = find(POT_TYPES, null, netlist, jackTipGroups);
     List<Node> potSleeveNodes = find(POT_TYPES, null, netlist, jackSleeveGroups);
-    if (!potTipNodes.isEmpty() && !potSleeveNodes.isEmpty()) {
-      if (potTipNodes.size() == 1 && potTipNodes.get(0).getDisplayName().equals("2") &&
-          potSleeveNodes.size() == 1 && potSleeveNodes.get(0).getDisplayName().equals("3")) {
-        notes.add("Volume pot detected: " + potTipNodes.get(0).getComponent().getName());
+    if (!potTipNodes.isEmpty() && !potSleeveNodes.isEmpty()) {                  
+      Set<IDIYComponent<?>> pots = extractComponents(potTipNodes);
+      List<Node> potInputNodes = find(POT_TYPES, "1", netlist, pots);
+      
+      if (allMatch(potTipNodes, "2") && allMatch(potSleeveNodes, "3") && allComponentsMatch(potInputNodes, pots)) {        
+        List<String> potNames = extractNames(pots);
+        notes.add("Detected volume control(s): " + potNames);
         
-        Set<Node> toEliminate = new HashSet<Node>(potTipNodes);
-        toEliminate.addAll(potSleeveNodes);
-        return eliminate(netlist, toEliminate);
-      } else if (potTipNodes.size() > 1 || potSleeveNodes.size() > 1) {
-        notes.add("Detected multiple volume pots, test inconclusive.");
+        Set<Node> toMerge = new HashSet<Node>(potTipNodes);
+        toMerge.addAll(potInputNodes);
+        return simplify(netlist, toMerge, potSleeveNodes);
+      } else {
+        notes.add("Detected incorrectly wired volume control(s).");
         return netlist;
       }
     }
     
-    notes.add("No volume pot detected.");    
+    notes.add("No volume controls detected.");    
     return netlist;
   }
 }
diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar
index 7a98c1fc6cb66d9b1ad942bfb81a352c0576127b..cf84282b7302563fdfdb041268010505a7282cd5 100644
GIT binary patch
delta 6745
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
PzU~9oAFw!<G$Z&w`oGbj

delta 6621
zcmZWu30#iZ_kW*zTP*E+(MFL{LMWQb5Jp<;5wfo#L=1{-ld?uvNr}=X)iAv(S&F1Z
zNwTF4l_-=M)ZlmTxzEh}`}}=Ae9!rwbH3-?`#jJ4-sja>r+l<dS;4~v%k+{+dPpSx
z3da-%p)Cr>Mt!IMhK&-87|am{Ab*9h-GU7RsbI;VQ5ecV7mZ;s3t2GOgGMpfE%Xgr
zTcOlVIIJB(oiVmzDN`v>>D?SMFi1Dy(Ja<q#(}{S8EXb7Wd>8YoG)_}F`OxXU6#?B
zimw=SDgMpauS!J%!#gU8fa}#vWSD<aYd`q<I_XedrpHwl={sW<Pc$+DzNp`2z(CVU
zkbiH017J_H1A>yj!c@0SF9Mp6OC*wFN!TuTZQ_`WHN%PqMKO()=7%8nvxP3tee~FD
zcn!_<6nJh5&7Ex7Omo9*tU6hV^$=B75;o2nT*sld@{HbQTLDV0qqPB-k8uOcwC7Vk
zaX1E3t{EExs4#vLtYY`XcJMb(J_V@kx&+YAy;T;bud3>6*nlLGY}qg;D{Znp9cy1c
zGxHrJg?Ji)NU9fKhW&iLRc+q3(A;d%4#>N(WQr0S^3w)o@MZmcq0ZkwT7mJ}dj|sV
zv_BH+st?#eTrETg{K26X5TA1x11>nK1i0>a0mHD7Cu<mJg;y|W34hK+?~<vIq!+mu
zFd*tcZ^p|f&Ij@3DUX47yd(!rCZ_3vzc_<8J90S${JxnrkpFj<5#$-<Tx1wla;=I%
zT<#a98hstQgrQsCm@DM*%b=I90V39S3;;du{sK4G>Ec@;x}fYM@KY;ZfVg!fznNZF
z<v~2@SsTP7UIai~xAr^7`W%Q?y-I+1U{ek7-fzs|b_n^90lY&;F7*5M`3>{Knmgmz
zc!#@q`>8)5O)7(gItBVrNgI`f3z!*))dV%HxP{)n%F|-!w9^})mDKA91|<3pR+K)`
z6#hmmtx88Qh5T=Qgq~pZFccKQ(C#Pb$|x~~ulkK@22?>8k%e|hTRL-qU=7s=%!I2d
zOlGW|a0-f^+Y2FJtaK87K+dXhLKiU0CknU080<nvV^vOWLMY_i_Yfukqcuag4@To`
zA%%~hX?ZMvE|y4Ul8;J)jx^ItSPL1Z-okMx&RQfm0n@cq=mO@;3gIjmk*kF%a;#Ic
zuMo`T)PwZK##6bo#M=((NW=XEDHOYJ6}~}@+jhYPn9~7bXhx7=4$Q87!VYGT3@6lI
zY8)(V1o~vCpe@6?TskU*0%LzdT!z9aAsLvfr-eU3J}p|91kBf1VHz;5al#-d-<l}s
zgF!9|g|MxQa)olp8Gch}0mCp~ygF6|f&=KRyC?h#MoWp{09EEMgmFFDJnI{UJih9t
zei4)B&{fYMA3cx`>0OC?OBb~WOQ5izRk#7hfscYZ7*U@DPcZ)aEKCQ(rAyceM$va+
zDH!w)Fa~3~EE*)Rb^&r|2ry|qQ4cV(6cFDcOBFO3m~HAP6$~?NR0+m+J=6z`J_aZV
zj2L4S0EVF{$^zq=8TtT5$zU`FjGopg4Vq>TMGIkP`r05r47aQ79W9-Gf<&@cAl|Y_
zn;1UFN@TArQX?+bNP(P_MdPKWw#X9dXV{@6Q2b$!(!rn?_aqpT#-sgUlutzbo^x~&
zo5i}KaS&?sKm?4y8R!rgN}gyGC{LV&lmu1w1=2U6Gge+kB9WnAv-)AySd(m@i_`<%
ztbEjzOg*feABO*WYu?S3Z~y2yHL^;pPom!7hSd3mdg1H*AC?wmI66CiaqZftym`W{
zqR@x#t)YQ8Ya6B{e2H3$O=N~$Zi?Dj)^WXTd(CIN(}B@H{v5Td!*|IfqqIdM_e<KR
zemY-%MEOJP{w$qN-$DEPSy_~5j@S`bpB$OCD)7{iMUt;N`VMV(H=pRt*yTK;y8J`%
zvo4#UvdVe0@{j8|%wDN9D&yiT@0FepKEyjc*<wCn{=)Ptv4LqT`b4i<R=l66{}x`F
zoVs1{vC5>)ZH+F6y-H`5bXCo*8fjmAar;x}f_s|HkIAUD4=sAgge9FuvHeELSeYDY
zw=237)qiGSzL$@w?TIP+lZQTBJ7#2ty27k2^U4yx7#|o@?INQ-VrSu2pYp=&1>WoR
zk2Rgq)-l`O`Rt5rZf0ECT)FK92X#K{Wjp6RSZZ-4{`sSKhaM>|DJ_nFviG;96F)t^
zl7jlL?Hq7nS!u>gz3UYpMm#SrxM=6UCVS0bI~2TNS#HbdLvsV&Odp0F{i|V7hv1T-
z>m6VFwmG$VU({`vtr0t)4yhUu9^`t|cF$$K>&L!mt?w08Enkv#DZu;WjIT8nzFt4y
zO}=fj+@#7wRmU;Ny+KiP&9xjGqIY5D(0Rcc6@!oM-TmHkV6b_W=@g$Hp?|hT-_|ej
z_!0IsA}?<5zMR$Rrte?N1}YvNulU)dCcg`PY+Ib+nw#t#yxIJK+VfE*+xMqzKkO3h
zw=z8MfrWkN`1W0G2M;ehR_OPx@h6?uKgNyS*HSs$CF)((hOTxE%iIOCckM}Dt#@)u
zY3_-F(KBk@PU;-$TwoLMA+r6#jB#5!;-_D@zBkdYI6b9iwDzy5%b(akn$n&g7^Q4c
zy?)81-nFyd4gIq9vzBs>zhh%c=1V>2+;x8Q_igFdVSD$;B7_pY%AD}Eb8mm!x6bXv
zn$=M+Ev}fTyz2E^g4DQTOpl8`{lCcnd}Hi4jrN&_+oB7Nnv$%RcKYufc0@&K;T+2Z
zuj0%f8VmZTv>P^@Ufj!~GQV+)MZ8I=Ms}d`m~qD?P4)VpQq7u2UYXYDK7N?|&S9VG
zzqL=#aSNGjsTz4G#`U5_T0(h{vdZ*g%kk^W28=xY=Gy&_HYlfLK%#NVG_{<+XSaK!
zpI;Zcypg~DT0YukMS!#Im56NzeSL@L?(^JVHl)S0L+4v>%L#U+Z+cD$_Sm;_T5*hq
z*_AS@K-H?ecHIeuwv+k{x!}G$Y;eifA|*M`=jx{I3RdaS8+PA`n5d)nMRoc-h2HiB
z_d<*tt=orB*EM*N_hjSpAitNz%3FTKf2+*@DQ|;Jj76r@=2~j~nH9DP^)G%z4y*IO
z+2r87Zsz7+?)U6;_o<gXIlN)h`1zlvo_8>hoRv_M7jjxXfOxsy`=<QQ5xfUIf=jVC
za%W%o(iuz8GIm0c<}636!5Fw2!D&ny?}IXc@$^M9?9?D#umPO`=9?dK1jAt~!g4G$
zE&weCCSf;nWXYsC2t5GdJ!qFYGkzk-7-SZnLgrwEMj%5lQX|nrcJ7b{ok97)OpHMu
zz(m9%IK)Yl&Ld4=ZpNe2V9ZZMd0-f)pm;C}Q;`NtQIn3OphJE~S?o+HopuW?Ghjwm
zEz(e920c=>Lr#7NvI3?<7CVE^=pI;#6xnC$;MuZur|5^g3o+8hrqcesaT3(rSHNbF
z`b7x`BRBzjh2Wc$>G9>N3^CTmCeq8Q*b7orG%$v#G_|oRFlM^=7RbES!^?n~rjOBV
zHq|UYoDNJ6fBX<~UTnoSiY%nQAIpJGpI}VCiz!1w@g4T6B3*DCKZPp0lXweU*o+A5
z0S1o7-b{xqjlp*8R1p({ofy`~U~7izXYoiDcR7p4Gdy+{|HQETEFQ~HJr=t#To{Yl
zix@c*izhOq`F#mGNB4m`w5TtcbPgLcXU#dxUav?BL)zi3h!*F0hYjcPWERgokKGt5
z#?gr=y2oLAhKJ(tEQYV+@B)U;@f_phG20{ZJsx{7^tizNqzl~dx`1agep&+8k50g@
z%x_J=Qy7j(<SY3tk?Yqb;&q^tgjX`mPQud|DkXDVoQyr0e=V8oE2W5h3ZB9Et0}yn
z@<ray>mpxI%0;e^Q}HC0=bDN)GQ5?_>$ER%y;Ya^T+&OtPCkv}>@*%vO5^kXmB#x{
zPUrP!)A4+!_ahxoWjHN^^NAVU@5;b)89)1XK7YpVcp>xEFXL4V11|IZthtPrFn`<?
zj)_<B8s=;M!TYWH1G_UnTg2X(d_FG`Q!;tK@0oZy%bPCc>pdgI6PW*6isvwNy2|;3
zSMe{*e{_|{^|Scgo3gl0K^EUPgKR$Uu57-)kF)tYhUV~fAI;&qZ$+GNjj#8dh~Gt=
zn@gWA+V55__F*{WI<Gr;o$J<%zWoi}|Huu_H{RfL+27=S!*6oF^(NmBhg%$v+~Vtg
zb&Jn!pU3Nt=kdCCd3?X@^Z9-r&F6kyKJPdDHrG9Po8G7NIeB`U?h8fZJM=lBxZ)1I
z4=84d*t>w%QGY=J)uDK)0FPtXQ9wVpD2~2M?-z;(?(+Il5!DO1u9t}C3+eqz^WGQo
zx{>#I{tglI?$IZl#(Nj>yxB#(KBkCXKgzch@&2QWIUX#g>!*A}F|V^I;pkVw^>a$-
ze$lu>DcvuMi%Pj(l87Hmd0xqL`XMsoKDJ;<yYKU%?%wB{qgBQix1@{@l_p|W86U!>
zoQsB))0>UfzbNOTCJ#98^MKc9J)jqZ#uY2*#iF>Rg2z)Tcz$~Y&vSf8A5I!S^pN|{
z9&%liO3rVr<aODVynnApe9k$K_~Oq!;uq`BM||-Us<=*A7586N@j9Ewyl&59u2=k+
zuUqvApU3kF&r5v5bw57gd3H~EeAiPxSCNPs&-nf<e8%GmBDOu_{l`4#e9&`VM>icV
zwq`Zw=T&q5LN)LES2d42zTkZD3w{$+zTkSsHFyGiRsQ?>LHug4gCYC&4Ey=pZVmcI
z;!od54C&8R|NM#DeTY1$fuHG!P>cJbn#IJh7Mrt&)P?%kc{w5_%aJkhx`f$JKO}->
zWvn97T5M^|q+^b43*SgzHRI$YlK%hbQjFU@#0QZ~A7nxX)nNt5-T$bhB#*`%=@<Ec
zZn+KX5n1Jn29ljLm-Pv$qurZ*5!rAG>5{;DEJqG+K<cDgjJL4(0l)tnx7>_WiCw+e
zOSkESYNjkbFephRL%a1V^#8BQ6y{pHXYG6)x`s`34OZQ9OLzX4D@R_{<G!$;*Xk}m
zZl#HH=t4$zD;P=)8?dtx+nE#>yGOfd@F@K|qFd6&AY#;j2a(hUtj896uYqo=^BzvB
zyu^JNY59__@NPKtA3*#FeUJYT&o}233$+jkjroTSe?>{H2r=LJ74FYeRx@@~B(VL-
z#aGynv89YvID^Q8c%(&=&LAbC@|tTKyr!WC(GVI)0%MRoStEwFu~7e5F?8cKR)@`4
zmlbDLLN_9b?x1D2bq*&VU-Og1kVaZMIUY)_$c{$d>mXyB5=6oBMyw8(!|iQ>&pdj7
zGoY8RyI@MPm}}95*;$r2HBp6WslW~(KT?q#32EZu5iGPa9YVUKM+Q<Rbz-QEg^Yg}
zLj#(z5!0H~Oxfz2z-p2mA{))vakU~_TZ>ePeLC;(fraLL6hm)1kOr}RgEg3z+Z!5k
z?f5UGN21>Fs$>@0DT|4*2G%0AZ!kLzlOK$|EibY*E!YsY;@@L0-CNUcd%Lq2<QkH&
z7QPjUEmXl%L1e!xV0qHo!drH+P>_-svU|%5+}=`FQB`C^MK+ePk?Oz>u=H>d=t-Xa
zj{$pKnd&xg_V(6tdaYOgzj<P`M4@5t#LKAS_iEBEn!AEt%I>rOt|R8|qq%JLk?&~J
z&3YpHL}XhTTiq8}17hBa*~<ZOXr*l3CSbLRwLexPNBwXQa=4W*Hj2fMZ}~5-L!88|
z|H48mw*D7VAr5U=4W8DXBZ?|Z=%mK<Gr*wRPM_IFeB1C~);qe5KB)1(F<+B7(VrMe
zO&jm}jzx?^|Bc8JllOdH+xN6-^D#`;AIC=IUbgu8bWkzf%0~Q=sQYJO{s~MbpTq-6
j@q4cQlqv{g$Y1aAFgAqw2kIUo6F*=}xp&d@LP-7x7D>zB

diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar
index c4618835ade7364af05ecb6aec670d4484a2c0dc..103891b7ab7e42295dab0157cf09eb7793abc8dc 100644
GIT binary patch
delta 10596
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

delta 9299
zcmZ8n2RN1Q-#`02kG=QE%3ehoAsML%S;;1pjHVHFer-`o<dn>)lu-&t<!2Njo1$c<
zQphITd!GC5egFUK?Q-?G@9+40$Nhbt=Xj33%W@4XvTQbch$I#q4#DBV+2Yw031MvU
zTjL0!Z1J@lu>XH;WJ(ga@k$sN;59Kgir<Do0bYj?&XyoTluzI!@L)?Bf*}Sz1QQGj
z@bdJ@I3mLOUl9__Nb>Y`4wRh0L1cm6x)?YRxBqoXC?|4b%Qm7m1_((X12fVV49<|$
zFvw>@7~6|pQWXiq40N3h!%Tq&B8I^t2oHwgDz*d+8`Savp4PM$2m8I@z|YJs4%mNm
z6eeTxNf$e?H}fEY{hosjz)t8e3gj|@vH*95qyxT@V~O0D-#-^rf&A&^2?X0`+%O0F
zpYaI*&m?9MIKtR$_sZMKEqMvxaOxWLsS>hi!qE`w3mbZ*0Or(`AHss6VJQc|y>E^J
ztZeiHBnmByf|y=rIENkB&x)}zdr>@!XUBpvmJoa;1zVJH;&rif7=L*10Vs$&%|1O_
zLB-*?Iq3sV%($EcgdRMD2r?dv;p?gFSZega)!Hs14mVHV9!eFXSDND489B1}5x|tF
zfTyAuWvV9L8blk{#XrW<W85{xe+H71R(N4nOmbsCUK@D5bHTH)f%rn(-8k_C9L}5w
z;?pbV5lM#7Av`OASph>X0RI!k7Mv&X1ypQN5s5b;aD+3{GAotii{`}PMrA<9U|u?B
z@hO~`UFUUtED>Ay#N!9BZZOQ!@J;O4f-et0gbf&Du>?;Q!WM)UyeA|zjJWkYfg6W=
zB}3;Pri$L4M0x1rO9(IHSsOkT8$O2h5Z(ji_Ut=;g&&g?EaTmQgkufQFNjIx_zA2;
zkff%Y@mC3Ec~^<_!XSbwy<ddD!Z;;FPzMeVMF_$q%%Mtx@LCL8oYf~B=LeqYw@bH^
zn4Z?qlc8)&kOWSab_5F$B`JWw4oZ9wM3@Dtdq)W)U~%OHArmZ=LJ5u{81ea=1WjOE
zoIqFvX+L{RZ~->#c?5r;3Vlk@2mN?aOYj9Mk@tja0+@Tw06_!0jv3w41V`Aa0*h-K
z>v?gwAbD_dpj9`>C_5v3j?lr2*;=8*Kv3Rmc49E#Q|2PF0f{aju^k2%B>s`Yj48TA
zJ0Nk<Cw73C8vBSlfaIh-u@4a1A0jRTiR}?0O!-wXF<lsQcZnu?164%~5dk6U<A`}c
z5*APF76UzX^uMcsWA@aDNcTKMl%_X7BeEv3p$H?ffO*ToXfmD=KZEW>z9Sw5lHYa2
zQm}Z`Knw+Kl58P91d`e|;t<F^Z-%%4rtTq;BnRfTiH#%%j7K?1o58Sc5Fu57#h@&S
zc`sqc+M+-z=fD>8TS!hoVy#CK;bPue8Ao=LDkzvr#g=r5%#MwF(`e$3H_W?n8-403
zS(bi@2jyq{aU?YY&KfV0BS=a7AgM<jb6h@0;^o2?T(?NpASJJRBzP_Dc|baXV5-u5
z(i%{eGDzX@P)k#G_BDy(aM^kZgN~x~RzEUAU*tzc8BwoDU80ziLnjF~ruGvF53+v$
zg~YrGGF2b@NRPq%{PTz83a-|^HIfs^Yb%~y4Hm0J@?A1!d<P}ZgDh_HkcB{|Po&Ap
zAe}B{vKeTMgdRB=c)i+2-V7Q%v4@-rY~mcqra<+<iQEB<AN!GMAPuDevJ1H4uY{5V
zU|H!nzo0BG9By4I!PX9xh0+<JWDbUA1o;IB{^Kfn8nm)Ik(>!=&fFnOf<a14A)A3~
z=z9ry9>nZ@N&W$fsHq?y0t@vTay$$bkDN)-W<E0CaMCjr@S^m8WKd3egcQojpw^L%
zK*biV<h>xooepv?AT;YFn}Jx@y2-NA;Jh1;zvCBY&gyA8w=Pi(qY-D!uaM<|z2rJs
z5isl~P&7dTXQ-3~aPVPr6fst;!M8OiQlO$zJ<4V<Oux5Ncz_q)l(LHPl<cI8f~)$s
zGX(_)w%|$G0QxHuK<NO)6Co5Dh<WrlB^h|Lg;FT+9+e{(e0+j}!<n(uGc_nm^cF>w
zhv6DaSp?ynZc)Ah3jI5j06_65nNkMI^i8Ma3xP{=Uga!LDwCpzjowy4R-#ubqrwcI
zQpzLnz+$VQ?8Y8(jQv#<R}j3Uni2}Q)M_d3!EIuxml6de;R6&`FruBylv6-rwMJ<N
zw@N7iY8a3t3sJLy*LHPk9SFg)g?a##?q@)~M*%reYGOWiF<ZYxhR>ulO_YPaTNCAG
z>@uYe0v?r}RBaR(=d>su&tg76KXA~EnUBYW3L=HRqRBk&3>#`bAhzC54FXQ(2dM2N
z;Kb)7eBX}wwAau8^Z0BND#&Q{p!$H+v_q-#piAzjsVra-aF%)+F#Pz3DhxRB(SHj%
z9YfUylEQduIIvMpr1AlY@jdEMIFm11F4`zEbCl<#do@ty=$u=b@s?Amn}MCi11fA_
z!6WJ%IJpM})Z>6lxRBZjBvTCP5g>7YMU|z38gR8z(qham#S!V6`~*?@_ChKP-B1tZ
zqK|2#2z{b}iZVK@sN%qF?k&|F1aoNk+l=Za>KLGY{^4(UjV|g%U{lgZZ3lxB^Nkt-
z+{we#4L~J7POS#l>+dxxyu07SBN<>~4OkI%F!;d&h$rxB6++hFLKG<n({oc2p@Qe^
zU429pTpT54NGGs~vq1QP&4WEiKagDBi)<1BrH1S*i|fZeB=OMS9YVI!@|}9E#k%;{
z*_Sn6zwj~9;CdJwDAp7HnM_>Uz`^yXxqG9|_T+&bW7T^v`<7k%xAAMQ6k0UyKT;BW
zPivotSn<9GyT50~C(q+!_s1;RXa~qv*gvs%IP=r)yHV!VXTK);gj>!|+A0Yag^i~~
zHoqKRX`V=Xz5HwSh9TuBGI5yp>H02y^&>fNvoE{p&?_U#ZdK-%Znzw)<le#cc2vod
zUF6|KW5>5zDw*NC>W+)}dCDIZcB-C?i7A_u?QLSYDznX!WmVZ*A?J?WF$d$5t)YQ`
zO3&Lo_t{~rV|S;7@57BxaoSsq^nLkTlI<dPi|k}^-fZM05HvN;`gZ)9+rCzs_CAFl
zuO9ur6jk!2u&2!J_-kv++dcR1o~kYTGqw2Hxm)c(4W7(hxMQa9Tb=I=`-{lF;+fu|
zB>jPZe^|+P8H@`A$!~pj&cA<X`_4;K(Oe2PV&r_$yBdmWU7wfvwH)rSzjkap$tt~3
z?os8Z%9A<!@1zf%?s2>G;$5S2u59aL8i$K<;~<B(1Fl#NB|n+iTQ#n_$(uXo4ejkx
z<AEoG{winD?pz;X*NWw1$&Zd~;|NZE+}fu(p8Q!k>qknDiJ7h0RWaGs=(nY*CoIFt
z>;8Qz$0%Gh`FL_v=Pf<Z|3FpEmHW1;ouaL~i^X3mIv-C{Iewa7HmWWAce8>;kW3)0
z-k5vt>H0)Y5be+J0a20&V|qTX$@|3zlltGk)dwa%-TL~<$GPKyZSEZ($1(EPZ#QS!
zoOi1@zQ__twURk_!_G6<=$Y!V&r07)e?PNL%u{Iz(Q|IN(Nq?CQ@Jf=1KPo=|NLoM
zL2+NqfQxQ(pgdbk+vS%L?3%Y`4xO2jdb>n>DtdV6(xP{#UQldOv46+w!Hnn~wSrT3
z&bxh&-pd#J<2<tGN^Asw$j@-zkV3^@`z!CqJslink?56G5%1Dyp}aa4s8@b2WMo00
zJpZe{UU@9zR1{~|sVK>i+=X*-l3yvJ8F7+>dg{?u&i99E7p}&IO%}wZd&h5Elq@g}
zU7<}Mqj`-ym+fvIiJA0vriH{O>o$l_>&{y|_vx)E%GzBS`<}zn<;e%-f*q&csa$ss
zc{#0L6;b83*gm_xLfZ1!oaTAW3AWJ`Kb99K$hF50wI<~qG%c|ydUeH`Bb`+%YRIxr
zr7hg)cBEqVjx*PzZBX70MV&3`rW5b;<5Wsd(tJLjA4)DU$@=kasnsk%|JPWyTXMra
z*0kKq2aNcforasD4(kkST)5`^JfLTB84Z&<ak~42-rB?8e*VZy9rx??>}t0aPFa8Z
zTy^dJTe{-68MbCMo%YNC`rfAIm#l+l76=uyS1T0wj&0W&AN=BF$Zsg~*u~~-?Jn{8
z<9r@+G~-Je{oOhp26AI>hoUaG#jSqGAbuyLAA4WWZ{GXT1)00@I*Hre*wmO-9i6w~
z$-qXxYD<SnYV}f<`AOkp)+XBa9x^h1`%Fe}Jh=X86Hh}cz0ilOKU&(?xhVgE_1Kx=
zO(Mbfs}RvP{%vobmhFjF%g<NIUu{Ha3Rz#2eVk~zhRvV4<GqVy7I=Of#l>1oCx*Vy
zbN@bqoPIe?s_2;?Wa~;O+T%qK7t1=d!}z_lw24uq=AMoV(*ABb3WcxYf@e3F-st){
z#g(OFc{sKr=^gh-<dK~(J9i$|zyGH-`|B?L+HtS+m`6I!{66c$twtuj!&(wI<%F~A
zJ9Ng4-D&bM2^lNR#5x(@x-0@8`ZJ`a@rtYVoAeD5<FTrPhvO)>MIVc8{aQYa*PLnV
zV!J)3sfDgAM_;)p%)OSI82Kep)!N~}mfGO^TZ0Z2*F;(hShL13-bN$q&%=)}k~+<=
zTf98J`l-I~%AvXEl%3I|wrfULeOA(|?MhAA?^W{ACfWMl(x<r7YUFh;Ssy##I49mM
z=`EKwC_;OlAuPY&<NA=XbAwJkM?><Fu@#x}F`>RW)qM+>^2*<js5gAf!RhC$rDiOJ
zoge9+%2oGkc|TG+wX^<0^f%*s6+fmbJKmEH2nV3%vpZOY3S+ix`YOT0;;}FLjS|nk
zDA#G3wF%npvnkoRc9s>5oY$vcGYVr@4vEMZBzLUjWn7BxH^0`tbNTHrc8-x2WzK*c
z>)*3{-sUQvyH#?+T+<F3<D7kYEa&dD=fx1+41f5}*guGP6tYyV(^US*vHog>N~ZhG
z14ln4l&NVudMeoe>3q|7!0E1@f2%^RP}*>t=z}qG5^YwQv|x58{3^Srm|V*De53lv
zW#1K^;Yrc8<W(U-i}bGj0=%?ZzO|bEcjtG<21ac}W$SnzS>M>M*<HN!TvR1lzG3pc
z<kw&&qpd6R@o%1<pFg&BL#x{^0kh^bncE|WR;`z~N!_tVK6gUhms^SXn?LaI=|)$d
z$+q7%Q5?HWyCvrvqjj{i#<|zuVzO;y#^>Uix#o{4V#TnX>4$`*AkVypr%mMr8M9tj
zLmzp3vRJtApqO^i5IGwBjrY#rb??m`4cA6usz;I4aq|m}hL*A%bz>&eI!1NnSG09y
zXGXky(>ztaTh?^jHZNt%7O~u3ETTuO-ESO{GrHkmXhus&&#Cvxk-pLV&jsJO2~M4Y
zLXX{F%~mZx8ydMDSpL%9{d}LFL#%0TW#f-eSD)UZnjO!P-F!BVn~jGveph08k;g=D
z;~<_T3(vv}f4&`j!gA><3*Q0mDVx$O2JZEo_PuQWkN-I6-do`O-`8LW^EH_5-hsG>
z)KCfL2mC%BdiE(qoAzM;FDFs#!+^y#F5)N8z}#cJa-o5R$mdVR4Ln<g$~=8+WX_u;
zzhi3`dMDAO&|arK-uKX|{fyPf!#&;Ed;bh%lX<&OdbD#IJnBFFDr$5}vh76s{2xDa
z0-8C{!P(fe{3Gno@_6J|>-C5^ZJa^4LG)V-swc&>zK%3#@`{GPA@$`SvB0UihElQW
zFOw35Q4i8SMB$uj-bWI{)59w~-ciqgis6j8A<6TMGq!eT^-$I(2~KaSp+IHrg>Zs3
zWis)aHK}mV{?+Vo+U}_JlSIP{EiCgVHW^A*2S;V%J*w#!*VL(#Cvh#&HANaz{K8%5
z7nIWYqm?(6ZyXw>Z7P=<y0<AUVM<lFKWVD$n&82xojWFH2U_pW@Y+ocp=eW<;Kzml
zm5@<$mCVnpJR`hId5^mn^EP^g{p!Ngwe3%ANqY9;mF^dsy+w7cJj+tzLS5@!>JYgk
zc>C5<%Q+XjEta!M{Wov7U$pK0@NW8-u&RD$vykgy;o@6QG#}IaPE|$58b<DI+4WPb
z`1y;%M8gnSpND>;r<>za8%Il$#XCQK&P(3=t>f@+_m9s{nx}mn)6}+_3W}efTibnT
zgQx7_yJ|UxPFzW?g3i3-3Qe<4&$hiomcBHc<B_#{BYt~w{9d%k8P3!LGP>SJoIjRa
z?80+4A7$iq^`_JZ2o})-9rs)x{%zTp^z4L8i=#|?&XLH&2ZlFa`e5F0jm>__H8Fg1
zID>75qg>M~w|<ZR$7?>;?@kG;?|#<6>)Jc!_hQ|zxmw1dF);9;&x5f|A-m4^7X`)#
ze3vGswQk;VC-8+Q@8ySXon^NTM#~CH@9J$ykRHsyT~Yh#7tm@czIB#X)NGY&b->&(
zzeZJWi<9=qv^kBpeBTyF{nu3`F%r+_-8b&_%a1bGnhj85*~2c};NIlG`|_53G5toW
zlH&f->l(QVOGY>O-|shYJ9jR7@Oq8soA>?+-KbmOdpA+b;$Sc1D%-LPXTE#Ck%+E;
za>7Zrs6cPaou(%<Z}i8vk^5;ie@a*Rq9l!MCQVkN&%DTtWZ66DMK*f3hovvhog=t&
zR}~?+^_Gh)S;<dnWODw>(K%l-@u$ON%(F$_75ggbB%PZ|j~uG3QU=(5#~0=eIFy+#
zWn2{h{@5U?>w4n5{a<>_IbWQ3quA7Wt0ZZJRe66^3*U;^)B1%==ZADM2Wa#iQ=K0_
zr0hF!VoY&x=;^_g163iDF64^06LMlg^IDfWBHngxzARAgs+BOxaw7eUSMRsa@mkZm
ztIs>F1Z(rOGw!SRvW)Y79(BIH_3(quNssS_sy!4Y`Q{fTrPx`e^6G6#YisQ2*+^}c
zyfsB7)A-yayR#>6dVMcSlvk5-q}i%u{kYhm*-V+%`yR1W?O?ZA_M}7Nol{FnNuGV|
zL3QodOVi2{TPC*`P>gDP4ARR?dnK0o0)B>1tPu*bM8=Cw&y8rB+u$a0pPW>Eex`$d
z<yIxjr>eUtsSXJx41>=5Vf2NYC5@jf$o6)>N(UVLSIPg#7^~m<BJ=z91TsxaNfzxW
z_|)t>;^ltB@`~cWKd!a79*pF2%YC@7M?QY8U(ET~QHyY`eW9x^MvcKkT#t_`kCdmH
zSoCoD8iZ|2Egb&k-TX39vy<B};xKR9HT!GDS3R!GxxTX*?se%+n%2-ME2^D-BK6}z
z@}Qs3WLw?Rp{{<Rf8$M*S@PNVldWhwbe@O4m(R}=5EYiVt0b*ZnA;sD&|AXNcd1jr
zyKYmpM3-vEu3bL6uA1T=f5`B%=k`7~TKti?_-$kC29b=V`j2JFsZtm2UArr=%hsyl
zuBr55={+M04wE<BAEXtUx!TXH9Co;HcADtBaz?JqGPzbP{m%)xcZ_OAg%8@!PNi+C
z^G|(I%2~T$?~1#u(a4ZBFP9gayLiMUK;XUUa#wVxfSI);SH7y?zZLg?DqiD~GhKg^
z9(yY4PeJ9@V$%Bl;Y}k#>FVEHE~^ZRygAQev5h{mywVnTv*HL^<*W5!peJ^Hb*H`1
ztS-f6fx=D_`ry74deQIVRF>8=K`Wi>w9RZ$th|~rFE~oNPFUFZ2!*ALnTbtgpTLV%
z5?yo6&gXu4`St$B=;IXzbs-6^K|7j6KS>XzT)VPnwI?{};X>`bbM(xv!_F5Yvbp?f
z8*C1U=sz&inp+fm_}O<wJXOl0PSWk`L^6M1>WJ*e=K}{rT8~w?3@f<l#BO<Yg0uHJ
zt^Mwf3@ux>5u~r?rrZ@J68~G7y*5FKQCk%y`-8$06Z=uE#t^lUC~j>xQ!8Evnc&UA
zbJ?_8oHio@GKX&Kz3#z@=_&nub(1FiMRu*-9sL;bfxWQv-LW|_3C_hM^um8H7xxxM
zr>bU}m3<en#Gk^~+qj_v9Mq#*zPVJXJ)}+LtA?q4E#Q$G^zBid8ade|J$~%oLGtTI
zJJ#gJekGVZw>hIOc=uogccdUo`L-Jm&wmtb6`L*|J8?;0&|)Xc$-<8uS@A8q=I3<B
zs!e`+zqImOcJ>?9n<=Us>pfVq*66x=`}2~h+JMKMQ%`1bn?qBZk`L<FONZ5*?p5j>
z6`<|Qv$$?@c<;ZYxoA7}nzoH2#R*IPyFTjP=KUBp*Bo)$ZZ;#s=T**7lx^)v+gdGO
zGv%%K=h=Hs9$0jBxzJUwCtkikMUxh0PiToQQ_EcCS1@~0Y;iR%*lbw(RT8)FxL8Rf
z`<L#RPa-8*{L6bj6CVUxD@Hy`G_XGyqBG;$s<+sZ_{Lv<rysQ>lQ-;mx@lX}xmW4V
z<Aa^s>RLGlS!ySE^L}>p$nmJ@N{Ox$|NFxP!|yD@u8O^@JC%zVW8Z1fO9v2L=KC)C
z%mA{T`68IEJ&0&v=s$>T!Q|<Kh#rPt1`%TnCB7n-7zTbtEHHnaZ-^MZ{VRg8((yyc
zUJPxA5IYQ+Mq>0gLx>8tnH)mQF=Tq|!tla3#OD8uroKTV$?u36CiMG`?7@)fBt~!f
zjwoT9<?jggogQ8P2NRh&ME+nJF|qCkvJXSCVJ0IJgNG4k4C{xP?`4>%{1XYmFy$xW
zj^WBr#0x`@UvOXX3pt4G<whV+#0cVm?OR6>KMZw7ksu5ojUs^<@{b__7@iwLTrlh#
zL)<Vl_>Jtxkp3GvfZ@z<#2-V~apVYw_2W=4GXe8EJArs$^8N|L2}7Mp$U~omyt9+g
z&U%WeXV#rF1?A*v=;t?$9LD_GrePhLGqB!-8OS#_1MRG4Ar{O+f7UsuKR5^Ttek^9
z%JYyXcAm+@jQ1PcGtue~(~gOc{~~#TSqF3Pv4D7E_;!JrHxs275myZVS%mgIi_Eyp
zy}=T42*XE9%ziSFbD7x}CWbE~z8Ll|L;bE5s4rYWd@#AdD)U^J7`2K7V>q@7<Jqi1
z`&VmFzhNE9FRnAsm1#G;4&=A3&_L$)_G<uiMLY_!y^cqZU{*_b^e~3L1QcY|L_m*W
z`|U&&M14p^1F$_02?g0lk)Yi-66CQUqo7Mq$dHGhf`V#8DUg5YFWOL1(4D7L6m*jl
zK|z;-5EOK=7C{}cIFcypf?*U2`G!%{8Qbq*ftbny`PW!rTu)XMOvOu9=qJDi?T)cQ
zeFqx~y1b1Y*8hYZ4Z`?@Iba?U9H=$6f6oE^<Tzp6o18GO5l++=(;IN1;9|bT1^3^%
zPzOxDjhiWF-YMd_A<tKC*f$Fv$e+W5g41B-g?R_^LjEpZDA(hIcFBA&{v03dlRZD|
za~VJ6lNLb1G+YsY@`=CbBnWw43BvP`5Q6)2La?8og;0AePjz7!H(40!SB0Uymk5kk
zDT0D2loy5l{6`eZ`$ge78HmAtri($oIWbs|qd1h8io-gDBp`-MK)!wnGz5!pBMI{_
zmV|xf+yL|Q-vIM!-vIN{mV&%VQt;f?rBE>SA=2mxjOUv)<lQ3!<K)V~ITMnFa+)m6
zw^tVCWh4jd%#wrrl#LJ%Z-nxujgUuG9@^iKhvzUN5A)cg0P`qPfO*I&!Z@*t(0@V^
zo`;hX<Y6d5y@WE%BTAWBAM@@stjx4yqO}S<&tes5C#DMfa!wV-8Bv9DTQ!KKYEUn(
z4&z)>hyJ73p2=sY0q6di2AoH#CamMICfrwQ!t)f~1m%&NAkWYyn6JrZs887p&trBo
zJP!{om`~kb)YOLg+|h>j0m2r@6R-v5)4B!qMzCMhW$iWk=xX|?0NrLQyd*NWLP|Cr
zXnI@+wyskL9)+$hY<03OEOlKM%DwfV-8(&)x`IAD>f8E&FKHX<iDD7wdb{(b=;_)h
zKmF`B)DoML#%(Y=Edy9(q5-UC)c{uOXb4Za@Gr6%LHm<NFjS`zv{T;>r}gSz9NG@M
zz1<j|ZkjRb`2WAEAnZVGrT)IM`1{6!`S&Hb|NP57*K-u1KR$(M&@IGKwhfr=WuKiz
zO)5AX!5xQ_{f{Xw``pe5dg~5!6R^rWRA;iTg~P2J|NmBw4>2o#dU7tpO}8*XxhV86
J%$Fs&{{b+4W=#M9

diff --git a/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java b/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java
index 18307302..dc9268a6 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java
@@ -1695,7 +1695,7 @@ public class ActionFactory {
       this.plugInPort = plugInPort;
       this.swingUI = swingUI;
       this.summarizer = summarizer;
-      putValue(AbstractAction.NAME, "Analyze " + summarizer.getName());      
+      putValue(AbstractAction.NAME, "Analyze " + summarizer.getName() + " (beta)");      
       putValue(AbstractAction.SMALL_ICON, Enum.valueOf(IconLoader.class, summarizer.getIconName()).getIcon());
     }
 
@@ -1703,26 +1703,26 @@ public class ActionFactory {
     public void actionPerformed(ActionEvent e) {
       List<Netlist> netlists = plugInPort.extractNetlists();
       if (netlists == null || netlists.isEmpty()) {
-        swingUI.showMessage("The generated netlist is empty, nothing to show.", "Netlist", ISwingUI.INFORMATION_MESSAGE);
+        swingUI.showMessage("The generated netlist is empty, nothing to show.", "Analyze " + summarizer.getName(), ISwingUI.INFORMATION_MESSAGE);
         return;
       }
       
       List<Summary> res = summarizer.summarize(netlists, null);
       if (res == null) {
-        swingUI.showMessage("The generated summary is empty, nothing to show.", "Analyze", ISwingUI.INFORMATION_MESSAGE);
+        swingUI.showMessage("The generated summary is empty, nothing to show.", "Analyze " + summarizer.getName(), ISwingUI.INFORMATION_MESSAGE);
         return;
       }
       StringBuilder sb = new StringBuilder("<html>");
       
       for (Summary summary : res) {        
-        sb.append("<p style=\"font-family: " + new JLabel().getFont().getName() + "; font-size: 9px\"><b>Switch configuration: ").append(summary.getNetlist().getSwitchSetup()).append("</b><br><br>Notes:<br><br>");        
+        sb.append("<p style=\"font-family: " + new JLabel().getFont().getName() + "; font-size: 9px\"><b>Switch configuration: ").append(summary.getNetlist().getSwitchSetup()).append("</b><br><br>");        
         for (String v : summary.getNotes()) {
           sb.append("&nbsp;&nbsp;").append(v).append("<br>");          
         }
         sb.append("</p><br><hr>");
       }
       sb.append("</html>");
-      new TextDialog(swingUI.getOwnerFrame().getRootPane(), sb.toString(), "Netlist", new Dimension(600, 480)).setVisible(true);
+      new TextDialog(swingUI.getOwnerFrame().getRootPane(), sb.toString(), "Analyze " + summarizer.getName(), new Dimension(600, 480)).setVisible(true);
     }    
   }
 }