From ecd6a262b2c410ccb66917494d882c98d43e2f17 Mon Sep 17 00:00:00 2001 From: Robert Greene Date: Sat, 14 Dec 2002 05:50:30 +0000 Subject: [PATCH] Support for multiple logical disks added. Also contains testing code for creating a disk image. The Disk Image Wizard needs to be created yet. --- .../ui/swt/SwtAppleCommander.java | 55 ++++++++++++++----- 1 file changed, 42 insertions(+), 13 deletions(-) diff --git a/src/com/webcodepro/applecommander/ui/swt/SwtAppleCommander.java b/src/com/webcodepro/applecommander/ui/swt/SwtAppleCommander.java index 33fb408..3962ec9 100644 --- a/src/com/webcodepro/applecommander/ui/swt/SwtAppleCommander.java +++ b/src/com/webcodepro/applecommander/ui/swt/SwtAppleCommander.java @@ -19,9 +19,17 @@ */ package com.webcodepro.applecommander.ui.swt; -import java.io.File; +import com.webcodepro.applecommander.storage.Disk; +import com.webcodepro.applecommander.storage.DosFormatDisk; +import com.webcodepro.applecommander.storage.FormattedDisk; +import com.webcodepro.applecommander.storage.PascalFormatDisk; +import com.webcodepro.applecommander.storage.ProdosFormatDisk; +import com.webcodepro.applecommander.storage.RdosFormatDisk; +import com.webcodepro.applecommander.storage.Disk.FilenameFilter; +import com.webcodepro.applecommander.ui.AppleCommander; +import com.webcodepro.applecommander.ui.UserPreferences; + import java.io.IOException; -import java.io.InputStream; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; @@ -38,12 +46,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.ToolItem; -import com.webcodepro.applecommander.storage.Disk; -import com.webcodepro.applecommander.storage.FormattedDisk; -import com.webcodepro.applecommander.storage.Disk.FilenameFilter; -import com.webcodepro.applecommander.ui.AppleCommander; -import com.webcodepro.applecommander.ui.UserPreferences; - /** * Main class for the SwtAppleCommander interface. *

@@ -151,9 +153,9 @@ public class SwtAppleCommander { userPreferences.setDiskImageDirectory(fileDialog.getFilterPath()); try { Disk disk = new Disk(fullpath); - FormattedDisk formattedDisk = disk.getFormattedDisk(); - if (formattedDisk != null) { - DiskWindow window = new DiskWindow(shell, formattedDisk, imageManager); + FormattedDisk[] formattedDisks = disk.getFormattedDisks(); + if (formattedDisks != null) { + DiskWindow window = new DiskWindow(shell, formattedDisks, imageManager); window.open(); } else { Shell finalShell = shell; @@ -172,6 +174,34 @@ public class SwtAppleCommander { } } + /** + * Create a disk image. + */ + private void createDiskImage() { + FileDialog fileDialog = new FileDialog(shell, SWT.SAVE); + FilenameFilter[] fileFilters = Disk.getFilenameFilters(); + String[] names = new String[fileFilters.length]; + String[] extensions = new String[fileFilters.length]; + for (int i=0; i