add check list dialogs when exporting blocks and variants

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>

diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java

@@ -29,6 +29,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -40,6 +41,7 @@ import javax.swing.KeyStroke;
 import org.apache.log4j.Logger;
 import org.diylc.appframework.miscutils.ConfigurationManager;
 import org.diylc.common.BuildingBlockPackage;
+import org.diylc.common.ComponentType;
 import org.diylc.common.IComponentTransformer;
 import org.diylc.common.IPlugInPort;
 import org.diylc.common.ITask;
@@ -63,6 +65,7 @@ import org.diylc.swing.plugins.edit.ComponentTransferable;
 import org.diylc.swing.plugins.file.BomDialog;
 import org.diylc.swing.plugins.file.FileFilterEnum;
 import org.diylc.swingframework.ButtonDialog;
+import org.diylc.swingframework.CheckBoxListDialog;
 import org.diylc.swingframework.IDrawingProvider;
 import org.diylc.swingframework.export.DrawingExporter;
 import org.diylc.utils.BomEntry;
@@ -123,8 +126,8 @@ public class ActionFactory {
     return new PrintAction(drawingProvider, keyModifiers);
   }
   
-  public ExportVariantsAction createExportVariantsAction(ISwingUI swingUI) {
+  public ExportVariantsAction createExportVariantsAction(ISwingUI swingUI, IPlugInPort plugInPort) {
-    return new ExportVariantsAction(swingUI);
+    return new ExportVariantsAction(swingUI, plugInPort);
   }
   
   public ImportVariantsAction createImportVariantsAction(ISwingUI swingUI, IPlugInPort plugInPort) {
@@ -689,11 +692,20 @@ public class ActionFactory {
     private static final long serialVersionUID = 1L;
 
     private ISwingUI swingUI;
+    private IPlugInPort plugInPort;
     
-    public ExportVariantsAction(ISwingUI swingUI) {
+    private Map<String, ComponentType> typeMap = new HashMap<String, ComponentType>();
+
+    public ExportVariantsAction(ISwingUI swingUI, IPlugInPort plugInPort) {
       super();
       this.swingUI = swingUI;
+      this.plugInPort = plugInPort;
       putValue(AbstractAction.NAME, "Export Variants");
+      
+      Map<String, List<ComponentType>> componentTypes = plugInPort.getComponentTypes();
+      for (Map.Entry<String, List<ComponentType>> entry : componentTypes.entrySet())
+        for (ComponentType type : entry.getValue())
+          typeMap.put(type.getInstanceClass().getCanonicalName(), type);
     }
 
     @SuppressWarnings("unchecked")
@@ -707,7 +719,32 @@ public class ActionFactory {
         return;
       }
       
-      final VariantPackage variantPkg = new VariantPackage(variantMap, System.getProperty("user.name"));
+      List<ComponentType> types = new ArrayList<ComponentType>();
+      for (String className : variantMap.keySet())
+        types.add(typeMap.get(className));
+      
+      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"));
 
       File initialFile =
           new File(variantPkg.getOwner() == null ? "variants.xml" : ("variants by "
@@ -770,7 +807,6 @@ public class ActionFactory {
     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());
@@ -822,7 +858,26 @@ public class ActionFactory {
         return;
       }
       
-      final BuildingBlockPackage variantPkg = new BuildingBlockPackage(blocks, System.getProperty("user.name"));
+      CheckBoxListDialog dialog = new CheckBoxListDialog(swingUI.getOwnerFrame(), "Export Building Blocks", blocks.keySet().toArray(new String[0]));
+      
+      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 =
           new File(variantPkg.getOwner() == null ? "building blocks.xml" : ("building blocks by "

diylc/diylc-swing/src/org/diylc/swing/plugins/file/FileMenuPlugin.java

@@ -92,7 +92,7 @@ public class FileMenuPlugin implements IPlugIn, IDynamicSubmenuHandler {
     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(actionFactory.createExportVariantsAction(swingUI, plugInPort), INTEGRATION_TITLE);    
     swingUI.injectMenuAction(null, FILE_TITLE);
     swingUI.injectMenuAction(actionFactory.createExitAction(plugInPort), FILE_TITLE);
   }

diylc/diylc-swing/update.xml

@@ -2414,6 +2414,10 @@
 					<changeType>NEW_FEATURE</changeType>
 					<description>Add switched type to "Open 1/4" Jack" component</description>
 				</org.diylc.appframework.update.Change>	
+				<org.diylc.appframework.update.Change>
+					<changeType>NEW_FEATURE</changeType>
+					<description>Selectable coordinate origin point for all perforated boards</description>
+				</org.diylc.appframework.update.Change>		
 				<org.diylc.appframework.update.Change>
 					<changeType>IMPROVEMENT</changeType>
 					<description>Vast improvement of rendering performance and memory management, especially with large layouts</description>