BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-10 17:22:09 +10:00
Code Issues Packages Projects Releases Wiki Activity

import/export variants and building blocks

Browse Source
This commit is contained in:
Branislav Stojkovic
2019-02-08 22:44:26 +01:00
parent f7e5421f18
commit 86500cb4a0
16 changed files with 519 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-swing/src/org/diylc/images/IconLoader.java
+2 -1
View File
@@ -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;
diylc/diylc-swing/src/org/diylc/images/node.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 865 B

diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java
+255 -1
View File
@@ -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 {
diylc/diylc-swing/src/org/diylc/swing/plugins/file/FileFilterEnum.java
+1 -1
View File
@@ -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;
diylc/diylc-swing/src/org/diylc/swing/plugins/file/FileMenuPlugin.java
+10 -2
View File
@@ -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);
}
diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentButtonFactory.java
+3 -3
View File
@@ -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();
}
});
diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java
+1 -1
View File
@@ -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);
diylc/diylc-swing/src/org/diylc/swing/plugins/tree/TreePanel.java
+2 -2
View File
@@ -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>";