From bb69d8dd04fb7ee3da07d7b2c6f580af6fc5b978 Mon Sep 17 00:00:00 2001
From: Branislav Stojkovic <Branislav Stojkovic@Bancika-PC>
Date: Sat, 9 Feb 2019 18:55:34 +0100
Subject: [PATCH] upgrade variants to new format on start fix for variant
 export

---
 .../org/diylc/common/IVariantProcessor.java   |   5 +-
 .../src/org/diylc/presenter/Presenter.java    |  44 +++++
 diylc/diylc-swing/lib/swing-framework.jar     | Bin 156973 -> 157095 bytes
 .../src/org/diylc/swing/ActionFactory.java    | 167 ++++++++++--------
 4 files changed, 143 insertions(+), 73 deletions(-)

diff --git a/diylc/diylc-core/src/org/diylc/common/IVariantProcessor.java b/diylc/diylc-core/src/org/diylc/common/IVariantProcessor.java
index b481b849..21aa4a4c 100644
--- a/diylc/diylc-core/src/org/diylc/common/IVariantProcessor.java
+++ b/diylc/diylc-core/src/org/diylc/common/IVariantProcessor.java
@@ -21,11 +21,10 @@
 */
 package org.diylc.common;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.List;
+import java.util.List;
 
-import org.diylc.core.Template;
+import org.diylc.core.Template;
 
 public interface IVariantProcessor {
 
diff --git a/diylc/diylc-core/src/org/diylc/presenter/Presenter.java b/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
index ccc145c5..036332c1 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
+++ b/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
@@ -191,6 +191,7 @@ public class Presenter implements IPlugInPort {
 
     // lockedLayers = EnumSet.noneOf(ComponentLayer.class);
     // visibleLayers = EnumSet.allOf(ComponentLayer.class);
+    upgradeVariants();
   }
 
   public void installPlugin(IPlugIn plugIn) {
@@ -2633,4 +2634,47 @@ public class Presenter implements IPlugInPort {
     
     return pkg.getBlocks().size();
   }
+  
+  private static boolean upgradedVariants = false;
+  
+  @SuppressWarnings("unchecked")
+  private synchronized void upgradeVariants() {
+    if (upgradedVariants)
+      return;
+    
+    upgradedVariants = true;
+    
+    LOG.info("Checking if variants need to be updated");
+    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)
+      return;
+    
+    Map<String, ComponentType> typeMap = new TreeMap<String, ComponentType>(String.CASE_INSENSITIVE_ORDER);
+    
+    Map<String, List<ComponentType>> componentTypes = getComponentTypes();
+    for (Map.Entry<String, List<ComponentType>> entry : componentTypes.entrySet())
+      for (ComponentType type : entry.getValue()) {
+        typeMap.put(type.getInstanceClass().getCanonicalName(), type);
+        typeMap.put(type.getCategory() + "." + type.getName(), type);
+        if (type.getCategory().contains("Electro-Mechanical"))
+          typeMap.put(type.getCategory().replace("Electro-Mechanical", "Electromechanical") + "." + type.getName(), type);
+      }
+    
+    Map<String, List<Template>> newVariantMap = new HashMap<String, List<Template>>();
+    
+    lookupMap.putAll(variantMap);
+    
+    for (Map.Entry<String, List<Template>> entry : variantMap.entrySet()) {
+      if (typeMap.containsKey(entry.getKey())) {
+        newVariantMap.put(typeMap.get(entry.getKey()).getInstanceClass().getCanonicalName(), entry.getValue()); // great, nothing to upgrade
+      } else {
+        LOG.warn("Could not upgrade variants for: " + entry.getKey());
+      }
+    }
+    
+    ConfigurationManager.getInstance().writeValue(TEMPLATES_KEY, newVariantMap);
+  }
 }
diff --git a/diylc/diylc-swing/lib/swing-framework.jar b/diylc/diylc-swing/lib/swing-framework.jar
index e3c7b6a5d0524e8cc81ba4c61f59a7861cd5fc70..6cf5eef18e83471f420afe7bbd9b2f07843d87c0 100644
GIT binary patch
delta 6673
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
M)G4+GC=tg00X`z>mjD0&

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

diff --git a/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java b/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java
index 4495b622..ad034d44 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java
@@ -36,6 +36,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 
 import javax.swing.AbstractAction;
 import javax.swing.JOptionPane;
@@ -697,7 +698,7 @@ public class ActionFactory {
     private ISwingUI swingUI;
     private IPlugInPort plugInPort;
     
-    private Map<String, ComponentType> typeMap = new HashMap<String, ComponentType>();
+    private Map<String, ComponentType> typeMap = new TreeMap<String, ComponentType>(String.CASE_INSENSITIVE_ORDER);
 
     public ExportVariantsAction(ISwingUI swingUI, IPlugInPort plugInPort) {
       super();
@@ -707,52 +708,69 @@ public class ActionFactory {
       
       Map<String, List<ComponentType>> componentTypes = plugInPort.getComponentTypes();
       for (Map.Entry<String, List<ComponentType>> entry : componentTypes.entrySet())
-        for (ComponentType type : entry.getValue())
+        for (ComponentType type : entry.getValue()) {
           typeMap.put(type.getInstanceClass().getCanonicalName(), type);
+        }
     }
 
     @SuppressWarnings("unchecked")
     @Override
     public void actionPerformed(ActionEvent e) {
       LOG.info("ExportVariantsAction triggered");
-      Map<String, List<Template>> variantMap =
-          (Map<String, List<Template>>) ConfigurationManager.getInstance().readObject(IPlugInPort.TEMPLATES_KEY, null);
-      if (variantMap == null || variantMap.isEmpty()) {
-        swingUI.showMessage("No variants found to export.", "Error", IView.ERROR_MESSAGE);
+      
+      Map<String, List<Template>> selectedVariants;
+      
+      try {
+        Map<String, List<Template>> variantMap =
+            (Map<String, List<Template>>) ConfigurationManager.getInstance().readObject(IPlugInPort.TEMPLATES_KEY, null);
+        if (variantMap == null || variantMap.isEmpty()) {
+          swingUI.showMessage("No variants found to export.", "Error", IView.ERROR_MESSAGE);
+          return;
+        }
+        
+        List<ComponentType> types = new ArrayList<ComponentType>();
+        for (String className : variantMap.keySet()) {
+          ComponentType type = typeMap.get(className);
+          if (type != null)            
+            types.add(type);
+          else
+            LOG.warn("Could not find type for: " + 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);      
+        
+        if (dialog.getSelectedButtonCaption() != "OK")
+          return;
+        
+        Object[] selected = dialog.getSelectedOptions();
+        
+        if (selected.length == 0) {
+          swingUI.showMessage("No variants selected for export.", "Error", IView.ERROR_MESSAGE);
+          return;      
+        }
+        
+        selectedVariants = new HashMap<String, List<Template>>();
+        for (Object key : selected) {
+          ComponentType type = (ComponentType) key;
+          String clazz = type.getInstanceClass().getCanonicalName();
+          List<Template> variants = variantMap.get(clazz);
+          if (variants != null)
+            selectedVariants.put(clazz, variants);
+        }
+      } catch (Exception ex) {
+        LOG.error("Error preparing variants for export", ex);
+        swingUI.showMessage("Could not export variants. Please check the log for details", "Export Variants", ISwingUI.ERROR_MESSAGE);
         return;
       }
-      
-      List<ComponentType> types = new ArrayList<ComponentType>();
-      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);      
-      
-      if (dialog.getSelectedButtonCaption() != "OK")
-        return;
-      
-      Object[] selected = dialog.getSelectedOptions();
-      
-      if (selected.length == 0) {
-        swingUI.showMessage("No building blocks selected for export.", "Error", IView.ERROR_MESSAGE);
-        return;      
-      }
-      
-      Map<String, List<Template>> selectedVariants = new HashMap<String, List<Template>>();
-      for (Object key : selected) {
-        ComponentType type = (ComponentType) key;
-        String clazz = type.getInstanceClass().getCanonicalName();
-        selectedVariants.put(clazz, variantMap.get(clazz));
-      }
 
       final VariantPackage variantPkg = new VariantPackage(selectedVariants, System.getProperty("user.name"));
 
@@ -861,41 +879,50 @@ public class ActionFactory {
     @Override
     public void actionPerformed(ActionEvent e) {
       LOG.info("ExportBuildingBlocksAction triggered");
-      Map<String, Collection<IDIYComponent<?>>> blocks =
-          (Map<String, Collection<IDIYComponent<?>>>) ConfigurationManager.getInstance().readObject(IPlugInPort.BLOCKS_KEY, null);
-      if (blocks == null || blocks.isEmpty()) {
-        swingUI.showMessage("No building blocks found to export.", "Error", IView.ERROR_MESSAGE);
+      
+      Map<String, Collection<IDIYComponent<?>>> selectedBlocks;
+      
+      try {
+        Map<String, Collection<IDIYComponent<?>>> blocks =
+            (Map<String, Collection<IDIYComponent<?>>>) ConfigurationManager.getInstance().readObject(IPlugInPort.BLOCKS_KEY, null);
+        if (blocks == null || blocks.isEmpty()) {
+          swingUI.showMessage("No building blocks found to export.", "Error", IView.ERROR_MESSAGE);
+          return;
+        }
+        
+        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);      
+        
+        if (dialog.getSelectedButtonCaption() != "OK")
+          return;
+        
+        Object[] selected = dialog.getSelectedOptions();
+        
+        if (selected.length == 0) {
+          swingUI.showMessage("No building blocks selected for export.", "Error", IView.ERROR_MESSAGE);
+          return;      
+        }
+        
+        selectedBlocks = new HashMap<String, Collection<IDIYComponent<?>>>();
+        for (Object key : selected) {
+          selectedBlocks.put(key.toString(), blocks.get(key));
+        }
+      } catch (Exception ex) {
+        LOG.error("Error preparing building blocks for export", ex);
+        swingUI.showMessage("Could not export building blocks. Please check the log for details", "Export Building Blocks", ISwingUI.ERROR_MESSAGE);
         return;
       }
       
-      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);      
-      
-      if (dialog.getSelectedButtonCaption() != "OK")
-        return;
-      
-      Object[] selected = dialog.getSelectedOptions();
-      
-      if (selected.length == 0) {
-        swingUI.showMessage("No building blocks selected for export.", "Error", IView.ERROR_MESSAGE);
-        return;      
-      }
-      
-      Map<String, Collection<IDIYComponent<?>>> selectedBlocks = new HashMap<String, Collection<IDIYComponent<?>>>();
-      for (Object key : selected) {
-        selectedBlocks.put(key.toString(), blocks.get(key));
-      }
-
       final BuildingBlockPackage variantPkg = new BuildingBlockPackage(selectedBlocks, System.getProperty("user.name"));
 
       File initialFile =