From 86500cb4a01484134874c78bb0eadd7b9dd74264 Mon Sep 17 00:00:00 2001
From: Branislav Stojkovic <Branislav Stojkovic@Bancika-PC>
Date: Fri, 8 Feb 2019 22:44:26 +0100
Subject: [PATCH] import/export variants and building blocks

---
 .../diylc/common/BuildingBlockPackage.java    |  47 ++++
 .../src/org/diylc/common/IBlockProcessor.java |   6 +-
 .../org/diylc/common/IVariantProcessor.java   |  14 +-
 .../src/org/diylc/common/VariantPackage.java  |  47 ++++
 .../src/org/diylc/presenter/Presenter.java    | 150 ++++++++--
 diylc/diylc-swing/DIYLCStarter.launch         |   2 +-
 diylc/diylc-swing/lib/diylc-core.jar          | Bin 247689 -> 247689 bytes
 .../src/org/diylc/images/IconLoader.java      |   3 +-
 .../diylc-swing/src/org/diylc/images/node.png | Bin 0 -> 865 bytes
 .../src/org/diylc/swing/ActionFactory.java    | 256 +++++++++++++++++-
 .../swing/plugins/file/FileFilterEnum.java    |   2 +-
 .../swing/plugins/file/FileMenuPlugin.java    |  12 +-
 .../toolbox/ComponentButtonFactory.java       |   6 +-
 .../plugins/toolbox/ComponentTabbedPane.java  |   2 +-
 .../diylc/swing/plugins/tree/TreePanel.java   |   4 +-
 diylc/diylc-swing/update.xml                  |   4 +
 16 files changed, 519 insertions(+), 36 deletions(-)
 create mode 100644 diylc/diylc-core/src/org/diylc/common/BuildingBlockPackage.java
 create mode 100644 diylc/diylc-core/src/org/diylc/common/VariantPackage.java
 create mode 100644 diylc/diylc-swing/src/org/diylc/images/node.png

diff --git a/diylc/diylc-core/src/org/diylc/common/BuildingBlockPackage.java b/diylc/diylc-core/src/org/diylc/common/BuildingBlockPackage.java
new file mode 100644
index 00000000..1131dd2e
--- /dev/null
+++ b/diylc/diylc-core/src/org/diylc/common/BuildingBlockPackage.java
@@ -0,0 +1,47 @@
+/*
+
+    DIY Layout Creator (DIYLC).
+    Copyright (c) 2009-2018 held jointly by the individual authors.
+
+    This file is part of DIYLC.
+
+    DIYLC is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    DIYLC is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+package org.diylc.common;
+
+import java.util.Collection;
+import java.util.Map;
+
+import org.diylc.core.IDIYComponent;
+
+public class BuildingBlockPackage {
+
+  private Map<String, Collection<IDIYComponent<?>>> block;
+  private String owner;
+
+  public BuildingBlockPackage(Map<String, Collection<IDIYComponent<?>>> blocks, String owner) {
+    super();
+    this.block = blocks;
+    this.owner = owner;
+  }
+
+  public Map<String, Collection<IDIYComponent<?>>> getBlocks() {
+    return block;
+  }
+
+  public String getOwner() {
+    return owner;
+  }
+}
diff --git a/diylc/diylc-core/src/org/diylc/common/IBlockProcessor.java b/diylc/diylc-core/src/org/diylc/common/IBlockProcessor.java
index 139915f4..b9f93fae 100644
--- a/diylc/diylc-core/src/org/diylc/common/IBlockProcessor.java
+++ b/diylc/diylc-core/src/org/diylc/common/IBlockProcessor.java
@@ -20,6 +20,8 @@
 
 */
 package org.diylc.common;
+
+import java.io.IOException;
 
 public interface IBlockProcessor {
 
@@ -29,7 +31,9 @@ public interface IBlockProcessor {
 
   void loadBlock(String blockName) throws InvalidBlockException;
   
-  void deleteBlock(String blockName);
+  void deleteBlock(String blockName);
+  
+  int importBlocks(String fileName) throws IOException;
 
   public class BlockAlreadyExistsException extends Exception {
 
diff --git a/diylc/diylc-core/src/org/diylc/common/IVariantProcessor.java b/diylc/diylc-core/src/org/diylc/common/IVariantProcessor.java
index d0cce3d4..b481b849 100644
--- a/diylc/diylc-core/src/org/diylc/common/IVariantProcessor.java
+++ b/diylc/diylc-core/src/org/diylc/common/IVariantProcessor.java
@@ -21,8 +21,10 @@
 */
 package org.diylc.common;
 
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.util.List;
-
+
 import org.diylc.core.Template;
 
 public interface IVariantProcessor {
@@ -32,17 +34,19 @@ public interface IVariantProcessor {
 
   void saveSelectedComponentAsVariant(String variantName);
 
-  List<Template> getVariantsFor(String categoryName, String componentTypeName);
+  List<Template> getVariantsFor(ComponentType type);
 
   List<Template> getVariantsForSelection();
 
   void applyVariantToSelection(Template variant);
 
-  void deleteVariant(String categoryName, String componentTypeName, String variantName);
+  void deleteVariant(ComponentType type, String variantName);
 
-  void setDefaultVariant(String categoryName, String componentTypeName, String variantName);
+  void setDefaultVariant(ComponentType type, String variantName);
   
-  String getDefaultVariant(String categoryName, String componentTypeName);
+  int importVariants(String fileName) throws IOException;
+  
+  String getDefaultVariant(ComponentType type);
 
   public class VariantAlreadyExistsException extends Exception {
 
diff --git a/diylc/diylc-core/src/org/diylc/common/VariantPackage.java b/diylc/diylc-core/src/org/diylc/common/VariantPackage.java
new file mode 100644
index 00000000..32879c60
--- /dev/null
+++ b/diylc/diylc-core/src/org/diylc/common/VariantPackage.java
@@ -0,0 +1,47 @@
+/*
+
+    DIY Layout Creator (DIYLC).
+    Copyright (c) 2009-2018 held jointly by the individual authors.
+
+    This file is part of DIYLC.
+
+    DIYLC is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    DIYLC is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+package org.diylc.common;
+
+import java.util.List;
+import java.util.Map;
+
+import org.diylc.core.Template;
+
+public class VariantPackage {
+
+  private Map<String, List<Template>> variants;
+  private String owner;
+
+  public VariantPackage(Map<String, List<Template>> variants, String owner) {
+    super();
+    this.variants = variants;
+    this.owner = owner;
+  }
+
+  public Map<String, List<Template>> getVariants() {
+    return variants;
+  }
+
+  public String getOwner() {
+    return owner;
+  }
+}
diff --git a/diylc/diylc-core/src/org/diylc/presenter/Presenter.java b/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
index 776a45e8..912f7451 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
+++ b/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
@@ -54,6 +54,7 @@ import org.diylc.appframework.miscutils.Utils;
 import org.diylc.appframework.simplemq.MessageDispatcher;
 import org.diylc.appframework.update.Version;
 import org.diylc.appframework.update.VersionNumber;
+import org.diylc.common.BuildingBlockPackage;
 import org.diylc.common.ComponentType;
 import org.diylc.common.DrawOption;
 import org.diylc.common.EventType;
@@ -63,6 +64,7 @@ import org.diylc.common.IKeyProcessor;
 import org.diylc.common.IPlugIn;
 import org.diylc.common.IPlugInPort;
 import org.diylc.common.PropertyWrapper;
+import org.diylc.common.VariantPackage;
 import org.diylc.core.ExpansionMode;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.IView;
@@ -2157,8 +2159,8 @@ public class Presenter implements IPlugInPort {
 
     // try to find a default template if none is provided
     if (componentType != null && template == null) {
-      String defaultTemplate = getDefaultVariant(componentType.getCategory(), componentType.getName());
-      List<Template> templates = getVariantsFor(componentType.getCategory(), componentType.getName());
+      String defaultTemplate = getDefaultVariant(componentType);
+      List<Template> templates = getVariantsFor(componentType);
       if (templates != null && defaultTemplate != null)
         for (Template t : templates) {
           if (t.getName().equals(defaultTemplate)) {
@@ -2205,7 +2207,7 @@ public class Presenter implements IPlugInPort {
     if (variantMap == null) {
       variantMap = new HashMap<String, List<Template>>();
     }
-    String key = type.getCategory() + "." + type.getName();
+    String key = type.getInstanceClass().getCanonicalName();
     List<Template> variants = variantMap.get(key);
     if (variants == null) {
       variants = new ArrayList<Template>();
@@ -2293,7 +2295,7 @@ public class Presenter implements IPlugInPort {
 
   @SuppressWarnings("unchecked")
   @Override
-  public List<Template> getVariantsFor(String categoryName, String componentTypeName) {
+  public List<Template> getVariantsFor(ComponentType type) {
     Map<String, List<Template>> lookupMap = new TreeMap<String, List<Template>>(String.CASE_INSENSITIVE_ORDER);
     
     Map<String, List<Template>> variantMap =
@@ -2301,14 +2303,24 @@ public class Presenter implements IPlugInPort {
     if (variantMap != null)
       lookupMap.putAll(variantMap);
     
+    // try by class name and then by old category.type format
+    String key1 = type.getInstanceClass().getCanonicalName();
+    String key2 = type.getCategory() + "." + type.getName();
+    
     List<Template> variants = new ArrayList<Template>();
     if (variantMap != null) {
-      List<Template> userVariants = variantMap.get(categoryName + "." + componentTypeName);
+      List<Template> userVariants = variantMap.get(key1);
+      if (userVariants != null && !userVariants.isEmpty())
+        variants.addAll(userVariants);
+      userVariants = variantMap.get(key2);
       if (userVariants != null && !userVariants.isEmpty())
         variants.addAll(userVariants);
     }
     if (defaultVariantMap != null) {
-      List<Template> defaultVariants = defaultVariantMap.get(categoryName + "." + componentTypeName);
+      List<Template> defaultVariants = defaultVariantMap.get(key1);        
+      if (defaultVariants != null && !defaultVariants.isEmpty())
+        variants.addAll(defaultVariants);
+      defaultVariants = defaultVariantMap.get(key2);
       if (defaultVariants != null && !defaultVariants.isEmpty())
         variants.addAll(defaultVariants);
     }
@@ -2339,7 +2351,7 @@ public class Presenter implements IPlugInPort {
       else if (selectedType.getInstanceClass() != type.getInstanceClass())
         return null;
     }
-    return getVariantsFor(selectedType.getCategory(), selectedType.getName());
+    return getVariantsFor(selectedType);
   }
 
   @Override
@@ -2370,12 +2382,26 @@ public class Presenter implements IPlugInPort {
 
   @SuppressWarnings("unchecked")
   @Override
-  public void deleteVariant(String categoryName, String componentTypeName, String templateName) {
-    LOG.debug(String.format("deleteTemplate(%s, %s, %s)", categoryName, componentTypeName, templateName));
+  public void deleteVariant(ComponentType type, String templateName) {
+    LOG.debug(String.format("deleteTemplate(%s, %s)", type, templateName));
     Map<String, List<Template>> templateMap =
         (Map<String, List<Template>>) ConfigurationManager.getInstance().readObject(TEMPLATES_KEY, null);
     if (templateMap != null) {
-      List<Template> templates = templateMap.get(categoryName + "." + componentTypeName);
+      // try by class name and then by old category.type format
+      String key1 = type.getInstanceClass().getCanonicalName();
+      String key2 = type.getCategory() + "." + type.getName();
+      
+      List<Template> templates = templateMap.get(key1);
+      if (templates != null) {
+        Iterator<Template> i = templates.iterator();
+        while (i.hasNext()) {
+          Template t = i.next();
+          if (t.getName().equalsIgnoreCase(templateName)) {
+            i.remove();
+          }
+        }
+      }
+      templates = templateMap.get(key2);
       if (templates != null) {
         Iterator<Template> i = templates.iterator();
         while (i.hasNext()) {
@@ -2391,27 +2417,44 @@ public class Presenter implements IPlugInPort {
 
   @SuppressWarnings("unchecked")
   @Override
-  public void setDefaultVariant(String categoryName, String componentTypeName, String templateName) {
-    LOG.debug(String.format("setTemplateDefault(%s, %s, %s)", categoryName, componentTypeName, templateName));
+  public void setDefaultVariant(ComponentType type, String templateName) {
+    LOG.debug(String.format("setTemplateDefault(%s, %s)", type, templateName));
     Map<String, String> defaultTemplateMap =
         (Map<String, String>) ConfigurationManager.getInstance().readObject(DEFAULT_TEMPLATES_KEY, null);
     if (defaultTemplateMap == null)
       defaultTemplateMap = new HashMap<String, String>();
-    if (templateName.equals(defaultTemplateMap.get(categoryName + "." + componentTypeName)))
-      defaultTemplateMap.remove(categoryName + "." + componentTypeName);
-    else
-      defaultTemplateMap.put(categoryName + "." + componentTypeName, templateName);
+    
+    // try by class name and then by old category.type format
+    String key1 = type.getInstanceClass().getCanonicalName();
+    String key2 = type.getCategory() + "." + type.getName();
+    
+    if (templateName.equals(defaultTemplateMap.get(key1)) || templateName.equals(defaultTemplateMap.get(key2))) {
+      defaultTemplateMap.remove(key1);
+      defaultTemplateMap.remove(key2);
+    }
+    else {
+      // get rid of legacy key
+      defaultTemplateMap.remove(key2);
+      defaultTemplateMap.put(key1, templateName);
+    }
     ConfigurationManager.getInstance().writeValue(DEFAULT_TEMPLATES_KEY, defaultTemplateMap);      
   }
   
   @SuppressWarnings("unchecked")
   @Override
-  public String getDefaultVariant(String categoryName, String componentTypeName) {
+  public String getDefaultVariant(ComponentType type) {
     Map<String, String> defaultTemplateMap =
         (Map<String, String>) ConfigurationManager.getInstance().readObject(DEFAULT_TEMPLATES_KEY, null);
     if (defaultTemplateMap == null)
       return null;
-    return defaultTemplateMap.get(categoryName + "." + componentTypeName);
+    
+    String key1 = type.getInstanceClass().getCanonicalName();
+    String key2 = type.getCategory() + "." + type.getName();
+    
+    if (defaultTemplateMap.containsKey(key1))
+      return defaultTemplateMap.get(key1);
+    
+    return defaultTemplateMap.get(key2);
   }
 
   private Set<IDIYComponent<?>> getLockedComponents() {
@@ -2519,4 +2562,75 @@ public class Presenter implements IPlugInPort {
     
     return extraSpace;
   }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  public int importVariants(String fileName) throws IOException {
+    LOG.debug(String.format("importVariants(%s)", fileName));
+    BufferedInputStream in = new BufferedInputStream(new FileInputStream(fileName));
+    XStream xStream = new XStream(new DomDriver());
+    
+    VariantPackage pkg = (VariantPackage) xStream.fromXML(in);
+    
+    in.close();
+    
+    if (pkg == null || pkg.getVariants().isEmpty())
+      return 0;
+    
+    Map<String, List<Template>> variantMap =
+        (Map<String, List<Template>>) ConfigurationManager.getInstance().readObject(TEMPLATES_KEY, null);
+    if (variantMap == null) {
+      variantMap = new HashMap<String, List<Template>>();
+    }
+    
+    for (Map.Entry<String, List<Template>> entry : pkg.getVariants().entrySet()) {
+      List<Template> templates;      
+      templates = variantMap.get(entry.getKey());
+      if (templates == null)
+      {
+        templates = new ArrayList<Template>();
+        variantMap.put(entry.getKey(), templates);
+      }
+      for (Template t : entry.getValue()) {
+        templates.add(new Template(t.getName() + " by " + pkg.getOwner(), t.getValues(), t.getPoints()));      
+      }
+    }
+    
+    ConfigurationManager.getInstance().writeValue(TEMPLATES_KEY, variantMap);
+        
+    LOG.info(String.format("Loaded variants for %d components", pkg.getVariants().size()));
+    
+    return pkg.getVariants().size();
+  }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  public int importBlocks(String fileName) throws IOException {
+    LOG.debug(String.format("importBlocks(%s)", fileName));
+    BufferedInputStream in = new BufferedInputStream(new FileInputStream(fileName));
+    XStream xStream = new XStream(new DomDriver());
+    
+    BuildingBlockPackage pkg = (BuildingBlockPackage) xStream.fromXML(in);
+    
+    in.close();
+    
+    if (pkg == null || pkg.getBlocks().isEmpty())
+      return 0;
+    
+    Map<String, Collection<IDIYComponent<?>>> blocks =
+        (Map<String, Collection<IDIYComponent<?>>>) ConfigurationManager.getInstance().readObject(BLOCKS_KEY, null);
+    if (blocks == null) {
+      blocks = new HashMap<String, Collection<IDIYComponent<?>>>();
+    }
+    
+    for (Map.Entry<String, Collection<IDIYComponent<?>>> entry : pkg.getBlocks().entrySet()) {
+      blocks.put(entry.getKey() + " by " + pkg.getOwner(), entry.getValue());
+    }
+    
+    ConfigurationManager.getInstance().writeValue(BLOCKS_KEY, blocks);
+        
+    LOG.info(String.format("Loaded building blocks for %d components", pkg.getBlocks().size()));
+    
+    return pkg.getBlocks().size();
+  }
 }
diff --git a/diylc/diylc-swing/DIYLCStarter.launch b/diylc/diylc-swing/DIYLCStarter.launch
index 38c8ab51..aff8a7cb 100644
--- a/diylc/diylc-swing/DIYLCStarter.launch
+++ b/diylc/diylc-swing/DIYLCStarter.launch
@@ -11,5 +11,5 @@
 <stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;Library&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;DIYLC&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;diylc-core&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;diylc-library&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;default/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.diylc.DIYLCStarter"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="diylc-swing"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-splash:splash.png -Xms256m -Xmx512m -Dorg.diylc.scriptRun=true -Ddorg.diylc.debugContinuityAreas=true -Dorg.diylc.WriteStaticVariants=true -Ddorg.diylc.debugComponentAreas=true"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-splash:splash.png -Xms256m -Xmx512m -Dorg.diylc.scriptRun=true -Ddorg.diylc.debugContinuityAreas=true -Ddorg.diylc.WriteStaticVariants=true -Ddorg.diylc.debugComponentAreas=true"/>
 </launchConfiguration>
diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar
index 31ef4eb5c50949db6f76107f487103c2940594d9..985a3c07ed3c0b8fd3cec8551ab585d718b7c54e 100644
GIT binary patch
delta 4301
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

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

diff --git a/diylc/diylc-swing/src/org/diylc/images/IconLoader.java b/diylc/diylc-swing/src/org/diylc/images/IconLoader.java
index 47ea675c..d79fc0f1 100644
--- a/diylc/diylc-swing/src/org/diylc/images/IconLoader.java
+++ b/diylc/diylc-swing/src/org/diylc/images/IconLoader.java
@@ -62,7 +62,8 @@ public enum IconLoader {
       "pin_green.png"), CoffeebeanEdit("coffeebean_edit.png"), ApplicationEdit("application_edit.png"), ComponentAdd(
       "component_add.png"), History("history.png"), DocumentPlain("document_plain.png"), FitToSize("fit_to_size.png"), DocumentsGear(
       "documents_gear.png"), SplashResistor("splash_resistor.png"), SplashCeramic("splash_ceramic.png"), SplashElectrolytic(
-      "splash_electrolytic.png"), SplashFilm("splash_film.png"), Splash("splash.png"), Help("help2.png"), ScrollInformation("scroll_information.png");
+      "splash_electrolytic.png"), SplashFilm("splash_film.png"), Splash("splash.png"), Help("help2.png"), ScrollInformation("scroll_information.png"),
+      Node("node.png");
 
   protected String name;
 
diff --git a/diylc/diylc-swing/src/org/diylc/images/node.png b/diylc/diylc-swing/src/org/diylc/images/node.png
new file mode 100644
index 0000000000000000000000000000000000000000..476fa6019746c4fbb2269398ae7ff3ec17618c11
GIT binary patch
literal 865
zcmV-n1D^beP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000hbVXQnLvm$d
zbZKvHAXI5>WdKBJATc-~MrC3kGB7YRATc*OG%`9eGaxH4F)%PonKteK000McNliru
z)&&<0GA24W_Zt8J010qNS#tmY3lRVS3lRZ-WM7d0000DMK}|sb0I`n?{9y$E00Oy5
zL_t(|+Kp3PNK<hXKilp$yqg<-Y?@^gabrweBcz&b!g?@;o`ev@-V9%&mk6>CdJV~m
z4?({8<YQ$JmQKi#j^RLaO-n@`XxeslUftTf`?$NEzuZ7AqXR!K_i)bdeEt3sIK>7B
z2VW`_ingt-t$DZG-5!ZV7<8vk#z{{juvjckm&>J%$K#G<GTDMI9YXTo1gTVt<9S{p
zpdB0>7}2HqTl{GR5+pcmH=oZFD8%Z*$w2Dp&%nUIqdk`G_&hh;y|*3V71BD8@oC|A
zvejy(%x3dNhGAB{UN4Kj+%W>9(Rjb=e5Do&G;jRHH=raYz`L?`X?;iGwOcm2+-SMr
zGMP-Jy}iBDNYIWco3i6`Cl`v;wDUt{r?#;|EeR#m;K^3NTF$C}+EQMd<C65pi3wq2
zV<Q?22FX>vA9i4~+2js~!>QNnn{qOx#H`K3Cq@cv7GOV~hqLl1+<89Cmd2)LC#QU2
zyh=*khd}lB_rJi|+6)FmiBhSA7!!qaJ7dtejF;m%=r->{XTvUdbR`<kxQfnZvk^@6
zA-*B@D79LBQ=`!ohe9C;hr_V5&HS8OPppHs%mQ2i3^N?uyK8{!&1YmaMw1=&Q8zj|
znx2`NnMDF#hFf)_%Bp=n-~7<fkY{A%eP}s2z0mDY<X$~)GHi~!Qx6_KdEIc;QEj)|
zDVAl)N$UfFz%+iNR8LROZIo<tCX=Z_$39{Su}-OqDrJ-m3RD{T%IaFCwYBwGS65dX
zP1Bae#YIxR7V(8Fk;UXOaV{dBI5`OJBP*9H0M(cy#EC@0+t=6UQ>j!}P~L^;`$6K#
z8F@sK5Q)hg5ui?|tHPZ$avaC|{r&*@CQ;Q(>2!Kc?D8uj_Q&HmVp_yy#3gaGx8&}k
rDy3p!;a>!l_<#rz8Dm@Q?wI`oJ{m4kNO-yG00000NkvXXu0mjfE8B$b

literal 0
HcmV?d00001

diff --git a/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java b/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java
index 700ac8b4..9df3699e 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java
@@ -23,10 +23,14 @@ import java.awt.datatransfer.ClipboardOwner;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 import java.awt.print.PrinterException;
+import java.io.BufferedOutputStream;
 import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import javax.swing.AbstractAction;
@@ -35,14 +39,17 @@ import javax.swing.KeyStroke;
 
 import org.apache.log4j.Logger;
 import org.diylc.appframework.miscutils.ConfigurationManager;
+import org.diylc.common.BuildingBlockPackage;
 import org.diylc.common.IComponentTransformer;
 import org.diylc.common.IPlugInPort;
 import org.diylc.common.ITask;
 import org.diylc.common.PropertyWrapper;
+import org.diylc.common.VariantPackage;
 import org.diylc.core.ExpansionMode;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.IView;
 import org.diylc.core.Project;
+import org.diylc.core.Template;
 import org.diylc.core.Theme;
 import org.diylc.core.measures.Nudge;
 import org.diylc.core.measures.Size;
@@ -60,6 +67,9 @@ import org.diylc.swingframework.IDrawingProvider;
 import org.diylc.swingframework.export.DrawingExporter;
 import org.diylc.utils.BomEntry;
 
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.xml.DomDriver;
+
 public class ActionFactory {
 
   private static final Logger LOG = Logger.getLogger(ActionFactory.class);
@@ -112,6 +122,22 @@ public class ActionFactory {
   public PrintAction createPrintAction(IDrawingProvider drawingProvider, int keyModifiers) {
     return new PrintAction(drawingProvider, keyModifiers);
   }
+  
+  public ExportVariantsAction createExportVariantsAction(ISwingUI swingUI) {
+    return new ExportVariantsAction(swingUI);
+  }
+  
+  public ImportVariantsAction createImportVariantsAction(ISwingUI swingUI, IPlugInPort plugInPort) {
+    return new ImportVariantsAction(swingUI, plugInPort);
+  }
+  
+  public ExportBlocksAction createExportBlocksAction(ISwingUI swingUI) {
+    return new ExportBlocksAction(swingUI);
+  }
+  
+  public ImportBlocksAction createImportBlocksAction(ISwingUI swingUI, IPlugInPort plugInPort) {
+    return new ImportBlocksAction(swingUI, plugInPort);
+  }
 
   public ExitAction createExitAction(IPlugInPort plugInPort) {
     return new ExitAction(plugInPort);
@@ -653,11 +679,239 @@ public class ActionFactory {
       try {
         DrawingExporter.getInstance().print(this.drawingProvider);
       } catch (PrinterException e1) {
-        // TODO Auto-generated catch block
         e1.printStackTrace();
       }
     }
   }
+  
+  public static class ExportVariantsAction extends AbstractAction {
+
+    private static final long serialVersionUID = 1L;
+
+    private ISwingUI swingUI;
+
+    public ExportVariantsAction(ISwingUI swingUI) {
+      super();
+      this.swingUI = swingUI;
+      putValue(AbstractAction.NAME, "Export Variants");
+    }
+
+    @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);
+        return;
+      }
+
+      final VariantPackage variantPkg = new VariantPackage(variantMap, System.getProperty("user.name"));
+
+      File initialFile =
+          new File(variantPkg.getOwner() == null ? "variants.xml" : ("variants by "
+              + variantPkg.getOwner().toLowerCase() + ".xml"));
+
+      final File file =
+          DialogFactory.getInstance().showSaveDialog(swingUI.getOwnerFrame(), FileFilterEnum.XML.getFilter(),
+              initialFile, FileFilterEnum.XML.getExtensions()[0], null);
+
+      if (file != null) {
+        swingUI.executeBackgroundTask(new ITask<Void>() {
+
+          @Override
+          public Void doInBackground() throws Exception {
+            LOG.debug("Exporting variants to " + file.getAbsolutePath());
+
+            try {
+              BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(file));
+              XStream xStream = new XStream(new DomDriver());
+              xStream.toXML(variantPkg, out);
+              out.close();
+              LOG.info("Exported variants succesfully");
+            } catch (IOException e) {
+              LOG.error("Could not export variants", e);
+            }
+
+            return null;
+          }
+
+          @Override
+          public void complete(Void result) {
+            swingUI.showMessage("Variants exported to \"" + file.getName() + "\".", "Success",
+                ISwingUI.INFORMATION_MESSAGE);
+          }
+
+          @Override
+          public void failed(Exception e) {
+            swingUI.showMessage("Could not export variants: " + e.getMessage(), "Error", ISwingUI.ERROR_MESSAGE);
+          }
+        }, true);
+      }
+    }
+  }
+  
+  public static class ImportVariantsAction extends AbstractAction {
+
+    private static final long serialVersionUID = 1L;
+
+    private ISwingUI swingUI;
+    private IPlugInPort plugInPort;
+
+    public ImportVariantsAction(ISwingUI swingUI, IPlugInPort plugInPort) {
+      super();
+      this.swingUI = swingUI;
+      this.plugInPort = plugInPort;
+      putValue(AbstractAction.NAME, "Import Variants");
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+      LOG.info("ImportVariantsAction triggered");
+      
+
+      final File file =
+          DialogFactory.getInstance().showOpenDialog(FileFilterEnum.XML.getFilter(),
+              null, FileFilterEnum.XML.getExtensions()[0], null, swingUI.getOwnerFrame());
+
+      if (file != null) {
+        swingUI.executeBackgroundTask(new ITask<Integer>() {
+
+          @Override
+          public Integer doInBackground() throws Exception {
+            return plugInPort.importVariants(file.getAbsolutePath());
+          }
+
+          @Override
+          public void complete(Integer result) {
+            swingUI.showMessage(result + " variant(s) imported from \"" + file.getName() + "\".", "Success",
+                ISwingUI.INFORMATION_MESSAGE);
+          }
+
+          @Override
+          public void failed(Exception e) {
+            swingUI.showMessage("Could not import variants: " + e.getMessage(), "Error", ISwingUI.ERROR_MESSAGE);
+          }
+        }, true);
+      }
+    }
+  }
+  
+  public static class ExportBlocksAction extends AbstractAction {
+
+    private static final long serialVersionUID = 1L;
+
+    private ISwingUI swingUI;
+
+    public ExportBlocksAction(ISwingUI swingUI) {
+      super();
+      this.swingUI = swingUI;
+      putValue(AbstractAction.NAME, "Export Building Blocks");
+      // putValue(AbstractAction.SMALL_ICON, IconLoader.Print.getIcon());
+    }
+
+    @SuppressWarnings("unchecked")
+    @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);
+        return;
+      }
+
+      final BuildingBlockPackage variantPkg = new BuildingBlockPackage(blocks, System.getProperty("user.name"));
+
+      File initialFile =
+          new File(variantPkg.getOwner() == null ? "building blocks.xml" : ("building blocks by "
+              + variantPkg.getOwner().toLowerCase() + ".xml"));
+
+      final File file =
+          DialogFactory.getInstance().showSaveDialog(swingUI.getOwnerFrame(), FileFilterEnum.XML.getFilter(),
+              initialFile, FileFilterEnum.XML.getExtensions()[0], null);
+
+      if (file != null) {
+        swingUI.executeBackgroundTask(new ITask<Void>() {
+
+          @Override
+          public Void doInBackground() throws Exception {
+            LOG.debug("Exporting variants to " + file.getAbsolutePath());
+
+            try {
+              BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(file));
+              XStream xStream = new XStream(new DomDriver());
+              xStream.toXML(variantPkg, out);
+              out.close();
+              LOG.info("Exported building blocks succesfully");
+            } catch (IOException e) {
+              LOG.error("Could not export building blocks", e);
+            }
+
+            return null;
+          }
+
+          @Override
+          public void complete(Void result) {
+            swingUI.showMessage("Building blocks exported to \"" + file.getName() + "\".", "Success",
+                ISwingUI.INFORMATION_MESSAGE);
+          }
+
+          @Override
+          public void failed(Exception e) {
+            swingUI.showMessage("Could not export building blocks: " + e.getMessage(), "Error", ISwingUI.ERROR_MESSAGE);
+          }
+        }, true);
+      }
+    }
+  }
+  
+  public static class ImportBlocksAction extends AbstractAction {
+
+    private static final long serialVersionUID = 1L;
+
+    private ISwingUI swingUI;
+    private IPlugInPort plugInPort;
+
+    public ImportBlocksAction(ISwingUI swingUI, IPlugInPort plugInPort) {
+      super();
+      this.swingUI = swingUI;
+      this.plugInPort = plugInPort;
+      putValue(AbstractAction.NAME, "Import Building Blocks");
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+      LOG.info("ImportBlocksAction triggered");
+      
+
+      final File file =
+          DialogFactory.getInstance().showOpenDialog(FileFilterEnum.XML.getFilter(),
+              null, FileFilterEnum.XML.getExtensions()[0], null, swingUI.getOwnerFrame());
+
+      if (file != null) {
+        swingUI.executeBackgroundTask(new ITask<Integer>() {
+
+          @Override
+          public Integer doInBackground() throws Exception {
+            return plugInPort.importBlocks(file.getAbsolutePath());
+          }
+
+          @Override
+          public void complete(Integer result) {
+            swingUI.showMessage(result + " building block(s) imported from \"" + file.getName() + "\".", "Success",
+                ISwingUI.INFORMATION_MESSAGE);
+          }
+
+          @Override
+          public void failed(Exception e) {
+            swingUI.showMessage("Could not import building blocks: " + e.getMessage(), "Error", ISwingUI.ERROR_MESSAGE);
+          }
+        }, true);
+      }
+    }
+  }
 
   public static class ExitAction extends AbstractAction {
 
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/file/FileFilterEnum.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/file/FileFilterEnum.java
index d9c32d4e..8117f0eb 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/file/FileFilterEnum.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/file/FileFilterEnum.java
@@ -29,7 +29,7 @@ public enum FileFilterEnum {
 
   PNG("PNG Images (*.png)", "png"), PDF("PDF Files (*.pdf)", "pdf"), DIY("DIY Project Files (*.diy)", "diy"), EXCEL(
       "Excel Workbooks (*.xls)", "xls"), CSV("Comma Separated Files (*.csv)", "csv"), HTML("HTML Files (*.html)",
-      "html"), IMAGES("Image Files (*.png, *.jpg, *.gif)", "png", "jpg", "gif");
+      "html"), IMAGES("Image Files (*.png, *.jpg, *.gif)", "png", "jpg", "gif"), XML("XML Files (*.xml)", "xml");
 
   FileFilter filter;
   String[] extensions;
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/file/FileMenuPlugin.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/file/FileMenuPlugin.java
index 4480d4cc..eae1b77d 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/file/FileMenuPlugin.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/file/FileMenuPlugin.java
@@ -46,7 +46,8 @@ public class FileMenuPlugin implements IPlugIn, IDynamicSubmenuHandler {
   private static final Logger LOG = Logger.getLogger(FileMenuPlugin.class);
 
   private static final String FILE_TITLE = "File";
-  private static final String TRACE_MASK_TITLE = "Trace Mask";
+  private static final String TRACE_MASK_TITLE = "Trace Mask";
+  private static final String INTEGRATION_TITLE = "Integration";
 
   private ProjectDrawingProvider drawingProvider;
   private TraceMaskDrawingProvider traceMaskDrawingProvider;
@@ -84,7 +85,14 @@ public class FileMenuPlugin implements IPlugIn, IDynamicSubmenuHandler {
     swingUI.injectMenuAction(
         actionFactory.createPrintAction(traceMaskDrawingProvider, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()
             | KeyEvent.SHIFT_DOWN_MASK), TRACE_MASK_TITLE);
-    swingUI.injectMenuAction(actionFactory.createBomAction(plugInPort), FILE_TITLE);
+    swingUI.injectMenuAction(actionFactory.createBomAction(plugInPort), FILE_TITLE);
+    swingUI.injectMenuAction(null, FILE_TITLE);
+    swingUI.injectSubmenu(INTEGRATION_TITLE, IconLoader.Node.getIcon(), FILE_TITLE);
+    swingUI.injectMenuAction(actionFactory.createImportBlocksAction(swingUI, plugInPort), INTEGRATION_TITLE);
+    swingUI.injectMenuAction(actionFactory.createExportBlocksAction(swingUI), INTEGRATION_TITLE);
+    swingUI.injectMenuAction(null, INTEGRATION_TITLE);
+    swingUI.injectMenuAction(actionFactory.createImportVariantsAction(swingUI, plugInPort), INTEGRATION_TITLE);
+    swingUI.injectMenuAction(actionFactory.createExportVariantsAction(swingUI), INTEGRATION_TITLE);    
     swingUI.injectMenuAction(null, FILE_TITLE);
     swingUI.injectMenuAction(actionFactory.createExitAction(plugInPort), FILE_TITLE);
   }
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 8e0e28b4..dace3c1b 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
@@ -126,7 +126,7 @@ public class ComponentButtonFactory {
       }
     });
     
-    String defaultVariant = plugInPort.getDefaultVariant(componentType.getCategory(), componentType.getName());
+    String defaultVariant = plugInPort.getDefaultVariant(componentType);
 
     JLabel label = new JLabel(variant.getName().equals(defaultVariant) ? IconLoader.PinGreen.getIcon() : IconLoader.PinGrey.getIcon());
     label.setToolTipText(variant.getName().equals(defaultVariant) ? "Remove default variant" : "Set default variant");
@@ -140,7 +140,7 @@ public class ComponentButtonFactory {
           JPopupMenu m = (JPopupMenu) c;
           m.setVisible(false);
         }
-        plugInPort.setDefaultVariant(componentType.getCategory(), componentType.getName(), variant.getName());
+        plugInPort.setDefaultVariant(componentType, variant.getName());
         e.consume();
       }
     });
@@ -167,7 +167,7 @@ public class ComponentButtonFactory {
         if (result != JOptionPane.YES_OPTION) {
           return;
         }
-        plugInPort.deleteVariant(componentType.getCategory(), componentType.getName(), variant.getName());
+        plugInPort.deleteVariant(componentType, variant.getName());
         e.consume();
       }
     });
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java
index 20bd96f4..9ac39644 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java
@@ -257,7 +257,7 @@ class ComponentTabbedPane extends JTabbedPane {
       @Override
       public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
         variantPopup.removeAll();
-        List<Template> variants = plugInPort.getVariantsFor(componentType.getCategory(), componentType.getName());
+        List<Template> variants = plugInPort.getVariantsFor(componentType);
         if (variants == null || variants.isEmpty()) {
           JMenuItem item = new JMenuItem("<no variants>");
           item.setEnabled(false);
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 8e72dc1e..ab5fe433 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
@@ -463,7 +463,7 @@ public class TreePanel extends JPanel {
             popup.add(shortcutSubmenu);
             popup.add(new JSeparator());
 
-            List<Template> templates = plugInPort.getVariantsFor(componentType.getCategory(), componentType.getName());
+            List<Template> templates = plugInPort.getVariantsFor(componentType);
             if (templates == null || templates.isEmpty()) {
               JMenuItem item = new JMenuItem("<no variants>");
               item.setEnabled(false);
@@ -650,7 +650,7 @@ public class TreePanel extends JPanel {
         }
         
         if (payload.getComponentType() != null) {
-          List<Template> variants = plugInPort.getVariantsFor(payload.getComponentType().getCategory(), payload.getComponentType().getName());
+          List<Template> variants = plugInPort.getVariantsFor(payload.getComponentType());
           if (variants != null && !variants.isEmpty()) {
             variantsHtml = " <a style=\"text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black; background-color: #D7FFC6; color: #666666;\">[+"
                 + variants.size() + "]</a>";  
diff --git a/diylc/diylc-swing/update.xml b/diylc/diylc-swing/update.xml
index a78fa6f9..2adeddcf 100644
--- a/diylc/diylc-swing/update.xml
+++ b/diylc/diylc-swing/update.xml
@@ -2397,6 +2397,10 @@
 				<org.diylc.appframework.update.Change>
 					<changeType>NEW_FEATURE</changeType>
 					<description>Added extra work space around the layout that can be used to store additional components and helpers, but does not get exported to a file. Configurable from the menu</description>
+				</org.diylc.appframework.update.Change>	
+				<org.diylc.appframework.update.Change>
+					<changeType>NEW_FEATURE</changeType>
+					<description>Ability to export and import building blocks and variants from the File menu</description>
 				</org.diylc.appframework.update.Change>		
 				<org.diylc.appframework.update.Change>
 					<changeType>NEW_FEATURE</changeType>