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

Replaced deep cloning library with manual implementation

Browse Source
This commit is contained in:
bancika
2012-08-21 14:16:07 +00:00
parent 5adbc2c6ca
commit 1645eae18d
7 changed files with 157 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diy-layout-creator --username bancika@gmail.com/diylc-swing/.classpath
-2
View File
@@ -13,7 +13,5 @@
<classpathentry combineaccessrules="false" kind="src" path="/diylc-core"/> <classpathentry combineaccessrules="false" kind="src" path="/diylc-core"/>
<classpathentry combineaccessrules="false" kind="src" path="/app-framework"/> <classpathentry combineaccessrules="false" kind="src" path="/app-framework"/>
<classpathentry combineaccessrules="false" kind="src" path="/swing-framework"/> <classpathentry combineaccessrules="false" kind="src" path="/swing-framework"/>
<classpathentry kind="lib" path="lib/cloning-1.8.1.jar"/>
<classpathentry kind="lib" path="lib/objenesis-1.2.jar"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>
diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/cloning-1.8.1.jar
BIN
View File
Binary file not shown.
diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/diylc-core.jar
BIN
View File
Binary file not shown.
diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/objenesis-1.2.jar
BIN
View File
Binary file not shown.
diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/ActionFactory.java
+138 -94
View File
@@ -6,6 +6,7 @@ import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.awt.print.PrinterException; import java.awt.print.PrinterException;
import java.io.File; import java.io.File;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.swing.AbstractAction; import javax.swing.AbstractAction;
@@ -31,14 +32,11 @@ import org.diylc.swingframework.IDrawingProvider;
import org.diylc.swingframework.export.DrawingExporter; import org.diylc.swingframework.export.DrawingExporter;
import org.diylc.utils.BomEntry; import org.diylc.utils.BomEntry;
import com.rits.cloning.Cloner;
public class ActionFactory { public class ActionFactory {
private static final Logger LOG = Logger.getLogger(ActionFactory.class); private static final Logger LOG = Logger.getLogger(ActionFactory.class);
private static ActionFactory instance; private static ActionFactory instance;
private static Cloner cloner = new Cloner();
public static ActionFactory getInstance() { public static ActionFactory getInstance() {
if (instance == null) { if (instance == null) {
@@ -64,7 +62,8 @@ public class ActionFactory {
return new SaveAction(plugInPort, swingUI); return new SaveAction(plugInPort, swingUI);
} }
public SaveAsAction createSaveAsAction(IPlugInPort plugInPort, ISwingUI swingUI) { public SaveAsAction createSaveAsAction(IPlugInPort plugInPort,
ISwingUI swingUI) {
return new SaveAsAction(plugInPort, swingUI); return new SaveAsAction(plugInPort, swingUI);
} }
@@ -72,11 +71,13 @@ public class ActionFactory {
return new CreateBomAction(plugInPort); return new CreateBomAction(plugInPort);
} }
public ExportPDFAction createExportPDFAction(IDrawingProvider drawingProvider, ISwingUI swingUI) { public ExportPDFAction createExportPDFAction(
IDrawingProvider drawingProvider, ISwingUI swingUI) {
return new ExportPDFAction(drawingProvider, swingUI); return new ExportPDFAction(drawingProvider, swingUI);
} }
public ExportPNGAction createExportPNGAction(IDrawingProvider drawingProvider, ISwingUI swingUI) { public ExportPNGAction createExportPNGAction(
IDrawingProvider drawingProvider, ISwingUI swingUI) {
return new ExportPNGAction(drawingProvider, swingUI); return new ExportPNGAction(drawingProvider, swingUI);
} }
@@ -90,17 +91,18 @@ public class ActionFactory {
// Edit menu actions. // Edit menu actions.
public CutAction createCutAction(IPlugInPort plugInPort, Clipboard clipboard, public CutAction createCutAction(IPlugInPort plugInPort,
ClipboardOwner clipboardOwner) { Clipboard clipboard, ClipboardOwner clipboardOwner) {
return new CutAction(plugInPort, clipboard, clipboardOwner); return new CutAction(plugInPort, clipboard, clipboardOwner);
} }
public CopyAction createCopyAction(IPlugInPort plugInPort, Clipboard clipboard, public CopyAction createCopyAction(IPlugInPort plugInPort,
ClipboardOwner clipboardOwner) { Clipboard clipboard, ClipboardOwner clipboardOwner) {
return new CopyAction(plugInPort, clipboard, clipboardOwner); return new CopyAction(plugInPort, clipboard, clipboardOwner);
} }
public PasteAction createPasteAction(IPlugInPort plugInPort, Clipboard clipboard) { public PasteAction createPasteAction(IPlugInPort plugInPort,
Clipboard clipboard) {
return new PasteAction(plugInPort, clipboard); return new PasteAction(plugInPort, clipboard);
} }
@@ -124,12 +126,13 @@ public class ActionFactory {
return new EditSelectionAction(plugInPort); return new EditSelectionAction(plugInPort);
} }
public DeleteSelectionAction createDeleteSelectionAction(IPlugInPort plugInPort) { public DeleteSelectionAction createDeleteSelectionAction(
IPlugInPort plugInPort) {
return new DeleteSelectionAction(plugInPort); return new DeleteSelectionAction(plugInPort);
} }
public ExpandSelectionAction createExpandSelectionAction(IPlugInPort plugInPort, public ExpandSelectionAction createExpandSelectionAction(
ExpansionMode expansionMode) { IPlugInPort plugInPort, ExpansionMode expansionMode) {
return new ExpandSelectionAction(plugInPort, expansionMode); return new ExpandSelectionAction(plugInPort, expansionMode);
} }
@@ -143,8 +146,8 @@ public class ActionFactory {
// Config actions. // Config actions.
public ConfigAction createConfigAction(IPlugInPort plugInPort, String title, String configKey, public ConfigAction createConfigAction(IPlugInPort plugInPort,
boolean defaultValue) { String title, String configKey, boolean defaultValue) {
return new ConfigAction(plugInPort, title, configKey, defaultValue); return new ConfigAction(plugInPort, title, configKey, defaultValue);
} }
@@ -152,7 +155,8 @@ public class ActionFactory {
return new ThemeAction(plugInPort, theme); return new ThemeAction(plugInPort, theme);
} }
public RenumberAction createRenumberAction(IPlugInPort plugInPort, boolean xAxisFirst) { public RenumberAction createRenumberAction(IPlugInPort plugInPort,
boolean xAxisFirst) {
return new RenumberAction(plugInPort, xAxisFirst); return new RenumberAction(plugInPort, xAxisFirst);
} }
@@ -168,9 +172,10 @@ public class ActionFactory {
super(); super();
this.plugInPort = plugInPort; this.plugInPort = plugInPort;
putValue(AbstractAction.NAME, "New"); putValue(AbstractAction.NAME, "New");
putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_N, putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
ActionEvent.CTRL_MASK)); KeyEvent.VK_N, ActionEvent.CTRL_MASK));
putValue(AbstractAction.SMALL_ICON, IconLoader.DocumentPlainYellow.getIcon()); putValue(AbstractAction.SMALL_ICON, IconLoader.DocumentPlainYellow
.getIcon());
} }
@Override @Override
@@ -180,9 +185,10 @@ public class ActionFactory {
return; return;
} }
plugInPort.createNewProject(); plugInPort.createNewProject();
List<PropertyWrapper> properties = plugInPort.getProjectProperties(); List<PropertyWrapper> properties = plugInPort
PropertyEditorDialog editor = DialogFactory.getInstance().createPropertyEditorDialog( .getProjectProperties();
properties, "Edit Project"); PropertyEditorDialog editor = DialogFactory.getInstance()
.createPropertyEditorDialog(properties, "Edit Project");
editor.setVisible(true); editor.setVisible(true);
if (ButtonDialog.OK.equals(editor.getSelectedButtonCaption())) { if (ButtonDialog.OK.equals(editor.getSelectedButtonCaption())) {
plugInPort.applyPropertiesToProject(properties); plugInPort.applyPropertiesToProject(properties);
@@ -190,8 +196,8 @@ public class ActionFactory {
// Save default values. // Save default values.
for (PropertyWrapper property : editor.getDefaultedProperties()) { for (PropertyWrapper property : editor.getDefaultedProperties()) {
if (property.getValue() != null) { if (property.getValue() != null) {
plugInPort.setProjectDefaultPropertyValue(property.getName(), property plugInPort.setProjectDefaultPropertyValue(property
.getValue()); .getName(), property.getValue());
} }
} }
} }
@@ -209,8 +215,8 @@ public class ActionFactory {
this.plugInPort = plugInPort; this.plugInPort = plugInPort;
this.swingUI = swingUI; this.swingUI = swingUI;
putValue(AbstractAction.NAME, "Open"); putValue(AbstractAction.NAME, "Open");
putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_O, putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
ActionEvent.CTRL_MASK)); KeyEvent.VK_O, ActionEvent.CTRL_MASK));
putValue(AbstractAction.SMALL_ICON, IconLoader.FolderOut.getIcon()); putValue(AbstractAction.SMALL_ICON, IconLoader.FolderOut.getIcon());
} }
@@ -221,8 +227,8 @@ public class ActionFactory {
return; return;
} }
final File file = DialogFactory.getInstance().showOpenDialog( final File file = DialogFactory.getInstance().showOpenDialog(
FileFilterEnum.DIY.getFilter(), null, FileFilterEnum.DIY.getExtensions()[0], FileFilterEnum.DIY.getFilter(), null,
null); FileFilterEnum.DIY.getExtensions()[0], null);
if (file != null) { if (file != null) {
swingUI.executeBackgroundTask(new ITask<Void>() { swingUI.executeBackgroundTask(new ITask<Void>() {
@@ -239,7 +245,8 @@ public class ActionFactory {
@Override @Override
public void failed(Exception e) { public void failed(Exception e) {
swingUI.showMessage("Could not open file. " + e.getMessage(), "Error", swingUI.showMessage("Could not open file. "
+ e.getMessage(), "Error",
ISwingUI.ERROR_MESSAGE); ISwingUI.ERROR_MESSAGE);
} }
}); });
@@ -259,8 +266,8 @@ public class ActionFactory {
this.plugInPort = plugInPort; this.plugInPort = plugInPort;
this.swingUI = swingUI; this.swingUI = swingUI;
putValue(AbstractAction.NAME, "Save"); putValue(AbstractAction.NAME, "Save");
putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_S, putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
ActionEvent.CTRL_MASK)); KeyEvent.VK_S, ActionEvent.CTRL_MASK));
putValue(AbstractAction.SMALL_ICON, IconLoader.DiskBlue.getIcon()); putValue(AbstractAction.SMALL_ICON, IconLoader.DiskBlue.getIcon());
} }
@@ -277,7 +284,8 @@ public class ActionFactory {
@Override @Override
public Void doInBackground() throws Exception { public Void doInBackground() throws Exception {
LOG.debug("Saving to " + file.getAbsolutePath()); LOG.debug("Saving to " + file.getAbsolutePath());
plugInPort.saveProjectToFile(file.getAbsolutePath(), false); plugInPort.saveProjectToFile(
file.getAbsolutePath(), false);
return null; return null;
} }
@@ -287,8 +295,9 @@ public class ActionFactory {
@Override @Override
public void failed(Exception e) { public void failed(Exception e) {
swingUI.showMessage("Could not save to file. " + e.getMessage(), swingUI.showMessage("Could not save to file. "
"Error", ISwingUI.ERROR_MESSAGE); + e.getMessage(), "Error",
ISwingUI.ERROR_MESSAGE);
} }
}); });
} }
@@ -297,8 +306,10 @@ public class ActionFactory {
@Override @Override
public Void doInBackground() throws Exception { public Void doInBackground() throws Exception {
LOG.debug("Saving to " + plugInPort.getCurrentFileName()); LOG.debug("Saving to "
plugInPort.saveProjectToFile(plugInPort.getCurrentFileName(), false); + plugInPort.getCurrentFileName());
plugInPort.saveProjectToFile(plugInPort
.getCurrentFileName(), false);
return null; return null;
} }
@@ -308,7 +319,8 @@ public class ActionFactory {
@Override @Override
public void failed(Exception e) { public void failed(Exception e) {
swingUI.showMessage("Could not save to file. " + e.getMessage(), "Error", swingUI.showMessage("Could not save to file. "
+ e.getMessage(), "Error",
ISwingUI.ERROR_MESSAGE); ISwingUI.ERROR_MESSAGE);
} }
}); });
@@ -328,8 +340,9 @@ public class ActionFactory {
this.plugInPort = plugInPort; this.plugInPort = plugInPort;
this.swingUI = swingUI; this.swingUI = swingUI;
putValue(AbstractAction.NAME, "Save As"); putValue(AbstractAction.NAME, "Save As");
putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_S, putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
ActionEvent.CTRL_MASK | ActionEvent.SHIFT_MASK)); KeyEvent.VK_S, ActionEvent.CTRL_MASK
| ActionEvent.SHIFT_MASK));
putValue(AbstractAction.SMALL_ICON, IconLoader.DiskBlue.getIcon()); putValue(AbstractAction.SMALL_ICON, IconLoader.DiskBlue.getIcon());
} }
@@ -337,15 +350,16 @@ public class ActionFactory {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
LOG.info("SaveAsAction triggered"); LOG.info("SaveAsAction triggered");
final File file = DialogFactory.getInstance().showSaveDialog( final File file = DialogFactory.getInstance().showSaveDialog(
FileFilterEnum.DIY.getFilter(), null, FileFilterEnum.DIY.getExtensions()[0], FileFilterEnum.DIY.getFilter(), null,
null); FileFilterEnum.DIY.getExtensions()[0], null);
if (file != null) { if (file != null) {
swingUI.executeBackgroundTask(new ITask<Void>() { swingUI.executeBackgroundTask(new ITask<Void>() {
@Override @Override
public Void doInBackground() throws Exception { public Void doInBackground() throws Exception {
LOG.debug("Saving to " + file.getAbsolutePath()); LOG.debug("Saving to " + file.getAbsolutePath());
plugInPort.saveProjectToFile(file.getAbsolutePath(), false); plugInPort.saveProjectToFile(file.getAbsolutePath(),
false);
return null; return null;
} }
@@ -355,7 +369,8 @@ public class ActionFactory {
@Override @Override
public void failed(Exception e) { public void failed(Exception e) {
swingUI.showMessage("Could not save to file. " + e.getMessage(), "Error", swingUI.showMessage("Could not save to file. "
+ e.getMessage(), "Error",
ISwingUI.ERROR_MESSAGE); ISwingUI.ERROR_MESSAGE);
} }
}); });
@@ -379,8 +394,8 @@ public class ActionFactory {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
LOG.info("CreateBomAction triggered"); LOG.info("CreateBomAction triggered");
List<BomEntry> bom = org.diylc.utils.BomMaker.getInstance().createBom( List<BomEntry> bom = org.diylc.utils.BomMaker.getInstance()
plugInPort.getCurrentProject().getComponents()); .createBom(plugInPort.getCurrentProject().getComponents());
BomDialog dialog = DialogFactory.getInstance().createBomDialog(bom); BomDialog dialog = DialogFactory.getInstance().createBomDialog(bom);
dialog.setVisible(true); dialog.setVisible(true);
} }
@@ -393,7 +408,8 @@ public class ActionFactory {
private IDrawingProvider drawingProvider; private IDrawingProvider drawingProvider;
private ISwingUI swingUI; private ISwingUI swingUI;
public ExportPDFAction(IDrawingProvider drawingProvider, ISwingUI swingUI) { public ExportPDFAction(IDrawingProvider drawingProvider,
ISwingUI swingUI) {
super(); super();
this.drawingProvider = drawingProvider; this.drawingProvider = drawingProvider;
this.swingUI = swingUI; this.swingUI = swingUI;
@@ -405,8 +421,8 @@ public class ActionFactory {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
LOG.info("ExportPDFAction triggered"); LOG.info("ExportPDFAction triggered");
final File file = DialogFactory.getInstance().showSaveDialog( final File file = DialogFactory.getInstance().showSaveDialog(
FileFilterEnum.PDF.getFilter(), null, FileFilterEnum.PDF.getExtensions()[0], FileFilterEnum.PDF.getFilter(), null,
null); FileFilterEnum.PDF.getExtensions()[0], null);
if (file != null) { if (file != null) {
swingUI.executeBackgroundTask(new ITask<Void>() { swingUI.executeBackgroundTask(new ITask<Void>() {
@@ -424,7 +440,8 @@ public class ActionFactory {
@Override @Override
public void failed(Exception e) { public void failed(Exception e) {
swingUI.showMessage("Could not export to PDF. " + e.getMessage(), "Error", swingUI.showMessage("Could not export to PDF. "
+ e.getMessage(), "Error",
ISwingUI.ERROR_MESSAGE); ISwingUI.ERROR_MESSAGE);
} }
}); });
@@ -439,7 +456,8 @@ public class ActionFactory {
private IDrawingProvider drawingProvider; private IDrawingProvider drawingProvider;
private ISwingUI swingUI; private ISwingUI swingUI;
public ExportPNGAction(IDrawingProvider drawingProvider, ISwingUI swingUI) { public ExportPNGAction(IDrawingProvider drawingProvider,
ISwingUI swingUI) {
super(); super();
this.drawingProvider = drawingProvider; this.drawingProvider = drawingProvider;
this.swingUI = swingUI; this.swingUI = swingUI;
@@ -451,8 +469,8 @@ public class ActionFactory {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
LOG.info("ExportPNGAction triggered"); LOG.info("ExportPNGAction triggered");
final File file = DialogFactory.getInstance().showSaveDialog( final File file = DialogFactory.getInstance().showSaveDialog(
FileFilterEnum.PNG.getFilter(), null, FileFilterEnum.PNG.getExtensions()[0], FileFilterEnum.PNG.getFilter(), null,
null); FileFilterEnum.PNG.getExtensions()[0], null);
if (file != null) { if (file != null) {
swingUI.executeBackgroundTask(new ITask<Void>() { swingUI.executeBackgroundTask(new ITask<Void>() {
@@ -470,7 +488,8 @@ public class ActionFactory {
@Override @Override
public void failed(Exception e) { public void failed(Exception e) {
swingUI.showMessage("Could not export to PNG. " + e.getMessage(), "Error", swingUI.showMessage("Could not export to PNG. "
+ e.getMessage(), "Error",
ISwingUI.ERROR_MESSAGE); ISwingUI.ERROR_MESSAGE);
} }
}); });
@@ -488,8 +507,8 @@ public class ActionFactory {
super(); super();
this.drawingProvider = drawingProvider; this.drawingProvider = drawingProvider;
putValue(AbstractAction.NAME, "Print..."); putValue(AbstractAction.NAME, "Print...");
putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_P, putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
ActionEvent.CTRL_MASK)); KeyEvent.VK_P, ActionEvent.CTRL_MASK));
putValue(AbstractAction.SMALL_ICON, IconLoader.Print.getIcon()); putValue(AbstractAction.SMALL_ICON, IconLoader.Print.getIcon());
} }
@@ -536,22 +555,24 @@ public class ActionFactory {
private Clipboard clipboard; private Clipboard clipboard;
private ClipboardOwner clipboardOwner; private ClipboardOwner clipboardOwner;
public CutAction(IPlugInPort plugInPort, Clipboard clipboard, ClipboardOwner clipboardOwner) { public CutAction(IPlugInPort plugInPort, Clipboard clipboard,
ClipboardOwner clipboardOwner) {
super(); super();
this.plugInPort = plugInPort; this.plugInPort = plugInPort;
this.clipboard = clipboard; this.clipboard = clipboard;
this.clipboardOwner = clipboardOwner; this.clipboardOwner = clipboardOwner;
putValue(AbstractAction.NAME, "Cut"); putValue(AbstractAction.NAME, "Cut");
putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_X, putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
ActionEvent.CTRL_MASK)); KeyEvent.VK_X, ActionEvent.CTRL_MASK));
putValue(AbstractAction.SMALL_ICON, IconLoader.Cut.getIcon()); putValue(AbstractAction.SMALL_ICON, IconLoader.Cut.getIcon());
} }
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
LOG.info("Cut triggered"); LOG.info("Cut triggered");
clipboard.setContents(new ComponentTransferable(cloner.deepClone(plugInPort clipboard.setContents(new ComponentTransferable(
.getSelectedComponents())), clipboardOwner); cloneComponents(plugInPort.getSelectedComponents())),
clipboardOwner);
plugInPort.deleteSelectedComponents(); plugInPort.deleteSelectedComponents();
} }
} }
@@ -564,22 +585,24 @@ public class ActionFactory {
private Clipboard clipboard; private Clipboard clipboard;
private ClipboardOwner clipboardOwner; private ClipboardOwner clipboardOwner;
public CopyAction(IPlugInPort plugInPort, Clipboard clipboard, ClipboardOwner clipboardOwner) { public CopyAction(IPlugInPort plugInPort, Clipboard clipboard,
ClipboardOwner clipboardOwner) {
super(); super();
this.plugInPort = plugInPort; this.plugInPort = plugInPort;
this.clipboard = clipboard; this.clipboard = clipboard;
this.clipboardOwner = clipboardOwner; this.clipboardOwner = clipboardOwner;
putValue(AbstractAction.NAME, "Copy"); putValue(AbstractAction.NAME, "Copy");
putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_C, putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
ActionEvent.CTRL_MASK)); KeyEvent.VK_C, ActionEvent.CTRL_MASK));
putValue(AbstractAction.SMALL_ICON, IconLoader.Copy.getIcon()); putValue(AbstractAction.SMALL_ICON, IconLoader.Copy.getIcon());
} }
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
LOG.info("Copy triggered"); LOG.info("Copy triggered");
clipboard.setContents(new ComponentTransferable(cloner.deepClone(plugInPort clipboard.setContents(new ComponentTransferable(
.getSelectedComponents())), clipboardOwner); cloneComponents(plugInPort.getSelectedComponents())),
clipboardOwner);
} }
} }
@@ -595,8 +618,8 @@ public class ActionFactory {
this.plugInPort = plugInPort; this.plugInPort = plugInPort;
this.clipboard = clipboard; this.clipboard = clipboard;
putValue(AbstractAction.NAME, "Paste"); putValue(AbstractAction.NAME, "Paste");
putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_V, putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
ActionEvent.CTRL_MASK)); KeyEvent.VK_V, ActionEvent.CTRL_MASK));
putValue(AbstractAction.SMALL_ICON, IconLoader.Paste.getIcon()); putValue(AbstractAction.SMALL_ICON, IconLoader.Paste.getIcon());
} }
@@ -607,13 +630,27 @@ public class ActionFactory {
try { try {
List<IDIYComponent<?>> components = (List<IDIYComponent<?>>) clipboard List<IDIYComponent<?>> components = (List<IDIYComponent<?>>) clipboard
.getData(ComponentTransferable.listFlavor); .getData(ComponentTransferable.listFlavor);
plugInPort.pasteComponents(cloner.deepClone(components)); plugInPort.pasteComponents(cloneComponents(components));
} catch (Exception ex) { } catch (Exception ex) {
LOG.error("Coule not paste.", ex); LOG.error("Coule not paste.", ex);
} }
} }
} }
private static List<IDIYComponent<?>> cloneComponents(
List<IDIYComponent<?>> components) {
List<IDIYComponent<?>> result = new ArrayList<IDIYComponent<?>>(
components.size());
for (IDIYComponent<?> component : components) {
try {
result.add(component.clone());
} catch (CloneNotSupportedException e) {
throw new RuntimeException(e);
}
}
return result;
}
public static class SelectAllAction extends AbstractAction { public static class SelectAllAction extends AbstractAction {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@@ -624,8 +661,8 @@ public class ActionFactory {
super(); super();
this.plugInPort = plugInPort; this.plugInPort = plugInPort;
putValue(AbstractAction.NAME, "Select All"); putValue(AbstractAction.NAME, "Select All");
putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_A, putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
ActionEvent.CTRL_MASK)); KeyEvent.VK_A, ActionEvent.CTRL_MASK));
putValue(AbstractAction.SMALL_ICON, IconLoader.Selection.getIcon()); putValue(AbstractAction.SMALL_ICON, IconLoader.Selection.getIcon());
} }
@@ -646,8 +683,8 @@ public class ActionFactory {
super(); super();
this.plugInPort = plugInPort; this.plugInPort = plugInPort;
putValue(AbstractAction.NAME, "Group Selection"); putValue(AbstractAction.NAME, "Group Selection");
putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_G, putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
ActionEvent.CTRL_MASK)); KeyEvent.VK_G, ActionEvent.CTRL_MASK));
putValue(AbstractAction.SMALL_ICON, IconLoader.Group.getIcon()); putValue(AbstractAction.SMALL_ICON, IconLoader.Group.getIcon());
} }
@@ -668,8 +705,8 @@ public class ActionFactory {
super(); super();
this.plugInPort = plugInPort; this.plugInPort = plugInPort;
putValue(AbstractAction.NAME, "Ungroup Selection"); putValue(AbstractAction.NAME, "Ungroup Selection");
putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_U, putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
ActionEvent.CTRL_MASK)); KeyEvent.VK_U, ActionEvent.CTRL_MASK));
putValue(AbstractAction.SMALL_ICON, IconLoader.Ungroup.getIcon()); putValue(AbstractAction.SMALL_ICON, IconLoader.Ungroup.getIcon());
} }
@@ -690,15 +727,17 @@ public class ActionFactory {
super(); super();
this.plugInPort = plugInPort; this.plugInPort = plugInPort;
putValue(AbstractAction.NAME, "Edit Project"); putValue(AbstractAction.NAME, "Edit Project");
putValue(AbstractAction.SMALL_ICON, IconLoader.DocumentEdit.getIcon()); putValue(AbstractAction.SMALL_ICON, IconLoader.DocumentEdit
.getIcon());
} }
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
LOG.info("Edit Project triggered"); LOG.info("Edit Project triggered");
List<PropertyWrapper> properties = plugInPort.getProjectProperties(); List<PropertyWrapper> properties = plugInPort
PropertyEditorDialog editor = DialogFactory.getInstance().createPropertyEditorDialog( .getProjectProperties();
properties, "Edit Project"); PropertyEditorDialog editor = DialogFactory.getInstance()
.createPropertyEditorDialog(properties, "Edit Project");
editor.setVisible(true); editor.setVisible(true);
if (ButtonDialog.OK.equals(editor.getSelectedButtonCaption())) { if (ButtonDialog.OK.equals(editor.getSelectedButtonCaption())) {
plugInPort.applyPropertiesToProject(properties); plugInPort.applyPropertiesToProject(properties);
@@ -706,8 +745,8 @@ public class ActionFactory {
// Save default values. // Save default values.
for (PropertyWrapper property : editor.getDefaultedProperties()) { for (PropertyWrapper property : editor.getDefaultedProperties()) {
if (property.getValue() != null) { if (property.getValue() != null) {
plugInPort.setProjectDefaultPropertyValue(property.getName(), property plugInPort.setProjectDefaultPropertyValue(property
.getValue()); .getName(), property.getValue());
} }
} }
} }
@@ -723,15 +762,17 @@ public class ActionFactory {
super(); super();
this.plugInPort = plugInPort; this.plugInPort = plugInPort;
putValue(AbstractAction.NAME, "Edit Selection"); putValue(AbstractAction.NAME, "Edit Selection");
putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_E, putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
ActionEvent.CTRL_MASK)); KeyEvent.VK_E, ActionEvent.CTRL_MASK));
putValue(AbstractAction.SMALL_ICON, IconLoader.EditComponent.getIcon()); putValue(AbstractAction.SMALL_ICON, IconLoader.EditComponent
.getIcon());
} }
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
LOG.info("Edit Selection triggered"); LOG.info("Edit Selection triggered");
List<PropertyWrapper> properties = plugInPort.getMutualSelectionProperties(); List<PropertyWrapper> properties = plugInPort
.getMutualSelectionProperties();
if (properties == null || properties.isEmpty()) { if (properties == null || properties.isEmpty()) {
LOG.info("Nothing to edit"); LOG.info("Nothing to edit");
return; return;
@@ -750,7 +791,8 @@ public class ActionFactory {
super(); super();
this.plugInPort = plugInPort; this.plugInPort = plugInPort;
putValue(AbstractAction.NAME, "Delete Selection"); putValue(AbstractAction.NAME, "Delete Selection");
putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0)); putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
KeyEvent.VK_DELETE, 0));
putValue(AbstractAction.SMALL_ICON, IconLoader.Delete.getIcon()); putValue(AbstractAction.SMALL_ICON, IconLoader.Delete.getIcon());
} }
@@ -768,7 +810,8 @@ public class ActionFactory {
private IPlugInPort plugInPort; private IPlugInPort plugInPort;
private ExpansionMode expansionMode; private ExpansionMode expansionMode;
public ExpandSelectionAction(IPlugInPort plugInPort, ExpansionMode expansionMode) { public ExpandSelectionAction(IPlugInPort plugInPort,
ExpansionMode expansionMode) {
super(); super();
this.plugInPort = plugInPort; this.plugInPort = plugInPort;
this.expansionMode = expansionMode; this.expansionMode = expansionMode;
@@ -842,15 +885,15 @@ public class ActionFactory {
private IPlugInPort plugInPort; private IPlugInPort plugInPort;
private String configKey; private String configKey;
public ConfigAction(IPlugInPort plugInPort, String title, String configKey, public ConfigAction(IPlugInPort plugInPort, String title,
boolean defaultValue) { String configKey, boolean defaultValue) {
super(); super();
this.plugInPort = plugInPort; this.plugInPort = plugInPort;
this.configKey = configKey; this.configKey = configKey;
putValue(AbstractAction.NAME, title); putValue(AbstractAction.NAME, title);
putValue(IView.CHECK_BOX_MENU_ITEM, true); putValue(IView.CHECK_BOX_MENU_ITEM, true);
putValue(AbstractAction.SELECTED_KEY, ConfigurationManager.getInstance().readBoolean( putValue(AbstractAction.SELECTED_KEY, ConfigurationManager
configKey, defaultValue)); .getInstance().readBoolean(configKey, defaultValue));
} }
@Override @Override
@@ -875,8 +918,8 @@ public class ActionFactory {
this.theme = theme; this.theme = theme;
putValue(AbstractAction.NAME, theme.getName()); putValue(AbstractAction.NAME, theme.getName());
putValue(IView.RADIO_BUTTON_GROUP_KEY, "theme"); putValue(IView.RADIO_BUTTON_GROUP_KEY, "theme");
putValue(AbstractAction.SELECTED_KEY, plugInPort.getSelectedTheme().getName().equals( putValue(AbstractAction.SELECTED_KEY, plugInPort.getSelectedTheme()
theme.getName())); .getName().equals(theme.getName()));
} }
@Override @Override
@@ -897,7 +940,8 @@ public class ActionFactory {
super(); super();
this.plugInPort = plugInPort; this.plugInPort = plugInPort;
this.xAxisFirst = xAxisFirst; this.xAxisFirst = xAxisFirst;
putValue(AbstractAction.NAME, xAxisFirst ? "X Axis First" : "Y Axis First"); putValue(AbstractAction.NAME, xAxisFirst ? "X Axis First"
: "Y Axis First");
} }
@Override @Override
diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/editor/MeasureEditor.java
+11 -3
View File
@@ -40,8 +40,12 @@ public class MeasureEditor extends Container {
@Override @Override
public void propertyChange(PropertyChangeEvent evt) { public void propertyChange(PropertyChangeEvent evt) {
try { try {
Constructor ctor = measure.getClass().getConstructors()[0]; Constructor ctor = measure.getClass()
AbstractMeasure<?> newMeasure = (AbstractMeasure<?>) ctor.newInstance((Double) evt.getNewValue(), measure.getUnit()); .getConstructors()[0];
AbstractMeasure<?> oldMeasure = (AbstractMeasure<?>) property.getValue();
AbstractMeasure<?> newMeasure = (AbstractMeasure<?>) ctor
.newInstance((Double) evt.getNewValue(),
oldMeasure.getUnit());
property.setValue(newMeasure); property.setValue(newMeasure);
property.setChanged(true); property.setChanged(true);
valueField.setBackground(oldBg); valueField.setBackground(oldBg);
@@ -72,7 +76,11 @@ public class MeasureEditor extends Container {
public void actionPerformed(ActionEvent evt) { public void actionPerformed(ActionEvent evt) {
try { try {
Constructor ctor = measure.getClass().getConstructors()[0]; Constructor ctor = measure.getClass().getConstructors()[0];
AbstractMeasure<?> newMeasure = (AbstractMeasure<?>) ctor.newInstance((Enum<? extends Unit>) unitBox.getSelectedItem()); AbstractMeasure<?> oldMeasure = (AbstractMeasure<?>) property.getValue();
AbstractMeasure<?> newMeasure = (AbstractMeasure<?>) ctor
.newInstance(oldMeasure.getValue(),
(Enum<? extends Unit>) unitBox
.getSelectedItem());
property.setValue(newMeasure); property.setValue(newMeasure);
property.setChanged(true); property.setChanged(true);
valueField.setBackground(oldBg); valueField.setBackground(oldBg);
diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml
+4
View File
@@ -710,6 +710,10 @@
<changeType>IMPROVEMENT</changeType> <changeType>IMPROVEMENT</changeType>
<description>Some components can be placed in any layer using Send to Back/Bring to Front</description> <description>Some components can be placed in any layer using Send to Back/Bring to Front</description>
</org.diylc.appframework.update.Change> </org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>IMPROVEMENT</changeType>
<description>Replaced deep cloning library with manual implementation</description>
</org.diylc.appframework.update.Change>
</changes> </changes>
<url>http://code.google.com/p/diy-layout-creator/downloads/list</url> <url>http://code.google.com/p/diy-layout-creator/downloads/list</url>
</org.diylc.appframework.update.Version> </org.diylc.appframework.update.Version>