diff --git a/src/com/webcodepro/applecommander/compiler/ApplesoftCompiler.java b/src/com/webcodepro/applecommander/compiler/ApplesoftCompiler.java index 980d12c..7a0a1b1 100644 --- a/src/com/webcodepro/applecommander/compiler/ApplesoftCompiler.java +++ b/src/com/webcodepro/applecommander/compiler/ApplesoftCompiler.java @@ -19,11 +19,6 @@ */ package com.webcodepro.applecommander.compiler; -import com.webcodepro.applecommander.storage.FileEntry; -import com.webcodepro.applecommander.util.ApplesoftToken; -import com.webcodepro.applecommander.util.ApplesoftTokenizer; -import com.webcodepro.applecommander.util.ApplesoftTokens; - import java.io.IOException; import java.io.InputStream; import java.lang.reflect.InvocationTargetException; @@ -36,6 +31,11 @@ import java.util.Map; import java.util.Properties; import java.util.Stack; +import com.webcodepro.applecommander.storage.FileEntry; +import com.webcodepro.applecommander.util.ApplesoftToken; +import com.webcodepro.applecommander.util.ApplesoftTokenizer; +import com.webcodepro.applecommander.util.ApplesoftTokens; + /** * Compile the given Applesoft file. The result will be an assembly * program (ultimately assembled). This is not intended to be anything diff --git a/src/com/webcodepro/applecommander/storage/Disk.java b/src/com/webcodepro/applecommander/storage/Disk.java index 097f119..afae0a8 100644 --- a/src/com/webcodepro/applecommander/storage/Disk.java +++ b/src/com/webcodepro/applecommander/storage/Disk.java @@ -19,16 +19,6 @@ */ package com.webcodepro.applecommander.storage; -import com.webcodepro.applecommander.storage.cpm.CpmFileEntry; -import com.webcodepro.applecommander.storage.cpm.CpmFormatDisk; -import com.webcodepro.applecommander.storage.physical.ByteArrayImageLayout; -import com.webcodepro.applecommander.storage.physical.DosOrder; -import com.webcodepro.applecommander.storage.physical.NibbleOrder; -import com.webcodepro.applecommander.storage.physical.ImageOrder; -import com.webcodepro.applecommander.storage.physical.ProdosOrder; -import com.webcodepro.applecommander.storage.physical.UniversalDiskImageLayout; -import com.webcodepro.applecommander.util.AppleUtil; - import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; @@ -39,6 +29,22 @@ import java.io.OutputStream; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; +import com.webcodepro.applecommander.storage.os.cpm.CpmFileEntry; +import com.webcodepro.applecommander.storage.os.cpm.CpmFormatDisk; +import com.webcodepro.applecommander.storage.os.dos33.DosFormatDisk; +import com.webcodepro.applecommander.storage.os.dos33.OzDosFormatDisk; +import com.webcodepro.applecommander.storage.os.dos33.UniDosFormatDisk; +import com.webcodepro.applecommander.storage.os.pascal.PascalFormatDisk; +import com.webcodepro.applecommander.storage.os.prodos.ProdosFormatDisk; +import com.webcodepro.applecommander.storage.os.rdos.RdosFormatDisk; +import com.webcodepro.applecommander.storage.physical.ByteArrayImageLayout; +import com.webcodepro.applecommander.storage.physical.DosOrder; +import com.webcodepro.applecommander.storage.physical.ImageOrder; +import com.webcodepro.applecommander.storage.physical.NibbleOrder; +import com.webcodepro.applecommander.storage.physical.ProdosOrder; +import com.webcodepro.applecommander.storage.physical.UniversalDiskImageLayout; +import com.webcodepro.applecommander.util.AppleUtil; + /** * Abstract representation of an Apple2 disk (floppy, 800k, hard disk). *

diff --git a/src/com/webcodepro/applecommander/storage/FileFilter.java b/src/com/webcodepro/applecommander/storage/FileFilter.java index cf8c688..61e244d 100644 --- a/src/com/webcodepro/applecommander/storage/FileFilter.java +++ b/src/com/webcodepro/applecommander/storage/FileFilter.java @@ -19,6 +19,7 @@ */ package com.webcodepro.applecommander.storage; + /** * A file filter taks a buffer of bytes and filters or converts the bytes * into another format. An example would be to filter Apple text by diff --git a/src/com/webcodepro/applecommander/storage/FormattedDisk.java b/src/com/webcodepro/applecommander/storage/FormattedDisk.java index 09bd792..ec007f9 100644 --- a/src/com/webcodepro/applecommander/storage/FormattedDisk.java +++ b/src/com/webcodepro/applecommander/storage/FormattedDisk.java @@ -19,8 +19,6 @@ */ package com.webcodepro.applecommander.storage; -import com.webcodepro.applecommander.storage.physical.ImageOrder; - import java.io.IOException; import java.io.InputStream; import java.text.SimpleDateFormat; @@ -28,6 +26,8 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import com.webcodepro.applecommander.storage.physical.ImageOrder; + /** * Abstract representation of a formatted Apple2 disk (floppy, 800k, hard disk). *

diff --git a/src/com/webcodepro/applecommander/storage/AppleWorksDataBaseFileFilter.java b/src/com/webcodepro/applecommander/storage/filters/AppleWorksDataBaseFileFilter.java similarity index 98% rename from src/com/webcodepro/applecommander/storage/AppleWorksDataBaseFileFilter.java rename to src/com/webcodepro/applecommander/storage/filters/AppleWorksDataBaseFileFilter.java index 7e919cf..7838386 100644 --- a/src/com/webcodepro/applecommander/storage/AppleWorksDataBaseFileFilter.java +++ b/src/com/webcodepro/applecommander/storage/filters/AppleWorksDataBaseFileFilter.java @@ -17,13 +17,15 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; - -import com.webcodepro.applecommander.util.AppleUtil; +package com.webcodepro.applecommander.storage.filters; import java.io.ByteArrayOutputStream; import java.io.PrintWriter; +import com.webcodepro.applecommander.storage.FileEntry; +import com.webcodepro.applecommander.storage.FileFilter; +import com.webcodepro.applecommander.util.AppleUtil; + /** * Export an AppleWorks database file to a text file. * Current export is limited to a standard comma-separated file (CSV) diff --git a/src/com/webcodepro/applecommander/storage/AppleWorksSpreadSheetFileFilter.java b/src/com/webcodepro/applecommander/storage/filters/AppleWorksSpreadSheetFileFilter.java similarity index 98% rename from src/com/webcodepro/applecommander/storage/AppleWorksSpreadSheetFileFilter.java rename to src/com/webcodepro/applecommander/storage/filters/AppleWorksSpreadSheetFileFilter.java index 6422369..0f1f051 100644 --- a/src/com/webcodepro/applecommander/storage/AppleWorksSpreadSheetFileFilter.java +++ b/src/com/webcodepro/applecommander/storage/filters/AppleWorksSpreadSheetFileFilter.java @@ -17,14 +17,16 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; - -import com.webcodepro.applecommander.util.AppleUtil; +package com.webcodepro.applecommander.storage.filters; import java.io.ByteArrayOutputStream; import java.io.PrintWriter; import java.text.NumberFormat; +import com.webcodepro.applecommander.storage.FileEntry; +import com.webcodepro.applecommander.storage.FileFilter; +import com.webcodepro.applecommander.util.AppleUtil; + /** * Export an AppleWorks SpreadSheet file. * The spread-sheet file starts with a 300 byte header, followed by diff --git a/src/com/webcodepro/applecommander/storage/AppleWorksWordProcessorFileFilter.java b/src/com/webcodepro/applecommander/storage/filters/AppleWorksWordProcessorFileFilter.java similarity index 98% rename from src/com/webcodepro/applecommander/storage/AppleWorksWordProcessorFileFilter.java rename to src/com/webcodepro/applecommander/storage/filters/AppleWorksWordProcessorFileFilter.java index 3abadcc..851ef5a 100644 --- a/src/com/webcodepro/applecommander/storage/AppleWorksWordProcessorFileFilter.java +++ b/src/com/webcodepro/applecommander/storage/filters/AppleWorksWordProcessorFileFilter.java @@ -17,16 +17,18 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; - -import com.webcodepro.applecommander.ui.AppleCommander; -import com.webcodepro.applecommander.util.AppleUtil; +package com.webcodepro.applecommander.storage.filters; import java.io.ByteArrayOutputStream; import java.io.PrintWriter; import java.text.SimpleDateFormat; import java.util.Date; +import com.webcodepro.applecommander.storage.FileEntry; +import com.webcodepro.applecommander.storage.FileFilter; +import com.webcodepro.applecommander.ui.AppleCommander; +import com.webcodepro.applecommander.util.AppleUtil; + /** * Extract the contents of an AWP (AppleWorks word processor) document and * convert to a text format. Currently supported formats are plain text, diff --git a/src/com/webcodepro/applecommander/storage/ApplesoftFileFilter.java b/src/com/webcodepro/applecommander/storage/filters/ApplesoftFileFilter.java similarity index 93% rename from src/com/webcodepro/applecommander/storage/ApplesoftFileFilter.java rename to src/com/webcodepro/applecommander/storage/filters/ApplesoftFileFilter.java index 0a5015c..0138f92 100644 --- a/src/com/webcodepro/applecommander/storage/ApplesoftFileFilter.java +++ b/src/com/webcodepro/applecommander/storage/filters/ApplesoftFileFilter.java @@ -17,14 +17,16 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; - -import com.webcodepro.applecommander.util.ApplesoftToken; -import com.webcodepro.applecommander.util.ApplesoftTokenizer; +package com.webcodepro.applecommander.storage.filters; import java.io.ByteArrayOutputStream; import java.io.PrintWriter; +import com.webcodepro.applecommander.storage.FileEntry; +import com.webcodepro.applecommander.storage.FileFilter; +import com.webcodepro.applecommander.util.ApplesoftToken; +import com.webcodepro.applecommander.util.ApplesoftTokenizer; + /** * Filter the given file as an Applesoft file. *

diff --git a/src/com/webcodepro/applecommander/storage/BinaryFileFilter.java b/src/com/webcodepro/applecommander/storage/filters/BinaryFileFilter.java similarity index 90% rename from src/com/webcodepro/applecommander/storage/BinaryFileFilter.java rename to src/com/webcodepro/applecommander/storage/filters/BinaryFileFilter.java index c043df7..1899596 100644 --- a/src/com/webcodepro/applecommander/storage/BinaryFileFilter.java +++ b/src/com/webcodepro/applecommander/storage/filters/BinaryFileFilter.java @@ -17,7 +17,10 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; +package com.webcodepro.applecommander.storage.filters; + +import com.webcodepro.applecommander.storage.FileEntry; +import com.webcodepro.applecommander.storage.FileFilter; /** * Filter the given file data to be the appropriate length. diff --git a/src/com/webcodepro/applecommander/storage/GraphicsFileFilter.java b/src/com/webcodepro/applecommander/storage/filters/GraphicsFileFilter.java similarity index 99% rename from src/com/webcodepro/applecommander/storage/GraphicsFileFilter.java rename to src/com/webcodepro/applecommander/storage/filters/GraphicsFileFilter.java index 76565a6..4024245 100644 --- a/src/com/webcodepro/applecommander/storage/GraphicsFileFilter.java +++ b/src/com/webcodepro/applecommander/storage/filters/GraphicsFileFilter.java @@ -17,16 +17,18 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; - -import com.webcodepro.applecommander.storage.filters.imagehandlers.AppleImage; -import com.webcodepro.applecommander.util.AppleUtil; +package com.webcodepro.applecommander.storage.filters; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import com.webcodepro.applecommander.storage.FileEntry; +import com.webcodepro.applecommander.storage.FileFilter; +import com.webcodepro.applecommander.storage.filters.imagehandlers.AppleImage; +import com.webcodepro.applecommander.util.AppleUtil; + /** * Filter the given file as if it were a graphics image. *

diff --git a/src/com/webcodepro/applecommander/storage/HexDumpFileFilter.java b/src/com/webcodepro/applecommander/storage/filters/HexDumpFileFilter.java similarity index 90% rename from src/com/webcodepro/applecommander/storage/HexDumpFileFilter.java rename to src/com/webcodepro/applecommander/storage/filters/HexDumpFileFilter.java index 8572813..b07a19a 100644 --- a/src/com/webcodepro/applecommander/storage/HexDumpFileFilter.java +++ b/src/com/webcodepro/applecommander/storage/filters/HexDumpFileFilter.java @@ -17,8 +17,10 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; +package com.webcodepro.applecommander.storage.filters; +import com.webcodepro.applecommander.storage.FileEntry; +import com.webcodepro.applecommander.storage.FileFilter; import com.webcodepro.applecommander.util.AppleUtil; /** diff --git a/src/com/webcodepro/applecommander/storage/IntegerBasicFileFilter.java b/src/com/webcodepro/applecommander/storage/filters/IntegerBasicFileFilter.java similarity index 96% rename from src/com/webcodepro/applecommander/storage/IntegerBasicFileFilter.java rename to src/com/webcodepro/applecommander/storage/filters/IntegerBasicFileFilter.java index 7f144c0..1f2aeda 100644 --- a/src/com/webcodepro/applecommander/storage/IntegerBasicFileFilter.java +++ b/src/com/webcodepro/applecommander/storage/filters/IntegerBasicFileFilter.java @@ -17,13 +17,15 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; - -import com.webcodepro.applecommander.util.AppleUtil; +package com.webcodepro.applecommander.storage.filters; import java.io.ByteArrayOutputStream; import java.io.PrintWriter; +import com.webcodepro.applecommander.storage.FileEntry; +import com.webcodepro.applecommander.storage.FileFilter; +import com.webcodepro.applecommander.util.AppleUtil; + /** * Filter the given file as an Integer BASIC file. *

diff --git a/src/com/webcodepro/applecommander/storage/TextFileFilter.java b/src/com/webcodepro/applecommander/storage/filters/TextFileFilter.java similarity index 92% rename from src/com/webcodepro/applecommander/storage/TextFileFilter.java rename to src/com/webcodepro/applecommander/storage/filters/TextFileFilter.java index da0f209..170d77f 100644 --- a/src/com/webcodepro/applecommander/storage/TextFileFilter.java +++ b/src/com/webcodepro/applecommander/storage/filters/TextFileFilter.java @@ -17,11 +17,14 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; +package com.webcodepro.applecommander.storage.filters; import java.io.ByteArrayOutputStream; import java.io.PrintWriter; +import com.webcodepro.applecommander.storage.FileEntry; +import com.webcodepro.applecommander.storage.FileFilter; + /** * Filter the given file data for text. *

diff --git a/src/com/webcodepro/applecommander/storage/filters/imagehandlers/SunJpegImage.java b/src/com/webcodepro/applecommander/storage/filters/imagehandlers/SunJpegImage.java index d587f9e..3986009 100644 --- a/src/com/webcodepro/applecommander/storage/filters/imagehandlers/SunJpegImage.java +++ b/src/com/webcodepro/applecommander/storage/filters/imagehandlers/SunJpegImage.java @@ -19,12 +19,12 @@ */ package com.webcodepro.applecommander.storage.filters.imagehandlers; -import com.sun.image.codec.jpeg.JPEGCodec; - import java.awt.image.BufferedImage; import java.io.IOException; import java.io.OutputStream; +import com.sun.image.codec.jpeg.JPEGCodec; + /** * SunJpegImage is a specific implementation of AppleImage that handles all * SUN JPEG codec related coding surrounding image manipulation. This is diff --git a/src/com/webcodepro/applecommander/storage/cpm/CpmFileEntry.java b/src/com/webcodepro/applecommander/storage/os/cpm/CpmFileEntry.java similarity index 98% rename from src/com/webcodepro/applecommander/storage/cpm/CpmFileEntry.java rename to src/com/webcodepro/applecommander/storage/os/cpm/CpmFileEntry.java index be5d130..60c5a0b 100644 --- a/src/com/webcodepro/applecommander/storage/cpm/CpmFileEntry.java +++ b/src/com/webcodepro/applecommander/storage/os/cpm/CpmFileEntry.java @@ -1,17 +1,17 @@ -package com.webcodepro.applecommander.storage.cpm; - -import com.webcodepro.applecommander.storage.BinaryFileFilter; -import com.webcodepro.applecommander.storage.DiskFullException; -import com.webcodepro.applecommander.storage.FileEntry; -import com.webcodepro.applecommander.storage.FileFilter; -import com.webcodepro.applecommander.storage.FormattedDisk; -import com.webcodepro.applecommander.storage.TextFileFilter; -import com.webcodepro.applecommander.util.AppleUtil; +package com.webcodepro.applecommander.storage.os.cpm; import java.text.NumberFormat; import java.util.ArrayList; import java.util.List; +import com.webcodepro.applecommander.storage.DiskFullException; +import com.webcodepro.applecommander.storage.FileEntry; +import com.webcodepro.applecommander.storage.FileFilter; +import com.webcodepro.applecommander.storage.FormattedDisk; +import com.webcodepro.applecommander.storage.filters.BinaryFileFilter; +import com.webcodepro.applecommander.storage.filters.TextFileFilter; +import com.webcodepro.applecommander.util.AppleUtil; + /** * Support the CP/M file entry. Note that this may actually contain references * to multiple file entries via the extent counter. diff --git a/src/com/webcodepro/applecommander/storage/cpm/CpmFormatDisk.java b/src/com/webcodepro/applecommander/storage/os/cpm/CpmFormatDisk.java similarity index 99% rename from src/com/webcodepro/applecommander/storage/cpm/CpmFormatDisk.java rename to src/com/webcodepro/applecommander/storage/os/cpm/CpmFormatDisk.java index a07dae6..f19a3d2 100644 --- a/src/com/webcodepro/applecommander/storage/cpm/CpmFormatDisk.java +++ b/src/com/webcodepro/applecommander/storage/os/cpm/CpmFormatDisk.java @@ -17,13 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage.cpm; - -import com.webcodepro.applecommander.storage.DiskFullException; -import com.webcodepro.applecommander.storage.FileEntry; -import com.webcodepro.applecommander.storage.FormattedDisk; -import com.webcodepro.applecommander.storage.physical.ImageOrder; -import com.webcodepro.applecommander.util.AppleUtil; +package com.webcodepro.applecommander.storage.os.cpm; import java.util.ArrayList; import java.util.HashMap; @@ -31,6 +25,12 @@ import java.util.List; import java.util.Map; import java.util.StringTokenizer; +import com.webcodepro.applecommander.storage.DiskFullException; +import com.webcodepro.applecommander.storage.FileEntry; +import com.webcodepro.applecommander.storage.FormattedDisk; +import com.webcodepro.applecommander.storage.physical.ImageOrder; +import com.webcodepro.applecommander.util.AppleUtil; + /** * Manages a disk that is in the Apple CP/M format. *

diff --git a/src/com/webcodepro/applecommander/storage/DosFileEntry.java b/src/com/webcodepro/applecommander/storage/os/dos33/DosFileEntry.java similarity index 94% rename from src/com/webcodepro/applecommander/storage/DosFileEntry.java rename to src/com/webcodepro/applecommander/storage/os/dos33/DosFileEntry.java index 1d4cde4..18fa173 100644 --- a/src/com/webcodepro/applecommander/storage/DosFileEntry.java +++ b/src/com/webcodepro/applecommander/storage/os/dos33/DosFileEntry.java @@ -17,14 +17,24 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; - -import com.webcodepro.applecommander.util.AppleUtil; +package com.webcodepro.applecommander.storage.os.dos33; import java.text.NumberFormat; import java.util.ArrayList; import java.util.List; +import com.webcodepro.applecommander.storage.Disk; +import com.webcodepro.applecommander.storage.DiskFullException; +import com.webcodepro.applecommander.storage.FileEntry; +import com.webcodepro.applecommander.storage.FileFilter; +import com.webcodepro.applecommander.storage.FormattedDisk; +import com.webcodepro.applecommander.storage.filters.ApplesoftFileFilter; +import com.webcodepro.applecommander.storage.filters.BinaryFileFilter; +import com.webcodepro.applecommander.storage.filters.GraphicsFileFilter; +import com.webcodepro.applecommander.storage.filters.IntegerBasicFileFilter; +import com.webcodepro.applecommander.storage.filters.TextFileFilter; +import com.webcodepro.applecommander.util.AppleUtil; + /** * Represents a DOS file entry on disk. *

diff --git a/src/com/webcodepro/applecommander/storage/DosFormatDisk.java b/src/com/webcodepro/applecommander/storage/os/dos33/DosFormatDisk.java similarity index 98% rename from src/com/webcodepro/applecommander/storage/DosFormatDisk.java rename to src/com/webcodepro/applecommander/storage/os/dos33/DosFormatDisk.java index ec9e407..6dae816 100644 --- a/src/com/webcodepro/applecommander/storage/DosFormatDisk.java +++ b/src/com/webcodepro/applecommander/storage/os/dos33/DosFormatDisk.java @@ -17,14 +17,17 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; - -import com.webcodepro.applecommander.storage.physical.ImageOrder; -import com.webcodepro.applecommander.util.AppleUtil; +package com.webcodepro.applecommander.storage.os.dos33; import java.util.ArrayList; import java.util.List; +import com.webcodepro.applecommander.storage.DiskFullException; +import com.webcodepro.applecommander.storage.FileEntry; +import com.webcodepro.applecommander.storage.FormattedDisk; +import com.webcodepro.applecommander.storage.physical.ImageOrder; +import com.webcodepro.applecommander.util.AppleUtil; + /** * Manages a disk that is in Apple DOS 3.3 format. *

diff --git a/src/com/webcodepro/applecommander/storage/OzDosFormatDisk.java b/src/com/webcodepro/applecommander/storage/os/dos33/OzDosFormatDisk.java similarity index 98% rename from src/com/webcodepro/applecommander/storage/OzDosFormatDisk.java rename to src/com/webcodepro/applecommander/storage/os/dos33/OzDosFormatDisk.java index c2a9401..c9902ca 100644 --- a/src/com/webcodepro/applecommander/storage/OzDosFormatDisk.java +++ b/src/com/webcodepro/applecommander/storage/os/dos33/OzDosFormatDisk.java @@ -17,7 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; +package com.webcodepro.applecommander.storage.os.dos33; import com.webcodepro.applecommander.storage.physical.ImageOrder; diff --git a/src/com/webcodepro/applecommander/storage/UniDosFormatDisk.java b/src/com/webcodepro/applecommander/storage/os/dos33/UniDosFormatDisk.java similarity index 98% rename from src/com/webcodepro/applecommander/storage/UniDosFormatDisk.java rename to src/com/webcodepro/applecommander/storage/os/dos33/UniDosFormatDisk.java index e80bf24..feb9851 100644 --- a/src/com/webcodepro/applecommander/storage/UniDosFormatDisk.java +++ b/src/com/webcodepro/applecommander/storage/os/dos33/UniDosFormatDisk.java @@ -17,7 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; +package com.webcodepro.applecommander.storage.os.dos33; import com.webcodepro.applecommander.storage.physical.ImageOrder; diff --git a/src/com/webcodepro/applecommander/storage/PascalFileEntry.java b/src/com/webcodepro/applecommander/storage/os/pascal/PascalFileEntry.java similarity index 92% rename from src/com/webcodepro/applecommander/storage/PascalFileEntry.java rename to src/com/webcodepro/applecommander/storage/os/pascal/PascalFileEntry.java index c08c564..f038cc9 100644 --- a/src/com/webcodepro/applecommander/storage/PascalFileEntry.java +++ b/src/com/webcodepro/applecommander/storage/os/pascal/PascalFileEntry.java @@ -17,9 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; - -import com.webcodepro.applecommander.util.AppleUtil; +package com.webcodepro.applecommander.storage.os.pascal; import java.text.NumberFormat; import java.text.SimpleDateFormat; @@ -27,6 +25,16 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import com.webcodepro.applecommander.storage.Disk; +import com.webcodepro.applecommander.storage.DiskFullException; +import com.webcodepro.applecommander.storage.FileEntry; +import com.webcodepro.applecommander.storage.FileFilter; +import com.webcodepro.applecommander.storage.FormattedDisk; +import com.webcodepro.applecommander.storage.filters.BinaryFileFilter; +import com.webcodepro.applecommander.storage.filters.GraphicsFileFilter; +import com.webcodepro.applecommander.storage.filters.TextFileFilter; +import com.webcodepro.applecommander.util.AppleUtil; + /** * Represents a Pascal file entry on disk. *

diff --git a/src/com/webcodepro/applecommander/storage/PascalFormatDisk.java b/src/com/webcodepro/applecommander/storage/os/pascal/PascalFormatDisk.java similarity index 98% rename from src/com/webcodepro/applecommander/storage/PascalFormatDisk.java rename to src/com/webcodepro/applecommander/storage/os/pascal/PascalFormatDisk.java index cedd1ea..36091e8 100644 --- a/src/com/webcodepro/applecommander/storage/PascalFormatDisk.java +++ b/src/com/webcodepro/applecommander/storage/os/pascal/PascalFormatDisk.java @@ -17,10 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; - -import com.webcodepro.applecommander.storage.physical.ImageOrder; -import com.webcodepro.applecommander.util.AppleUtil; +package com.webcodepro.applecommander.storage.os.pascal; import java.util.ArrayList; import java.util.BitSet; @@ -28,6 +25,12 @@ import java.util.Date; import java.util.Iterator; import java.util.List; +import com.webcodepro.applecommander.storage.DiskFullException; +import com.webcodepro.applecommander.storage.FileEntry; +import com.webcodepro.applecommander.storage.FormattedDisk; +import com.webcodepro.applecommander.storage.physical.ImageOrder; +import com.webcodepro.applecommander.util.AppleUtil; + /** * Manages a disk that is in the Pascal format. *

diff --git a/src/com/webcodepro/applecommander/storage/ProdosCommonDirectoryHeader.java b/src/com/webcodepro/applecommander/storage/os/prodos/ProdosCommonDirectoryHeader.java similarity index 98% rename from src/com/webcodepro/applecommander/storage/ProdosCommonDirectoryHeader.java rename to src/com/webcodepro/applecommander/storage/os/prodos/ProdosCommonDirectoryHeader.java index 5cd82fb..bd17338 100644 --- a/src/com/webcodepro/applecommander/storage/ProdosCommonDirectoryHeader.java +++ b/src/com/webcodepro/applecommander/storage/os/prodos/ProdosCommonDirectoryHeader.java @@ -17,7 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; +package com.webcodepro.applecommander.storage.os.prodos; import com.webcodepro.applecommander.util.AppleUtil; diff --git a/src/com/webcodepro/applecommander/storage/ProdosCommonEntry.java b/src/com/webcodepro/applecommander/storage/os/prodos/ProdosCommonEntry.java similarity index 98% rename from src/com/webcodepro/applecommander/storage/ProdosCommonEntry.java rename to src/com/webcodepro/applecommander/storage/os/prodos/ProdosCommonEntry.java index 9433687..6ab90ee 100644 --- a/src/com/webcodepro/applecommander/storage/ProdosCommonEntry.java +++ b/src/com/webcodepro/applecommander/storage/os/prodos/ProdosCommonEntry.java @@ -17,12 +17,13 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; - -import com.webcodepro.applecommander.util.AppleUtil; +package com.webcodepro.applecommander.storage.os.prodos; import java.util.Date; +import com.webcodepro.applecommander.storage.FormattedDisk; +import com.webcodepro.applecommander.util.AppleUtil; + /** * Represents the common Prodos entry behavior. *

diff --git a/src/com/webcodepro/applecommander/storage/ProdosDirectoryEntry.java b/src/com/webcodepro/applecommander/storage/os/prodos/ProdosDirectoryEntry.java similarity index 91% rename from src/com/webcodepro/applecommander/storage/ProdosDirectoryEntry.java rename to src/com/webcodepro/applecommander/storage/os/prodos/ProdosDirectoryEntry.java index d087d74..8bc5a93 100644 --- a/src/com/webcodepro/applecommander/storage/ProdosDirectoryEntry.java +++ b/src/com/webcodepro/applecommander/storage/os/prodos/ProdosDirectoryEntry.java @@ -17,10 +17,14 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; +package com.webcodepro.applecommander.storage.os.prodos; import java.util.List; +import com.webcodepro.applecommander.storage.DirectoryEntry; +import com.webcodepro.applecommander.storage.DiskFullException; +import com.webcodepro.applecommander.storage.FileEntry; + /** * Implement directory functionality. *

diff --git a/src/com/webcodepro/applecommander/storage/ProdosDiskSizeDoesNotMatchException.java b/src/com/webcodepro/applecommander/storage/os/prodos/ProdosDiskSizeDoesNotMatchException.java similarity index 92% rename from src/com/webcodepro/applecommander/storage/ProdosDiskSizeDoesNotMatchException.java rename to src/com/webcodepro/applecommander/storage/os/prodos/ProdosDiskSizeDoesNotMatchException.java index cf3cffe..4b82b02 100644 --- a/src/com/webcodepro/applecommander/storage/ProdosDiskSizeDoesNotMatchException.java +++ b/src/com/webcodepro/applecommander/storage/os/prodos/ProdosDiskSizeDoesNotMatchException.java @@ -17,7 +17,9 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; +package com.webcodepro.applecommander.storage.os.prodos; + +import com.webcodepro.applecommander.storage.DiskFullException; /** * A ProdosDiskSizeDoesNotMatchException is thrown during write operations diff --git a/src/com/webcodepro/applecommander/storage/ProdosFileEntry.java b/src/com/webcodepro/applecommander/storage/os/prodos/ProdosFileEntry.java similarity index 94% rename from src/com/webcodepro/applecommander/storage/ProdosFileEntry.java rename to src/com/webcodepro/applecommander/storage/os/prodos/ProdosFileEntry.java index 2775751..68cfd0b 100644 --- a/src/com/webcodepro/applecommander/storage/ProdosFileEntry.java +++ b/src/com/webcodepro/applecommander/storage/os/prodos/ProdosFileEntry.java @@ -17,9 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; - -import com.webcodepro.applecommander.util.AppleUtil; +package com.webcodepro.applecommander.storage.os.prodos; import java.text.NumberFormat; import java.text.SimpleDateFormat; @@ -27,6 +25,20 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import com.webcodepro.applecommander.storage.DiskFullException; +import com.webcodepro.applecommander.storage.FileEntry; +import com.webcodepro.applecommander.storage.FileFilter; +import com.webcodepro.applecommander.storage.FormattedDisk; +import com.webcodepro.applecommander.storage.filters.AppleWorksDataBaseFileFilter; +import com.webcodepro.applecommander.storage.filters.AppleWorksSpreadSheetFileFilter; +import com.webcodepro.applecommander.storage.filters.AppleWorksWordProcessorFileFilter; +import com.webcodepro.applecommander.storage.filters.ApplesoftFileFilter; +import com.webcodepro.applecommander.storage.filters.BinaryFileFilter; +import com.webcodepro.applecommander.storage.filters.GraphicsFileFilter; +import com.webcodepro.applecommander.storage.filters.IntegerBasicFileFilter; +import com.webcodepro.applecommander.storage.filters.TextFileFilter; +import com.webcodepro.applecommander.util.AppleUtil; + /** * Represents a ProDOS file entry on disk. *

diff --git a/src/com/webcodepro/applecommander/storage/ProdosFileTypes.properties b/src/com/webcodepro/applecommander/storage/os/prodos/ProdosFileTypes.properties similarity index 100% rename from src/com/webcodepro/applecommander/storage/ProdosFileTypes.properties rename to src/com/webcodepro/applecommander/storage/os/prodos/ProdosFileTypes.properties diff --git a/src/com/webcodepro/applecommander/storage/ProdosFormatDisk.java b/src/com/webcodepro/applecommander/storage/os/prodos/ProdosFormatDisk.java similarity index 99% rename from src/com/webcodepro/applecommander/storage/ProdosFormatDisk.java rename to src/com/webcodepro/applecommander/storage/os/prodos/ProdosFormatDisk.java index f6f97d2..777d3d0 100644 --- a/src/com/webcodepro/applecommander/storage/ProdosFormatDisk.java +++ b/src/com/webcodepro/applecommander/storage/os/prodos/ProdosFormatDisk.java @@ -17,10 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; - -import com.webcodepro.applecommander.storage.physical.ImageOrder; -import com.webcodepro.applecommander.util.AppleUtil; +package com.webcodepro.applecommander.storage.os.prodos; import java.io.IOException; import java.io.InputStream; @@ -29,6 +26,12 @@ import java.util.Date; import java.util.List; import java.util.Properties; +import com.webcodepro.applecommander.storage.DiskFullException; +import com.webcodepro.applecommander.storage.FileEntry; +import com.webcodepro.applecommander.storage.FormattedDisk; +import com.webcodepro.applecommander.storage.physical.ImageOrder; +import com.webcodepro.applecommander.util.AppleUtil; + /** * Manages a disk that is in the ProDOS format. *

diff --git a/src/com/webcodepro/applecommander/storage/ProdosSubdirectoryHeader.java b/src/com/webcodepro/applecommander/storage/os/prodos/ProdosSubdirectoryHeader.java similarity index 97% rename from src/com/webcodepro/applecommander/storage/ProdosSubdirectoryHeader.java rename to src/com/webcodepro/applecommander/storage/os/prodos/ProdosSubdirectoryHeader.java index c909123..fcfeccd 100644 --- a/src/com/webcodepro/applecommander/storage/ProdosSubdirectoryHeader.java +++ b/src/com/webcodepro/applecommander/storage/os/prodos/ProdosSubdirectoryHeader.java @@ -17,7 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; +package com.webcodepro.applecommander.storage.os.prodos; import com.webcodepro.applecommander.util.AppleUtil; diff --git a/src/com/webcodepro/applecommander/storage/ProdosVolumeDirectoryHeader.java b/src/com/webcodepro/applecommander/storage/os/prodos/ProdosVolumeDirectoryHeader.java similarity index 96% rename from src/com/webcodepro/applecommander/storage/ProdosVolumeDirectoryHeader.java rename to src/com/webcodepro/applecommander/storage/os/prodos/ProdosVolumeDirectoryHeader.java index 443e741..946c378 100644 --- a/src/com/webcodepro/applecommander/storage/ProdosVolumeDirectoryHeader.java +++ b/src/com/webcodepro/applecommander/storage/os/prodos/ProdosVolumeDirectoryHeader.java @@ -17,7 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; +package com.webcodepro.applecommander.storage.os.prodos; import com.webcodepro.applecommander.util.AppleUtil; diff --git a/src/com/webcodepro/applecommander/storage/RdosFileEntry.java b/src/com/webcodepro/applecommander/storage/os/rdos/RdosFileEntry.java similarity index 92% rename from src/com/webcodepro/applecommander/storage/RdosFileEntry.java rename to src/com/webcodepro/applecommander/storage/os/rdos/RdosFileEntry.java index a67dc92..f4cbcc6 100644 --- a/src/com/webcodepro/applecommander/storage/RdosFileEntry.java +++ b/src/com/webcodepro/applecommander/storage/os/rdos/RdosFileEntry.java @@ -17,14 +17,23 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; - -import com.webcodepro.applecommander.util.AppleUtil; +package com.webcodepro.applecommander.storage.os.rdos; import java.text.NumberFormat; import java.util.ArrayList; import java.util.List; +import com.webcodepro.applecommander.storage.DiskFullException; +import com.webcodepro.applecommander.storage.FileEntry; +import com.webcodepro.applecommander.storage.FileFilter; +import com.webcodepro.applecommander.storage.FormattedDisk; +import com.webcodepro.applecommander.storage.filters.ApplesoftFileFilter; +import com.webcodepro.applecommander.storage.filters.BinaryFileFilter; +import com.webcodepro.applecommander.storage.filters.GraphicsFileFilter; +import com.webcodepro.applecommander.storage.filters.IntegerBasicFileFilter; +import com.webcodepro.applecommander.storage.filters.TextFileFilter; +import com.webcodepro.applecommander.util.AppleUtil; + /** * Handle RDOS file entry format. *

diff --git a/src/com/webcodepro/applecommander/storage/RdosFormatDisk.java b/src/com/webcodepro/applecommander/storage/os/rdos/RdosFormatDisk.java similarity index 98% rename from src/com/webcodepro/applecommander/storage/RdosFormatDisk.java rename to src/com/webcodepro/applecommander/storage/os/rdos/RdosFormatDisk.java index 498051e..ea7a738 100644 --- a/src/com/webcodepro/applecommander/storage/RdosFormatDisk.java +++ b/src/com/webcodepro/applecommander/storage/os/rdos/RdosFormatDisk.java @@ -17,16 +17,19 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.storage; - -import com.webcodepro.applecommander.storage.physical.ImageOrder; -import com.webcodepro.applecommander.util.AppleUtil; +package com.webcodepro.applecommander.storage.os.rdos; import java.util.ArrayList; import java.util.BitSet; import java.util.Iterator; import java.util.List; +import com.webcodepro.applecommander.storage.DiskFullException; +import com.webcodepro.applecommander.storage.FileEntry; +import com.webcodepro.applecommander.storage.FormattedDisk; +import com.webcodepro.applecommander.storage.physical.ImageOrder; +import com.webcodepro.applecommander.util.AppleUtil; + /** * Manages a disk that is in the RDOS format. *

diff --git a/src/com/webcodepro/applecommander/ui/ac.java b/src/com/webcodepro/applecommander/ui/ac.java index 71f7769..85ef975 100644 --- a/src/com/webcodepro/applecommander/ui/ac.java +++ b/src/com/webcodepro/applecommander/ui/ac.java @@ -21,20 +21,20 @@ */ package com.webcodepro.applecommander.ui; +import java.io.IOException; +import java.util.List; + import com.webcodepro.applecommander.storage.DirectoryEntry; import com.webcodepro.applecommander.storage.Disk; import com.webcodepro.applecommander.storage.DiskFullException; import com.webcodepro.applecommander.storage.FileEntry; import com.webcodepro.applecommander.storage.FileFilter; import com.webcodepro.applecommander.storage.FormattedDisk; -import com.webcodepro.applecommander.storage.ProdosFormatDisk; +import com.webcodepro.applecommander.storage.os.prodos.ProdosFormatDisk; import com.webcodepro.applecommander.storage.physical.ByteArrayImageLayout; import com.webcodepro.applecommander.storage.physical.ImageOrder; import com.webcodepro.applecommander.storage.physical.ProdosOrder; -import java.io.IOException; -import java.util.List; - public class ac { public static void main(String[] args) throws IOException { diff --git a/src/com/webcodepro/applecommander/ui/swt/DiskExplorerTab.java b/src/com/webcodepro/applecommander/ui/swt/DiskExplorerTab.java index c3e32df..19bf5ac 100644 --- a/src/com/webcodepro/applecommander/ui/swt/DiskExplorerTab.java +++ b/src/com/webcodepro/applecommander/ui/swt/DiskExplorerTab.java @@ -69,23 +69,23 @@ import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; import com.webcodepro.applecommander.compiler.ApplesoftCompiler; -import com.webcodepro.applecommander.storage.AppleWorksDataBaseFileFilter; -import com.webcodepro.applecommander.storage.AppleWorksSpreadSheetFileFilter; -import com.webcodepro.applecommander.storage.AppleWorksWordProcessorFileFilter; -import com.webcodepro.applecommander.storage.ApplesoftFileFilter; -import com.webcodepro.applecommander.storage.BinaryFileFilter; import com.webcodepro.applecommander.storage.DirectoryEntry; import com.webcodepro.applecommander.storage.Disk; import com.webcodepro.applecommander.storage.FileEntry; import com.webcodepro.applecommander.storage.FileEntryComparator; import com.webcodepro.applecommander.storage.FileFilter; import com.webcodepro.applecommander.storage.FormattedDisk; -import com.webcodepro.applecommander.storage.GraphicsFileFilter; -import com.webcodepro.applecommander.storage.IntegerBasicFileFilter; -import com.webcodepro.applecommander.storage.ProdosDiskSizeDoesNotMatchException; -import com.webcodepro.applecommander.storage.ProdosFormatDisk; -import com.webcodepro.applecommander.storage.TextFileFilter; import com.webcodepro.applecommander.storage.FormattedDisk.FileColumnHeader; +import com.webcodepro.applecommander.storage.filters.AppleWorksDataBaseFileFilter; +import com.webcodepro.applecommander.storage.filters.AppleWorksSpreadSheetFileFilter; +import com.webcodepro.applecommander.storage.filters.AppleWorksWordProcessorFileFilter; +import com.webcodepro.applecommander.storage.filters.ApplesoftFileFilter; +import com.webcodepro.applecommander.storage.filters.BinaryFileFilter; +import com.webcodepro.applecommander.storage.filters.GraphicsFileFilter; +import com.webcodepro.applecommander.storage.filters.IntegerBasicFileFilter; +import com.webcodepro.applecommander.storage.filters.TextFileFilter; +import com.webcodepro.applecommander.storage.os.prodos.ProdosDiskSizeDoesNotMatchException; +import com.webcodepro.applecommander.storage.os.prodos.ProdosFormatDisk; import com.webcodepro.applecommander.storage.physical.ByteArrayImageLayout; import com.webcodepro.applecommander.storage.physical.DosOrder; import com.webcodepro.applecommander.storage.physical.ImageOrder; @@ -93,6 +93,12 @@ import com.webcodepro.applecommander.storage.physical.NibbleOrder; import com.webcodepro.applecommander.storage.physical.ProdosOrder; import com.webcodepro.applecommander.ui.ImportSpecification; import com.webcodepro.applecommander.ui.UserPreferences; +import com.webcodepro.applecommander.ui.swt.util.DropDownSelectionListener; +import com.webcodepro.applecommander.ui.swt.util.ImageManager; +import com.webcodepro.applecommander.ui.swt.util.SwtUtil; +import com.webcodepro.applecommander.ui.swt.wizard.compilefile.CompileWizard; +import com.webcodepro.applecommander.ui.swt.wizard.exportfile.ExportWizard; +import com.webcodepro.applecommander.ui.swt.wizard.importfile.ImportWizard; import com.webcodepro.applecommander.util.AppleUtil; /** diff --git a/src/com/webcodepro/applecommander/ui/swt/DiskInfoTab.java b/src/com/webcodepro/applecommander/ui/swt/DiskInfoTab.java index a7d48e7..d7ddca7 100644 --- a/src/com/webcodepro/applecommander/ui/swt/DiskInfoTab.java +++ b/src/com/webcodepro/applecommander/ui/swt/DiskInfoTab.java @@ -19,9 +19,6 @@ */ package com.webcodepro.applecommander.ui.swt; -import com.webcodepro.applecommander.storage.FormattedDisk; -import com.webcodepro.applecommander.storage.FormattedDisk.DiskInformation; - import java.util.Iterator; import org.eclipse.swt.SWT; @@ -38,6 +35,9 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; +import com.webcodepro.applecommander.storage.FormattedDisk; +import com.webcodepro.applecommander.storage.FormattedDisk.DiskInformation; + /** * Build the Disk Info tab for the Disk Window. *

diff --git a/src/com/webcodepro/applecommander/ui/swt/DiskMapTab.java b/src/com/webcodepro/applecommander/ui/swt/DiskMapTab.java index 22bbd65..3cc07d6 100644 --- a/src/com/webcodepro/applecommander/ui/swt/DiskMapTab.java +++ b/src/com/webcodepro/applecommander/ui/swt/DiskMapTab.java @@ -19,9 +19,6 @@ */ package com.webcodepro.applecommander.ui.swt; -import com.webcodepro.applecommander.storage.FormattedDisk; -import com.webcodepro.applecommander.storage.FormattedDisk.DiskUsage; - import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CTabFolder; import org.eclipse.swt.custom.CTabItem; @@ -38,6 +35,9 @@ import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; +import com.webcodepro.applecommander.storage.FormattedDisk; +import com.webcodepro.applecommander.storage.FormattedDisk.DiskUsage; + /** * Build the Disk Map tab for the Disk Window. *

diff --git a/src/com/webcodepro/applecommander/ui/swt/DiskWindow.java b/src/com/webcodepro/applecommander/ui/swt/DiskWindow.java index e714f0d..1c66f2e 100644 --- a/src/com/webcodepro/applecommander/ui/swt/DiskWindow.java +++ b/src/com/webcodepro/applecommander/ui/swt/DiskWindow.java @@ -19,8 +19,6 @@ */ package com.webcodepro.applecommander.ui.swt; -import com.webcodepro.applecommander.storage.FormattedDisk; - import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CTabFolder; import org.eclipse.swt.events.DisposeEvent; @@ -28,6 +26,9 @@ import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Shell; +import com.webcodepro.applecommander.storage.FormattedDisk; +import com.webcodepro.applecommander.ui.swt.util.ImageManager; + /** * Displays disk information on the screen. *

diff --git a/src/com/webcodepro/applecommander/ui/swt/FileViewerWindow.java b/src/com/webcodepro/applecommander/ui/swt/FileViewerWindow.java index 37cc5fc..6487b81 100644 --- a/src/com/webcodepro/applecommander/ui/swt/FileViewerWindow.java +++ b/src/com/webcodepro/applecommander/ui/swt/FileViewerWindow.java @@ -19,20 +19,6 @@ */ package com.webcodepro.applecommander.ui.swt; -import com.webcodepro.applecommander.storage.AppleWorksDataBaseFileFilter; -import com.webcodepro.applecommander.storage.AppleWorksSpreadSheetFileFilter; -import com.webcodepro.applecommander.storage.AppleWorksWordProcessorFileFilter; -import com.webcodepro.applecommander.storage.ApplesoftFileFilter; -import com.webcodepro.applecommander.storage.FileEntry; -import com.webcodepro.applecommander.storage.FileFilter; -import com.webcodepro.applecommander.storage.GraphicsFileFilter; -import com.webcodepro.applecommander.storage.HexDumpFileFilter; -import com.webcodepro.applecommander.storage.IntegerBasicFileFilter; -import com.webcodepro.applecommander.storage.TextFileFilter; -import com.webcodepro.applecommander.util.AppleUtil; -import com.webcodepro.applecommander.util.ApplesoftToken; -import com.webcodepro.applecommander.util.ApplesoftTokenizer; - import java.io.ByteArrayInputStream; import org.eclipse.swt.SWT; @@ -65,6 +51,22 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.ToolItem; +import com.webcodepro.applecommander.storage.FileEntry; +import com.webcodepro.applecommander.storage.FileFilter; +import com.webcodepro.applecommander.storage.filters.AppleWorksDataBaseFileFilter; +import com.webcodepro.applecommander.storage.filters.AppleWorksSpreadSheetFileFilter; +import com.webcodepro.applecommander.storage.filters.AppleWorksWordProcessorFileFilter; +import com.webcodepro.applecommander.storage.filters.ApplesoftFileFilter; +import com.webcodepro.applecommander.storage.filters.GraphicsFileFilter; +import com.webcodepro.applecommander.storage.filters.HexDumpFileFilter; +import com.webcodepro.applecommander.storage.filters.IntegerBasicFileFilter; +import com.webcodepro.applecommander.storage.filters.TextFileFilter; +import com.webcodepro.applecommander.ui.swt.util.ImageCanvas; +import com.webcodepro.applecommander.ui.swt.util.ImageManager; +import com.webcodepro.applecommander.util.AppleUtil; +import com.webcodepro.applecommander.util.ApplesoftToken; +import com.webcodepro.applecommander.util.ApplesoftTokenizer; + /** * View a particular files content. *

diff --git a/src/com/webcodepro/applecommander/ui/swt/SwtAppleCommander.java b/src/com/webcodepro/applecommander/ui/swt/SwtAppleCommander.java index 789c694..d1d328b 100644 --- a/src/com/webcodepro/applecommander/ui/swt/SwtAppleCommander.java +++ b/src/com/webcodepro/applecommander/ui/swt/SwtAppleCommander.java @@ -19,13 +19,6 @@ */ package com.webcodepro.applecommander.ui.swt; -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; -import com.webcodepro.applecommander.ui.swt.wizard.comparedisks.CompareDisksWizard; - import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; @@ -43,6 +36,16 @@ 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; +import com.webcodepro.applecommander.ui.swt.util.ImageCanvas; +import com.webcodepro.applecommander.ui.swt.util.ImageManager; +import com.webcodepro.applecommander.ui.swt.wizard.comparedisks.CompareDisksWizard; +import com.webcodepro.applecommander.ui.swt.wizard.diskimage.DiskImageWizard; + /** * Main class for the SwtAppleCommander interface. *

diff --git a/src/com/webcodepro/applecommander/ui/swt/DropDownSelectionListener.java b/src/com/webcodepro/applecommander/ui/swt/util/DropDownSelectionListener.java similarity index 98% rename from src/com/webcodepro/applecommander/ui/swt/DropDownSelectionListener.java rename to src/com/webcodepro/applecommander/ui/swt/util/DropDownSelectionListener.java index ebaa1d5..898f19c 100644 --- a/src/com/webcodepro/applecommander/ui/swt/DropDownSelectionListener.java +++ b/src/com/webcodepro/applecommander/ui/swt/util/DropDownSelectionListener.java @@ -17,7 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.ui.swt; +package com.webcodepro.applecommander.ui.swt.util; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; diff --git a/src/com/webcodepro/applecommander/ui/swt/ImageCanvas.java b/src/com/webcodepro/applecommander/ui/swt/util/ImageCanvas.java similarity index 97% rename from src/com/webcodepro/applecommander/ui/swt/ImageCanvas.java rename to src/com/webcodepro/applecommander/ui/swt/util/ImageCanvas.java index 64d5701..f39da91 100644 --- a/src/com/webcodepro/applecommander/ui/swt/ImageCanvas.java +++ b/src/com/webcodepro/applecommander/ui/swt/util/ImageCanvas.java @@ -17,7 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.ui.swt; +package com.webcodepro.applecommander.ui.swt.util; import org.eclipse.swt.SWT; import org.eclipse.swt.events.PaintEvent; diff --git a/src/com/webcodepro/applecommander/ui/swt/ImageManager.java b/src/com/webcodepro/applecommander/ui/swt/util/ImageManager.java similarity index 98% rename from src/com/webcodepro/applecommander/ui/swt/ImageManager.java rename to src/com/webcodepro/applecommander/ui/swt/util/ImageManager.java index 488fd47..d335107 100644 --- a/src/com/webcodepro/applecommander/ui/swt/ImageManager.java +++ b/src/com/webcodepro/applecommander/ui/swt/util/ImageManager.java @@ -17,7 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.ui.swt; +package com.webcodepro.applecommander.ui.swt.util; import java.io.InputStream; import java.util.HashMap; @@ -100,7 +100,7 @@ public class ImageManager { /** * Construct the ImageManager and load all images. */ - protected ImageManager(Display display) { + public ImageManager(Display display) { for (int i=0; i diff --git a/src/com/webcodepro/applecommander/ui/swt/CompileWizard.java b/src/com/webcodepro/applecommander/ui/swt/wizard/compilefile/CompileWizard.java similarity index 88% rename from src/com/webcodepro/applecommander/ui/swt/CompileWizard.java rename to src/com/webcodepro/applecommander/ui/swt/wizard/compilefile/CompileWizard.java index 7e9a578..dd01890 100644 --- a/src/com/webcodepro/applecommander/ui/swt/CompileWizard.java +++ b/src/com/webcodepro/applecommander/ui/swt/wizard/compilefile/CompileWizard.java @@ -17,12 +17,15 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.ui.swt; - -import com.webcodepro.applecommander.storage.FormattedDisk; +package com.webcodepro.applecommander.ui.swt.wizard.compilefile; import org.eclipse.swt.widgets.Shell; +import com.webcodepro.applecommander.storage.FormattedDisk; +import com.webcodepro.applecommander.ui.swt.util.ImageManager; +import com.webcodepro.applecommander.ui.swt.wizard.Wizard; +import com.webcodepro.applecommander.ui.swt.wizard.WizardPane; + /** * Compile wizard. *

diff --git a/src/com/webcodepro/applecommander/ui/swt/DiskImageFormatPane.java b/src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageFormatPane.java similarity index 97% rename from src/com/webcodepro/applecommander/ui/swt/DiskImageFormatPane.java rename to src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageFormatPane.java index 2da8d12..d75b9c1 100644 --- a/src/com/webcodepro/applecommander/ui/swt/DiskImageFormatPane.java +++ b/src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageFormatPane.java @@ -17,9 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.ui.swt; - -import com.webcodepro.applecommander.storage.FormattedDisk; +package com.webcodepro.applecommander.ui.swt.wizard.diskimage; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -29,6 +27,9 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; +import com.webcodepro.applecommander.storage.FormattedDisk; +import com.webcodepro.applecommander.ui.swt.wizard.WizardPane; + /** * Allow the user to choose the which operating system to format the * disk with. diff --git a/src/com/webcodepro/applecommander/ui/swt/DiskImageNamePane.java b/src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageNamePane.java similarity index 97% rename from src/com/webcodepro/applecommander/ui/swt/DiskImageNamePane.java rename to src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageNamePane.java index 25d6b01..7c5d976 100644 --- a/src/com/webcodepro/applecommander/ui/swt/DiskImageNamePane.java +++ b/src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageNamePane.java @@ -17,7 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.ui.swt; +package com.webcodepro.applecommander.ui.swt.wizard.diskimage; import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyAdapter; @@ -28,6 +28,8 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; +import com.webcodepro.applecommander.ui.swt.wizard.WizardPane; + /** * Allow the user to choose the names of the disk image, as well as the * volume name, if appropriate. diff --git a/src/com/webcodepro/applecommander/ui/swt/DiskImageOrderPane.java b/src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageOrderPane.java similarity index 97% rename from src/com/webcodepro/applecommander/ui/swt/DiskImageOrderPane.java rename to src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageOrderPane.java index a431ef9..1382992 100644 --- a/src/com/webcodepro/applecommander/ui/swt/DiskImageOrderPane.java +++ b/src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageOrderPane.java @@ -17,9 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.ui.swt; - -import com.webcodepro.applecommander.storage.Disk; +package com.webcodepro.applecommander.ui.swt.wizard.diskimage; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -29,6 +27,9 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; +import com.webcodepro.applecommander.storage.Disk; +import com.webcodepro.applecommander.ui.swt.wizard.WizardPane; + /** * Allow the user to choose the order of the disk image, as well as * compression. diff --git a/src/com/webcodepro/applecommander/ui/swt/DiskImageSizePane.java b/src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageSizePane.java similarity index 96% rename from src/com/webcodepro/applecommander/ui/swt/DiskImageSizePane.java rename to src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageSizePane.java index 2d62846..dc54e7c 100644 --- a/src/com/webcodepro/applecommander/ui/swt/DiskImageSizePane.java +++ b/src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageSizePane.java @@ -17,9 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.ui.swt; - -import com.webcodepro.applecommander.storage.FormattedDisk; +package com.webcodepro.applecommander.ui.swt.wizard.diskimage; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -29,6 +27,9 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; +import com.webcodepro.applecommander.storage.FormattedDisk; +import com.webcodepro.applecommander.ui.swt.wizard.WizardPane; + /** * Allow the user to choose the size of the disk image, as appropriate. *
diff --git a/src/com/webcodepro/applecommander/ui/swt/DiskImageWizard.java b/src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageWizard.java similarity index 88% rename from src/com/webcodepro/applecommander/ui/swt/DiskImageWizard.java rename to src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageWizard.java index a1ddaec..1af562b 100644 --- a/src/com/webcodepro/applecommander/ui/swt/DiskImageWizard.java +++ b/src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageWizard.java @@ -17,24 +17,27 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.ui.swt; +package com.webcodepro.applecommander.ui.swt.wizard.diskimage; + +import org.eclipse.swt.widgets.Shell; import com.webcodepro.applecommander.storage.Disk; -import com.webcodepro.applecommander.storage.DosFormatDisk; import com.webcodepro.applecommander.storage.FormattedDisk; -import com.webcodepro.applecommander.storage.OzDosFormatDisk; -import com.webcodepro.applecommander.storage.PascalFormatDisk; -import com.webcodepro.applecommander.storage.ProdosFormatDisk; -import com.webcodepro.applecommander.storage.RdosFormatDisk; -import com.webcodepro.applecommander.storage.UniDosFormatDisk; -import com.webcodepro.applecommander.storage.cpm.CpmFormatDisk; +import com.webcodepro.applecommander.storage.os.cpm.CpmFormatDisk; +import com.webcodepro.applecommander.storage.os.dos33.DosFormatDisk; +import com.webcodepro.applecommander.storage.os.dos33.OzDosFormatDisk; +import com.webcodepro.applecommander.storage.os.dos33.UniDosFormatDisk; +import com.webcodepro.applecommander.storage.os.pascal.PascalFormatDisk; +import com.webcodepro.applecommander.storage.os.prodos.ProdosFormatDisk; +import com.webcodepro.applecommander.storage.os.rdos.RdosFormatDisk; import com.webcodepro.applecommander.storage.physical.ByteArrayImageLayout; import com.webcodepro.applecommander.storage.physical.DosOrder; import com.webcodepro.applecommander.storage.physical.ImageOrder; import com.webcodepro.applecommander.storage.physical.NibbleOrder; import com.webcodepro.applecommander.storage.physical.ProdosOrder; - -import org.eclipse.swt.widgets.Shell; +import com.webcodepro.applecommander.ui.swt.util.ImageManager; +import com.webcodepro.applecommander.ui.swt.wizard.Wizard; +import com.webcodepro.applecommander.ui.swt.wizard.WizardPane; /** * Disk Image Wizard. diff --git a/src/com/webcodepro/applecommander/ui/swt/AppleWorksWordProcessorPane.java b/src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/AppleWorksWordProcessorPane.java similarity index 94% rename from src/com/webcodepro/applecommander/ui/swt/AppleWorksWordProcessorPane.java rename to src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/AppleWorksWordProcessorPane.java index 9a8b7ba..4bf61cc 100644 --- a/src/com/webcodepro/applecommander/ui/swt/AppleWorksWordProcessorPane.java +++ b/src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/AppleWorksWordProcessorPane.java @@ -17,9 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.ui.swt; - -import com.webcodepro.applecommander.storage.AppleWorksWordProcessorFileFilter; +package com.webcodepro.applecommander.ui.swt.wizard.exportfile; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -29,6 +27,9 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; +import com.webcodepro.applecommander.storage.filters.AppleWorksWordProcessorFileFilter; +import com.webcodepro.applecommander.ui.swt.wizard.WizardPane; + /** * Choose format for AppleWorks Word Processor export. *

diff --git a/src/com/webcodepro/applecommander/ui/swt/ExportFileDestinationPane.java b/src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportFileDestinationPane.java similarity index 96% rename from src/com/webcodepro/applecommander/ui/swt/ExportFileDestinationPane.java rename to src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportFileDestinationPane.java index 5b9e4d1..566c638 100644 --- a/src/com/webcodepro/applecommander/ui/swt/ExportFileDestinationPane.java +++ b/src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportFileDestinationPane.java @@ -17,7 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.ui.swt; +package com.webcodepro.applecommander.ui.swt.wizard.exportfile; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -33,6 +33,8 @@ import org.eclipse.swt.widgets.DirectoryDialog; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; +import com.webcodepro.applecommander.ui.swt.wizard.WizardPane; + /** * Set locations and file names for the export. *

diff --git a/src/com/webcodepro/applecommander/ui/swt/ExportFileStartPane.java b/src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportFileStartPane.java similarity index 89% rename from src/com/webcodepro/applecommander/ui/swt/ExportFileStartPane.java rename to src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportFileStartPane.java index 4d0fbb3..a6db621 100644 --- a/src/com/webcodepro/applecommander/ui/swt/ExportFileStartPane.java +++ b/src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportFileStartPane.java @@ -17,17 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.ui.swt; - -import com.webcodepro.applecommander.storage.AppleWorksDataBaseFileFilter; -import com.webcodepro.applecommander.storage.AppleWorksSpreadSheetFileFilter; -import com.webcodepro.applecommander.storage.AppleWorksWordProcessorFileFilter; -import com.webcodepro.applecommander.storage.ApplesoftFileFilter; -import com.webcodepro.applecommander.storage.BinaryFileFilter; -import com.webcodepro.applecommander.storage.GraphicsFileFilter; -import com.webcodepro.applecommander.storage.HexDumpFileFilter; -import com.webcodepro.applecommander.storage.IntegerBasicFileFilter; -import com.webcodepro.applecommander.storage.TextFileFilter; +package com.webcodepro.applecommander.ui.swt.wizard.exportfile; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -37,6 +27,17 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; +import com.webcodepro.applecommander.storage.filters.AppleWorksDataBaseFileFilter; +import com.webcodepro.applecommander.storage.filters.AppleWorksSpreadSheetFileFilter; +import com.webcodepro.applecommander.storage.filters.AppleWorksWordProcessorFileFilter; +import com.webcodepro.applecommander.storage.filters.ApplesoftFileFilter; +import com.webcodepro.applecommander.storage.filters.BinaryFileFilter; +import com.webcodepro.applecommander.storage.filters.GraphicsFileFilter; +import com.webcodepro.applecommander.storage.filters.HexDumpFileFilter; +import com.webcodepro.applecommander.storage.filters.IntegerBasicFileFilter; +import com.webcodepro.applecommander.storage.filters.TextFileFilter; +import com.webcodepro.applecommander.ui.swt.wizard.WizardPane; + /** * Provides the wizard pane which gets the export filter. *

diff --git a/src/com/webcodepro/applecommander/ui/swt/ExportGraphicsTypePane.java b/src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportGraphicsTypePane.java similarity index 96% rename from src/com/webcodepro/applecommander/ui/swt/ExportGraphicsTypePane.java rename to src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportGraphicsTypePane.java index c4b2bf8..e76aecf 100644 --- a/src/com/webcodepro/applecommander/ui/swt/ExportGraphicsTypePane.java +++ b/src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportGraphicsTypePane.java @@ -17,9 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.ui.swt; - -import com.webcodepro.applecommander.storage.GraphicsFileFilter; +package com.webcodepro.applecommander.ui.swt.wizard.exportfile; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -29,6 +27,9 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; +import com.webcodepro.applecommander.storage.filters.GraphicsFileFilter; +import com.webcodepro.applecommander.ui.swt.wizard.WizardPane; + /** * Choose graphics options for file export. *

diff --git a/src/com/webcodepro/applecommander/ui/swt/ExportWizard.java b/src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportWizard.java similarity index 90% rename from src/com/webcodepro/applecommander/ui/swt/ExportWizard.java rename to src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportWizard.java index 7d19df6..98d8c73 100644 --- a/src/com/webcodepro/applecommander/ui/swt/ExportWizard.java +++ b/src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportWizard.java @@ -17,12 +17,15 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.ui.swt; +package com.webcodepro.applecommander.ui.swt.wizard.exportfile; + +import org.eclipse.swt.widgets.Shell; import com.webcodepro.applecommander.storage.FileFilter; import com.webcodepro.applecommander.storage.FormattedDisk; - -import org.eclipse.swt.widgets.Shell; +import com.webcodepro.applecommander.ui.swt.util.ImageManager; +import com.webcodepro.applecommander.ui.swt.wizard.Wizard; +import com.webcodepro.applecommander.ui.swt.wizard.WizardPane; /** * File export wizard. diff --git a/src/com/webcodepro/applecommander/ui/swt/ImportSelectFilesWizardPane.java b/src/com/webcodepro/applecommander/ui/swt/wizard/importfile/ImportSelectFilesWizardPane.java similarity index 98% rename from src/com/webcodepro/applecommander/ui/swt/ImportSelectFilesWizardPane.java rename to src/com/webcodepro/applecommander/ui/swt/wizard/importfile/ImportSelectFilesWizardPane.java index 6cde5b1..bedd26e 100644 --- a/src/com/webcodepro/applecommander/ui/swt/ImportSelectFilesWizardPane.java +++ b/src/com/webcodepro/applecommander/ui/swt/wizard/importfile/ImportSelectFilesWizardPane.java @@ -1,8 +1,4 @@ -package com.webcodepro.applecommander.ui.swt; - -import com.webcodepro.applecommander.ui.ImportSpecification; -import com.webcodepro.applecommander.ui.UserPreferences; -import com.webcodepro.applecommander.util.AppleUtil; +package com.webcodepro.applecommander.ui.swt.wizard.importfile; import java.io.File; import java.util.Iterator; @@ -26,6 +22,12 @@ import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.Text; +import com.webcodepro.applecommander.ui.ImportSpecification; +import com.webcodepro.applecommander.ui.UserPreferences; +import com.webcodepro.applecommander.ui.swt.util.SwtUtil; +import com.webcodepro.applecommander.ui.swt.wizard.WizardPane; +import com.webcodepro.applecommander.util.AppleUtil; + /** * Allow the used to choose the files to import into the disk image. *
diff --git a/src/com/webcodepro/applecommander/ui/swt/ImportWizard.java b/src/com/webcodepro/applecommander/ui/swt/wizard/importfile/ImportWizard.java similarity index 90% rename from src/com/webcodepro/applecommander/ui/swt/ImportWizard.java rename to src/com/webcodepro/applecommander/ui/swt/wizard/importfile/ImportWizard.java index 238c3aa..c313a7b 100644 --- a/src/com/webcodepro/applecommander/ui/swt/ImportWizard.java +++ b/src/com/webcodepro/applecommander/ui/swt/wizard/importfile/ImportWizard.java @@ -17,16 +17,19 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.webcodepro.applecommander.ui.swt; - -import com.webcodepro.applecommander.storage.FormattedDisk; -import com.webcodepro.applecommander.ui.ImportSpecification; +package com.webcodepro.applecommander.ui.swt.wizard.importfile; import java.util.ArrayList; import java.util.List; import org.eclipse.swt.widgets.Shell; +import com.webcodepro.applecommander.storage.FormattedDisk; +import com.webcodepro.applecommander.ui.ImportSpecification; +import com.webcodepro.applecommander.ui.swt.util.ImageManager; +import com.webcodepro.applecommander.ui.swt.wizard.Wizard; +import com.webcodepro.applecommander.ui.swt.wizard.WizardPane; + /** * The Disk Import Wizard. *
diff --git a/test/com/webcodepro/applecommander/compiler/ApplesoftCompilerTest.java b/test/com/webcodepro/applecommander/compiler/ApplesoftCompilerTest.java index 3a8cd03..be69166 100644 --- a/test/com/webcodepro/applecommander/compiler/ApplesoftCompilerTest.java +++ b/test/com/webcodepro/applecommander/compiler/ApplesoftCompilerTest.java @@ -19,10 +19,9 @@ */ package com.webcodepro.applecommander.compiler; -import com.webcodepro.applecommander.compiler.ApplesoftCompiler; import com.webcodepro.applecommander.storage.Disk; -import com.webcodepro.applecommander.storage.DosFormatDisk; import com.webcodepro.applecommander.storage.FileEntry; +import com.webcodepro.applecommander.storage.os.dos33.DosFormatDisk; import java.io.FileOutputStream; diff --git a/test/com/webcodepro/applecommander/storage/DiskHelperTest.java b/test/com/webcodepro/applecommander/storage/DiskHelperTest.java index c517bfa..c268019 100644 --- a/test/com/webcodepro/applecommander/storage/DiskHelperTest.java +++ b/test/com/webcodepro/applecommander/storage/DiskHelperTest.java @@ -19,16 +19,12 @@ */ package com.webcodepro.applecommander.storage; -import com.webcodepro.applecommander.storage.ApplesoftFileFilter; -import com.webcodepro.applecommander.storage.BinaryFileFilter; -import com.webcodepro.applecommander.storage.DirectoryEntry; -import com.webcodepro.applecommander.storage.Disk; -import com.webcodepro.applecommander.storage.FileEntry; -import com.webcodepro.applecommander.storage.FormattedDisk; -import com.webcodepro.applecommander.storage.GraphicsFileFilter; -import com.webcodepro.applecommander.storage.IntegerBasicFileFilter; -import com.webcodepro.applecommander.storage.TextFileFilter; import com.webcodepro.applecommander.storage.FormattedDisk.DiskUsage; +import com.webcodepro.applecommander.storage.filters.ApplesoftFileFilter; +import com.webcodepro.applecommander.storage.filters.BinaryFileFilter; +import com.webcodepro.applecommander.storage.filters.GraphicsFileFilter; +import com.webcodepro.applecommander.storage.filters.IntegerBasicFileFilter; +import com.webcodepro.applecommander.storage.filters.TextFileFilter; import java.io.IOException; import java.util.List; diff --git a/test/com/webcodepro/applecommander/storage/DiskWriterTest.java b/test/com/webcodepro/applecommander/storage/DiskWriterTest.java index 92af28b..9c236b3 100644 --- a/test/com/webcodepro/applecommander/storage/DiskWriterTest.java +++ b/test/com/webcodepro/applecommander/storage/DiskWriterTest.java @@ -19,27 +19,22 @@ */ package com.webcodepro.applecommander.storage; -import com.webcodepro.applecommander.storage.DirectoryEntry; -import com.webcodepro.applecommander.storage.Disk; -import com.webcodepro.applecommander.storage.DiskFullException; -import com.webcodepro.applecommander.storage.DosFormatDisk; -import com.webcodepro.applecommander.storage.FileEntry; -import com.webcodepro.applecommander.storage.FormattedDisk; -import com.webcodepro.applecommander.storage.OzDosFormatDisk; -import com.webcodepro.applecommander.storage.ProdosFormatDisk; -import com.webcodepro.applecommander.storage.UniDosFormatDisk; +import java.io.IOException; +import java.util.List; + +import junit.framework.TestCase; + import com.webcodepro.applecommander.storage.FormattedDisk.DiskUsage; +import com.webcodepro.applecommander.storage.os.dos33.DosFormatDisk; +import com.webcodepro.applecommander.storage.os.dos33.OzDosFormatDisk; +import com.webcodepro.applecommander.storage.os.dos33.UniDosFormatDisk; +import com.webcodepro.applecommander.storage.os.prodos.ProdosFormatDisk; import com.webcodepro.applecommander.storage.physical.ByteArrayImageLayout; import com.webcodepro.applecommander.storage.physical.DosOrder; import com.webcodepro.applecommander.storage.physical.ImageOrder; import com.webcodepro.applecommander.storage.physical.NibbleOrder; import com.webcodepro.applecommander.storage.physical.ProdosOrder; -import java.io.IOException; -import java.util.List; - -import junit.framework.TestCase; - /** * Test Disk and FormattedDisk for write. *

diff --git a/test/com/webcodepro/applecommander/util/AppleUtilTest.java b/test/com/webcodepro/applecommander/util/AppleUtilTest.java index 3a8da18..101aaa9 100644 --- a/test/com/webcodepro/applecommander/util/AppleUtilTest.java +++ b/test/com/webcodepro/applecommander/util/AppleUtilTest.java @@ -23,13 +23,13 @@ import junit.framework.TestCase; import com.webcodepro.applecommander.storage.Disk; import com.webcodepro.applecommander.storage.DiskFullException; -import com.webcodepro.applecommander.storage.DosFormatDisk; import com.webcodepro.applecommander.storage.FileEntry; -import com.webcodepro.applecommander.storage.ProdosFormatDisk; +import com.webcodepro.applecommander.storage.os.dos33.DosFormatDisk; import com.webcodepro.applecommander.storage.physical.ByteArrayImageLayout; import com.webcodepro.applecommander.storage.physical.DosOrder; import com.webcodepro.applecommander.storage.physical.NibbleOrder; import com.webcodepro.applecommander.storage.physical.ProdosOrder; +import com.webcodepro.applecommander.storage.os.prodos.ProdosFormatDisk; /** * Test AppleUtil.