* Address for Apple2 HGR/DHR address is calculated from an observation of a pattern:
* line number bits: 87654321
- * 87 are multipled by 0x0028
- * 65 are multipled by 0x0100
+ * 87 are multiplied by 0x0028
+ * 65 are multiplied by 0x0100
* 4 is multiplied by 0x0080
- * 321 are multipled by 0x0400
+ * 321 are multiplied by 0x0400
*
* HGR bit values ignore the high bit, as that switches the "palette", and for B&W mode, * the bit does nothing. The other 7 bits simply toggle the pixel on or off. Double hires @@ -45,8 +45,8 @@ import com.webcodepro.applecommander.util.AppleUtil; * graphics (hence, the 560 instead of 640 resolution). *
* SHR has been implemented in "16 color" mode as well as 3200 color mode. Note that - * 16 color mode is really 16 pallettes of 16 colors while 3200 color mode is 200 - * pallettes of 16 colors (one pallette per line). + * 16 color mode is really 16 palettes of 16 colors while 3200 color mode is 200 + * palettes of 16 colors (one palette per line). *
* NOTE: The design is feeling kludgy. There are 6 distinct variations - possibly a * subclass is needed to interpret the various graphic image or some such redesign. @@ -197,7 +197,7 @@ public class GraphicsFileFilter implements FileFilter { * HGR color is two bits to determine color - essentially resolution is * 140 horizontally, but it indicates the color for two pixels. *
- * The names of pixles is a bit confusion - pixel0 is really the left-most
+ * The names of pixels is a bit confusion - pixel0 is really the left-most
* pixel (not the low-value bit).
* To alleviate my bad naming, here is a color table to assist:
*
@@ -235,7 +235,7 @@ public class GraphicsFileFilter implements FileFilter { if (pixel0 && highbit) { color = 0x0000ff; // blue } else if (pixel0 && !highbit) { - color = 0xff00ff; // voilet + color = 0xff00ff; // violet } else if (pixel1 && !highbit) { color = 0x00ff00; // green } else { // pixel1 && highbit @@ -305,7 +305,7 @@ public class GraphicsFileFilter implements FileFilter { int[] colorValues = { 0x000000, 0xff0000, 0x800000, 0xff8000, // black, magenta, brown, orange 0x008000, 0x808080, 0x00ff00, 0xffff00, // dark green, grey1, green, yellow - 0x000080, 0xff00ff, 0x808080, 0xff80c0, // dark blue, voilet, grey2, pink + 0x000080, 0xff00ff, 0x808080, 0xff80c0, // dark blue, violet, grey2, pink 0x0000a0, 0x0000ff, 0x00c080, 0xffffff // medium blue, light blue, aqua, white }; for (int x=0; x<560; x+=4) { @@ -454,7 +454,7 @@ public class GraphicsFileFilter implements FileFilter { int[] colors = { // this is a wild guess, by the way! 0x000000, 0xff0000, 0x800000, 0xff8000, // black, magenta, brown, orange 0x008000, 0x808080, 0x00ff00, 0xffff00, // dark green, grey1, green, yellow - 0x000080, 0xff00ff, 0x808080, 0xff80c0, // dark blue, voilet, grey2, pink + 0x000080, 0xff00ff, 0x808080, 0xff80c0, // dark blue, violet, grey2, pink 0x0000a0, 0x0000ff, 0x00c080, 0xffffff // medium blue, light blue, aqua, white }; int[] grays = { // a logical guess... diff --git a/src/main/java/com/webcodepro/applecommander/storage/filters/PascalTextFileFilter.java b/src/main/java/com/webcodepro/applecommander/storage/filters/PascalTextFileFilter.java index fdb89d7..6c804a7 100644 --- a/src/main/java/com/webcodepro/applecommander/storage/filters/PascalTextFileFilter.java +++ b/src/main/java/com/webcodepro/applecommander/storage/filters/PascalTextFileFilter.java @@ -38,10 +38,10 @@ import com.webcodepro.applecommander.storage.FileFilter; * by all portions of the system. When a user program opens a text file, * and REWRITEs or RESETs it with a title ending in .TEXT, the I/O * subsystem will create and skip over the initial header page. This is - * done to faciliatie users editing their input and/or output data. The - * file-handler wil transfer the header page only on a disk-to-disk + * done to facilitate users editing their input and/or output data. The + * file-handler will transfer the header page only on a disk-to-disk * transfer, and will omit it on a transfer to a serial device (thus - * transfers to PRINTER: abd CONSOLE: will omit the header page). + * transfers to PRINTER: and CONSOLE: will omit the header page). *- * XX is then shifted by a bit and ANDed with YY to get the databyte. + * XX is then shifted by a bit and ANDed with YY to get the data byte. * See page 3-12 in Beneath Apple DOS for more information. */ protected int decodeOddEven(byte[] buffer, int offset) { diff --git a/src/main/java/com/webcodepro/applecommander/ui/UiBundle.java b/src/main/java/com/webcodepro/applecommander/ui/UiBundle.java index 43c4661..14d0c22 100644 --- a/src/main/java/com/webcodepro/applecommander/ui/UiBundle.java +++ b/src/main/java/com/webcodepro/applecommander/ui/UiBundle.java @@ -23,7 +23,7 @@ import com.webcodepro.applecommander.util.TextBundle; /** * Manage the user-interface specific ResourceBundle. Inheritance is used to - * allow logical groupings of ResourceBundles and to reuse the common metods. + * allow logical groupings of ResourceBundles and to reuse the common methods. * * @author Rob Greene */ diff --git a/src/main/java/com/webcodepro/applecommander/ui/swt/filteradapter/RawDumpFilterAdapter.java b/src/main/java/com/webcodepro/applecommander/ui/swt/filteradapter/RawDumpFilterAdapter.java index 6332677..ee7efcb 100644 --- a/src/main/java/com/webcodepro/applecommander/ui/swt/filteradapter/RawDumpFilterAdapter.java +++ b/src/main/java/com/webcodepro/applecommander/ui/swt/filteradapter/RawDumpFilterAdapter.java @@ -26,7 +26,7 @@ import com.webcodepro.applecommander.util.AppleUtil; /** * Provides a view of a raw hex dump from the diskette. This includes any operating - * system-specific data (ie, for DOS it may include starting address and/or length). + * system-specific data (i.e., for DOS it may include starting address and/or length). * * @author Rob Greene */ diff --git a/src/main/java/com/webcodepro/applecommander/util/AppleUtil.java b/src/main/java/com/webcodepro/applecommander/util/AppleUtil.java index 13147b2..438dd28 100644 --- a/src/main/java/com/webcodepro/applecommander/util/AppleUtil.java +++ b/src/main/java/com/webcodepro/applecommander/util/AppleUtil.java @@ -294,7 +294,7 @@ public class AppleUtil { } /** - * Format a byte value as hexidecimal. + * Format a byte value as hexadecimal. */ public static String getFormattedByte(int byt) { int byt1 = byt & 0x0f; @@ -306,7 +306,7 @@ public class AppleUtil { } /** - * Format a word value as hexidecimal. + * Format a word value as hexadecimal. */ public static String getFormattedWord(int word) { return getFormattedByte((word & 0xff00) >> 8) @@ -314,7 +314,7 @@ public class AppleUtil { } /** - * Format a 3 byte value as hexidecimal. + * Format a 3 byte value as hexadecimal. */ public static String getFormatted3ByteAddress(int addr) { return getFormattedByte((addr & 0xff0000) >> 16) @@ -515,7 +515,7 @@ public class AppleUtil { * 5 bytes long, a float will not work - hence the double. Some * precision is lost, but (hopefully) nothing significant! ** Following the initial header page, the text itself appears in * subsequent 1024-byte text pages (two block each, on diskette), diff --git a/src/main/java/com/webcodepro/applecommander/storage/os/cpm/CpmFileEntry.java b/src/main/java/com/webcodepro/applecommander/storage/os/cpm/CpmFileEntry.java index e8a02d3..dc3b7c2 100644 --- a/src/main/java/com/webcodepro/applecommander/storage/os/cpm/CpmFileEntry.java +++ b/src/main/java/com/webcodepro/applecommander/storage/os/cpm/CpmFileEntry.java @@ -342,7 +342,7 @@ public class CpmFileEntry implements FileEntry { /** * Return the user number (UU). 0-15 on Apple CP/M (can range to 31 * on some systems). The user number allows multiple files with the - * same name to coexist on the disk. Apparantly, this is used in + * same name to coexist on the disk. Apparently, this is used in * conjunction with deleted files. */ public int getUserNumber(int entryNumber) { diff --git a/src/main/java/com/webcodepro/applecommander/storage/os/cpm/CpmFormatDisk.java b/src/main/java/com/webcodepro/applecommander/storage/os/cpm/CpmFormatDisk.java index 3332f3b..b6746a2 100644 --- a/src/main/java/com/webcodepro/applecommander/storage/os/cpm/CpmFormatDisk.java +++ b/src/main/java/com/webcodepro/applecommander/storage/os/cpm/CpmFormatDisk.java @@ -115,7 +115,7 @@ public class CpmFormatDisk extends FormattedDisk { } /** - * There apparantly is no corresponding CP/M disk name. + * There apparently is no corresponding CP/M disk name. * @see com.webcodepro.applecommander.storage.FormattedDisk#getDiskName() */ public String getDiskName() { @@ -515,7 +515,7 @@ public class CpmFormatDisk extends FormattedDisk { /** * Change to a different ImageOrder. Remains in CP/M format but - * the underlying order can chage. + * the underlying order can change. * @see ImageOrder */ public void changeImageOrder(ImageOrder imageOrder) { diff --git a/src/main/java/com/webcodepro/applecommander/storage/os/dos33/DosFormatDisk.java b/src/main/java/com/webcodepro/applecommander/storage/os/dos33/DosFormatDisk.java index a388271..a2a9997 100644 --- a/src/main/java/com/webcodepro/applecommander/storage/os/dos33/DosFormatDisk.java +++ b/src/main/java/com/webcodepro/applecommander/storage/os/dos33/DosFormatDisk.java @@ -76,7 +76,7 @@ public class DosFormatDisk extends FormattedDisk { /** * Use this inner interface for managing the disk usage data. - * This offloads format-specific implementation to the implementing class. + * This off-loads format-specific implementation to the implementing class. */ private class DosDiskUsage implements DiskUsage { private int[] location = null; @@ -206,7 +206,7 @@ public class DosFormatDisk extends FormattedDisk { /** * Indicates if this disk image can create a file. - * If not, the reason may be as simple as it has not beem implemented + * If not, the reason may be as simple as it has not been implemented * to something specific about the disk. */ public boolean canCreateFile() { @@ -224,7 +224,7 @@ public class DosFormatDisk extends FormattedDisk { } /** - * Comput the number of free sectors available on the disk. + * Compute the number of free sectors available on the disk. */ public int getFreeSectors() { byte[] vtoc = readVtoc(); @@ -579,7 +579,7 @@ public class DosFormatDisk extends FormattedDisk { } /** - * Format the disk as DOS 3.3 given the dymanic parameters. + * Format the disk as DOS 3.3 given the dynamic parameters. * (Used for UniDOS and OzDOS.) */ protected void format(int firstCatalogSector, int tracksPerDisk, @@ -748,7 +748,7 @@ public class DosFormatDisk extends FormattedDisk { /** * Change to a different ImageOrder. Remains in DOS 3.3 format but - * the underlying order can chage. + * the underlying order can change. * @see ImageOrder */ public void changeImageOrder(ImageOrder imageOrder) { diff --git a/src/main/java/com/webcodepro/applecommander/storage/os/gutenberg/GutenbergFormatDisk.java b/src/main/java/com/webcodepro/applecommander/storage/os/gutenberg/GutenbergFormatDisk.java index 75387ca..80adfb6 100644 --- a/src/main/java/com/webcodepro/applecommander/storage/os/gutenberg/GutenbergFormatDisk.java +++ b/src/main/java/com/webcodepro/applecommander/storage/os/gutenberg/GutenbergFormatDisk.java @@ -68,7 +68,7 @@ public class GutenbergFormatDisk extends FormattedDisk { /** * Use this inner interface for managing the disk usage data. - * This offloads format-specific implementation to the implementing class. + * This off-loads format-specific implementation to the implementing class. */ private class WPDiskUsage implements DiskUsage { private int[] location = null; @@ -189,7 +189,7 @@ public class GutenbergFormatDisk extends FormattedDisk { /** * Indicates if this disk image can create a file. - * If not, the reason may be as simple as it has not beem implemented + * If not, the reason may be as simple as it has not been implemented * to something specific about the disk. */ public boolean canCreateFile() { @@ -510,30 +510,6 @@ public class GutenbergFormatDisk extends FormattedDisk { writeVtoc(vtoc); } - /** - * Free sectors used by a GutenbergFileEntry. - */ -/* - protected void freeSectors(GutenbergFileEntry GutenbergFileEntry) { - byte[] vtoc = readVtoc(); - int track = GutenbergFileEntry.getTrack(); - if (track == 255) return; - int sector = GutenbergFileEntry.getSector(); - while (track != 0) { - setSectorFree(track,sector,vtoc); - byte[] trackSectorList = readSector(track, sector); - track = AppleUtil.getUnsignedByte(trackSectorList[0x01]); - sector = AppleUtil.getUnsignedByte(trackSectorList[0x02]); - for (int i=0x0c; i<0x100; i+=2) { - int t = AppleUtil.getUnsignedByte(trackSectorList[i]); - if (t == 0) break; - int s = AppleUtil.getUnsignedByte(trackSectorList[i+1]); - setSectorFree(t,s,vtoc); - } - } - writeVtoc(vtoc); - } -*/ /** * Format the disk as DOS 3.3. * @see com.webcodepro.applecommander.storage.FormattedDisk#format() @@ -703,7 +679,7 @@ public class GutenbergFormatDisk extends FormattedDisk { /** * Change to a different ImageOrder. Remains in DOS 3.3 format but - * the underlying order can chage. + * the underlying order can change. * @see ImageOrder */ public void changeImageOrder(ImageOrder imageOrder) { diff --git a/src/main/java/com/webcodepro/applecommander/storage/os/nakedos/NakedosFormatDisk.java b/src/main/java/com/webcodepro/applecommander/storage/os/nakedos/NakedosFormatDisk.java index c6f126f..32ebc4e 100644 --- a/src/main/java/com/webcodepro/applecommander/storage/os/nakedos/NakedosFormatDisk.java +++ b/src/main/java/com/webcodepro/applecommander/storage/os/nakedos/NakedosFormatDisk.java @@ -73,7 +73,7 @@ public class NakedosFormatDisk extends FormattedDisk { private static final int[] sectorTranslate = {0, 7, 14, 6, 13, 5, 12, 4, 11, 3, 10, 2, 9, 1, 8, 15}; /** * Use this inner interface for managing the disk usage data. - * This offloads format-specific implementation to the implementing class. + * This off-loads format-specific implementation to the implementing class. */ private class WPDiskUsage implements DiskUsage { private int[] location = null; diff --git a/src/main/java/com/webcodepro/applecommander/storage/os/pascal/PascalFileEntry.java b/src/main/java/com/webcodepro/applecommander/storage/os/pascal/PascalFileEntry.java index a978e80..6260b4b 100644 --- a/src/main/java/com/webcodepro/applecommander/storage/os/pascal/PascalFileEntry.java +++ b/src/main/java/com/webcodepro/applecommander/storage/os/pascal/PascalFileEntry.java @@ -488,7 +488,7 @@ public class PascalFileEntry implements FileEntry { /** * Get the byte[] associated with this FileEntry. - * This is need to manipuate the directory as a whole. + * This is need to manipulate the directory as a whole. */ public byte[] toBytes() { return fileEntry; diff --git a/src/main/java/com/webcodepro/applecommander/storage/os/pascal/PascalFormatDisk.java b/src/main/java/com/webcodepro/applecommander/storage/os/pascal/PascalFormatDisk.java index 49e79c8..87528a6 100644 --- a/src/main/java/com/webcodepro/applecommander/storage/os/pascal/PascalFormatDisk.java +++ b/src/main/java/com/webcodepro/applecommander/storage/os/pascal/PascalFormatDisk.java @@ -69,7 +69,7 @@ public class PascalFormatDisk extends FormattedDisk { /** * Use this inner interface for managing the disk usage data. - * This offloads format-specific implementation to the implementing class. + * This off-loads format-specific implementation to the implementing class. * A BitSet is used to track all blocks, as Pascal disks do not have a * bitmap stored on the disk. This is safe since we know the number of blocks * that exist. (BitSet length is of last set bit - unset bits at the end are @@ -337,7 +337,7 @@ public class PascalFormatDisk extends FormattedDisk { } /** - * Return the fisrt block. + * Return the first block. */ public int getFirstBlock() { return AppleUtil.getWordValue(getVolumeEntry(), 18); diff --git a/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosDirectoryEntry.java b/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosDirectoryEntry.java index 22978c7..529f9c9 100644 --- a/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosDirectoryEntry.java +++ b/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosDirectoryEntry.java @@ -86,7 +86,7 @@ public class ProdosDirectoryEntry extends ProdosFileEntry implements DirectoryEn /** * Indicates if this disk image can create a file. - * If not, the reason may be as simple as it has not beem implemented + * If not, the reason may be as simple as it has not been implemented * to something specific about the disk. */ public boolean canCreateFile() { diff --git a/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosFileEntry.java b/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosFileEntry.java index b46b68d..434a9a7 100644 --- a/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosFileEntry.java +++ b/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosFileEntry.java @@ -61,7 +61,7 @@ public class ProdosFileEntry extends ProdosCommonEntry implements FileEntry { /** * Return the name of this file. * This handles normal files, deleted files, and AppleWorks files - which use - * the AUXTYPE attribute to indicate upper/lower-case in the filename. + * the AUXTYPE attribute to indicate upper/lowercase in the filename. */ public String getFilename() { String fileName; @@ -85,7 +85,7 @@ public class ProdosFileEntry extends ProdosCommonEntry implements FileEntry { StringBuffer mixedCase = new StringBuffer(fileName); // the highest bit of the least significant byte is the first // character through the 2nd bit of the most significant byte - // being the 15th character. Bit is on indicates lowercase or + // being the 15th character. Bit is on indicates lower-case or // a space if a "." is present. for (int i=0; i<16 && i
- * This methid fills fieldData as well as returning the last position referenced + * This method fills fieldData as well as returning the last position referenced * in the track buffer. */ protected int locateField(int byte1, int byte2, int byte3, byte[] trackData, byte[] fieldData, int startingOffset) { int i = startingOffset; // logical position in track buffer (can wrap) int position = 0; // physical position in field buffer while (i < trackData.length + fieldData.length) { - int offset = i % trackData.length; // physical posistion in track buffer + int offset = i % trackData.length; // physical position in track buffer int b = AppleUtil.getUnsignedByte(trackData[offset]); if (position == 0 && b == byte1) { fieldData[position++] = (byte) b; @@ -188,7 +188,7 @@ public class NibbleOrder extends DosOrder { * XX = 1d1d1d1d (odd data bits) * YY = 1d1d1d1d (even data bits) *
- * More specificially, the mapping is as follows:
+ * More specifically, the mapping is as follows:
* (Applesoft)
* EEEEEEEE SFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF
* (IEEE 754 - Java)
diff --git a/src/main/java/com/webcodepro/applecommander/util/TextBundle.java b/src/main/java/com/webcodepro/applecommander/util/TextBundle.java
index 16b0254..101d00a 100644
--- a/src/main/java/com/webcodepro/applecommander/util/TextBundle.java
+++ b/src/main/java/com/webcodepro/applecommander/util/TextBundle.java
@@ -23,7 +23,7 @@ import java.text.MessageFormat;
import java.util.ResourceBundle;
/**
- * Manage the user-interface specific ResourceBundle. Initally, this is to actually clean up the
+ * Manage the user-interface specific ResourceBundle. Initially, this is to actually clean up the
* text. Ultimately, it should allow AppleCommander to be translated into other languages.
*
* Note that TextBundle serves as a generic resource for the util package. Other diff --git a/src/main/resources/com/webcodepro/applecommander/storage/StorageBundle.properties b/src/main/resources/com/webcodepro/applecommander/storage/StorageBundle.properties index 80773ac..20ee896 100644 --- a/src/main/resources/com/webcodepro/applecommander/storage/StorageBundle.properties +++ b/src/main/resources/com/webcodepro/applecommander/storage/StorageBundle.properties @@ -183,6 +183,6 @@ AppleWorksDataBaseFileFilter.September=September AppleWorksDataBaseFileFilter.October=October AppleWorksDataBaseFileFilter.November=November AppleWorksDataBaseFileFilter.December=December -AppleWorksDataBaseFileFilter.InvalidHeaderLengthError=AppleWorks Data Base file header lenth does not check. Aborting. +AppleWorksDataBaseFileFilter.InvalidHeaderLengthError=AppleWorks Data Base file header length does not check. Aborting. AppleWorksDataBaseFileFilter.InvalidDate=[Invalid Date={0}] AppleWorksDataBaseFileFilter.InvalidTime=[Invalid Time={0}] diff --git a/src/main/resources/com/webcodepro/applecommander/ui/UiBundle.properties b/src/main/resources/com/webcodepro/applecommander/ui/UiBundle.properties index 95733c9..37771ad 100644 --- a/src/main/resources/com/webcodepro/applecommander/ui/UiBundle.properties +++ b/src/main/resources/com/webcodepro/applecommander/ui/UiBundle.properties @@ -22,10 +22,10 @@ DeleteFileToolItem=Delete DeleteFileHoverText=Delete a file (CTRL+D) DeleteFileErrorTitle=Unable to view a deleted file! ResizeDiskTitle = Resize disk? -ResizeDiskMessage = This disk needs to be resized to match the formatted capacity. This should be an ApplePC HDV disk iamge - they typically start at 0 bytes and grow to the maximum capacity (32MB). Resize the disk? +ResizeDiskMessage = This disk needs to be resized to match the formatted capacity. This should be an ApplePC HDV disk image - they typically start at 0 bytes and grow to the maximum capacity (32MB). Resize the disk? ImportFileTitle = Unable to import file(s)! ImportMenuItem=Import...\tCTRL+I -ImportFileMessage = An error occured during import!\n\nException was "{0}". +ImportFileMessage = An error occurred during import!\n\nException was "{0}". FilesTab=Files ExpandMenuItem=Expand\t+ CollapseMenuItem=Collapse\t- diff --git a/src/test/java/com/webcodepro/applecommander/storage/DiskWriterTest.java b/src/test/java/com/webcodepro/applecommander/storage/DiskWriterTest.java index 211cd83..bb93acd 100644 --- a/src/test/java/com/webcodepro/applecommander/storage/DiskWriterTest.java +++ b/src/test/java/com/webcodepro/applecommander/storage/DiskWriterTest.java @@ -457,7 +457,7 @@ public class DiskWriterTest { /** * Create a bunch of files and then delete them repeatedly. - * This is intended to excersize not only creating and deleting + * This is intended to exercise not only creating and deleting * files but the disk management (ala Disk Map). */ protected void createAndDeleteFiles(FormattedDisk[] disks, String filetype) throws DiskException {