removed com.bytezone.common

src/com/bytezone/diskbrowser/gui/CatalogPanel.java

@@ -24,13 +24,13 @@ import javax.swing.event.ChangeListener;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreePath;
 
-import com.bytezone.common.FontAction.FontChangeEvent;
-import com.bytezone.common.FontAction.FontChangeListener;
 import com.bytezone.diskbrowser.applefile.AppleFileSource;
 import com.bytezone.diskbrowser.disk.DualDosDisk;
 import com.bytezone.diskbrowser.disk.FormattedDisk;
 import com.bytezone.diskbrowser.duplicates.DiskDetails;
 import com.bytezone.diskbrowser.gui.DuplicateAction.DiskTableSelectionListener;
+import com.bytezone.diskbrowser.gui.FontAction.FontChangeEvent;
+import com.bytezone.diskbrowser.gui.FontAction.FontChangeListener;
 import com.bytezone.diskbrowser.gui.RedoHandler.RedoEvent;
 import com.bytezone.diskbrowser.gui.RedoHandler.RedoListener;
 import com.bytezone.diskbrowser.gui.TreeBuilder.FileNode;

src/com/bytezone/diskbrowser/gui/DataPanel.java

@@ -25,8 +25,6 @@ import javax.swing.SwingWorker;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
-import com.bytezone.common.FontAction.FontChangeEvent;
-import com.bytezone.common.FontAction.FontChangeListener;
 import com.bytezone.diskbrowser.applefile.ApplesoftBasicProgram;
 import com.bytezone.diskbrowser.applefile.AssemblerProgram;
 import com.bytezone.diskbrowser.applefile.HiResImage;
@@ -37,6 +35,8 @@ import com.bytezone.diskbrowser.applefile.SHRPictureFile2;
 import com.bytezone.diskbrowser.applefile.VisicalcFile;
 import com.bytezone.diskbrowser.disk.DiskAddress;
 import com.bytezone.diskbrowser.disk.SectorList;
+import com.bytezone.diskbrowser.gui.FontAction.FontChangeEvent;
+import com.bytezone.diskbrowser.gui.FontAction.FontChangeListener;
 
 // -----------------------------------------------------------------------------------//
 public class DataPanel extends JTabbedPane implements DiskSelectionListener,

src/com/bytezone/diskbrowser/gui/DiskLegendPanel.java

@@ -5,12 +5,12 @@ import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Graphics;
 
-import com.bytezone.common.Platform;
-import com.bytezone.common.Platform.FontSize;
-import com.bytezone.common.Platform.FontType;
 import com.bytezone.diskbrowser.disk.FormattedDisk;
 import com.bytezone.diskbrowser.disk.SectorType;
 import com.bytezone.diskbrowser.gui.DiskLayoutPanel.LayoutDetails;
+import com.bytezone.diskbrowser.utilities.FontUtility;
+import com.bytezone.diskbrowser.utilities.FontUtility.FontSize;
+import com.bytezone.diskbrowser.utilities.FontUtility.FontType;
 
 // -----------------------------------------------------------------------------------//
 class DiskLegendPanel extends DiskPanel
@@ -25,7 +25,7 @@ class DiskLegendPanel extends DiskPanel
   public DiskLegendPanel ()
   // ---------------------------------------------------------------------------------//
   {
-    font = Platform.getFont (FontType.SANS_SERIF, FontSize.BASE);
+    font = FontUtility.getFont (FontType.SANS_SERIF, FontSize.BASE);
     setBackground (Color.WHITE);
   }
 

src/com/bytezone/diskbrowser/gui/FontAction.java

@@ -0,0 +1,154 @@
+package com.bytezone.diskbrowser.gui;
+
+import java.awt.Canvas;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.util.EventListener;
+import java.util.prefs.Preferences;
+
+import javax.swing.Action;
+import javax.swing.KeyStroke;
+import javax.swing.event.EventListenerList;
+
+import com.bytezone.diskbrowser.utilities.DefaultAction;
+
+// -----------------------------------------------------------------------------------//
+public class FontAction extends DefaultAction implements QuitListener
+// -----------------------------------------------------------------------------------//
+{
+  private static final String prefsFontName = "prefsFontName";
+  private static final String prefsFontSize = "prefsFontSize";
+  private static Canvas canvas;
+
+  private final EventListenerList listenerList = new EventListenerList ();
+
+  private FontFrame frame;
+  private String fontName;
+  private String fontSize;
+  private String text;
+
+  // ---------------------------------------------------------------------------------//
+  public FontAction ()
+  // ---------------------------------------------------------------------------------//
+  {
+    super ("Set Font...", "Set display to a different font or font size",
+        "/com/bytezone/loadlister/");
+    int mask = Toolkit.getDefaultToolkit ().getMenuShortcutKeyMaskEx ();
+    putValue (Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke (KeyEvent.VK_F, mask));
+  }
+
+  // ---------------------------------------------------------------------------------//
+  @Override
+  public void actionPerformed (ActionEvent e)
+  // ---------------------------------------------------------------------------------//
+  {
+    if (frame == null)
+    {
+      frame = new FontFrame (this);
+      frame.setSelectedValue (fontName);
+      frame.setSelectedSize (fontSize);
+      frame.setText (text);
+    }
+    frame.setVisible (true);
+  }
+
+  // ---------------------------------------------------------------------------------//
+  @Override
+  public void quit (Preferences preferences)
+  // ---------------------------------------------------------------------------------//
+  {
+    if (frame != null)
+    {
+      String fontName = frame.getSelectedValue ();
+      preferences.put (prefsFontName, fontName == null ? "Monospaced" : fontName);
+      String fontSize = frame.getSelectedSize ();
+      preferences.put (prefsFontSize, fontSize == null ? "12 point" : fontSize);
+    }
+  }
+
+  // ---------------------------------------------------------------------------------//
+  @Override
+  public void restore (Preferences preferences)
+  // ---------------------------------------------------------------------------------//
+  {
+    String fontName = preferences.get (prefsFontName, "Monospaced");
+    if (fontName.isEmpty ())
+      fontName = "Monospaced";
+
+    this.fontName = fontName;
+    if (frame != null)
+      frame.setSelectedValue (fontName);
+
+    String fontSize = preferences.get (prefsFontSize, "12 point");
+    if (fontSize.isEmpty ())
+      fontSize = "12 point";
+
+    this.fontSize = fontSize;
+    if (frame != null)
+      frame.setSelectedSize (fontSize);
+
+    int pos = fontSize.indexOf (' ');
+    int size = Integer.parseInt (fontSize.substring (0, pos));
+    fireFontChangeEvent (new Font (fontName, Font.PLAIN, size));
+  }
+
+  // ---------------------------------------------------------------------------------//
+  public void setSampleText (String text)
+  // ---------------------------------------------------------------------------------//
+  {
+    this.text = text;
+    if (frame != null)
+      frame.setText (text);
+  }
+
+  // ---------------------------------------------------------------------------------//
+  public interface FontChangeListener extends EventListener
+  // ---------------------------------------------------------------------------------//
+  {
+    public void changeFont (FontChangeEvent fontChangeEvent);
+  }
+
+  // ---------------------------------------------------------------------------------//
+  public class FontChangeEvent
+  // ---------------------------------------------------------------------------------//
+  {
+    public final Font font;
+    public final FontMetrics fontMetrics;
+
+    public FontChangeEvent (Font font)
+    {
+      this.font = font;
+      if (canvas == null)
+        canvas = new Canvas ();
+      fontMetrics = canvas.getFontMetrics (font);
+    }
+  }
+
+  // ---------------------------------------------------------------------------------//
+  public void addFontChangeListener (FontChangeListener listener)
+  // ---------------------------------------------------------------------------------//
+  {
+    listenerList.add (FontChangeListener.class, listener);
+  }
+
+  // ---------------------------------------------------------------------------------//
+  public void removeFontChangeListener (FontChangeListener listener)
+  // ---------------------------------------------------------------------------------//
+  {
+    listenerList.remove (FontChangeListener.class, listener);
+  }
+
+  // ---------------------------------------------------------------------------------//
+  public void fireFontChangeEvent (Font font)
+  // ---------------------------------------------------------------------------------//
+  {
+    FontChangeEvent fontChangeEvent = new FontChangeEvent (font);
+    FontChangeListener[] listeners =
+        (listenerList.getListeners (FontChangeListener.class));
+    for (FontChangeListener listener : listeners)
+      listener.changeFont (fontChangeEvent);
+  }
+}

src/com/bytezone/diskbrowser/gui/FontFrame.java

@@ -0,0 +1,274 @@
+package com.bytezone.diskbrowser.gui;
+
+import java.awt.Font;
+import java.awt.GraphicsEnvironment;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+
+import javax.swing.DefaultListModel;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JList;
+import javax.swing.JScrollPane;
+import javax.swing.ListSelectionModel;
+import javax.swing.ScrollPaneConstants;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
+import com.bytezone.input.ButtonPanel;
+import com.bytezone.input.ColumnPanel;
+import com.bytezone.input.InputPanel;
+import com.bytezone.input.RadioButtonPanel;
+import com.bytezone.input.RowPanel;
+import com.bytezone.input.ScrollPanel;
+import com.bytezone.input.TextAreaPanel;
+
+// -----------------------------------------------------------------------------------//
+public class FontFrame extends JFrame
+// -----------------------------------------------------------------------------------//
+{
+  private final JList<String> fontList =
+      new JList<String> (new DefaultListModel<String> ());
+  private final FontAction fontAction;
+
+  private String initialFont;
+  private String initialSize;
+
+  private RadioButtonPanel fontSizePanel;
+  private TextAreaPanel textPanel;
+  private JButton btnCancel;
+  private JButton btnOK;
+  private JButton btnApply;
+
+  // ---------------------------------------------------------------------------------//
+  public FontFrame (FontAction fontAction)
+  // ---------------------------------------------------------------------------------//
+  {
+    super ("Font Selection");
+    this.fontAction = fontAction;
+    buildLayout ();
+    getFonts ();
+    setListeners ();
+  }
+
+  // ---------------------------------------------------------------------------------//
+  private void buildLayout ()
+  // ---------------------------------------------------------------------------------//
+  {
+    fontList.setSelectionMode (ListSelectionModel.SINGLE_SELECTION);
+    JScrollPane sp = new JScrollPane (fontList);
+    sp.setVerticalScrollBarPolicy (ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
+    ScrollPanel listPanel = new ScrollPanel (sp, 200, 300);     // width, height
+
+    fontSizePanel = new RadioButtonPanel (
+        new String[][] { { "6 point", "7 point", "8 point", "9 point", "10 point",
+                           "11 point", "12 point", "13 point", "14 point", "15 point",
+                           "16 point", "18 point", } });
+
+    InputPanel.setTextLength (80);
+    textPanel = new TextAreaPanel (10);
+
+    ButtonPanel buttonPanel = new ButtonPanel (new String[] { "Cancel", "OK", "Apply" });
+    btnCancel = buttonPanel.getItem (0);
+    btnOK = buttonPanel.getItem (1);
+    btnApply = buttonPanel.getItem (2);
+
+    RowPanel rp = new RowPanel (new RowPanel ("Font", listPanel),
+        new RowPanel ("Size", fontSizePanel), new RowPanel ("Sample code", textPanel));
+
+    add (new ColumnPanel (rp, buttonPanel));
+
+    pack ();
+    setResizable (false);
+    setLocationRelativeTo (null);
+  }
+
+  // ---------------------------------------------------------------------------------//
+  public void setText (String text)
+  // ---------------------------------------------------------------------------------//
+  {
+    textPanel.getItem (0).setText (text);
+  }
+
+  // ---------------------------------------------------------------------------------//
+  public String getSelectedValue ()
+  // ---------------------------------------------------------------------------------//
+  {
+    String fontName = fontList.getSelectedValue ();
+    return fontName;
+  }
+
+  // ---------------------------------------------------------------------------------//
+  public void setSelectedValue (String fontName)
+  // ---------------------------------------------------------------------------------//
+  {
+    fontList.setSelectedValue (fontName, true);
+    initialFont = fontName;
+  }
+
+  // ---------------------------------------------------------------------------------//
+  public String getSelectedSize ()
+  // ---------------------------------------------------------------------------------//
+  {
+    String fontSize = fontSizePanel.getSelectedText ();
+    return fontSize;
+  }
+
+  // ---------------------------------------------------------------------------------//
+  public void setSelectedSize (String fontSize)
+  // ---------------------------------------------------------------------------------//
+  {
+    fontSizePanel.setSelected (fontSize);
+    initialSize = fontSize;
+  }
+
+  // ---------------------------------------------------------------------------------//
+  private void getFonts ()
+  // ---------------------------------------------------------------------------------//
+  {
+    String fonts[] =
+        GraphicsEnvironment.getLocalGraphicsEnvironment ().getAvailableFontFamilyNames ();
+    String pf[] =
+        { "Andale Mono", "Anonymous Pro", "Anonymous Pro Minus", "Apple2Forever",
+          "Apple2Forever80", "Consolas", "Bitstream Vera Sans Mono", "Consolas",
+          "Courier", "Courier New", "DejaVu Sans Mono", "Envy Code R", "Inconsolata",
+          "Input Mono", "Input Mono Narrow", "Iosevka", "Lucida Sans Typewriter",
+          "Luculent", "Menlo", "Monaco", "monofur", "Monospaced", "Nimbus Mono L",
+          "PCMyungjo", "PR Number 3", "Pragmata", "Print Char 21", "ProFont", "ProFontX",
+          "Proggy", "PT Mono", "Source Code Pro", "Ubuntu Mono" };
+
+    DefaultListModel<String> lm = (DefaultListModel<String>) fontList.getModel ();
+
+    int ptr = 0;
+    for (String fontName : fonts)
+    {
+      while (ptr < pf.length)
+      {
+        int result = fontName.compareToIgnoreCase (pf[ptr]);
+        if (result >= 0)
+        {
+          ++ptr;
+          if (result > 0)
+            continue;
+          lm.addElement (fontName);
+        }
+        break;
+      }
+    }
+
+    fontList.setSelectedValue (initialFont, true);
+  }
+
+  // ---------------------------------------------------------------------------------//
+  private void setListeners ()
+  // ---------------------------------------------------------------------------------//
+  {
+    addComponentListener (new ComponentAdapter ()
+    {
+      @Override
+      public void componentShown (ComponentEvent e)
+      {
+        if (fontList.getModel ().getSize () == 0)
+          getFonts ();
+
+        initialFont = getSelectedValue ();
+        initialSize = getSelectedSize ();
+      }
+
+      @Override
+      public void componentHidden (ComponentEvent e)
+      {
+      }
+    });
+
+    fontList.addListSelectionListener (new ListSelectionListener ()
+    {
+      @Override
+      public void valueChanged (ListSelectionEvent e)
+      {
+        if (e.getValueIsAdjusting ())
+          return;
+      }
+    });
+
+    btnCancel.addActionListener (new ActionListener ()
+    {
+      @Override
+      public void actionPerformed (ActionEvent e)
+      {
+        setVisible (false);
+        setSelectedValue (initialFont);
+        setSelectedSize (initialSize);
+      }
+    });
+
+    btnOK.addActionListener (new ActionListener ()
+    {
+      @Override
+      public void actionPerformed (ActionEvent e)
+      {
+        setVisible (false);
+        setSelection ();
+      }
+    });
+
+    btnApply.addActionListener (new ActionListener ()
+    {
+      @Override
+      public void actionPerformed (ActionEvent e)
+      {
+        setSelection ();
+      }
+    });
+
+    fontList.addListSelectionListener (new ListSelectionListener ()
+    {
+      @Override
+      public void valueChanged (ListSelectionEvent e)
+      {
+        if (e.getValueIsAdjusting ())
+          return;
+
+        Font font = getCurrentFont ();
+        if (font != null)
+          textPanel.getItem (0).setFont (font);
+      }
+    });
+
+    fontSizePanel.addActionListener (new ActionListener ()
+    {
+      @Override
+      public void actionPerformed (ActionEvent e)
+      {
+        textPanel.getItem (0).setFont (getCurrentFont ());
+      }
+    });
+  }
+
+  // ---------------------------------------------------------------------------------//
+  private Font getCurrentFont ()
+  // ---------------------------------------------------------------------------------//
+  {
+    String fontName = getSelectedValue ();
+    String fontSize = getSelectedSize ();
+    if (fontSize.isEmpty ())
+      return null;
+    int pos = fontSize.indexOf (' ');
+    int size = Integer.parseInt (fontSize.substring (0, pos));
+    return new Font (fontName, Font.PLAIN, size);
+  }
+
+  // ---------------------------------------------------------------------------------//
+  private void setSelection ()
+  // ---------------------------------------------------------------------------------//
+  {
+    initialFont = getSelectedValue ();
+    initialSize = getSelectedSize ();
+    int pos = initialSize.indexOf (' ');
+    int size = Integer.parseInt (initialSize.substring (0, pos));
+    Font font = new Font (initialFont, Font.PLAIN, size);
+    fontAction.fireFontChangeEvent (font);
+  }
+}

src/com/bytezone/diskbrowser/gui/MenuHandler.java

@@ -17,7 +17,6 @@ import javax.swing.JMenuItem;
 import javax.swing.JRadioButtonMenuItem;
 import javax.swing.KeyStroke;
 
-import com.bytezone.common.FontAction;
 import com.bytezone.diskbrowser.applefile.AssemblerProgram;
 import com.bytezone.diskbrowser.applefile.BasicProgram;
 import com.bytezone.diskbrowser.applefile.HiResImage;

src/com/bytezone/diskbrowser/gui/PreferencesAction.java

@@ -1,49 +0,0 @@
-package com.bytezone.diskbrowser.gui;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.util.prefs.Preferences;
-
-import javax.swing.Action;
-import javax.swing.JFrame;
-import javax.swing.KeyStroke;
-
-import com.bytezone.diskbrowser.utilities.DefaultAction;
-
-// ********** not currently used ***********
-
-// -----------------------------------------------------------------------------------//
-public class PreferencesAction extends DefaultAction
-// -----------------------------------------------------------------------------------//
-{
-  JFrame owner;
-  Preferences prefs;
-
-  // ---------------------------------------------------------------------------------//
-  public PreferencesAction (JFrame owner, Preferences prefs)
-  // ---------------------------------------------------------------------------------//
-  {
-    super ("Preferences...", "Set preferences", "/com/bytezone/diskbrowser/icons/");
-    putValue (Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke ("alt P"));
-    putValue (Action.MNEMONIC_KEY, KeyEvent.VK_P);
-
-    setIcon (Action.LARGE_ICON_KEY, "script_gear_32.png");
-    this.owner = owner;
-    this.prefs = prefs;
-  }
-
-  // ---------------------------------------------------------------------------------//
-  @Override
-  public void actionPerformed (ActionEvent e)
-  // ---------------------------------------------------------------------------------//
-  {
-    prefs ();
-  }
-
-  // ---------------------------------------------------------------------------------//
-  public void prefs ()
-  // ---------------------------------------------------------------------------------//
-  {
-    new PreferencesDialog (owner, prefs);
-  }
-}

src/com/bytezone/diskbrowser/gui/PreferencesDialog.java

@@ -1,230 +0,0 @@
-package com.bytezone.diskbrowser.gui;
-
-import java.awt.BorderLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.util.prefs.Preferences;
-
-import javax.swing.AbstractAction;
-import javax.swing.InputMap;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.KeyStroke;
-import javax.swing.SpringLayout;
-import javax.swing.border.EmptyBorder;
-
-import com.bytezone.common.FontTester;
-import com.bytezone.input.SpringUtilities;
-
-// not currently used
-// -----------------------------------------------------------------------------------//
-class PreferencesDialog extends JDialog
-// -----------------------------------------------------------------------------------//
-{
-  static final String prefsCatalogFont = "CatalogFont";
-  static final String prefsDataFont = "DataFont";
-  static final String prefsCatalogFontSize = "CatalogFontSize";
-  static final String prefsDataFontSize = "DataFontSize";
-
-  static final String defaultFontName = "Lucida Sans Typewriter";
-  static final int defaultFontSize = 12;
-  static final String[] monoFonts = new FontTester ().getMonospacedFontList ();
-
-  private final JComboBox<String> catalogFontList = new JComboBox<String> (monoFonts);
-  private final JComboBox<String> dataFontList = new JComboBox<String> (monoFonts);
-  private final String[] sizes =
-      { "8", "9", "10", "11", "12", "13", "14", "15", "16", "18" };
-  private final JComboBox<String> catalogFontSizes = new JComboBox<String> (sizes);
-  private final JComboBox<String> dataFontSizes = new JComboBox<String> (sizes);
-  private final Preferences prefs;
-
-  private final JButton apply = new JButton ("Apply");
-
-  private String catalogFontName;
-  private String dataFontName;
-  private int catalogFontSize;
-  private int dataFontSize;
-
-  // ---------------------------------------------------------------------------------//
-  PreferencesDialog (JFrame owner, Preferences prefs)
-  // ---------------------------------------------------------------------------------//
-  {
-    super (owner, "Set Preferences", false);
-
-    this.prefs = prefs;
-    System.out.println ("********* not used ***********");
-
-    catalogFontName = prefs.get (prefsCatalogFont, defaultFontName);
-    dataFontName = prefs.get (prefsDataFont, defaultFontName);
-    catalogFontSize = prefs.getInt (prefsCatalogFontSize, defaultFontSize);
-    dataFontSize = prefs.getInt (prefsDataFontSize, defaultFontSize);
-
-    catalogFontList.setSelectedItem (catalogFontName);
-    dataFontList.setSelectedItem (dataFontName);
-    catalogFontSizes.setSelectedItem (catalogFontSize + "");
-    dataFontSizes.setSelectedItem (dataFontSize + "");
-
-    catalogFontList.setMaximumRowCount (30);
-    dataFontList.setMaximumRowCount (30);
-    catalogFontSizes.setMaximumRowCount (sizes.length);
-    dataFontSizes.setMaximumRowCount (sizes.length);
-
-    Listener listener = new Listener ();
-    catalogFontList.addActionListener (listener);
-    dataFontList.addActionListener (listener);
-    catalogFontSizes.addActionListener (listener);
-    dataFontSizes.addActionListener (listener);
-
-    setDefaultCloseOperation (DISPOSE_ON_CLOSE);
-    setResizable (false);
-    addCancelByEscapeKey (); // doesn't seem to work
-
-    JPanel layoutPanel = new JPanel ();
-    layoutPanel.setBorder (new EmptyBorder (10, 20, 0, 20)); // T/L/B/R
-    layoutPanel.setLayout (new SpringLayout ());
-
-    layoutPanel.add (new JLabel ("Catalog panel font", JLabel.TRAILING));
-    layoutPanel.add (catalogFontList);
-    layoutPanel.add (catalogFontSizes);
-
-    layoutPanel.add (new JLabel ("Output panel font", JLabel.TRAILING));
-    layoutPanel.add (dataFontList);
-    layoutPanel.add (dataFontSizes);
-
-    SpringUtilities.makeCompactGrid (layoutPanel, 2, 3, //rows, cols
-        10, 5, //initX, initY
-        10, 5); //xPad, yPad
-
-    JPanel panel = new JPanel (new BorderLayout ());
-    panel.add (layoutPanel, BorderLayout.CENTER);
-    panel.add (getCommandPanel (), BorderLayout.SOUTH);
-    getContentPane ().add (panel);
-
-    pack ();
-    setLocationRelativeTo (owner);
-    setVisible (true);
-  }
-
-  // ---------------------------------------------------------------------------------//
-  private JComponent getCommandPanel ()
-  // ---------------------------------------------------------------------------------//
-  {
-    JButton cancel = new JButton ("Cancel");
-    cancel.addActionListener (new ActionListener ()
-    {
-      @Override
-      public void actionPerformed (ActionEvent event)
-      {
-        closeDialog ();
-      }
-    });
-
-    apply.setEnabled (false);
-    apply.addActionListener (new ActionListener ()
-    {
-      @Override
-      public void actionPerformed (ActionEvent event)
-      {
-        updatePreferences ();
-        apply.setEnabled (false);
-      }
-    });
-
-    JButton ok = new JButton ("OK");
-    getRootPane ().setDefaultButton (ok);
-    ok.addActionListener (new ActionListener ()
-    {
-      @Override
-      public void actionPerformed (ActionEvent event)
-      {
-        updatePreferences ();
-        closeDialog ();
-      }
-    });
-
-    JPanel commandPanel = new JPanel ();
-    commandPanel.add (cancel);
-    commandPanel.add (apply);
-    commandPanel.add (ok);
-
-    return commandPanel;
-  }
-
-  // ---------------------------------------------------------------------------------//
-  private void updatePreferences ()
-  // ---------------------------------------------------------------------------------//
-  {
-    String newFontName = (String) catalogFontList.getSelectedItem ();
-    if (!newFontName.equals (catalogFontName))
-    {
-      prefs.put (prefsCatalogFont, newFontName);
-      catalogFontName = newFontName;
-    }
-
-    newFontName = (String) dataFontList.getSelectedItem ();
-    if (!newFontName.equals (dataFontName))
-    {
-      prefs.put (prefsDataFont, newFontName);
-      dataFontName = newFontName;
-    }
-
-    int newFontSize = Integer.parseInt ((String) catalogFontSizes.getSelectedItem ());
-    if (newFontSize != catalogFontSize)
-    {
-      prefs.putInt (prefsCatalogFontSize, newFontSize);
-      catalogFontSize = newFontSize;
-    }
-
-    newFontSize = Integer.parseInt ((String) dataFontSizes.getSelectedItem ());
-    if (newFontSize != dataFontSize)
-    {
-      prefs.putInt (prefsDataFontSize, newFontSize);
-      dataFontSize = newFontSize;
-    }
-  }
-
-  // ---------------------------------------------------------------------------------//
-  private void addCancelByEscapeKey ()
-  // ---------------------------------------------------------------------------------//
-  {
-    String CANCEL_ACTION_KEY = "CANCEL_ACTION_KEY";
-    int noModifiers = 0;
-    KeyStroke escapeKey = KeyStroke.getKeyStroke (KeyEvent.VK_ESCAPE, noModifiers, false);
-    InputMap inputMap =
-        getRootPane ().getInputMap (JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
-    inputMap.put (escapeKey, CANCEL_ACTION_KEY);
-    AbstractAction cancelAction = new AbstractAction ()
-    {
-      @Override
-      public void actionPerformed (ActionEvent e)
-      {
-        closeDialog ();
-      }
-    };
-    getRootPane ().getActionMap ().put (CANCEL_ACTION_KEY, cancelAction);
-  }
-
-  // ---------------------------------------------------------------------------------//
-  private void closeDialog ()
-  // ---------------------------------------------------------------------------------//
-  {
-    dispose ();
-  }
-
-  // ---------------------------------------------------------------------------------//
-  class Listener implements ActionListener
-  // ---------------------------------------------------------------------------------//
-  {
-    @Override
-    public void actionPerformed (ActionEvent e)
-    {
-      apply.setEnabled (true);
-    }
-  }
-}

src/com/bytezone/diskbrowser/gui/ScrollRuler.java

@@ -8,10 +8,10 @@ import java.awt.Rectangle;
 
 import javax.swing.JComponent;
 
-import com.bytezone.common.Platform;
-import com.bytezone.common.Platform.FontSize;
-import com.bytezone.common.Platform.FontType;
 import com.bytezone.diskbrowser.gui.DiskLayoutPanel.LayoutDetails;
+import com.bytezone.diskbrowser.utilities.FontUtility;
+import com.bytezone.diskbrowser.utilities.FontUtility.FontSize;
+import com.bytezone.diskbrowser.utilities.FontUtility.FontType;
 
 // -----------------------------------------------------------------------------------//
 class ScrollRuler extends JComponent
@@ -24,7 +24,7 @@ class ScrollRuler extends JComponent
   public static final int HORIZONTAL = 0;
   public static final int VERTICAL = 1;
 
-  private final Font font = Platform.getFont (FontType.SANS_SERIF, FontSize.BASE);
+  private final Font font = FontUtility.getFont (FontType.SANS_SERIF, FontSize.BASE);
   private final int orientation;
   private boolean isHex = true;
   private boolean isTrackMode = true;

src/com/bytezone/diskbrowser/utilities/FontUtility.java

@@ -0,0 +1,90 @@
+package com.bytezone.diskbrowser.utilities;
+
+import java.awt.Font;
+import java.awt.GraphicsEnvironment;
+
+public class FontUtility
+{
+  public static final String OS = System.getProperty ("os.name").toLowerCase ();
+  public static final String userHome = System.getProperty ("user.home");
+  public static final boolean MAC = OS.startsWith ("mac os");
+  public static final boolean MAC_OS_X = OS.startsWith ("mac os x");
+  public static final boolean LINUX = OS.equals ("linux");
+  public static final boolean WINDOWS = OS.startsWith ("windows");
+  public static final String USER = System.getProperty ("user.name");
+
+  private static GraphicsEnvironment ge =
+      GraphicsEnvironment.getLocalGraphicsEnvironment ();
+  public static String[] fontNames = ge.getAvailableFontFamilyNames ();
+
+  public static enum FontType
+  {
+    PLAIN, SANS_SERIF, SERIF, MONOSPACED
+  };
+
+  public static enum FontSize
+  {
+    BASE_MINUS_2, BASE_MINUS_1, BASE, BASE_PLUS_1, BASE_PLUS_2
+  };
+
+  public static String fontName =
+      MAC_OS_X ? "Monaco" : WINDOWS ? "Lucida Sans Typewriter" : "Lucida Sans Typewriter";
+
+  // ---------------------------------------------------------------------------------//
+  public static boolean isFontAvailable (String name)
+  // ---------------------------------------------------------------------------------//
+  {
+    for (String s : fontNames)
+      if (s.equals (name))
+        return true;
+    return false;
+  }
+
+  // ---------------------------------------------------------------------------------//
+  public static Font getFont (FontType fontType, FontSize fontSize)
+  // ---------------------------------------------------------------------------------//
+  {
+    switch (fontSize)
+    {
+      case BASE:
+        return getFont (fontType, 12);
+      case BASE_PLUS_1:
+        return getFont (fontType, 14);
+      case BASE_PLUS_2:
+        return getFont (fontType, 16);
+      case BASE_MINUS_1:
+        return getFont (fontType, 10);
+      case BASE_MINUS_2:
+        return getFont (fontType, 8);
+    }
+    return getFont (fontType, 12);
+  }
+
+  // ---------------------------------------------------------------------------------//
+  public static Font getFont (FontType fontType, int type, int fontSize)
+  // ---------------------------------------------------------------------------------//
+  {
+    assert isFontAvailable (fontName);
+
+    switch (fontType)
+    {
+      case PLAIN:
+        return new Font (fontName, type, fontSize);
+      case SANS_SERIF:
+        return new Font (fontName, type, fontSize);
+      case SERIF:
+        return new Font ("Serif", type, fontSize);
+      case MONOSPACED:
+        return new Font ("Monospaced", type, fontSize);
+      default:
+        return new Font (fontName, type, fontSize);
+    }
+  }
+
+  // ---------------------------------------------------------------------------------//
+  public static Font getFont (FontType fontType, int fontSize)
+  // ---------------------------------------------------------------------------------//
+  {
+    return getFont (fontType, Font.PLAIN, fontSize);
+  }
+}