From 661e5e240349aef810568f00cd24016d0aaf3928 Mon Sep 17 00:00:00 2001
From: Branislav Stojkovic <Branislav Stojkovic@Bancika-PC>
Date: Sat, 9 Feb 2019 12:48:37 +0100
Subject: [PATCH] jack variants

---
 diylc/diylc-swing/variants.xml | 673 +++++++++++++++++++++------------
 1 file changed, 434 insertions(+), 239 deletions(-)

diff --git a/diylc/diylc-swing/variants.xml b/diylc/diylc-swing/variants.xml
index 5f064f44..fd8178f5 100644
--- a/diylc/diylc-swing/variants.xml
+++ b/diylc/diylc-swing/variants.xml
@@ -171,6 +171,10 @@
       <org.diylc.core.Template>
         <name>DPDT</name>
         <values>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
+          </entry>
           <entry>
             <string>Body</string>
             <awt-color>
@@ -180,18 +184,10 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
-          <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
-          </entry>
           <entry>
             <string>Orientation</string>
             <org.diylc.common.OrientationHV>VERTICAL</org.diylc.common.OrientationHV>
           </entry>
-          <entry>
-            <string>Type</string>
-            <org.diylc.components.electromechanical.ToggleSwitchType>DPDT</org.diylc.components.electromechanical.ToggleSwitchType>
-          </entry>
           <entry>
             <string>Border</string>
             <awt-color>
@@ -201,6 +197,10 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
+          <entry>
+            <string>Type</string>
+            <org.diylc.components.electromechanical.ToggleSwitchType>DPDT</org.diylc.components.electromechanical.ToggleSwitchType>
+          </entry>
           <entry>
             <string>Spacing</string>
             <org.diylc.core.measures.Size>
@@ -240,25 +240,25 @@
       <org.diylc.core.Template>
         <name>SPDT</name>
         <values>
-          <entry>
-            <string>Body</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry/awt-color"/>
-          </entry>
           <entry>
             <string>Alpha</string>
             <byte>127</byte>
           </entry>
+          <entry>
+            <string>Body</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[2]/awt-color"/>
+          </entry>
           <entry>
             <string>Orientation</string>
             <org.diylc.common.OrientationHV>VERTICAL</org.diylc.common.OrientationHV>
           </entry>
           <entry>
-            <string>Type</string>
-            <org.diylc.components.electromechanical.ToggleSwitchType>SPDT</org.diylc.components.electromechanical.ToggleSwitchType>
+            <string>Border</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[4]/awt-color"/>
           </entry>
           <entry>
-            <string>Border</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[5]/awt-color"/>
+            <string>Type</string>
+            <org.diylc.components.electromechanical.ToggleSwitchType>SPDT</org.diylc.components.electromechanical.ToggleSwitchType>
           </entry>
           <entry>
             <string>Spacing</string>
@@ -293,10 +293,6 @@
       <org.diylc.core.Template>
         <name>Covered PAF-Style</name>
         <values>
-          <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
-          </entry>
           <entry>
             <string>Bobin 1</string>
             <awt-color>
@@ -306,6 +302,18 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
+          </entry>
+          <entry>
+            <string>Model</string>
+            <string></string>
+          </entry>
+          <entry>
+            <string>Orientation</string>
+            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
+          </entry>
           <entry>
             <string>Pole Color</string>
             <awt-color>
@@ -315,14 +323,6 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
-          <entry>
-            <string>Orientation</string>
-            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
-          </entry>
-          <entry>
-            <string>Model</string>
-            <string></string>
-          </entry>
           <entry>
             <string>Bobin 2</string>
             <awt-color>
@@ -369,6 +369,10 @@
       <org.diylc.core.Template>
         <name>Uncovered PAF-Style</name>
         <values>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
+          </entry>
           <entry>
             <string>Bobin 1</string>
             <awt-color>
@@ -378,18 +382,6 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
-          <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
-          </entry>
-          <entry>
-            <string>Model</string>
-            <string></string>
-          </entry>
-          <entry>
-            <string>Orientation</string>
-            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
-          </entry>
           <entry>
             <string>Pole Color</string>
             <awt-color>
@@ -399,6 +391,14 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
+          <entry>
+            <string>Orientation</string>
+            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
+          </entry>
+          <entry>
+            <string>Model</string>
+            <string></string>
+          </entry>
           <entry>
             <string>Bobin 2</string>
             <awt-color>
@@ -445,6 +445,10 @@
       <org.diylc.core.Template>
         <name>EMG-style</name>
         <values>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
+          </entry>
           <entry>
             <string>Bobin 1</string>
             <awt-color>
@@ -454,18 +458,6 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
-          <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
-          </entry>
-          <entry>
-            <string>Model</string>
-            <string></string>
-          </entry>
-          <entry>
-            <string>Orientation</string>
-            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
-          </entry>
           <entry>
             <string>Pole Color</string>
             <awt-color>
@@ -475,6 +467,14 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
+          <entry>
+            <string>Orientation</string>
+            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
+          </entry>
+          <entry>
+            <string>Model</string>
+            <string></string>
+          </entry>
           <entry>
             <string>Bobin 2</string>
             <awt-color>
@@ -521,10 +521,6 @@
       <org.diylc.core.Template>
         <name>Filtertron-style</name>
         <values>
-          <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
-          </entry>
           <entry>
             <string>Bobin 1</string>
             <awt-color>
@@ -534,6 +530,18 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
+          </entry>
+          <entry>
+            <string>Model</string>
+            <string></string>
+          </entry>
+          <entry>
+            <string>Orientation</string>
+            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
+          </entry>
           <entry>
             <string>Pole Color</string>
             <awt-color>
@@ -543,14 +551,6 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
-          <entry>
-            <string>Orientation</string>
-            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
-          </entry>
-          <entry>
-            <string>Model</string>
-            <string></string>
-          </entry>
           <entry>
             <string>Bobin 2</string>
             <awt-color>
@@ -564,14 +564,14 @@
             <string>Type</string>
             <org.diylc.components.guitar.HumbuckerPickup_-HumbuckerType>Filtertron</org.diylc.components.guitar.HumbuckerPickup_-HumbuckerType>
           </entry>
-          <entry>
-            <string>Legs</string>
-            <boolean>false</boolean>
-          </entry>
           <entry>
             <string>Cover</string>
             <boolean>true</boolean>
           </entry>
+          <entry>
+            <string>Legs</string>
+            <boolean>false</boolean>
+          </entry>
           <entry>
             <string>Pole Pieces 1</string>
             <org.diylc.components.guitar.HumbuckerPickup_-PolePieceType>Screws</org.diylc.components.guitar.HumbuckerPickup_-PolePieceType>
@@ -792,14 +792,6 @@
             <string>Alpha</string>
             <byte>127</byte>
           </entry>
-          <entry>
-            <string>Model</string>
-            <string></string>
-          </entry>
-          <entry>
-            <string>Orientation</string>
-            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
-          </entry>
           <entry>
             <string>Pole Color</string>
             <awt-color>
@@ -809,6 +801,14 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
+          <entry>
+            <string>Orientation</string>
+            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
+          </entry>
+          <entry>
+            <string>Model</string>
+            <string></string>
+          </entry>
           <entry>
             <string>Type</string>
             <org.diylc.components.guitar.SingleCoilPickup_-SingleCoilType>Stratocaster</org.diylc.components.guitar.SingleCoilPickup_-SingleCoilType>
@@ -847,16 +847,16 @@
             <byte>127</byte>
           </entry>
           <entry>
-            <string>Model</string>
-            <string></string>
+            <string>Pole Color</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[3]/awt-color"/>
           </entry>
           <entry>
             <string>Orientation</string>
             <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
           </entry>
           <entry>
-            <string>Pole Color</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[5]/awt-color"/>
+            <string>Model</string>
+            <string></string>
           </entry>
           <entry>
             <string>Type</string>
@@ -891,16 +891,16 @@
             <byte>127</byte>
           </entry>
           <entry>
-            <string>Model</string>
-            <string></string>
+            <string>Pole Color</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[3]/awt-color"/>
           </entry>
           <entry>
             <string>Orientation</string>
             <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
           </entry>
           <entry>
-            <string>Pole Color</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[5]/awt-color"/>
+            <string>Model</string>
+            <string></string>
           </entry>
           <entry>
             <string>Type</string>
@@ -935,16 +935,16 @@
             <byte>127</byte>
           </entry>
           <entry>
-            <string>Model</string>
-            <string></string>
+            <string>Pole Color</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[3]/awt-color"/>
           </entry>
           <entry>
             <string>Orientation</string>
             <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
           </entry>
           <entry>
-            <string>Pole Color</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[5]/awt-color"/>
+            <string>Model</string>
+            <string></string>
           </entry>
           <entry>
             <string>Type</string>
@@ -979,16 +979,16 @@
             <byte>127</byte>
           </entry>
           <entry>
-            <string>Model</string>
-            <string></string>
+            <string>Pole Color</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[3]/awt-color"/>
           </entry>
           <entry>
             <string>Orientation</string>
             <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
           </entry>
           <entry>
-            <string>Pole Color</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[5]/awt-color"/>
+            <string>Model</string>
+            <string></string>
           </entry>
           <entry>
             <string>Type</string>
@@ -1023,16 +1023,16 @@
             <byte>127</byte>
           </entry>
           <entry>
-            <string>Model</string>
-            <string></string>
+            <string>Pole Color</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[3]/awt-color"/>
           </entry>
           <entry>
             <string>Orientation</string>
             <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
           </entry>
           <entry>
-            <string>Pole Color</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[5]/awt-color"/>
+            <string>Model</string>
+            <string></string>
           </entry>
           <entry>
             <string>Type</string>
@@ -1057,6 +1057,99 @@
       </org.diylc.core.Template>
     </list>
   </entry>
+  <entry>
+    <string>org.diylc.components.electromechanical.CliffJack1_4</string>
+    <list>
+      <org.diylc.core.Template>
+        <name>Mono</name>
+        <values>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
+          </entry>
+          <entry>
+            <string>Value</string>
+            <string></string>
+          </entry>
+          <entry>
+            <string>Orientation</string>
+            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
+          </entry>
+          <entry>
+            <string>Type</string>
+            <org.diylc.components.electromechanical.JackType>MONO</org.diylc.components.electromechanical.JackType>
+          </entry>
+        </values>
+        <points>
+          <java.awt.Point>
+            <x>0</x>
+            <y>0</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>0</x>
+            <y>120</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>120</x>
+            <y>0</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>120</x>
+            <y>120</y>
+          </java.awt.Point>
+        </points>
+        <defaultFlag>false</defaultFlag>
+      </org.diylc.core.Template>
+      <org.diylc.core.Template>
+        <name>Stereo</name>
+        <values>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
+          </entry>
+          <entry>
+            <string>Value</string>
+            <string></string>
+          </entry>
+          <entry>
+            <string>Orientation</string>
+            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
+          </entry>
+          <entry>
+            <string>Type</string>
+            <org.diylc.components.electromechanical.JackType>STEREO</org.diylc.components.electromechanical.JackType>
+          </entry>
+        </values>
+        <points>
+          <java.awt.Point>
+            <x>0</x>
+            <y>0</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>0</x>
+            <y>120</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>120</x>
+            <y>0</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>120</x>
+            <y>120</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>60</x>
+            <y>0</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>60</x>
+            <y>120</y>
+          </java.awt.Point>
+        </points>
+        <defaultFlag>false</defaultFlag>
+      </org.diylc.core.Template>
+    </list>
+  </entry>
   <entry>
     <string>org.diylc.components.electromechanical.OpenJack1_4</string>
     <list>
@@ -1172,7 +1265,109 @@
   </entry>
   <entry>
     <string>org.diylc.components.passive.PotentiometerPanel</string>
-    <list/>
+    <list>
+      <org.diylc.core.Template>
+        <name>mini pot [Branislav Stojkovic]</name>
+        <values>
+          <entry>
+            <string>Body</string>
+            <awt-color>
+              <red>192</red>
+              <green>192</green>
+              <blue>192</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+          <entry>
+            <string>Value</string>
+            <null/>
+          </entry>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
+          </entry>
+          <entry>
+            <string>Orientation</string>
+            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
+          </entry>
+          <entry>
+            <string>Type</string>
+            <org.diylc.components.passive.PotentiometerPanel_-Type>ThroughHole</org.diylc.components.passive.PotentiometerPanel_-Type>
+          </entry>
+          <entry>
+            <string>Border</string>
+            <awt-color>
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+          <entry>
+            <string>Spacing</string>
+            <org.diylc.core.measures.Size>
+              <value>0.2</value>
+              <unit class="org.diylc.core.measures.SizeUnit">in</unit>
+            </org.diylc.core.measures.Size>
+          </entry>
+          <entry>
+            <string>Nut</string>
+            <awt-color>
+              <red>203</red>
+              <green>213</green>
+              <blue>219</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+          <entry>
+            <string>Diameter</string>
+            <org.diylc.core.measures.Size>
+              <value>16.0</value>
+              <unit class="org.diylc.core.measures.SizeUnit">mm</unit>
+            </org.diylc.core.measures.Size>
+          </entry>
+          <entry>
+            <string>View</string>
+            <org.diylc.components.passive.PotentiometerPanel_-View>ShaftDown</org.diylc.components.passive.PotentiometerPanel_-View>
+          </entry>
+          <entry>
+            <string>Taper</string>
+            <org.diylc.components.passive.Taper>LIN</org.diylc.components.passive.Taper>
+          </entry>
+          <entry>
+            <string>Wafer</string>
+            <awt-color>
+              <red>205</red>
+              <green>133</green>
+              <blue>0</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+          <entry>
+            <string>Lug Size</string>
+            <org.diylc.core.measures.Size>
+              <value>0.15</value>
+              <unit class="org.diylc.core.measures.SizeUnit">in</unit>
+            </org.diylc.core.measures.Size>
+          </entry>
+        </values>
+        <points>
+          <java.awt.Point>
+            <x>0</x>
+            <y>0</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>40</x>
+            <y>0</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>80</x>
+            <y>0</y>
+          </java.awt.Point>
+        </points>
+        <defaultFlag>false</defaultFlag>
+      </org.diylc.core.Template>
+    </list>
   </entry>
   <entry>
     <string>Passive.Audio Transformer</string>
@@ -1581,8 +1776,10 @@
             </awt-color>
           </entry>
           <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
+            <string>Value</string>
+            <org.diylc.core.measures.Capacitance-array>
+              <null/>
+            </org.diylc.core.measures.Capacitance-array>
           </entry>
           <entry>
             <string>Body</string>
@@ -1594,10 +1791,8 @@
             </awt-color>
           </entry>
           <entry>
-            <string>Value</string>
-            <org.diylc.core.measures.Capacitance-array>
-              <null/>
-            </org.diylc.core.measures.Capacitance-array>
+            <string>Alpha</string>
+            <byte>127</byte>
           </entry>
           <entry>
             <string>Orientation</string>
@@ -1612,14 +1807,14 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
-          <entry>
-            <string>Display</string>
-            <org.diylc.common.Display>BOTH</org.diylc.common.Display>
-          </entry>
           <entry>
             <string>Voltage</string>
             <null/>
           </entry>
+          <entry>
+            <string>Display</string>
+            <org.diylc.common.Display>BOTH</org.diylc.common.Display>
+          </entry>
           <entry>
             <string>Label</string>
             <awt-color>
@@ -1671,12 +1866,8 @@
             </awt-color>
           </entry>
           <entry>
-            <string>Value</string>
-            <org.diylc.core.measures.Capacitance-array>
-              <null/>
-              <null/>
-              <null/>
-            </org.diylc.core.measures.Capacitance-array>
+            <string>Alpha</string>
+            <byte>127</byte>
           </entry>
           <entry>
             <string>Body</string>
@@ -1688,8 +1879,12 @@
             </awt-color>
           </entry>
           <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
+            <string>Value</string>
+            <org.diylc.core.measures.Capacitance-array>
+              <null/>
+              <null/>
+              <null/>
+            </org.diylc.core.measures.Capacitance-array>
           </entry>
           <entry>
             <string>Orientation</string>
@@ -1704,14 +1899,14 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
-          <entry>
-            <string>Voltage</string>
-            <null/>
-          </entry>
           <entry>
             <string>Display</string>
             <org.diylc.common.Display>BOTH</org.diylc.common.Display>
           </entry>
+          <entry>
+            <string>Voltage</string>
+            <null/>
+          </entry>
           <entry>
             <string>Label</string>
             <awt-color>
@@ -1771,8 +1966,13 @@
             </awt-color>
           </entry>
           <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
+            <string>Value</string>
+            <org.diylc.core.measures.Capacitance-array>
+              <null/>
+              <null/>
+              <null/>
+              <null/>
+            </org.diylc.core.measures.Capacitance-array>
           </entry>
           <entry>
             <string>Body</string>
@@ -1784,13 +1984,8 @@
             </awt-color>
           </entry>
           <entry>
-            <string>Value</string>
-            <org.diylc.core.measures.Capacitance-array>
-              <null/>
-              <null/>
-              <null/>
-              <null/>
-            </org.diylc.core.measures.Capacitance-array>
+            <string>Alpha</string>
+            <byte>127</byte>
           </entry>
           <entry>
             <string>Orientation</string>
@@ -1805,14 +2000,14 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
-          <entry>
-            <string>Display</string>
-            <org.diylc.common.Display>BOTH</org.diylc.common.Display>
-          </entry>
           <entry>
             <string>Voltage</string>
             <null/>
           </entry>
+          <entry>
+            <string>Display</string>
+            <org.diylc.common.Display>BOTH</org.diylc.common.Display>
+          </entry>
           <entry>
             <string>Label</string>
             <awt-color>
@@ -1868,19 +2063,19 @@
             <awt-color reference="../../../../org.diylc.core.Template[3]/values/entry[2]/awt-color"/>
           </entry>
           <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
+            <string>Value</string>
+            <org.diylc.core.measures.Capacitance-array>
+              <null/>
+              <null/>
+            </org.diylc.core.measures.Capacitance-array>
           </entry>
           <entry>
             <string>Body</string>
             <awt-color reference="../../../../org.diylc.core.Template[3]/values/entry[4]/awt-color"/>
           </entry>
           <entry>
-            <string>Value</string>
-            <org.diylc.core.measures.Capacitance-array>
-              <null/>
-              <null/>
-            </org.diylc.core.measures.Capacitance-array>
+            <string>Alpha</string>
+            <byte>127</byte>
           </entry>
           <entry>
             <string>Orientation</string>
@@ -1890,14 +2085,14 @@
             <string>Border</string>
             <awt-color reference="../../../../org.diylc.core.Template[3]/values/entry[7]/awt-color"/>
           </entry>
-          <entry>
-            <string>Display</string>
-            <org.diylc.common.Display>BOTH</org.diylc.common.Display>
-          </entry>
           <entry>
             <string>Voltage</string>
             <null/>
           </entry>
+          <entry>
+            <string>Display</string>
+            <org.diylc.common.Display>BOTH</org.diylc.common.Display>
+          </entry>
           <entry>
             <string>Label</string>
             <awt-color reference="../../../../org.diylc.core.Template[3]/values/entry[10]/awt-color"/>
@@ -3016,8 +3211,8 @@
             <org.diylc.components.AbstractLeadedComponent_-LabelOriantation>Directional</org.diylc.components.AbstractLeadedComponent_-LabelOriantation>
           </entry>
           <entry>
-            <string>Value</string>
-            <string></string>
+            <string>Alpha</string>
+            <byte>127</byte>
           </entry>
           <entry>
             <string>Body</string>
@@ -3029,13 +3224,17 @@
             </awt-color>
           </entry>
           <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
+            <string>Value</string>
+            <string></string>
           </entry>
           <entry>
             <string>Orientation</string>
             <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
           </entry>
+          <entry>
+            <string>Type</string>
+            <org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>MiniDIP1</org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>
+          </entry>
           <entry>
             <string>Border</string>
             <awt-color>
@@ -3046,17 +3245,13 @@
             </awt-color>
           </entry>
           <entry>
-            <string>Type</string>
-            <org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>MiniDIP1</org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>
+            <string>Voltage</string>
+            <null/>
           </entry>
           <entry>
             <string>Display</string>
             <org.diylc.common.Display>BOTH</org.diylc.common.Display>
           </entry>
-          <entry>
-            <string>Voltage</string>
-            <null/>
-          </entry>
           <entry>
             <string>Label</string>
             <awt-color>
@@ -3099,37 +3294,37 @@
             <org.diylc.components.AbstractLeadedComponent_-LabelOriantation>Directional</org.diylc.components.AbstractLeadedComponent_-LabelOriantation>
           </entry>
           <entry>
-            <string>Value</string>
-            <string></string>
+            <string>Alpha</string>
+            <byte>100</byte>
           </entry>
           <entry>
             <string>Body</string>
             <awt-color reference="../../../../org.diylc.core.Template/values/entry[3]/awt-color"/>
           </entry>
           <entry>
-            <string>Alpha</string>
-            <byte>100</byte>
+            <string>Value</string>
+            <string></string>
           </entry>
           <entry>
             <string>Orientation</string>
             <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
           </entry>
-          <entry>
-            <string>Border</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[6]/awt-color"/>
-          </entry>
           <entry>
             <string>Type</string>
             <org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>MiniRound1</org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>
           </entry>
           <entry>
-            <string>Display</string>
-            <org.diylc.common.Display>BOTH</org.diylc.common.Display>
+            <string>Border</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[7]/awt-color"/>
           </entry>
           <entry>
             <string>Voltage</string>
             <null/>
           </entry>
+          <entry>
+            <string>Display</string>
+            <org.diylc.common.Display>BOTH</org.diylc.common.Display>
+          </entry>
           <entry>
             <string>Label</string>
             <awt-color reference="../../../../org.diylc.core.Template/values/entry[10]/awt-color"/>
@@ -3167,37 +3362,37 @@
             <org.diylc.components.AbstractLeadedComponent_-LabelOriantation>Directional</org.diylc.components.AbstractLeadedComponent_-LabelOriantation>
           </entry>
           <entry>
-            <string>Value</string>
-            <string></string>
+            <string>Alpha</string>
+            <byte>100</byte>
           </entry>
           <entry>
             <string>Body</string>
             <awt-color reference="../../../../org.diylc.core.Template/values/entry[3]/awt-color"/>
           </entry>
           <entry>
-            <string>Alpha</string>
-            <byte>100</byte>
+            <string>Value</string>
+            <string></string>
           </entry>
           <entry>
             <string>Orientation</string>
             <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
           </entry>
-          <entry>
-            <string>Border</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[6]/awt-color"/>
-          </entry>
           <entry>
             <string>Type</string>
             <org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>InLine</org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>
           </entry>
           <entry>
-            <string>Display</string>
-            <org.diylc.common.Display>BOTH</org.diylc.common.Display>
+            <string>Border</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[7]/awt-color"/>
           </entry>
           <entry>
             <string>Voltage</string>
             <null/>
           </entry>
+          <entry>
+            <string>Display</string>
+            <org.diylc.common.Display>BOTH</org.diylc.common.Display>
+          </entry>
           <entry>
             <string>Label</string>
             <awt-color reference="../../../../org.diylc.core.Template/values/entry[10]/awt-color"/>
@@ -3235,8 +3430,8 @@
             <org.diylc.components.AbstractLeadedComponent_-LabelOriantation>Horizontal</org.diylc.components.AbstractLeadedComponent_-LabelOriantation>
           </entry>
           <entry>
-            <string>Alpha</string>
-            <byte>100</byte>
+            <string>Value</string>
+            <string></string>
           </entry>
           <entry>
             <string>Body</string>
@@ -3248,17 +3443,13 @@
             </awt-color>
           </entry>
           <entry>
-            <string>Value</string>
-            <string></string>
+            <string>Alpha</string>
+            <byte>100</byte>
           </entry>
           <entry>
             <string>Orientation</string>
             <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
           </entry>
-          <entry>
-            <string>Type</string>
-            <org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>SquareBR3</org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>
-          </entry>
           <entry>
             <string>Border</string>
             <awt-color>
@@ -3269,13 +3460,17 @@
             </awt-color>
           </entry>
           <entry>
-            <string>Voltage</string>
-            <null/>
+            <string>Type</string>
+            <org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>SquareBR3</org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>
           </entry>
           <entry>
             <string>Display</string>
             <org.diylc.common.Display>BOTH</org.diylc.common.Display>
           </entry>
+          <entry>
+            <string>Voltage</string>
+            <null/>
+          </entry>
           <entry>
             <string>Label</string>
             <awt-color>
@@ -3321,10 +3516,6 @@
       <org.diylc.core.Template>
         <name>DIP8</name>
         <values>
-          <entry>
-            <string>Pins</string>
-            <org.diylc.components.semiconductors.DIL__IC_-PinCount>_8</org.diylc.components.semiconductors.DIL__IC_-PinCount>
-          </entry>
           <entry>
             <string>Row Spacing</string>
             <org.diylc.core.measures.Size>
@@ -3333,16 +3524,20 @@
             </org.diylc.core.measures.Size>
           </entry>
           <entry>
-            <string>Value</string>
-            <string></string>
+            <string>Pins</string>
+            <org.diylc.components.semiconductors.DIL__IC_-PinCount>_8</org.diylc.components.semiconductors.DIL__IC_-PinCount>
+          </entry>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
           </entry>
           <entry>
             <string>Body</string>
             <awt-color reference="../../../../../../entry[6]/list/org.diylc.core.Template/values/entry/awt-color"/>
           </entry>
           <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
+            <string>Value</string>
+            <string></string>
           </entry>
           <entry>
             <string>Orientation</string>
@@ -3425,10 +3620,6 @@
       <org.diylc.core.Template>
         <name>DIP16</name>
         <values>
-          <entry>
-            <string>Pins</string>
-            <org.diylc.components.semiconductors.DIL__IC_-PinCount>_16</org.diylc.components.semiconductors.DIL__IC_-PinCount>
-          </entry>
           <entry>
             <string>Row Spacing</string>
             <org.diylc.core.measures.Size>
@@ -3437,16 +3628,20 @@
             </org.diylc.core.measures.Size>
           </entry>
           <entry>
-            <string>Value</string>
-            <string></string>
+            <string>Pins</string>
+            <org.diylc.components.semiconductors.DIL__IC_-PinCount>_16</org.diylc.components.semiconductors.DIL__IC_-PinCount>
+          </entry>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
           </entry>
           <entry>
             <string>Body</string>
             <awt-color reference="../../../../../../entry[6]/list/org.diylc.core.Template/values/entry/awt-color"/>
           </entry>
           <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
+            <string>Value</string>
+            <string></string>
           </entry>
           <entry>
             <string>Orientation</string>
@@ -3556,14 +3751,14 @@
       <org.diylc.core.Template>
         <name>PCB Noval</name>
         <values>
-          <entry>
-            <string>Angle</string>
-            <int>0</int>
-          </entry>
           <entry>
             <string>Base</string>
             <org.diylc.components.tube.TubeSocket_-Base>B9A</org.diylc.components.tube.TubeSocket_-Base>
           </entry>
+          <entry>
+            <string>Angle</string>
+            <int>0</int>
+          </entry>
           <entry>
             <string>Alpha</string>
             <byte>127</byte>
@@ -3629,14 +3824,14 @@
       <org.diylc.core.Template>
         <name>PCB Octal</name>
         <values>
-          <entry>
-            <string>Angle</string>
-            <int>0</int>
-          </entry>
           <entry>
             <string>Base</string>
             <org.diylc.components.tube.TubeSocket_-Base>OCTAL</org.diylc.components.tube.TubeSocket_-Base>
           </entry>
+          <entry>
+            <string>Angle</string>
+            <int>0</int>
+          </entry>
           <entry>
             <string>Alpha</string>
             <byte>127</byte>
@@ -3693,14 +3888,14 @@
       <org.diylc.core.Template>
         <name>Chassis Noval</name>
         <values>
-          <entry>
-            <string>Base</string>
-            <org.diylc.components.tube.TubeSocket_-Base>B9A</org.diylc.components.tube.TubeSocket_-Base>
-          </entry>
           <entry>
             <string>Angle</string>
             <int>0</int>
           </entry>
+          <entry>
+            <string>Base</string>
+            <org.diylc.components.tube.TubeSocket_-Base>B9A</org.diylc.components.tube.TubeSocket_-Base>
+          </entry>
           <entry>
             <string>Alpha</string>
             <byte>127</byte>
@@ -3778,14 +3973,14 @@
       <org.diylc.core.Template>
         <name>Chassis Octal</name>
         <values>
-          <entry>
-            <string>Base</string>
-            <org.diylc.components.tube.TubeSocket_-Base>OCTAL</org.diylc.components.tube.TubeSocket_-Base>
-          </entry>
           <entry>
             <string>Angle</string>
             <int>0</int>
           </entry>
+          <entry>
+            <string>Base</string>
+            <org.diylc.components.tube.TubeSocket_-Base>OCTAL</org.diylc.components.tube.TubeSocket_-Base>
+          </entry>
           <entry>
             <string>Alpha</string>
             <byte>127</byte>
@@ -3854,14 +4049,14 @@
       <org.diylc.core.Template>
         <name>Chassis Noval 9A (12A?7)</name>
         <values>
-          <entry>
-            <string>Base</string>
-            <org.diylc.components.tube.TubeSocket_-Base>B9A</org.diylc.components.tube.TubeSocket_-Base>
-          </entry>
           <entry>
             <string>Angle</string>
             <int>0</int>
           </entry>
+          <entry>
+            <string>Base</string>
+            <org.diylc.components.tube.TubeSocket_-Base>B9A</org.diylc.components.tube.TubeSocket_-Base>
+          </entry>
           <entry>
             <string>Alpha</string>
             <byte>127</byte>
@@ -3934,14 +4129,14 @@
       <org.diylc.core.Template>
         <name>Chassis Noval 9CV (EL84)</name>
         <values>
-          <entry>
-            <string>Base</string>
-            <org.diylc.components.tube.TubeSocket_-Base>B9A</org.diylc.components.tube.TubeSocket_-Base>
-          </entry>
           <entry>
             <string>Angle</string>
             <int>0</int>
           </entry>
+          <entry>
+            <string>Base</string>
+            <org.diylc.components.tube.TubeSocket_-Base>B9A</org.diylc.components.tube.TubeSocket_-Base>
+          </entry>
           <entry>
             <string>Alpha</string>
             <byte>127</byte>
@@ -4014,14 +4209,14 @@
       <org.diylc.core.Template>
         <name>Chassis Octal 5T</name>
         <values>
-          <entry>
-            <string>Angle</string>
-            <int>0</int>
-          </entry>
           <entry>
             <string>Base</string>
             <org.diylc.components.tube.TubeSocket_-Base>OCTAL</org.diylc.components.tube.TubeSocket_-Base>
           </entry>
+          <entry>
+            <string>Angle</string>
+            <int>0</int>
+          </entry>
           <entry>
             <string>Alpha</string>
             <byte>127</byte>
@@ -4090,14 +4285,14 @@
       <org.diylc.core.Template>
         <name>Chassis Octal 7AC (6?6)</name>
         <values>
-          <entry>
-            <string>Angle</string>
-            <int>0</int>
-          </entry>
           <entry>
             <string>Base</string>
             <org.diylc.components.tube.TubeSocket_-Base>OCTAL</org.diylc.components.tube.TubeSocket_-Base>
           </entry>
+          <entry>
+            <string>Angle</string>
+            <int>0</int>
+          </entry>
           <entry>
             <string>Alpha</string>
             <byte>127</byte>
@@ -4166,14 +4361,14 @@
       <org.diylc.core.Template>
         <name>Chassis 7-pin 7BK</name>
         <values>
-          <entry>
-            <string>Base</string>
-            <org.diylc.components.tube.TubeSocket_-Base>B7G</org.diylc.components.tube.TubeSocket_-Base>
-          </entry>
           <entry>
             <string>Angle</string>
             <int>0</int>
           </entry>
+          <entry>
+            <string>Base</string>
+            <org.diylc.components.tube.TubeSocket_-Base>B7G</org.diylc.components.tube.TubeSocket_-Base>
+          </entry>
           <entry>
             <string>Alpha</string>
             <byte>127</byte>
@@ -4248,14 +4443,14 @@
       <org.diylc.core.Template>
         <name>Chassis Octal 8ET (EL34)</name>
         <values>
-          <entry>
-            <string>Base</string>
-            <org.diylc.components.tube.TubeSocket_-Base>OCTAL</org.diylc.components.tube.TubeSocket_-Base>
-          </entry>
           <entry>
             <string>Angle</string>
             <int>0</int>
           </entry>
+          <entry>
+            <string>Base</string>
+            <org.diylc.components.tube.TubeSocket_-Base>OCTAL</org.diylc.components.tube.TubeSocket_-Base>
+          </entry>
           <entry>
             <string>Alpha</string>
             <byte>127</byte>