From e84f77a7ca3986a4b6bcbabee69264ec209886eb Mon Sep 17 00:00:00 2001 From: bancika Date: Mon, 24 Jan 2011 20:58:18 +0000 Subject: [PATCH] pulled out scripting because of locale issues --- .../DIYLC/config.xml | 2 +- .../DIYLC/lib/bancika-gui-framework.jar | Bin 87957 -> 87879 bytes .../swing/plugins/file/FileMenuPlugin.java | 19 +++++++++++------- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml b/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml index 29030c88..59d99305 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml @@ -9,7 +9,7 @@ lastPath - C:\Documents and Settings\Branislav Stojkovic\Desktop\oldFiles + C:\Documents and Settings\Branislav Stojkovic\Desktop default.org.diylc.components.misc.Label:Color diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/lib/bancika-gui-framework.jar b/ diy-layout-creator --username bancika@gmail.com/DIYLC/lib/bancika-gui-framework.jar index c3edf3e636be34bff8076a92ae3e42350183db24..71f30d9b798079d17edaabb711e75fa1e3b2c859 100644 GIT binary patch delta 4918 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 X3`H(S3=%MGHT?0@gj6foKG^>N{{#i< diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/FileMenuPlugin.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/FileMenuPlugin.java index 3c10b80c..1c7ca2fb 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/FileMenuPlugin.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/FileMenuPlugin.java @@ -36,8 +36,20 @@ public class FileMenuPlugin implements IPlugIn { private IPlugInPort plugInPort; private ProjectDrawingProvider drawingProvider; private TraceMaskDrawingProvider traceMaskDrawingProvider; + + private ISwingUI swingUI; public FileMenuPlugin(ISwingUI swingUI) { + super(); + this.swingUI = swingUI; + } + + @Override + public void connect(IPlugInPort plugInPort) { + this.plugInPort = plugInPort; + this.drawingProvider = new ProjectDrawingProvider(plugInPort, false); + this.traceMaskDrawingProvider = new TraceMaskDrawingProvider(plugInPort); + swingUI.injectMenuAction(new NewAction(), FILE_TITLE); swingUI.injectMenuAction(new OpenAction(), FILE_TITLE); swingUI.injectMenuAction(new SaveAction(), FILE_TITLE); @@ -55,13 +67,6 @@ public class FileMenuPlugin implements IPlugIn { swingUI.injectMenuAction(new ExitAction(), FILE_TITLE); } - @Override - public void connect(IPlugInPort plugInPort) { - this.plugInPort = plugInPort; - this.drawingProvider = new ProjectDrawingProvider(plugInPort, false); - this.traceMaskDrawingProvider = new TraceMaskDrawingProvider(plugInPort); - } - class NewAction extends AbstractAction { private static final long serialVersionUID = 1L;