From 8afac62b0074aa220e495a03c45be315023ba5b5 Mon Sep 17 00:00:00 2001 From: Denis Molony Date: Thu, 25 Feb 2016 08:11:14 +1100 Subject: [PATCH] new utilities package --- src/com/bytezone/diskbrowser/applefile/AbstractFile.java | 2 +- .../bytezone/diskbrowser/applefile/AssemblerProgram.java | 2 +- .../diskbrowser/applefile/AssemblerStatement.java | 2 +- src/com/bytezone/diskbrowser/applefile/BasicProgram.java | 2 +- src/com/bytezone/diskbrowser/applefile/Charset.java | 2 +- src/com/bytezone/diskbrowser/applefile/HiResImage.java | 2 +- src/com/bytezone/diskbrowser/applefile/IconFile.java | 2 +- .../diskbrowser/applefile/IntegerBasicProgram.java | 2 +- src/com/bytezone/diskbrowser/applefile/LodeRunner.java | 2 +- src/com/bytezone/diskbrowser/applefile/PascalCode.java | 2 +- .../diskbrowser/applefile/PascalCodeStatement.java | 2 +- .../bytezone/diskbrowser/applefile/PascalProcedure.java | 2 +- src/com/bytezone/diskbrowser/applefile/PascalSegment.java | 4 ++-- src/com/bytezone/diskbrowser/applefile/ShapeTable.java | 2 +- src/com/bytezone/diskbrowser/applefile/SimpleText2.java | 2 +- .../bytezone/diskbrowser/applefile/StoredVariables.java | 2 +- src/com/bytezone/diskbrowser/applefile/TextBuffer.java | 2 +- src/com/bytezone/diskbrowser/applefile/TextFile.java | 2 +- src/com/bytezone/diskbrowser/applefile/VisicalcFile.java | 2 +- .../diskbrowser/applefile/VisicalcSpreadsheet.java | 2 +- src/com/bytezone/diskbrowser/applefile/WizardryTitle.java | 2 +- .../diskbrowser/appleworks/AppleworksADBFile.java | 2 +- .../bytezone/diskbrowser/appleworks/AppleworksSSFile.java | 2 +- src/com/bytezone/diskbrowser/appleworks/CellAddress.java | 2 +- src/com/bytezone/diskbrowser/appleworks/CellConstant.java | 2 +- src/com/bytezone/diskbrowser/appleworks/CellFormula.java | 2 +- src/com/bytezone/diskbrowser/appleworks/CellLabel.java | 2 +- src/com/bytezone/diskbrowser/appleworks/CellValue.java | 2 +- src/com/bytezone/diskbrowser/appleworks/Report.java | 2 +- src/com/bytezone/diskbrowser/cpm/DirectoryEntry.java | 8 +++++++- src/com/bytezone/diskbrowser/disk/AbstractSector.java | 2 +- src/com/bytezone/diskbrowser/disk/AppleDisk.java | 4 ++-- src/com/bytezone/diskbrowser/disk/DefaultDataSource.java | 2 +- src/com/bytezone/diskbrowser/disk/DefaultSector.java | 2 +- src/com/bytezone/diskbrowser/disk/DiskFactory.java | 4 ++-- .../bytezone/diskbrowser/dos/AbstractCatalogEntry.java | 2 +- src/com/bytezone/diskbrowser/dos/CatalogEntry.java | 2 +- src/com/bytezone/diskbrowser/dos/DosCatalogSector.java | 2 +- src/com/bytezone/diskbrowser/dos/DosTSListSector.java | 2 +- src/com/bytezone/diskbrowser/dos/DosVTOCSector.java | 2 +- src/com/bytezone/diskbrowser/gui/TreeBuilder.java | 2 +- src/com/bytezone/diskbrowser/infocom/CodeManager.java | 2 +- src/com/bytezone/diskbrowser/infocom/Dictionary.java | 2 +- src/com/bytezone/diskbrowser/infocom/Grammar.java | 2 +- .../bytezone/diskbrowser/infocom/InfocomAbstractFile.java | 2 +- src/com/bytezone/diskbrowser/infocom/InfocomDisk.java | 2 +- src/com/bytezone/diskbrowser/infocom/Instruction.java | 2 +- src/com/bytezone/diskbrowser/infocom/StringManager.java | 2 +- src/com/bytezone/diskbrowser/infocom/ZObject.java | 2 +- .../bytezone/diskbrowser/pascal/PascalCatalogSector.java | 2 +- src/com/bytezone/diskbrowser/pascal/PascalDisk.java | 2 +- src/com/bytezone/diskbrowser/prodos/CatalogEntry.java | 2 +- src/com/bytezone/diskbrowser/prodos/DirectoryHeader.java | 2 +- src/com/bytezone/diskbrowser/prodos/FileEntry.java | 2 +- .../bytezone/diskbrowser/prodos/ProdosCatalogSector.java | 2 +- src/com/bytezone/diskbrowser/prodos/ProdosDirectory.java | 2 +- src/com/bytezone/diskbrowser/prodos/ProdosDisk.java | 2 +- .../bytezone/diskbrowser/prodos/ProdosIndexSector.java | 2 +- .../bytezone/diskbrowser/prodos/SubDirectoryHeader.java | 2 +- .../diskbrowser/prodos/VolumeDirectoryHeader.java | 2 +- .../bytezone/diskbrowser/{ => utilities}/DateTime.java | 2 +- .../diskbrowser/{ => utilities}/FileFormatException.java | 2 +- .../diskbrowser/{ => utilities}/HexFormatter.java | 2 +- src/com/bytezone/diskbrowser/{ => utilities}/LZW.java | 2 +- src/com/bytezone/diskbrowser/{ => utilities}/LZW1.java | 2 +- src/com/bytezone/diskbrowser/{ => utilities}/LZW2.java | 2 +- src/com/bytezone/diskbrowser/{ => utilities}/NuFX.java | 2 +- src/com/bytezone/diskbrowser/{ => utilities}/Thread.java | 2 +- src/com/bytezone/diskbrowser/wizardry/Character.java | 2 +- src/com/bytezone/diskbrowser/wizardry/CodedMessage.java | 2 +- .../bytezone/diskbrowser/wizardry/ExperienceLevel.java | 2 +- src/com/bytezone/diskbrowser/wizardry/Header.java | 2 +- src/com/bytezone/diskbrowser/wizardry/Item.java | 2 +- src/com/bytezone/diskbrowser/wizardry/MazeCell.java | 2 +- src/com/bytezone/diskbrowser/wizardry/MazeLevel.java | 2 +- src/com/bytezone/diskbrowser/wizardry/Monster.java | 2 +- src/com/bytezone/diskbrowser/wizardry/PlainMessage.java | 2 +- .../diskbrowser/wizardry/WizardryScenarioDisk.java | 2 +- 78 files changed, 87 insertions(+), 81 deletions(-) rename src/com/bytezone/diskbrowser/{ => utilities}/DateTime.java (96%) rename src/com/bytezone/diskbrowser/{ => utilities}/FileFormatException.java (83%) rename src/com/bytezone/diskbrowser/{ => utilities}/HexFormatter.java (95%) rename src/com/bytezone/diskbrowser/{ => utilities}/LZW.java (98%) rename src/com/bytezone/diskbrowser/{ => utilities}/LZW1.java (98%) rename src/com/bytezone/diskbrowser/{ => utilities}/LZW2.java (98%) rename src/com/bytezone/diskbrowser/{ => utilities}/NuFX.java (99%) rename src/com/bytezone/diskbrowser/{ => utilities}/Thread.java (98%) diff --git a/src/com/bytezone/diskbrowser/applefile/AbstractFile.java b/src/com/bytezone/diskbrowser/applefile/AbstractFile.java index b11892e..52afbbd 100755 --- a/src/com/bytezone/diskbrowser/applefile/AbstractFile.java +++ b/src/com/bytezone/diskbrowser/applefile/AbstractFile.java @@ -5,8 +5,8 @@ import java.awt.image.BufferedImage; import javax.swing.JComponent; import javax.swing.JPanel; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.gui.DataSource; +import com.bytezone.diskbrowser.utilities.HexFormatter; public abstract class AbstractFile implements DataSource { diff --git a/src/com/bytezone/diskbrowser/applefile/AssemblerProgram.java b/src/com/bytezone/diskbrowser/applefile/AssemblerProgram.java index 4a1b52e..2c12711 100755 --- a/src/com/bytezone/diskbrowser/applefile/AssemblerProgram.java +++ b/src/com/bytezone/diskbrowser/applefile/AssemblerProgram.java @@ -9,8 +9,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.gui.DiskBrowser; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class AssemblerProgram extends AbstractFile { diff --git a/src/com/bytezone/diskbrowser/applefile/AssemblerStatement.java b/src/com/bytezone/diskbrowser/applefile/AssemblerStatement.java index 71b98bf..fe5b23e 100755 --- a/src/com/bytezone/diskbrowser/applefile/AssemblerStatement.java +++ b/src/com/bytezone/diskbrowser/applefile/AssemblerStatement.java @@ -3,7 +3,7 @@ package com.bytezone.diskbrowser.applefile; import java.util.Arrays; import java.util.Comparator; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class AssemblerStatement { diff --git a/src/com/bytezone/diskbrowser/applefile/BasicProgram.java b/src/com/bytezone/diskbrowser/applefile/BasicProgram.java index ddafad6..f1caf9b 100644 --- a/src/com/bytezone/diskbrowser/applefile/BasicProgram.java +++ b/src/com/bytezone/diskbrowser/applefile/BasicProgram.java @@ -2,7 +2,7 @@ package com.bytezone.diskbrowser.applefile; import java.util.*; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class BasicProgram extends AbstractFile { diff --git a/src/com/bytezone/diskbrowser/applefile/Charset.java b/src/com/bytezone/diskbrowser/applefile/Charset.java index f66b115..6b1b9b8 100755 --- a/src/com/bytezone/diskbrowser/applefile/Charset.java +++ b/src/com/bytezone/diskbrowser/applefile/Charset.java @@ -1,6 +1,6 @@ package com.bytezone.diskbrowser.applefile; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class Charset extends AbstractFile { diff --git a/src/com/bytezone/diskbrowser/applefile/HiResImage.java b/src/com/bytezone/diskbrowser/applefile/HiResImage.java index 008ae6b..cc0ef3c 100755 --- a/src/com/bytezone/diskbrowser/applefile/HiResImage.java +++ b/src/com/bytezone/diskbrowser/applefile/HiResImage.java @@ -7,7 +7,7 @@ import java.io.IOException; import javax.imageio.ImageIO; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class HiResImage extends AbstractFile { diff --git a/src/com/bytezone/diskbrowser/applefile/IconFile.java b/src/com/bytezone/diskbrowser/applefile/IconFile.java index 2830292..3704cf8 100644 --- a/src/com/bytezone/diskbrowser/applefile/IconFile.java +++ b/src/com/bytezone/diskbrowser/applefile/IconFile.java @@ -3,7 +3,7 @@ package com.bytezone.diskbrowser.applefile; import java.util.ArrayList; import java.util.List; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class IconFile extends AbstractFile { diff --git a/src/com/bytezone/diskbrowser/applefile/IntegerBasicProgram.java b/src/com/bytezone/diskbrowser/applefile/IntegerBasicProgram.java index 70829b8..4188423 100755 --- a/src/com/bytezone/diskbrowser/applefile/IntegerBasicProgram.java +++ b/src/com/bytezone/diskbrowser/applefile/IntegerBasicProgram.java @@ -1,6 +1,6 @@ package com.bytezone.diskbrowser.applefile; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class IntegerBasicProgram extends AbstractFile { diff --git a/src/com/bytezone/diskbrowser/applefile/LodeRunner.java b/src/com/bytezone/diskbrowser/applefile/LodeRunner.java index 7cd8148..6f2a802 100644 --- a/src/com/bytezone/diskbrowser/applefile/LodeRunner.java +++ b/src/com/bytezone/diskbrowser/applefile/LodeRunner.java @@ -1,6 +1,6 @@ package com.bytezone.diskbrowser.applefile; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class LodeRunner extends AbstractFile { diff --git a/src/com/bytezone/diskbrowser/applefile/PascalCode.java b/src/com/bytezone/diskbrowser/applefile/PascalCode.java index a4ba3b8..6d82ab1 100755 --- a/src/com/bytezone/diskbrowser/applefile/PascalCode.java +++ b/src/com/bytezone/diskbrowser/applefile/PascalCode.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class PascalCode extends AbstractFile implements PascalConstants, Iterable { diff --git a/src/com/bytezone/diskbrowser/applefile/PascalCodeStatement.java b/src/com/bytezone/diskbrowser/applefile/PascalCodeStatement.java index 156fef8..49b86fc 100755 --- a/src/com/bytezone/diskbrowser/applefile/PascalCodeStatement.java +++ b/src/com/bytezone/diskbrowser/applefile/PascalCodeStatement.java @@ -3,7 +3,7 @@ package com.bytezone.diskbrowser.applefile; import java.util.ArrayList; import java.util.List; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class PascalCodeStatement implements PascalConstants { diff --git a/src/com/bytezone/diskbrowser/applefile/PascalProcedure.java b/src/com/bytezone/diskbrowser/applefile/PascalProcedure.java index dd18bdc..de3e74f 100755 --- a/src/com/bytezone/diskbrowser/applefile/PascalProcedure.java +++ b/src/com/bytezone/diskbrowser/applefile/PascalProcedure.java @@ -3,8 +3,8 @@ package com.bytezone.diskbrowser.applefile; import java.util.ArrayList; import java.util.List; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.PascalCodeStatement.Jump; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class PascalProcedure { diff --git a/src/com/bytezone/diskbrowser/applefile/PascalSegment.java b/src/com/bytezone/diskbrowser/applefile/PascalSegment.java index fe99913..ae1fd96 100755 --- a/src/com/bytezone/diskbrowser/applefile/PascalSegment.java +++ b/src/com/bytezone/diskbrowser/applefile/PascalSegment.java @@ -3,8 +3,8 @@ package com.bytezone.diskbrowser.applefile; import java.util.ArrayList; import java.util.List; -import com.bytezone.diskbrowser.FileFormatException; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.FileFormatException; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class PascalSegment extends AbstractFile implements PascalConstants { diff --git a/src/com/bytezone/diskbrowser/applefile/ShapeTable.java b/src/com/bytezone/diskbrowser/applefile/ShapeTable.java index 3307c74..4e60db1 100755 --- a/src/com/bytezone/diskbrowser/applefile/ShapeTable.java +++ b/src/com/bytezone/diskbrowser/applefile/ShapeTable.java @@ -1,6 +1,6 @@ package com.bytezone.diskbrowser.applefile; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class ShapeTable extends AbstractFile { diff --git a/src/com/bytezone/diskbrowser/applefile/SimpleText2.java b/src/com/bytezone/diskbrowser/applefile/SimpleText2.java index 8a1065b..1d90866 100755 --- a/src/com/bytezone/diskbrowser/applefile/SimpleText2.java +++ b/src/com/bytezone/diskbrowser/applefile/SimpleText2.java @@ -3,7 +3,7 @@ package com.bytezone.diskbrowser.applefile; import java.util.ArrayList; import java.util.List; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class SimpleText2 extends AbstractFile { diff --git a/src/com/bytezone/diskbrowser/applefile/StoredVariables.java b/src/com/bytezone/diskbrowser/applefile/StoredVariables.java index 0a85416..a2554aa 100755 --- a/src/com/bytezone/diskbrowser/applefile/StoredVariables.java +++ b/src/com/bytezone/diskbrowser/applefile/StoredVariables.java @@ -1,6 +1,6 @@ package com.bytezone.diskbrowser.applefile; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class StoredVariables extends AbstractFile { diff --git a/src/com/bytezone/diskbrowser/applefile/TextBuffer.java b/src/com/bytezone/diskbrowser/applefile/TextBuffer.java index 5e1e7ed..0fc4017 100644 --- a/src/com/bytezone/diskbrowser/applefile/TextBuffer.java +++ b/src/com/bytezone/diskbrowser/applefile/TextBuffer.java @@ -1,6 +1,6 @@ package com.bytezone.diskbrowser.applefile; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; // only used by Prodos text files - note the fixed block size of 512 - bad! public class TextBuffer diff --git a/src/com/bytezone/diskbrowser/applefile/TextFile.java b/src/com/bytezone/diskbrowser/applefile/TextFile.java index 531374b..4f51d3e 100755 --- a/src/com/bytezone/diskbrowser/applefile/TextFile.java +++ b/src/com/bytezone/diskbrowser/applefile/TextFile.java @@ -2,7 +2,7 @@ package com.bytezone.diskbrowser.applefile; import java.util.List; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class TextFile extends AbstractFile { diff --git a/src/com/bytezone/diskbrowser/applefile/VisicalcFile.java b/src/com/bytezone/diskbrowser/applefile/VisicalcFile.java index d9656f7..ed5b002 100644 --- a/src/com/bytezone/diskbrowser/applefile/VisicalcFile.java +++ b/src/com/bytezone/diskbrowser/applefile/VisicalcFile.java @@ -1,6 +1,6 @@ package com.bytezone.diskbrowser.applefile; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class VisicalcFile extends AbstractFile { diff --git a/src/com/bytezone/diskbrowser/applefile/VisicalcSpreadsheet.java b/src/com/bytezone/diskbrowser/applefile/VisicalcSpreadsheet.java index d3eda25..41363ae 100644 --- a/src/com/bytezone/diskbrowser/applefile/VisicalcSpreadsheet.java +++ b/src/com/bytezone/diskbrowser/applefile/VisicalcSpreadsheet.java @@ -11,8 +11,8 @@ import java.util.TreeMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.VisicalcSpreadsheet.VisicalcCell; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class VisicalcSpreadsheet implements Iterable { diff --git a/src/com/bytezone/diskbrowser/applefile/WizardryTitle.java b/src/com/bytezone/diskbrowser/applefile/WizardryTitle.java index 5ca4c0d..8ffc9e8 100755 --- a/src/com/bytezone/diskbrowser/applefile/WizardryTitle.java +++ b/src/com/bytezone/diskbrowser/applefile/WizardryTitle.java @@ -1,6 +1,6 @@ package com.bytezone.diskbrowser.applefile; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class WizardryTitle extends AbstractFile { diff --git a/src/com/bytezone/diskbrowser/appleworks/AppleworksADBFile.java b/src/com/bytezone/diskbrowser/appleworks/AppleworksADBFile.java index aff9f6a..09a3fe6 100644 --- a/src/com/bytezone/diskbrowser/appleworks/AppleworksADBFile.java +++ b/src/com/bytezone/diskbrowser/appleworks/AppleworksADBFile.java @@ -3,8 +3,8 @@ package com.bytezone.diskbrowser.appleworks; import java.util.ArrayList; import java.util.List; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.AbstractFile; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class AppleworksADBFile extends AbstractFile { diff --git a/src/com/bytezone/diskbrowser/appleworks/AppleworksSSFile.java b/src/com/bytezone/diskbrowser/appleworks/AppleworksSSFile.java index 9cbb14b..2280370 100644 --- a/src/com/bytezone/diskbrowser/appleworks/AppleworksSSFile.java +++ b/src/com/bytezone/diskbrowser/appleworks/AppleworksSSFile.java @@ -3,8 +3,8 @@ package com.bytezone.diskbrowser.appleworks; import java.util.ArrayList; import java.util.List; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.AbstractFile; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class AppleworksSSFile extends AbstractFile { diff --git a/src/com/bytezone/diskbrowser/appleworks/CellAddress.java b/src/com/bytezone/diskbrowser/appleworks/CellAddress.java index d569cfa..08af0f3 100644 --- a/src/com/bytezone/diskbrowser/appleworks/CellAddress.java +++ b/src/com/bytezone/diskbrowser/appleworks/CellAddress.java @@ -1,6 +1,6 @@ package com.bytezone.diskbrowser.appleworks; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class CellAddress { diff --git a/src/com/bytezone/diskbrowser/appleworks/CellConstant.java b/src/com/bytezone/diskbrowser/appleworks/CellConstant.java index ab4e492..e13b571 100644 --- a/src/com/bytezone/diskbrowser/appleworks/CellConstant.java +++ b/src/com/bytezone/diskbrowser/appleworks/CellConstant.java @@ -1,6 +1,6 @@ package com.bytezone.diskbrowser.appleworks; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class CellConstant extends Cell { diff --git a/src/com/bytezone/diskbrowser/appleworks/CellFormula.java b/src/com/bytezone/diskbrowser/appleworks/CellFormula.java index d05c3f7..3bbbd6d 100644 --- a/src/com/bytezone/diskbrowser/appleworks/CellFormula.java +++ b/src/com/bytezone/diskbrowser/appleworks/CellFormula.java @@ -1,6 +1,6 @@ package com.bytezone.diskbrowser.appleworks; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class CellFormula { diff --git a/src/com/bytezone/diskbrowser/appleworks/CellLabel.java b/src/com/bytezone/diskbrowser/appleworks/CellLabel.java index 39cbf49..fcd1539 100644 --- a/src/com/bytezone/diskbrowser/appleworks/CellLabel.java +++ b/src/com/bytezone/diskbrowser/appleworks/CellLabel.java @@ -1,6 +1,6 @@ package com.bytezone.diskbrowser.appleworks; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class CellLabel extends Cell { diff --git a/src/com/bytezone/diskbrowser/appleworks/CellValue.java b/src/com/bytezone/diskbrowser/appleworks/CellValue.java index 98ec223..0463a81 100644 --- a/src/com/bytezone/diskbrowser/appleworks/CellValue.java +++ b/src/com/bytezone/diskbrowser/appleworks/CellValue.java @@ -1,6 +1,6 @@ package com.bytezone.diskbrowser.appleworks; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class CellValue extends Cell { diff --git a/src/com/bytezone/diskbrowser/appleworks/Report.java b/src/com/bytezone/diskbrowser/appleworks/Report.java index 7106f03..9ba0b09 100644 --- a/src/com/bytezone/diskbrowser/appleworks/Report.java +++ b/src/com/bytezone/diskbrowser/appleworks/Report.java @@ -1,6 +1,6 @@ package com.bytezone.diskbrowser.appleworks; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; abstract class Report { diff --git a/src/com/bytezone/diskbrowser/cpm/DirectoryEntry.java b/src/com/bytezone/diskbrowser/cpm/DirectoryEntry.java index 0c485c2..3ca55cd 100644 --- a/src/com/bytezone/diskbrowser/cpm/DirectoryEntry.java +++ b/src/com/bytezone/diskbrowser/cpm/DirectoryEntry.java @@ -1,6 +1,6 @@ package com.bytezone.diskbrowser.cpm; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class DirectoryEntry { @@ -25,6 +25,12 @@ public class DirectoryEntry System.arraycopy (buffer, offset + 16, blockList, 0, 16); } + public boolean matches (DirectoryEntry directoryEntry) + { + return userNumber == directoryEntry.userNumber && name.equals (directoryEntry.name) + && type.equals (directoryEntry.type); + } + @Override public String toString () { diff --git a/src/com/bytezone/diskbrowser/disk/AbstractSector.java b/src/com/bytezone/diskbrowser/disk/AbstractSector.java index e1e6f1f..dcc6793 100755 --- a/src/com/bytezone/diskbrowser/disk/AbstractSector.java +++ b/src/com/bytezone/diskbrowser/disk/AbstractSector.java @@ -5,9 +5,9 @@ import java.awt.image.BufferedImage; import javax.swing.JComponent; import javax.swing.JPanel; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.AssemblerProgram; import com.bytezone.diskbrowser.gui.DataSource; +import com.bytezone.diskbrowser.utilities.HexFormatter; public abstract class AbstractSector implements DataSource { diff --git a/src/com/bytezone/diskbrowser/disk/AppleDisk.java b/src/com/bytezone/diskbrowser/disk/AppleDisk.java index a75a5ff..161fa42 100755 --- a/src/com/bytezone/diskbrowser/disk/AppleDisk.java +++ b/src/com/bytezone/diskbrowser/disk/AppleDisk.java @@ -14,9 +14,9 @@ import java.util.zip.CRC32; import java.util.zip.Checksum; import com.bytezone.common.Utility; -import com.bytezone.diskbrowser.FileFormatException; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.AppleFileSource; +import com.bytezone.diskbrowser.utilities.FileFormatException; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class AppleDisk implements Disk { diff --git a/src/com/bytezone/diskbrowser/disk/DefaultDataSource.java b/src/com/bytezone/diskbrowser/disk/DefaultDataSource.java index 6f9fca2..1bfafcf 100755 --- a/src/com/bytezone/diskbrowser/disk/DefaultDataSource.java +++ b/src/com/bytezone/diskbrowser/disk/DefaultDataSource.java @@ -5,8 +5,8 @@ import java.awt.image.BufferedImage; import javax.swing.JComponent; import javax.swing.JPanel; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.gui.DataSource; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class DefaultDataSource implements DataSource { diff --git a/src/com/bytezone/diskbrowser/disk/DefaultSector.java b/src/com/bytezone/diskbrowser/disk/DefaultSector.java index 2432682..49f2823 100755 --- a/src/com/bytezone/diskbrowser/disk/DefaultSector.java +++ b/src/com/bytezone/diskbrowser/disk/DefaultSector.java @@ -1,6 +1,6 @@ package com.bytezone.diskbrowser.disk; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class DefaultSector extends AbstractSector { diff --git a/src/com/bytezone/diskbrowser/disk/DiskFactory.java b/src/com/bytezone/diskbrowser/disk/DiskFactory.java index 6716823..7a75a95 100755 --- a/src/com/bytezone/diskbrowser/disk/DiskFactory.java +++ b/src/com/bytezone/diskbrowser/disk/DiskFactory.java @@ -9,13 +9,13 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.zip.GZIPInputStream; -import com.bytezone.diskbrowser.FileFormatException; -import com.bytezone.diskbrowser.NuFX; import com.bytezone.diskbrowser.cpm.CPMDisk; import com.bytezone.diskbrowser.dos.DosDisk; import com.bytezone.diskbrowser.infocom.InfocomDisk; import com.bytezone.diskbrowser.pascal.PascalDisk; import com.bytezone.diskbrowser.prodos.ProdosDisk; +import com.bytezone.diskbrowser.utilities.FileFormatException; +import com.bytezone.diskbrowser.utilities.NuFX; import com.bytezone.diskbrowser.wizardry.WizardryScenarioDisk; public class DiskFactory diff --git a/src/com/bytezone/diskbrowser/dos/AbstractCatalogEntry.java b/src/com/bytezone/diskbrowser/dos/AbstractCatalogEntry.java index 6ac5780..8cb50c0 100644 --- a/src/com/bytezone/diskbrowser/dos/AbstractCatalogEntry.java +++ b/src/com/bytezone/diskbrowser/dos/AbstractCatalogEntry.java @@ -3,13 +3,13 @@ package com.bytezone.diskbrowser.dos; import java.util.ArrayList; import java.util.List; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.*; import com.bytezone.diskbrowser.disk.Disk; import com.bytezone.diskbrowser.disk.DiskAddress; import com.bytezone.diskbrowser.disk.FormattedDisk; import com.bytezone.diskbrowser.dos.DosDisk.FileType; import com.bytezone.diskbrowser.gui.DataSource; +import com.bytezone.diskbrowser.utilities.HexFormatter; abstract class AbstractCatalogEntry implements AppleFileSource { diff --git a/src/com/bytezone/diskbrowser/dos/CatalogEntry.java b/src/com/bytezone/diskbrowser/dos/CatalogEntry.java index bbccfd0..a9a18a6 100644 --- a/src/com/bytezone/diskbrowser/dos/CatalogEntry.java +++ b/src/com/bytezone/diskbrowser/dos/CatalogEntry.java @@ -1,8 +1,8 @@ package com.bytezone.diskbrowser.dos; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.disk.DiskAddress; import com.bytezone.diskbrowser.dos.DosDisk.FileType; +import com.bytezone.diskbrowser.utilities.HexFormatter; class CatalogEntry extends AbstractCatalogEntry { diff --git a/src/com/bytezone/diskbrowser/dos/DosCatalogSector.java b/src/com/bytezone/diskbrowser/dos/DosCatalogSector.java index c4683ea..b4132c6 100755 --- a/src/com/bytezone/diskbrowser/dos/DosCatalogSector.java +++ b/src/com/bytezone/diskbrowser/dos/DosCatalogSector.java @@ -1,8 +1,8 @@ package com.bytezone.diskbrowser.dos; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.disk.AbstractSector; import com.bytezone.diskbrowser.disk.Disk; +import com.bytezone.diskbrowser.utilities.HexFormatter; class DosCatalogSector extends AbstractSector { diff --git a/src/com/bytezone/diskbrowser/dos/DosTSListSector.java b/src/com/bytezone/diskbrowser/dos/DosTSListSector.java index 5c85946..5672ae3 100755 --- a/src/com/bytezone/diskbrowser/dos/DosTSListSector.java +++ b/src/com/bytezone/diskbrowser/dos/DosTSListSector.java @@ -1,9 +1,9 @@ package com.bytezone.diskbrowser.dos; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.disk.AbstractSector; import com.bytezone.diskbrowser.disk.Disk; import com.bytezone.diskbrowser.disk.DiskAddress; +import com.bytezone.diskbrowser.utilities.HexFormatter; class DosTSListSector extends AbstractSector { diff --git a/src/com/bytezone/diskbrowser/dos/DosVTOCSector.java b/src/com/bytezone/diskbrowser/dos/DosVTOCSector.java index 9959401..5ddd852 100755 --- a/src/com/bytezone/diskbrowser/dos/DosVTOCSector.java +++ b/src/com/bytezone/diskbrowser/dos/DosVTOCSector.java @@ -1,8 +1,8 @@ package com.bytezone.diskbrowser.dos; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.disk.AbstractSector; import com.bytezone.diskbrowser.disk.Disk; +import com.bytezone.diskbrowser.utilities.HexFormatter; class DosVTOCSector extends AbstractSector { diff --git a/src/com/bytezone/diskbrowser/gui/TreeBuilder.java b/src/com/bytezone/diskbrowser/gui/TreeBuilder.java index 41a567f..016dcd0 100755 --- a/src/com/bytezone/diskbrowser/gui/TreeBuilder.java +++ b/src/com/bytezone/diskbrowser/gui/TreeBuilder.java @@ -22,11 +22,11 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeCellRenderer; import javax.swing.tree.DefaultTreeModel; -import com.bytezone.diskbrowser.FileFormatException; import com.bytezone.diskbrowser.disk.AppleDisk; import com.bytezone.diskbrowser.disk.Disk; import com.bytezone.diskbrowser.disk.DiskFactory; import com.bytezone.diskbrowser.disk.FormattedDisk; +import com.bytezone.diskbrowser.utilities.FileFormatException; public class TreeBuilder { diff --git a/src/com/bytezone/diskbrowser/infocom/CodeManager.java b/src/com/bytezone/diskbrowser/infocom/CodeManager.java index 91db800..e3615ba 100644 --- a/src/com/bytezone/diskbrowser/infocom/CodeManager.java +++ b/src/com/bytezone/diskbrowser/infocom/CodeManager.java @@ -6,10 +6,10 @@ import java.util.TreeMap; import javax.swing.tree.DefaultMutableTreeNode; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.AbstractFile; import com.bytezone.diskbrowser.disk.DefaultAppleFileSource; import com.bytezone.diskbrowser.disk.FormattedDisk; +import com.bytezone.diskbrowser.utilities.HexFormatter; class CodeManager extends AbstractFile { diff --git a/src/com/bytezone/diskbrowser/infocom/Dictionary.java b/src/com/bytezone/diskbrowser/infocom/Dictionary.java index 2dce904..eb554d2 100755 --- a/src/com/bytezone/diskbrowser/infocom/Dictionary.java +++ b/src/com/bytezone/diskbrowser/infocom/Dictionary.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.AbstractFile; +import com.bytezone.diskbrowser.utilities.HexFormatter; class Dictionary extends AbstractFile { diff --git a/src/com/bytezone/diskbrowser/infocom/Grammar.java b/src/com/bytezone/diskbrowser/infocom/Grammar.java index a4fcc52..d53ce9c 100644 --- a/src/com/bytezone/diskbrowser/infocom/Grammar.java +++ b/src/com/bytezone/diskbrowser/infocom/Grammar.java @@ -2,7 +2,7 @@ package com.bytezone.diskbrowser.infocom; import java.util.*; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; class Grammar extends InfocomAbstractFile { diff --git a/src/com/bytezone/diskbrowser/infocom/InfocomAbstractFile.java b/src/com/bytezone/diskbrowser/infocom/InfocomAbstractFile.java index 3db1ba8..ed5c1c6 100644 --- a/src/com/bytezone/diskbrowser/infocom/InfocomAbstractFile.java +++ b/src/com/bytezone/diskbrowser/infocom/InfocomAbstractFile.java @@ -3,8 +3,8 @@ package com.bytezone.diskbrowser.infocom; import java.util.ArrayList; import java.util.List; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.AbstractFile; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class InfocomAbstractFile extends AbstractFile { diff --git a/src/com/bytezone/diskbrowser/infocom/InfocomDisk.java b/src/com/bytezone/diskbrowser/infocom/InfocomDisk.java index 72f5bc3..9782113 100755 --- a/src/com/bytezone/diskbrowser/infocom/InfocomDisk.java +++ b/src/com/bytezone/diskbrowser/infocom/InfocomDisk.java @@ -11,10 +11,10 @@ import java.util.List; import javax.swing.JOptionPane; import javax.swing.tree.DefaultMutableTreeNode; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.AppleFileSource; import com.bytezone.diskbrowser.disk.*; import com.bytezone.diskbrowser.gui.DataSource; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class InfocomDisk extends AbstractFormattedDisk { diff --git a/src/com/bytezone/diskbrowser/infocom/Instruction.java b/src/com/bytezone/diskbrowser/infocom/Instruction.java index f4eacac..f9a5aa2 100755 --- a/src/com/bytezone/diskbrowser/infocom/Instruction.java +++ b/src/com/bytezone/diskbrowser/infocom/Instruction.java @@ -3,7 +3,7 @@ package com.bytezone.diskbrowser.infocom; import java.util.ArrayList; import java.util.List; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; class Instruction { diff --git a/src/com/bytezone/diskbrowser/infocom/StringManager.java b/src/com/bytezone/diskbrowser/infocom/StringManager.java index 39661a5..a92c43d 100644 --- a/src/com/bytezone/diskbrowser/infocom/StringManager.java +++ b/src/com/bytezone/diskbrowser/infocom/StringManager.java @@ -3,8 +3,8 @@ package com.bytezone.diskbrowser.infocom; import java.util.Map; import java.util.TreeMap; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.AbstractFile; +import com.bytezone.diskbrowser.utilities.HexFormatter; class StringManager extends AbstractFile { diff --git a/src/com/bytezone/diskbrowser/infocom/ZObject.java b/src/com/bytezone/diskbrowser/infocom/ZObject.java index 6e9048e..4bf8d6d 100755 --- a/src/com/bytezone/diskbrowser/infocom/ZObject.java +++ b/src/com/bytezone/diskbrowser/infocom/ZObject.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.BitSet; import java.util.List; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.AbstractFile; +import com.bytezone.diskbrowser.utilities.HexFormatter; class ZObject extends AbstractFile { diff --git a/src/com/bytezone/diskbrowser/pascal/PascalCatalogSector.java b/src/com/bytezone/diskbrowser/pascal/PascalCatalogSector.java index c914ebd..7811a1b 100644 --- a/src/com/bytezone/diskbrowser/pascal/PascalCatalogSector.java +++ b/src/com/bytezone/diskbrowser/pascal/PascalCatalogSector.java @@ -3,9 +3,9 @@ package com.bytezone.diskbrowser.pascal; import java.text.DateFormat; import java.util.GregorianCalendar; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.disk.AbstractSector; import com.bytezone.diskbrowser.disk.Disk; +import com.bytezone.diskbrowser.utilities.HexFormatter; class PascalCatalogSector extends AbstractSector { diff --git a/src/com/bytezone/diskbrowser/pascal/PascalDisk.java b/src/com/bytezone/diskbrowser/pascal/PascalDisk.java index 24d756f..76f06e2 100755 --- a/src/com/bytezone/diskbrowser/pascal/PascalDisk.java +++ b/src/com/bytezone/diskbrowser/pascal/PascalDisk.java @@ -8,10 +8,10 @@ import java.util.List; import javax.swing.tree.DefaultMutableTreeNode; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.*; import com.bytezone.diskbrowser.disk.*; import com.bytezone.diskbrowser.gui.DataSource; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class PascalDisk extends AbstractFormattedDisk { diff --git a/src/com/bytezone/diskbrowser/prodos/CatalogEntry.java b/src/com/bytezone/diskbrowser/prodos/CatalogEntry.java index 5b734c5..cc6c04c 100755 --- a/src/com/bytezone/diskbrowser/prodos/CatalogEntry.java +++ b/src/com/bytezone/diskbrowser/prodos/CatalogEntry.java @@ -4,11 +4,11 @@ import java.util.ArrayList; import java.util.GregorianCalendar; import java.util.List; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.AppleFileSource; import com.bytezone.diskbrowser.disk.Disk; import com.bytezone.diskbrowser.disk.DiskAddress; import com.bytezone.diskbrowser.disk.FormattedDisk; +import com.bytezone.diskbrowser.utilities.HexFormatter; abstract class CatalogEntry implements AppleFileSource { diff --git a/src/com/bytezone/diskbrowser/prodos/DirectoryHeader.java b/src/com/bytezone/diskbrowser/prodos/DirectoryHeader.java index 08d093e..7f9df4d 100755 --- a/src/com/bytezone/diskbrowser/prodos/DirectoryHeader.java +++ b/src/com/bytezone/diskbrowser/prodos/DirectoryHeader.java @@ -1,6 +1,6 @@ package com.bytezone.diskbrowser.prodos; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; abstract class DirectoryHeader extends CatalogEntry { diff --git a/src/com/bytezone/diskbrowser/prodos/FileEntry.java b/src/com/bytezone/diskbrowser/prodos/FileEntry.java index d180830..cb64cbc 100755 --- a/src/com/bytezone/diskbrowser/prodos/FileEntry.java +++ b/src/com/bytezone/diskbrowser/prodos/FileEntry.java @@ -4,13 +4,13 @@ import java.util.ArrayList; import java.util.GregorianCalendar; import java.util.List; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.*; import com.bytezone.diskbrowser.appleworks.AppleworksADBFile; import com.bytezone.diskbrowser.appleworks.AppleworksSSFile; import com.bytezone.diskbrowser.appleworks.AppleworksWPFile; import com.bytezone.diskbrowser.disk.DiskAddress; import com.bytezone.diskbrowser.gui.DataSource; +import com.bytezone.diskbrowser.utilities.HexFormatter; // - Set sector types for each used sector // - Populate dataBlocks, indexBlocks, catalogBlock and masterIndexBlock diff --git a/src/com/bytezone/diskbrowser/prodos/ProdosCatalogSector.java b/src/com/bytezone/diskbrowser/prodos/ProdosCatalogSector.java index 6fdbda1..f06fb50 100755 --- a/src/com/bytezone/diskbrowser/prodos/ProdosCatalogSector.java +++ b/src/com/bytezone/diskbrowser/prodos/ProdosCatalogSector.java @@ -4,9 +4,9 @@ import static com.bytezone.diskbrowser.prodos.ProdosConstants.*; import java.util.GregorianCalendar; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.disk.AbstractSector; import com.bytezone.diskbrowser.disk.Disk; +import com.bytezone.diskbrowser.utilities.HexFormatter; class ProdosCatalogSector extends AbstractSector { diff --git a/src/com/bytezone/diskbrowser/prodos/ProdosDirectory.java b/src/com/bytezone/diskbrowser/prodos/ProdosDirectory.java index b22d816..f2e4815 100755 --- a/src/com/bytezone/diskbrowser/prodos/ProdosDirectory.java +++ b/src/com/bytezone/diskbrowser/prodos/ProdosDirectory.java @@ -2,9 +2,9 @@ package com.bytezone.diskbrowser.prodos; import java.util.GregorianCalendar; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.AbstractFile; import com.bytezone.diskbrowser.disk.FormattedDisk; +import com.bytezone.diskbrowser.utilities.HexFormatter; class ProdosDirectory extends AbstractFile { diff --git a/src/com/bytezone/diskbrowser/prodos/ProdosDisk.java b/src/com/bytezone/diskbrowser/prodos/ProdosDisk.java index 74c527b..58c0d62 100755 --- a/src/com/bytezone/diskbrowser/prodos/ProdosDisk.java +++ b/src/com/bytezone/diskbrowser/prodos/ProdosDisk.java @@ -8,11 +8,11 @@ import java.util.List; import javax.swing.tree.DefaultMutableTreeNode; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.AppleFileSource; import com.bytezone.diskbrowser.applefile.BootSector; import com.bytezone.diskbrowser.disk.*; import com.bytezone.diskbrowser.gui.DataSource; +import com.bytezone.diskbrowser.utilities.HexFormatter; public class ProdosDisk extends AbstractFormattedDisk { diff --git a/src/com/bytezone/diskbrowser/prodos/ProdosIndexSector.java b/src/com/bytezone/diskbrowser/prodos/ProdosIndexSector.java index bb61cba..d9c7401 100755 --- a/src/com/bytezone/diskbrowser/prodos/ProdosIndexSector.java +++ b/src/com/bytezone/diskbrowser/prodos/ProdosIndexSector.java @@ -1,8 +1,8 @@ package com.bytezone.diskbrowser.prodos; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.disk.AbstractSector; import com.bytezone.diskbrowser.disk.Disk; +import com.bytezone.diskbrowser.utilities.HexFormatter; class ProdosIndexSector extends AbstractSector { diff --git a/src/com/bytezone/diskbrowser/prodos/SubDirectoryHeader.java b/src/com/bytezone/diskbrowser/prodos/SubDirectoryHeader.java index 56dca6e..592c9a7 100755 --- a/src/com/bytezone/diskbrowser/prodos/SubDirectoryHeader.java +++ b/src/com/bytezone/diskbrowser/prodos/SubDirectoryHeader.java @@ -2,9 +2,9 @@ package com.bytezone.diskbrowser.prodos; import java.util.List; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.disk.DiskAddress; import com.bytezone.diskbrowser.gui.DataSource; +import com.bytezone.diskbrowser.utilities.HexFormatter; class SubDirectoryHeader extends DirectoryHeader { diff --git a/src/com/bytezone/diskbrowser/prodos/VolumeDirectoryHeader.java b/src/com/bytezone/diskbrowser/prodos/VolumeDirectoryHeader.java index 860da65..e0bd69e 100755 --- a/src/com/bytezone/diskbrowser/prodos/VolumeDirectoryHeader.java +++ b/src/com/bytezone/diskbrowser/prodos/VolumeDirectoryHeader.java @@ -3,9 +3,9 @@ package com.bytezone.diskbrowser.prodos; import java.util.ArrayList; import java.util.List; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.disk.DiskAddress; import com.bytezone.diskbrowser.gui.DataSource; +import com.bytezone.diskbrowser.utilities.HexFormatter; /* * There is only one of these - it is always the first entry in the first block. diff --git a/src/com/bytezone/diskbrowser/DateTime.java b/src/com/bytezone/diskbrowser/utilities/DateTime.java similarity index 96% rename from src/com/bytezone/diskbrowser/DateTime.java rename to src/com/bytezone/diskbrowser/utilities/DateTime.java index 7705a0c..e448861 100644 --- a/src/com/bytezone/diskbrowser/DateTime.java +++ b/src/com/bytezone/diskbrowser/utilities/DateTime.java @@ -1,4 +1,4 @@ -package com.bytezone.diskbrowser; +package com.bytezone.diskbrowser.utilities; class DateTime { diff --git a/src/com/bytezone/diskbrowser/FileFormatException.java b/src/com/bytezone/diskbrowser/utilities/FileFormatException.java similarity index 83% rename from src/com/bytezone/diskbrowser/FileFormatException.java rename to src/com/bytezone/diskbrowser/utilities/FileFormatException.java index 59b6a56..5717b6e 100644 --- a/src/com/bytezone/diskbrowser/FileFormatException.java +++ b/src/com/bytezone/diskbrowser/utilities/FileFormatException.java @@ -1,4 +1,4 @@ -package com.bytezone.diskbrowser; +package com.bytezone.diskbrowser.utilities; public class FileFormatException extends RuntimeException { diff --git a/src/com/bytezone/diskbrowser/HexFormatter.java b/src/com/bytezone/diskbrowser/utilities/HexFormatter.java similarity index 95% rename from src/com/bytezone/diskbrowser/HexFormatter.java rename to src/com/bytezone/diskbrowser/utilities/HexFormatter.java index c8879f8..d1d27c1 100755 --- a/src/com/bytezone/diskbrowser/HexFormatter.java +++ b/src/com/bytezone/diskbrowser/utilities/HexFormatter.java @@ -1,4 +1,4 @@ -package com.bytezone.diskbrowser; +package com.bytezone.diskbrowser.utilities; import java.math.BigDecimal; import java.math.MathContext; diff --git a/src/com/bytezone/diskbrowser/LZW.java b/src/com/bytezone/diskbrowser/utilities/LZW.java similarity index 98% rename from src/com/bytezone/diskbrowser/LZW.java rename to src/com/bytezone/diskbrowser/utilities/LZW.java index b65d1dd..5ef3ae1 100644 --- a/src/com/bytezone/diskbrowser/LZW.java +++ b/src/com/bytezone/diskbrowser/utilities/LZW.java @@ -1,4 +1,4 @@ -package com.bytezone.diskbrowser; +package com.bytezone.diskbrowser.utilities; import java.util.ArrayList; import java.util.List; diff --git a/src/com/bytezone/diskbrowser/LZW1.java b/src/com/bytezone/diskbrowser/utilities/LZW1.java similarity index 98% rename from src/com/bytezone/diskbrowser/LZW1.java rename to src/com/bytezone/diskbrowser/utilities/LZW1.java index aa8e1d5..3ab42ef 100644 --- a/src/com/bytezone/diskbrowser/LZW1.java +++ b/src/com/bytezone/diskbrowser/utilities/LZW1.java @@ -1,4 +1,4 @@ -package com.bytezone.diskbrowser; +package com.bytezone.diskbrowser.utilities; import java.util.Objects; diff --git a/src/com/bytezone/diskbrowser/LZW2.java b/src/com/bytezone/diskbrowser/utilities/LZW2.java similarity index 98% rename from src/com/bytezone/diskbrowser/LZW2.java rename to src/com/bytezone/diskbrowser/utilities/LZW2.java index 5c0e3e5..a2af51f 100644 --- a/src/com/bytezone/diskbrowser/LZW2.java +++ b/src/com/bytezone/diskbrowser/utilities/LZW2.java @@ -1,4 +1,4 @@ -package com.bytezone.diskbrowser; +package com.bytezone.diskbrowser.utilities; import java.util.Objects; diff --git a/src/com/bytezone/diskbrowser/NuFX.java b/src/com/bytezone/diskbrowser/utilities/NuFX.java similarity index 99% rename from src/com/bytezone/diskbrowser/NuFX.java rename to src/com/bytezone/diskbrowser/utilities/NuFX.java index cfc6aa8..982d2f1 100644 --- a/src/com/bytezone/diskbrowser/NuFX.java +++ b/src/com/bytezone/diskbrowser/utilities/NuFX.java @@ -1,4 +1,4 @@ -package com.bytezone.diskbrowser; +package com.bytezone.diskbrowser.utilities; import java.io.IOException; import java.nio.file.Files; diff --git a/src/com/bytezone/diskbrowser/Thread.java b/src/com/bytezone/diskbrowser/utilities/Thread.java similarity index 98% rename from src/com/bytezone/diskbrowser/Thread.java rename to src/com/bytezone/diskbrowser/utilities/Thread.java index 2788038..a3465a9 100644 --- a/src/com/bytezone/diskbrowser/Thread.java +++ b/src/com/bytezone/diskbrowser/utilities/Thread.java @@ -1,4 +1,4 @@ -package com.bytezone.diskbrowser; +package com.bytezone.diskbrowser.utilities; import com.bytezone.common.Utility; diff --git a/src/com/bytezone/diskbrowser/wizardry/Character.java b/src/com/bytezone/diskbrowser/wizardry/Character.java index 5ebe331..517d08a 100755 --- a/src/com/bytezone/diskbrowser/wizardry/Character.java +++ b/src/com/bytezone/diskbrowser/wizardry/Character.java @@ -5,8 +5,8 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.AbstractFile; +import com.bytezone.diskbrowser.utilities.HexFormatter; class Character extends AbstractFile { diff --git a/src/com/bytezone/diskbrowser/wizardry/CodedMessage.java b/src/com/bytezone/diskbrowser/wizardry/CodedMessage.java index b0b0935..e81d733 100755 --- a/src/com/bytezone/diskbrowser/wizardry/CodedMessage.java +++ b/src/com/bytezone/diskbrowser/wizardry/CodedMessage.java @@ -1,6 +1,6 @@ package com.bytezone.diskbrowser.wizardry; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; class CodedMessage extends Message { diff --git a/src/com/bytezone/diskbrowser/wizardry/ExperienceLevel.java b/src/com/bytezone/diskbrowser/wizardry/ExperienceLevel.java index 20bcfc0..dc8bcf2 100755 --- a/src/com/bytezone/diskbrowser/wizardry/ExperienceLevel.java +++ b/src/com/bytezone/diskbrowser/wizardry/ExperienceLevel.java @@ -1,7 +1,7 @@ package com.bytezone.diskbrowser.wizardry; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.AbstractFile; +import com.bytezone.diskbrowser.utilities.HexFormatter; class ExperienceLevel extends AbstractFile { diff --git a/src/com/bytezone/diskbrowser/wizardry/Header.java b/src/com/bytezone/diskbrowser/wizardry/Header.java index 8629d93..57933ce 100755 --- a/src/com/bytezone/diskbrowser/wizardry/Header.java +++ b/src/com/bytezone/diskbrowser/wizardry/Header.java @@ -5,12 +5,12 @@ import java.util.List; import javax.swing.tree.DefaultMutableTreeNode; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.AppleFileSource; import com.bytezone.diskbrowser.applefile.DefaultAppleFile; import com.bytezone.diskbrowser.disk.DefaultAppleFileSource; import com.bytezone.diskbrowser.disk.DiskAddress; import com.bytezone.diskbrowser.disk.FormattedDisk; +import com.bytezone.diskbrowser.utilities.HexFormatter; class Header { diff --git a/src/com/bytezone/diskbrowser/wizardry/Item.java b/src/com/bytezone/diskbrowser/wizardry/Item.java index 4029438..d383676 100755 --- a/src/com/bytezone/diskbrowser/wizardry/Item.java +++ b/src/com/bytezone/diskbrowser/wizardry/Item.java @@ -1,7 +1,7 @@ package com.bytezone.diskbrowser.wizardry; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.AbstractFile; +import com.bytezone.diskbrowser.utilities.HexFormatter; class Item extends AbstractFile implements Comparable { diff --git a/src/com/bytezone/diskbrowser/wizardry/MazeCell.java b/src/com/bytezone/diskbrowser/wizardry/MazeCell.java index 55c081b..07d85d3 100755 --- a/src/com/bytezone/diskbrowser/wizardry/MazeCell.java +++ b/src/com/bytezone/diskbrowser/wizardry/MazeCell.java @@ -5,7 +5,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.util.List; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; class MazeCell { diff --git a/src/com/bytezone/diskbrowser/wizardry/MazeLevel.java b/src/com/bytezone/diskbrowser/wizardry/MazeLevel.java index b859b85..ab9cce9 100755 --- a/src/com/bytezone/diskbrowser/wizardry/MazeLevel.java +++ b/src/com/bytezone/diskbrowser/wizardry/MazeLevel.java @@ -6,8 +6,8 @@ import java.awt.RenderingHints; import java.awt.image.BufferedImage; import java.util.List; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.AbstractFile; +import com.bytezone.diskbrowser.utilities.HexFormatter; class MazeLevel extends AbstractFile { diff --git a/src/com/bytezone/diskbrowser/wizardry/Monster.java b/src/com/bytezone/diskbrowser/wizardry/Monster.java index 37035cd..bb4eff8 100755 --- a/src/com/bytezone/diskbrowser/wizardry/Monster.java +++ b/src/com/bytezone/diskbrowser/wizardry/Monster.java @@ -4,8 +4,8 @@ import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.List; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.AbstractFile; +import com.bytezone.diskbrowser.utilities.HexFormatter; class Monster extends AbstractFile implements Comparable { diff --git a/src/com/bytezone/diskbrowser/wizardry/PlainMessage.java b/src/com/bytezone/diskbrowser/wizardry/PlainMessage.java index ac82a54..6007f95 100755 --- a/src/com/bytezone/diskbrowser/wizardry/PlainMessage.java +++ b/src/com/bytezone/diskbrowser/wizardry/PlainMessage.java @@ -1,6 +1,6 @@ package com.bytezone.diskbrowser.wizardry; -import com.bytezone.diskbrowser.HexFormatter; +import com.bytezone.diskbrowser.utilities.HexFormatter; class PlainMessage extends Message { diff --git a/src/com/bytezone/diskbrowser/wizardry/WizardryScenarioDisk.java b/src/com/bytezone/diskbrowser/wizardry/WizardryScenarioDisk.java index f3fee60..6425b72 100755 --- a/src/com/bytezone/diskbrowser/wizardry/WizardryScenarioDisk.java +++ b/src/com/bytezone/diskbrowser/wizardry/WizardryScenarioDisk.java @@ -7,12 +7,12 @@ import java.util.List; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; -import com.bytezone.diskbrowser.HexFormatter; import com.bytezone.diskbrowser.applefile.AbstractFile; import com.bytezone.diskbrowser.applefile.AppleFileSource; import com.bytezone.diskbrowser.disk.*; import com.bytezone.diskbrowser.gui.DataSource; import com.bytezone.diskbrowser.pascal.PascalDisk; +import com.bytezone.diskbrowser.utilities.HexFormatter; import com.bytezone.diskbrowser.wizardry.Character.Attributes; import com.bytezone.diskbrowser.wizardry.Character.Statistics; import com.bytezone.diskbrowser.wizardry.Header.ScenarioData;