From ef5bde9091b8d77717f43c91adf58fae36548134 Mon Sep 17 00:00:00 2001
From: Branislav Stojkovic <Branislav Stojkovic@Bancika-PC>
Date: Wed, 23 Jan 2019 10:51:51 +0100
Subject: [PATCH] Since 3.49, some capacitor variants have disappeared. The fix
 brings them back

---
 .../diylc-core/src/org/diylc/presenter/Presenter.java | 11 ++++++++++-
 diylc/diylc-swing/update.xml                          |  4 ++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/diylc/diylc-core/src/org/diylc/presenter/Presenter.java b/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
index ead45b27..47671fea 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
+++ b/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
@@ -44,6 +44,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 
 import javax.swing.JOptionPane;
 
@@ -116,7 +117,10 @@ public class Presenter implements IPlugInPort {
     try {
       BufferedInputStream in = new BufferedInputStream(new FileInputStream("variants.xml"));
       XStream xStream = new XStream(new DomDriver());
-      defaultVariantMap = (Map<String, List<Template>>) xStream.fromXML(in);
+      @SuppressWarnings("unchecked")
+      Map<String, List<Template>> map = (Map<String, List<Template>>) xStream.fromXML(in);
+      defaultVariantMap = new TreeMap<String, List<Template>>(String.CASE_INSENSITIVE_ORDER);
+      defaultVariantMap.putAll(map);
       in.close();
       LOG.info(String.format("Loaded default variants for %d components", defaultVariantMap == null ? 0 : defaultVariantMap.size()));
     } catch (IOException e) {
@@ -2250,8 +2254,13 @@ public class Presenter implements IPlugInPort {
   @SuppressWarnings("unchecked")
   @Override
   public List<Template> getVariantsFor(String categoryName, String componentTypeName) {
+    Map<String, List<Template>> lookupMap = new TreeMap<String, List<Template>>(String.CASE_INSENSITIVE_ORDER);
+    
     Map<String, List<Template>> variantMap =
         (Map<String, List<Template>>) ConfigurationManager.getInstance().readObject(TEMPLATES_KEY, null);
+    if (variantMap != null)
+      lookupMap.putAll(variantMap);
+    
     List<Template> variants = new ArrayList<Template>();
     if (variantMap != null) {
       List<Template> userVariants = variantMap.get(categoryName + "." + componentTypeName);
diff --git a/diylc/diylc-swing/update.xml b/diylc/diylc-swing/update.xml
index a48debef..67a73fa9 100644
--- a/diylc/diylc-swing/update.xml
+++ b/diylc/diylc-swing/update.xml
@@ -2306,6 +2306,10 @@
 					<changeType>BUG_FIX</changeType>
 					<description>Since 3.49, straight traces are rendered 1px thinner than curved traces of the same thickness</description>
 				</org.diylc.appframework.update.Change>
+				<org.diylc.appframework.update.Change>
+					<changeType>BUG_FIX</changeType>
+					<description>Since 3.49, some capacitor variants have disappeared. The fix brings them back</description>
+				</org.diylc.appframework.update.Change>
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>
 		</org.diylc.appframework.update.Version>