From 8074f6e49c8425f482c2481c4d9d31a60b482cf6 Mon Sep 17 00:00:00 2001 From: Bane Stojkovic Date: Sun, 31 Jul 2022 15:50:52 +0200 Subject: [PATCH] Load recent files in background thread --- .../swing/plugins/file/FileMenuPlugin.java | 281 ++++++++++-------- 1 file changed, 155 insertions(+), 126 deletions(-) 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 761ffaff..97154fd2 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 @@ -1,143 +1,172 @@ /* + * + * 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 + * . + * + */ +package org.diylc.swing.plugins.file; - DIY Layout Creator (DIYLC). - Copyright (c) 2009-2018 held jointly by the individual authors. +import java.awt.Toolkit; +import java.awt.event.KeyEvent; +import java.util.EnumSet; +import java.util.List; - 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 . - -*/ -package org.diylc.swing.plugins.file; - -import java.awt.Toolkit; -import java.awt.event.KeyEvent; -import java.util.EnumSet; -import java.util.List; - -import org.apache.log4j.Logger; -import org.diylc.appframework.miscutils.ConfigurationManager; -import org.diylc.common.EventType; +import org.apache.log4j.Logger; +import org.diylc.appframework.miscutils.ConfigurationManager; +import org.diylc.common.EventType; import org.diylc.common.INetlistAnalyzer; -import org.diylc.common.IPlugIn; +import org.diylc.common.IPlugIn; import org.diylc.common.IPlugInPort; +import org.diylc.common.ITask; import org.diylc.swing.images.IconLoader; -import org.diylc.swing.ActionFactory; -import org.diylc.swing.IDynamicSubmenuHandler; +import org.diylc.swing.ActionFactory; +import org.diylc.swing.IDynamicSubmenuHandler; import org.diylc.swing.ISwingUI; -import org.diylc.swing.loadline.LoadlineEditorFrame; - -/** - * Entry point class for File management utilities. - * - * @author Branislav Stojkovic - */ -public class FileMenuPlugin implements IPlugIn, IDynamicSubmenuHandler { - - private static final Logger LOG = Logger.getLogger(FileMenuPlugin.class); - - private static final String FILE_TITLE = "File"; +import org.diylc.swing.loadline.LoadlineEditorFrame; + +/** + * Entry point class for File management utilities. + * + * @author Branislav Stojkovic + */ +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 INTEGRATION_TITLE = "Integration"; - private static final String ANALYZE_TITLE = "Analyze"; - - private ProjectDrawingProvider drawingProvider; - private TraceMaskDrawingProvider traceMaskDrawingProvider; - - private ISwingUI swingUI; - private IPlugInPort plugInPort; - - public FileMenuPlugin(ISwingUI swingUI) { - super(); - this.swingUI = swingUI; - } - - @Override - public void connect(IPlugInPort plugInPort) { - this.plugInPort = plugInPort; - this.drawingProvider = new ProjectDrawingProvider(plugInPort, false, true, false); - this.traceMaskDrawingProvider = new TraceMaskDrawingProvider(plugInPort); - - ActionFactory actionFactory = ActionFactory.getInstance(); - swingUI.injectMenuAction(actionFactory.createNewAction(plugInPort), FILE_TITLE); - swingUI.injectMenuAction(actionFactory.createOpenAction(plugInPort, swingUI), FILE_TITLE); + private static final String ANALYZE_TITLE = "Analyze"; + + private ProjectDrawingProvider drawingProvider; + private TraceMaskDrawingProvider traceMaskDrawingProvider; + + private ISwingUI swingUI; + private IPlugInPort plugInPort; + + public FileMenuPlugin(ISwingUI swingUI) { + super(); + this.swingUI = swingUI; + } + + @Override + public void connect(IPlugInPort plugInPort) { + this.plugInPort = plugInPort; + this.drawingProvider = new ProjectDrawingProvider(plugInPort, false, true, false); + this.traceMaskDrawingProvider = new TraceMaskDrawingProvider(plugInPort); + + ActionFactory actionFactory = ActionFactory.getInstance(); + swingUI.injectMenuAction(actionFactory.createNewAction(plugInPort), FILE_TITLE); + swingUI.injectMenuAction(actionFactory.createOpenAction(plugInPort, swingUI), FILE_TITLE); swingUI.injectMenuAction(actionFactory.createImportAction(plugInPort, swingUI), FILE_TITLE); - swingUI.injectMenuAction(actionFactory.createImportNetlistAction(plugInPort, swingUI), FILE_TITLE); - swingUI.injectMenuAction(actionFactory.createSaveAction(plugInPort, swingUI), FILE_TITLE); - swingUI.injectMenuAction(actionFactory.createSaveAsAction(plugInPort, swingUI), FILE_TITLE); - swingUI.injectDynamicSubmenu("Recent Files", IconLoader.History.getIcon(), FILE_TITLE, this); - swingUI.injectMenuAction(null, FILE_TITLE); - swingUI.injectMenuAction(actionFactory.createExportPDFAction(plugInPort, drawingProvider, swingUI, ""), FILE_TITLE); - swingUI.injectMenuAction(actionFactory.createExportPNGAction(plugInPort, drawingProvider, swingUI, ""), FILE_TITLE); - swingUI.injectMenuAction( - actionFactory.createPrintAction(drawingProvider, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), - FILE_TITLE); - swingUI.injectSubmenu(TRACE_MASK_TITLE, IconLoader.TraceMask.getIcon(), FILE_TITLE); - swingUI.injectMenuAction(actionFactory.createExportPDFAction(plugInPort, traceMaskDrawingProvider, swingUI, " (mask)"), TRACE_MASK_TITLE); - swingUI.injectMenuAction(actionFactory.createExportPNGAction(plugInPort, traceMaskDrawingProvider, swingUI, " (mask)"), TRACE_MASK_TITLE); - swingUI.injectMenuAction( - actionFactory.createPrintAction(traceMaskDrawingProvider, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() - | KeyEvent.SHIFT_DOWN_MASK), TRACE_MASK_TITLE); - - swingUI.injectSubmenu(ANALYZE_TITLE, IconLoader.Scientist.getIcon(), FILE_TITLE); - swingUI.injectMenuAction(actionFactory.createCheckProximityAction(plugInPort, swingUI), ANALYZE_TITLE); + swingUI.injectMenuAction(actionFactory.createImportNetlistAction(plugInPort, swingUI), + FILE_TITLE); + swingUI.injectMenuAction(actionFactory.createSaveAction(plugInPort, swingUI), FILE_TITLE); + swingUI.injectMenuAction(actionFactory.createSaveAsAction(plugInPort, swingUI), FILE_TITLE); + swingUI.injectDynamicSubmenu("Recent Files", IconLoader.History.getIcon(), FILE_TITLE, this); + swingUI.injectMenuAction(null, FILE_TITLE); + swingUI.injectMenuAction( + actionFactory.createExportPDFAction(plugInPort, drawingProvider, swingUI, ""), FILE_TITLE); + swingUI.injectMenuAction( + actionFactory.createExportPNGAction(plugInPort, drawingProvider, swingUI, ""), FILE_TITLE); + swingUI.injectMenuAction(actionFactory.createPrintAction(drawingProvider, + Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), FILE_TITLE); + swingUI.injectSubmenu(TRACE_MASK_TITLE, IconLoader.TraceMask.getIcon(), FILE_TITLE); + swingUI.injectMenuAction(actionFactory.createExportPDFAction(plugInPort, + traceMaskDrawingProvider, swingUI, " (mask)"), TRACE_MASK_TITLE); + swingUI.injectMenuAction(actionFactory.createExportPNGAction(plugInPort, + traceMaskDrawingProvider, swingUI, " (mask)"), TRACE_MASK_TITLE); + swingUI.injectMenuAction( + actionFactory.createPrintAction(traceMaskDrawingProvider, + Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | KeyEvent.SHIFT_DOWN_MASK), + TRACE_MASK_TITLE); + + swingUI.injectSubmenu(ANALYZE_TITLE, IconLoader.Scientist.getIcon(), FILE_TITLE); + swingUI.injectMenuAction(actionFactory.createCheckProximityAction(plugInPort, swingUI), + ANALYZE_TITLE); swingUI.injectMenuAction(actionFactory.createBomAction(plugInPort), ANALYZE_TITLE); - swingUI.injectMenuAction(actionFactory.createGenerateNetlistAction(plugInPort, swingUI), ANALYZE_TITLE); - + swingUI.injectMenuAction(actionFactory.createGenerateNetlistAction(plugInPort, swingUI), + ANALYZE_TITLE); + List summarizers = plugInPort.getNetlistAnalyzers(); if (summarizers != null) { - for(INetlistAnalyzer summarizer : summarizers) - swingUI.injectMenuAction(actionFactory.createSummarizeNetlistAction(plugInPort, swingUI, summarizer), ANALYZE_TITLE); - } - + for (INetlistAnalyzer summarizer : summarizers) + swingUI.injectMenuAction( + actionFactory.createSummarizeNetlistAction(plugInPort, swingUI, summarizer), + ANALYZE_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.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, plugInPort), INTEGRATION_TITLE); - swingUI.injectMenuAction(new LoadlineEditorFrame.LoadlineEditorAction(), FILE_TITLE); - swingUI.injectMenuAction(null, FILE_TITLE); - swingUI.injectMenuAction(actionFactory.createExitAction(plugInPort), FILE_TITLE); - } - - @Override - public EnumSet getSubscribedEventTypes() { - return null; - } - - @Override - public void processMessage(EventType eventType, Object... params) { - // Do nothing. - } - - // Dynamic menu for recent files - - @Override - public void onActionPerformed(String name) { - LOG.info("Openning recent file: " + name); - if (!plugInPort.allowFileAction()) { - LOG.info("Aborted openning recent file"); - return; - } - this.plugInPort.loadProjectFromFile(name); - } - - @SuppressWarnings("unchecked") - @Override - public List getAvailableItems() { - return (List) ConfigurationManager.getInstance().readObject(IPlugInPort.RECENT_FILES_KEY, null); - } -} + swingUI.injectMenuAction(actionFactory.createImportVariantsAction(swingUI, plugInPort), + INTEGRATION_TITLE); + swingUI.injectMenuAction(actionFactory.createExportVariantsAction(swingUI, plugInPort), + INTEGRATION_TITLE); + swingUI.injectMenuAction(new LoadlineEditorFrame.LoadlineEditorAction(), FILE_TITLE); + swingUI.injectMenuAction(null, FILE_TITLE); + swingUI.injectMenuAction(actionFactory.createExitAction(plugInPort), FILE_TITLE); + } + + @Override + public EnumSet getSubscribedEventTypes() { + return null; + } + + @Override + public void processMessage(EventType eventType, Object... params) { + // Do nothing. + } + + // Dynamic menu for recent files + + @Override + public void onActionPerformed(String fileName) { + LOG.info("Openning recent file: " + fileName); + if (!plugInPort.allowFileAction()) { + LOG.info("Aborted openning recent file"); + return; + } + + swingUI.executeBackgroundTask(new ITask() { + + @Override + public Void doInBackground() throws Exception { + LOG.debug("Opening recent file from " + fileName); + plugInPort.loadProjectFromFile(fileName); + return null; + } + + @Override + public void complete(Void result) {} + + @Override + public void failed(Exception e) { + swingUI.showMessage("Could not open file. " + e.getMessage(), "Error", + ISwingUI.ERROR_MESSAGE); + } + }, true); + } + + @SuppressWarnings("unchecked") + @Override + public List getAvailableItems() { + return (List) ConfigurationManager.getInstance() + .readObject(IPlugInPort.RECENT_FILES_KEY, null); + } +}