From 45a97d2959c9915efb84ed5d315bc8b88326337b Mon Sep 17 00:00:00 2001 From: Denis Molony Date: Wed, 19 May 2021 19:07:45 +1000 Subject: [PATCH] tidying --- .../bytezone/diskbrowser/gui/DiskBrowser.java | 3 +- .../bytezone/diskbrowser/gui/MenuHandler.java | 32 ++++--------------- .../diskbrowser/gui/SaveDiskAction.java | 9 +++--- .../diskbrowser/gui/SaveFileAction.java | 7 ++-- 4 files changed, 18 insertions(+), 33 deletions(-) diff --git a/src/com/bytezone/diskbrowser/gui/DiskBrowser.java b/src/com/bytezone/diskbrowser/gui/DiskBrowser.java index 9fd23a1..c4a3e63 100755 --- a/src/com/bytezone/diskbrowser/gui/DiskBrowser.java +++ b/src/com/bytezone/diskbrowser/gui/DiskBrowser.java @@ -103,11 +103,13 @@ public class DiskBrowser extends JFrame implements DiskSelectionListener, QuitLi catalogPanel.addDiskSelectionListener (diskLayoutPanel); catalogPanel.addDiskSelectionListener (redoHandler); catalogPanel.addDiskSelectionListener (menuHandler); + catalogPanel.addDiskSelectionListener (menuHandler.saveDiskAction); catalogPanel.addFileSelectionListener (dataPanel); catalogPanel.addFileSelectionListener (diskLayoutPanel); catalogPanel.addFileSelectionListener (redoHandler); catalogPanel.addFileSelectionListener (menuHandler); + catalogPanel.addFileSelectionListener (menuHandler.saveFileAction); catalogPanel.addFileNodeSelectionListener (dataPanel); catalogPanel.addFileNodeSelectionListener (redoHandler); @@ -115,7 +117,6 @@ public class DiskBrowser extends JFrame implements DiskSelectionListener, QuitLi diskLayoutPanel.addSectorSelectionListener (dataPanel); diskLayoutPanel.addSectorSelectionListener (redoHandler); diskLayoutPanel.addSectorSelectionListener (catalogPanel); - diskLayoutPanel.addSectorSelectionListener (menuHandler); diskLayoutPanel.addSectorSelectionListener (menuHandler.saveSectorsAction); duplicateAction.addTableSelectionListener (catalogPanel); diff --git a/src/com/bytezone/diskbrowser/gui/MenuHandler.java b/src/com/bytezone/diskbrowser/gui/MenuHandler.java index 313d442..5162eea 100755 --- a/src/com/bytezone/diskbrowser/gui/MenuHandler.java +++ b/src/com/bytezone/diskbrowser/gui/MenuHandler.java @@ -32,8 +32,7 @@ import com.bytezone.diskbrowser.prodos.ProdosDisk; import com.bytezone.diskbrowser.utilities.EnvironmentAction; // -----------------------------------------------------------------------------------// -class MenuHandler implements DiskSelectionListener, FileSelectionListener, QuitListener, - SectorSelectionListener +class MenuHandler implements DiskSelectionListener, FileSelectionListener, QuitListener // -----------------------------------------------------------------------------------// { static final String PREFS_LINE_WRAP = "line wrap"; @@ -78,8 +77,8 @@ class MenuHandler implements DiskSelectionListener, FileSelectionListener, QuitL private static final String PREFS_PALETTE = "palette"; FormattedDisk currentDisk; - private final SaveDiskAction saveDiskAction = new SaveDiskAction (); - private final SaveFileAction saveFileAction = new SaveFileAction (); + final SaveDiskAction saveDiskAction = new SaveDiskAction (); + final SaveFileAction saveFileAction = new SaveFileAction (); final SaveSectorsAction saveSectorsAction = new SaveSectorsAction (); private final BasicPreferences basicPreferences = new BasicPreferences (); @@ -156,16 +155,11 @@ class MenuHandler implements DiskSelectionListener, FileSelectionListener, QuitL final JMenuItem splitRemarkItem = new JCheckBoxMenuItem ("Split REM"); final JMenuItem splitDimItem = new JCheckBoxMenuItem ("Split DIM"); final JMenuItem alignAssignItem = new JCheckBoxMenuItem ("Align consecutive assign"); - // final JMenuItem showBasicTargetsItem = new JCheckBoxMenuItem ("Show targets"); - // final JMenuItem onlyShowTargetLinesItem = - // new JCheckBoxMenuItem ("Only show target line numbers"); final JMenuItem showCaretItem = new JCheckBoxMenuItem ("Show caret"); final JMenuItem showThenItem = new JCheckBoxMenuItem ("Show THEN after IF"); final JMenuItem blankAfterReturnItem = new JCheckBoxMenuItem ("Blank line after RETURN"); final JMenuItem formatRemItem = new JCheckBoxMenuItem ("Allow formatted REM"); - // final JMenuItem deleteExtraRemSpace = - // new JCheckBoxMenuItem ("Delete extra REM space"); final JMenuItem deleteExtraDataSpace = new JCheckBoxMenuItem ("Delete extra DATA space"); @@ -176,7 +170,6 @@ class MenuHandler implements DiskSelectionListener, FileSelectionListener, QuitL final JMenuItem showConstantsItem = new JCheckBoxMenuItem ("List constants"); final JMenuItem showDuplicateSymbolsItem = new JCheckBoxMenuItem ("List duplicate variables"); - // final JMenuItem listStringsItem = new JCheckBoxMenuItem ("List strings"); // Assembler menu items final JMenuItem showAssemblerTargetsItem = new JCheckBoxMenuItem ("Show targets"); @@ -207,16 +200,18 @@ class MenuHandler implements DiskSelectionListener, FileSelectionListener, QuitL menuBar.add (helpMenu); fileMenu.add (rootItem); - fileMenu.addSeparator (); fileMenu.add (refreshTreeItem); + + fileMenu.addSeparator (); fileMenu.add (saveDiskItem); fileMenu.add (saveFileItem); fileMenu.add (saveSectorsItem); + fileMenu.addSeparator (); addLauncherMenu (); fileMenu.add (printItem); - fileMenu.addSeparator (); + // fileMenu.addSeparator (); fileMenu.add (closeTabItem); JMenuItem fontItem = new JMenuItem (fontAction); @@ -722,8 +717,6 @@ class MenuHandler implements DiskSelectionListener, FileSelectionListener, QuitL currentDisk = event.appleFileSource.getFormattedDisk (); adjustMenus (currentDisk); } - - saveFileAction.setFile (event.appleFileSource); } // ---------------------------------------------------------------------------------// @@ -770,16 +763,5 @@ class MenuHandler implements DiskSelectionListener, FileSelectionListener, QuitL ((InterleaveAction) interleave2Item.getAction ()).setDisk (currentDisk); ((InterleaveAction) interleave3Item.getAction ()).setDisk (currentDisk); } - - saveDiskItem.setEnabled (disk.isTempDisk ()); - saveDiskAction.setDisk (disk); - } - - // ---------------------------------------------------------------------------------// - @Override - public void sectorSelected (SectorSelectedEvent event) - // ---------------------------------------------------------------------------------// - { - // List sectors = event.getSectors (); } } \ No newline at end of file diff --git a/src/com/bytezone/diskbrowser/gui/SaveDiskAction.java b/src/com/bytezone/diskbrowser/gui/SaveDiskAction.java index 4679adb..bb0cee7 100644 --- a/src/com/bytezone/diskbrowser/gui/SaveDiskAction.java +++ b/src/com/bytezone/diskbrowser/gui/SaveDiskAction.java @@ -12,7 +12,7 @@ import com.bytezone.diskbrowser.disk.FormattedDisk; import com.bytezone.diskbrowser.utilities.DefaultAction; // -----------------------------------------------------------------------------------// -class SaveDiskAction extends DefaultAction +class SaveDiskAction extends DefaultAction implements DiskSelectionListener // -----------------------------------------------------------------------------------// { FormattedDisk disk; @@ -55,10 +55,11 @@ class SaveDiskAction extends DefaultAction } // ---------------------------------------------------------------------------------// - void setDisk (FormattedDisk disk) + @Override + public void diskSelected (DiskSelectedEvent event) // ---------------------------------------------------------------------------------// { - this.disk = disk; - this.setEnabled (true); + this.disk = event.getFormattedDisk (); + setEnabled (disk.isTempDisk ()); } } diff --git a/src/com/bytezone/diskbrowser/gui/SaveFileAction.java b/src/com/bytezone/diskbrowser/gui/SaveFileAction.java index 9df4a91..fb23da1 100644 --- a/src/com/bytezone/diskbrowser/gui/SaveFileAction.java +++ b/src/com/bytezone/diskbrowser/gui/SaveFileAction.java @@ -13,7 +13,7 @@ import com.bytezone.diskbrowser.applefile.AppleFileSource; import com.bytezone.diskbrowser.utilities.DefaultAction; // -----------------------------------------------------------------------------------// -class SaveFileAction extends DefaultAction +class SaveFileAction extends DefaultAction implements FileSelectionListener //-----------------------------------------------------------------------------------// { AppleFileSource appleFileSource; @@ -57,9 +57,10 @@ class SaveFileAction extends DefaultAction } // ---------------------------------------------------------------------------------// - void setFile (AppleFileSource dataSource) + @Override + public void fileSelected (FileSelectedEvent event) // ---------------------------------------------------------------------------------// { - this.appleFileSource = dataSource; + this.appleFileSource = event.appleFileSource; } }