From 8ccd68789a157a00300cecb36c1aba1b2bd1e286 Mon Sep 17 00:00:00 2001 From: dchandler Date: Mon, 11 Jul 2005 03:10:32 +0000 Subject: [PATCH] Since I had Eclipse fired up, I had it automatically organized the imports. It made two errors, but the compiler found them. I've cvs tagged the tree before doing this, just in case. --- source/org/thdl/tib/input/ConvertDialog.java | 31 +++++++--- source/org/thdl/tib/input/ConverterGUI.java | 18 ++++-- source/org/thdl/tib/input/DuffPane.java | 62 +++++++++++++++---- source/org/thdl/tib/input/DuffPaneTest.java | 1 - .../org/thdl/tib/input/DuffPaneTestBase.java | 3 - .../tib/input/FontConverterConstants.java | 2 - source/org/thdl/tib/input/JskadKeyboard.java | 4 +- .../thdl/tib/input/JskadKeyboardFactory.java | 2 - .../thdl/tib/input/JskadKeyboardManager.java | 2 - .../org/thdl/tib/input/PreferenceWindow.java | 11 +++- .../input/RecentlyOpenedFilesDatabase.java | 6 +- .../tib/input/TMW_RTF_TO_THDL_WYLIETest.java | 14 ++--- .../org/thdl/tib/input/TibetanConverter.java | 23 ++++--- source/org/thdl/tib/input/TibetanPane.java | 16 ++--- source/org/thdl/tib/input/TinyTest.java | 1 - source/org/thdl/tib/scanner/AboutDialog.java | 18 +++++- source/org/thdl/tib/scanner/AcipToTab.java | 9 ++- source/org/thdl/tib/scanner/AcipToWylie.java | 9 ++- .../AlmostDefaultTableCellRenderer.java | 14 +++-- .../thdl/tib/scanner/AppletScannerFilter.java | 30 +++++++-- .../thdl/tib/scanner/BinaryFileGenerator.java | 9 ++- .../thdl/tib/scanner/BitDictionarySource.java | 4 +- .../tib/scanner/ByteDictionarySource.java | 4 +- .../tib/scanner/CachedSyllableListTree.java | 4 +- .../tib/scanner/ConsoleScannerFilter.java | 12 +++- .../tib/scanner/CreateDatabaseWizard.java | 31 ++++++++-- .../tib/scanner/DictionaryFileFilter.java | 3 +- .../DictionaryListSelectionListener.java | 10 +-- .../thdl/tib/scanner/DictionarySource.java | 4 +- .../org/thdl/tib/scanner/DictionaryTable.java | 14 +++-- .../tib/scanner/DictionaryTableModel.java | 6 +- .../thdl/tib/scanner/DuffCellRenderer.java | 18 +++--- .../thdl/tib/scanner/DuffScannerPanel.java | 31 +++++++--- .../tib/scanner/FileSyllableListTree.java | 8 ++- .../tib/scanner/FilterHTMLDictionary.java | 9 ++- .../thdl/tib/scanner/LocalTibetanScanner.java | 4 +- .../tib/scanner/MemorySyllableListTree.java | 10 ++- .../thdl/tib/scanner/OnLineScannerFilter.java | 17 ++--- .../tib/scanner/PocketPreferenceWindow.java | 18 +++++- .../scanner/PocketWhichDictionaryFrame.java | 18 ++++-- .../scanner/PocketWindowScannerFilter.java | 25 +++++--- .../thdl/tib/scanner/RemoteScannerFilter.java | 15 ++--- .../tib/scanner/RemoteTibetanScanner.java | 11 +++- .../org/thdl/tib/scanner/ScannerLogger.java | 6 +- source/org/thdl/tib/scanner/ScannerPanel.java | 14 ++++- .../thdl/tib/scanner/SimpleScannerPanel.java | 13 +++- .../org/thdl/tib/scanner/StrictDuffPane.java | 20 +++--- .../scanner/SwingWhichDictionaryFrame.java | 19 ++++-- .../tib/scanner/SwingWindowScannerFilter.java | 33 +++++++--- .../org/thdl/tib/scanner/TibetanScanner.java | 4 +- .../tib/scanner/WhichDictionaryFrame.java | 15 +++-- .../thdl/tib/scanner/WindowScannerFilter.java | 17 ++++- .../org/thdl/tib/text/DuffCellRenderer.java | 21 ++++--- source/org/thdl/tib/text/TibTextUtils.java | 20 +++--- source/org/thdl/tib/text/TibetanDocument.java | 29 ++++++--- source/org/thdl/tib/text/TibetanKeyboard.java | 8 ++- .../org/thdl/tib/text/TibetanLabelView.java | 6 +- .../org/thdl/tib/text/TibetanMachineWeb.java | 28 +++++---- .../thdl/tib/text/TibetanRTFEditorKit.java | 3 +- .../thdl/tib/text/TibetanRTFViewFactory.java | 6 +- source/org/thdl/tib/text/TranslitTuple.java | 1 - .../thdl/tib/text/tshegbar/UnicodeReader.java | 1 - source/org/thdl/tib/text/ttt/EWTSTest.java | 2 +- source/org/thdl/tib/text/ttt/EWTSTraits.java | 2 +- source/org/thdl/tib/text/ttt/TConverter.java | 2 +- source/org/thdl/tib/text/ttt/TPairList.java | 1 - .../thdl/tib/text/ttt/TPairListFactory.java | 4 +- source/org/thdl/tib/text/ttt/TStackList.java | 1 - source/org/thdl/tib/text/ttt/TString.java | 2 +- 69 files changed, 574 insertions(+), 265 deletions(-) diff --git a/source/org/thdl/tib/input/ConvertDialog.java b/source/org/thdl/tib/input/ConvertDialog.java index 9e2dd23..1ec3e33 100644 --- a/source/org/thdl/tib/input/ConvertDialog.java +++ b/source/org/thdl/tib/input/ConvertDialog.java @@ -18,15 +18,30 @@ Contributor(s): ______________________________________. package org.thdl.tib.input; -import java.awt.*; -import java.awt.event.*; -import java.io.*; -import java.util.*; -import javax.swing.*; -import javax.swing.event.*; -import javax.swing.filechooser.*; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Frame; +import java.awt.GridLayout; +import java.awt.event.ActionEvent; +import java.io.File; +import java.io.IOException; -import org.thdl.util.*; +import javax.swing.Box; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JComboBox; +import javax.swing.JDialog; +import javax.swing.JFileChooser; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JTextField; + +import org.thdl.util.ThdlActionListener; +import org.thdl.util.ThdlDebug; +import org.thdl.util.ThdlOptions; +import org.thdl.util.ThdlVersion; /** A GUI widget used to convert Tibetan documents from one encoding to another. diff --git a/source/org/thdl/tib/input/ConverterGUI.java b/source/org/thdl/tib/input/ConverterGUI.java index 715d338..810099e 100644 --- a/source/org/thdl/tib/input/ConverterGUI.java +++ b/source/org/thdl/tib/input/ConverterGUI.java @@ -18,13 +18,19 @@ Contributor(s): ______________________________________. package org.thdl.tib.input; -import java.io.*; - -import org.thdl.util.*; -import org.thdl.tib.text.*; -import javax.swing.JOptionPane; import java.awt.Frame; -import java.awt.Dialog; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintStream; + +import javax.swing.JOptionPane; + +import org.thdl.util.ThdlDebug; +import org.thdl.util.ThdlLazyException; +import org.thdl.util.ThdlOptions; /** The ConverterGUI is a Swing GUI application. It is used for * converting TibetanMachine-, TibetanMachineWeb-, and THDL Extended diff --git a/source/org/thdl/tib/input/DuffPane.java b/source/org/thdl/tib/input/DuffPane.java index 2553cdf..78d9438 100644 --- a/source/org/thdl/tib/input/DuffPane.java +++ b/source/org/thdl/tib/input/DuffPane.java @@ -18,22 +18,58 @@ Contributor(s): ______________________________________. package org.thdl.tib.input; -import java.io.*; -import java.util.*; -import java.awt.*; -import java.awt.datatransfer.*; -import java.awt.font.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.text.*; -import javax.swing.event.*; -import javax.swing.text.rtf.*; +import java.awt.Font; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.ClipboardOwner; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.StringSelection; +import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.UnsupportedFlavorException; +import java.awt.event.ActionEvent; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.io.BufferedWriter; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.util.ArrayList; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.LinkedList; -import org.thdl.tib.text.*; +import javax.swing.AbstractAction; +import javax.swing.Action; +import javax.swing.JOptionPane; +import javax.swing.text.AttributeSet; +import javax.swing.text.BadLocationException; +import javax.swing.text.Caret; +import javax.swing.text.DefaultStyledDocument; +import javax.swing.text.JTextComponent; +import javax.swing.text.Keymap; +import javax.swing.text.MutableAttributeSet; +import javax.swing.text.Position; +import javax.swing.text.Style; +import javax.swing.text.StyleConstants; +import javax.swing.text.StyleContext; +import javax.swing.text.StyledDocument; + +import org.thdl.tib.text.DuffCode; +import org.thdl.tib.text.DuffData; +import org.thdl.tib.text.InvalidTransliterationException; +import org.thdl.tib.text.THDLWylieConstants; +import org.thdl.tib.text.TibTextUtils; +import org.thdl.tib.text.TibetanDocument; +import org.thdl.tib.text.TibetanKeyboard; +import org.thdl.tib.text.TibetanMachineWeb; +import org.thdl.util.RTFFixerInputStream; +import org.thdl.util.StatusBar; import org.thdl.util.ThdlDebug; import org.thdl.util.ThdlOptions; -import org.thdl.util.StatusBar; -import org.thdl.util.RTFFixerInputStream; /** * Enables input of Tibetan text diff --git a/source/org/thdl/tib/input/DuffPaneTest.java b/source/org/thdl/tib/input/DuffPaneTest.java index eecb901..ddc9ab3 100644 --- a/source/org/thdl/tib/input/DuffPaneTest.java +++ b/source/org/thdl/tib/input/DuffPaneTest.java @@ -18,7 +18,6 @@ Contributor(s): ______________________________________. package org.thdl.tib.input; -import junit.framework.TestCase; /** * @author David Chandler diff --git a/source/org/thdl/tib/input/DuffPaneTestBase.java b/source/org/thdl/tib/input/DuffPaneTestBase.java index 1b3af0d..4e41ce6 100644 --- a/source/org/thdl/tib/input/DuffPaneTestBase.java +++ b/source/org/thdl/tib/input/DuffPaneTestBase.java @@ -20,9 +20,6 @@ package org.thdl.tib.input; import junit.framework.TestCase; -import javax.swing.Action; -import javax.swing.KeyStroke; - import org.thdl.util.ThdlOptions; /** diff --git a/source/org/thdl/tib/input/FontConverterConstants.java b/source/org/thdl/tib/input/FontConverterConstants.java index 611ad93..b5734ed 100644 --- a/source/org/thdl/tib/input/FontConverterConstants.java +++ b/source/org/thdl/tib/input/FontConverterConstants.java @@ -18,8 +18,6 @@ Contributor(s): ______________________________________. package org.thdl.tib.input; -import java.io.*; -import java.awt.*; /** Constants used by ConvertDialog. diff --git a/source/org/thdl/tib/input/JskadKeyboard.java b/source/org/thdl/tib/input/JskadKeyboard.java index a9c371d..779e934 100644 --- a/source/org/thdl/tib/input/JskadKeyboard.java +++ b/source/org/thdl/tib/input/JskadKeyboard.java @@ -18,13 +18,11 @@ Contributor(s): ______________________________________. package org.thdl.tib.input; -import java.util.Vector; import java.net.URL; +import org.thdl.tib.text.TibetanMachineWeb; import org.thdl.util.RTFPane; import org.thdl.util.ThdlLazyException; -import org.thdl.tib.text.TibetanMachineWeb; -import org.thdl.tib.input.DuffPane; /** A JskadKeyboard is the high-level view of a Tibetan-input keyboard that Jskad has. Each keyboard is associated with a .ini file diff --git a/source/org/thdl/tib/input/JskadKeyboardFactory.java b/source/org/thdl/tib/input/JskadKeyboardFactory.java index 228819f..8beeba1 100644 --- a/source/org/thdl/tib/input/JskadKeyboardFactory.java +++ b/source/org/thdl/tib/input/JskadKeyboardFactory.java @@ -20,8 +20,6 @@ package org.thdl.tib.input; import java.util.Properties; -import org.thdl.tib.input.JskadKeyboard; -import org.thdl.util.ThdlLazyException; import org.thdl.util.ThdlOptions; /** A JskadKeyboardFactory determines which Tibetan keyboards Jskad diff --git a/source/org/thdl/tib/input/JskadKeyboardManager.java b/source/org/thdl/tib/input/JskadKeyboardManager.java index d06ff8b..79e6ce8 100644 --- a/source/org/thdl/tib/input/JskadKeyboardManager.java +++ b/source/org/thdl/tib/input/JskadKeyboardManager.java @@ -20,8 +20,6 @@ package org.thdl.tib.input; import java.util.Vector; -import org.thdl.tib.input.JskadKeyboard; - /** A JskadKeyboardManager maintains a list of JskadKeyboards. @author David Chandler diff --git a/source/org/thdl/tib/input/PreferenceWindow.java b/source/org/thdl/tib/input/PreferenceWindow.java index 68b895b..2d59866 100644 --- a/source/org/thdl/tib/input/PreferenceWindow.java +++ b/source/org/thdl/tib/input/PreferenceWindow.java @@ -18,8 +18,15 @@ Contributor(s): ______________________________________. package org.thdl.tib.input; -import javax.swing.*; -import java.awt.*; +import java.awt.Component; +import java.awt.GraphicsEnvironment; +import java.awt.GridLayout; + +import javax.swing.BorderFactory; +import javax.swing.JComboBox; +import javax.swing.JDialog; +import javax.swing.JOptionPane; +import javax.swing.JPanel; /** Shows a standard dialog window to set the preferences for the tibetan and roman script used diff --git a/source/org/thdl/tib/input/RecentlyOpenedFilesDatabase.java b/source/org/thdl/tib/input/RecentlyOpenedFilesDatabase.java index dcc9e6d..6099e9c 100644 --- a/source/org/thdl/tib/input/RecentlyOpenedFilesDatabase.java +++ b/source/org/thdl/tib/input/RecentlyOpenedFilesDatabase.java @@ -18,10 +18,10 @@ Contributor(s): ______________________________________. package org.thdl.tib.input; -import org.thdl.util.ThdlOptions; - -import java.util.Vector; import java.io.File; +import java.util.Vector; + +import org.thdl.util.ThdlOptions; /** A database of the files most recently opened in Jskad. The client must call {@link #storeRecentlyOpenedFilePreferences()} before diff --git a/source/org/thdl/tib/input/TMW_RTF_TO_THDL_WYLIETest.java b/source/org/thdl/tib/input/TMW_RTF_TO_THDL_WYLIETest.java index 4658644..2d5a330 100644 --- a/source/org/thdl/tib/input/TMW_RTF_TO_THDL_WYLIETest.java +++ b/source/org/thdl/tib/input/TMW_RTF_TO_THDL_WYLIETest.java @@ -18,16 +18,16 @@ Contributor(s): ______________________________________. package org.thdl.tib.input; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.PrintStream; + import junit.framework.TestCase; -import java.io.File; -import java.io.PrintStream; -import java.io.FileOutputStream; -import java.io.FileNotFoundException; - -import org.thdl.util.ThdlOptions; -import org.apache.commons.jrcs.tools.JDiff; import org.apache.commons.jrcs.diff.Revision; +import org.apache.commons.jrcs.tools.JDiff; +import org.thdl.util.ThdlOptions; /** * @author David Chandler diff --git a/source/org/thdl/tib/input/TibetanConverter.java b/source/org/thdl/tib/input/TibetanConverter.java index 29e762a..4713f90 100644 --- a/source/org/thdl/tib/input/TibetanConverter.java +++ b/source/org/thdl/tib/input/TibetanConverter.java @@ -18,19 +18,28 @@ Contributor(s): ______________________________________. package org.thdl.tib.input; -import java.io.*; -import javax.swing.text.rtf.RTFEditorKit; +import java.io.BufferedWriter; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.io.PrintStream; +import java.util.ArrayList; + import javax.swing.text.SimpleAttributeSet; import javax.swing.text.StyleConstants; +import javax.swing.text.rtf.RTFEditorKit; -import org.thdl.util.*; -import org.thdl.tib.text.*; - -import org.thdl.tib.text.ttt.TConverter; +import org.thdl.tib.text.TibetanDocument; import org.thdl.tib.text.ttt.ACIPTraits; import org.thdl.tib.text.ttt.EWTSTraits; +import org.thdl.tib.text.ttt.TConverter; import org.thdl.tib.text.ttt.TTraits; -import java.util.ArrayList; +import org.thdl.util.RTFFixerInputStream; +import org.thdl.util.ThdlDebug; +import org.thdl.util.ThdlLazyException; +import org.thdl.util.ThdlOptions; +import org.thdl.util.ThdlVersion; /** TibetanConverter is a command-line utility for converting to and * from Tibetan Machine Web (TMW). It converts TMW to Wylie, ACIP, diff --git a/source/org/thdl/tib/input/TibetanPane.java b/source/org/thdl/tib/input/TibetanPane.java index 037a1ac..fcef08c 100644 --- a/source/org/thdl/tib/input/TibetanPane.java +++ b/source/org/thdl/tib/input/TibetanPane.java @@ -18,17 +18,13 @@ Contributor(s): ______________________________________. package org.thdl.tib.input; -import java.io.*; -import java.util.*; -import java.awt.datatransfer.*; -import javax.swing.*; -import javax.swing.text.*; -import javax.swing.text.rtf.*; +import java.awt.datatransfer.DataFlavor; -import org.thdl.tib.text.*; -import org.thdl.util.ThdlDebug; -import org.thdl.util.ThdlLazyException; -import org.thdl.util.ThdlOptions; +import javax.swing.JTextPane; +import javax.swing.text.rtf.RTFEditorKit; + +import org.thdl.tib.text.TibetanDocument; +import org.thdl.tib.text.TibetanRTFEditorKit; /** * Enables display of Tibetan text using Tibetan Computer Company's diff --git a/source/org/thdl/tib/input/TinyTest.java b/source/org/thdl/tib/input/TinyTest.java index 2162a6d..28f967b 100644 --- a/source/org/thdl/tib/input/TinyTest.java +++ b/source/org/thdl/tib/input/TinyTest.java @@ -18,7 +18,6 @@ Contributor(s): ______________________________________. package org.thdl.tib.input; -import junit.framework.TestCase; /** @author David Chandler diff --git a/source/org/thdl/tib/scanner/AboutDialog.java b/source/org/thdl/tib/scanner/AboutDialog.java index 7e77dc3..ad3c2fe 100644 --- a/source/org/thdl/tib/scanner/AboutDialog.java +++ b/source/org/thdl/tib/scanner/AboutDialog.java @@ -18,9 +18,21 @@ Contributor(s): ______________________________________. package org.thdl.tib.scanner; -import java.awt.*; -import java.awt.event.*; -import org.thdl.util.*; +import java.awt.BorderLayout; +import java.awt.Button; +import java.awt.Checkbox; +import java.awt.Dialog; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.Panel; +import java.awt.TextArea; +import java.awt.Toolkit; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowEvent; +import java.awt.event.WindowListener; + +import org.thdl.util.ThdlOptions; /** Window that displays copyright stuff. diff --git a/source/org/thdl/tib/scanner/AcipToTab.java b/source/org/thdl/tib/scanner/AcipToTab.java index 1255abb..cac6ad6 100644 --- a/source/org/thdl/tib/scanner/AcipToTab.java +++ b/source/org/thdl/tib/scanner/AcipToTab.java @@ -1,7 +1,12 @@ package org.thdl.tib.scanner; -import java.net.*; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.net.URL; class AcipToTab { diff --git a/source/org/thdl/tib/scanner/AcipToWylie.java b/source/org/thdl/tib/scanner/AcipToWylie.java index 659685d..58e446c 100644 --- a/source/org/thdl/tib/scanner/AcipToWylie.java +++ b/source/org/thdl/tib/scanner/AcipToWylie.java @@ -18,8 +18,13 @@ Contributor(s): ______________________________________. package org.thdl.tib.scanner; -import java.net.*; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.net.URL; /** Provides an interfase to convert from tibetan text transliterated in the Acip scheme to THDL's Extended Wylie scheme. diff --git a/source/org/thdl/tib/scanner/AlmostDefaultTableCellRenderer.java b/source/org/thdl/tib/scanner/AlmostDefaultTableCellRenderer.java index 0c29dd7..3967da5 100644 --- a/source/org/thdl/tib/scanner/AlmostDefaultTableCellRenderer.java +++ b/source/org/thdl/tib/scanner/AlmostDefaultTableCellRenderer.java @@ -17,12 +17,18 @@ Contributor(s): ______________________________________. */ package org.thdl.tib.scanner; -import java.awt.*; -import javax.swing.table.TableCellRenderer; -import javax.swing.border.*; -import javax.swing.*; +import java.awt.Color; +import java.awt.Component; import java.io.Serializable; +import javax.swing.JComponent; +import javax.swing.JTable; +import javax.swing.JTextArea; +import javax.swing.UIManager; +import javax.swing.border.Border; +import javax.swing.border.EmptyBorder; +import javax.swing.table.TableCellRenderer; + /** Used by DictionaryTable to display multiple lines of text (in Roman script) in a single cell. diff --git a/source/org/thdl/tib/scanner/AppletScannerFilter.java b/source/org/thdl/tib/scanner/AppletScannerFilter.java index 6342e53..f6be816 100644 --- a/source/org/thdl/tib/scanner/AppletScannerFilter.java +++ b/source/org/thdl/tib/scanner/AppletScannerFilter.java @@ -18,14 +18,32 @@ Contributor(s): ______________________________________. package org.thdl.tib.scanner; -import java.awt.*; -import java.applet.Applet; -import javax.swing.*; +import java.awt.Frame; +import java.awt.TextArea; +import java.awt.TextComponent; +import java.awt.Toolkit; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.StringSelection; +import java.awt.datatransfer.Transferable; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.awt.event.KeyEvent; + +import javax.swing.JApplet; +import javax.swing.JCheckBoxMenuItem; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.KeyStroke; +import javax.swing.UIManager; import javax.swing.text.JTextComponent; -import java.awt.event.*; -import java.awt.datatransfer.*; + import org.thdl.tib.input.DuffPane; -import org.thdl.util.*; +import org.thdl.util.ThdlOptions; /** Inputs a Tibetan text and displays the words with their definitions through through a graphical interfase using a diff --git a/source/org/thdl/tib/scanner/BinaryFileGenerator.java b/source/org/thdl/tib/scanner/BinaryFileGenerator.java index a03b4c4..796242e 100644 --- a/source/org/thdl/tib/scanner/BinaryFileGenerator.java +++ b/source/org/thdl/tib/scanner/BinaryFileGenerator.java @@ -17,10 +17,15 @@ Contributor(s): ______________________________________. */ package org.thdl.tib.scanner; -import java.io.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStreamReader; +import java.io.RandomAccessFile; + +import org.thdl.util.Link; import org.thdl.util.SimplifiedLinkedList; import org.thdl.util.SimplifiedListIterator; -import org.thdl.util.Link; /** Converts Tibetan dictionaries stored in text files diff --git a/source/org/thdl/tib/scanner/BitDictionarySource.java b/source/org/thdl/tib/scanner/BitDictionarySource.java index fc6f52c..9dc261b 100644 --- a/source/org/thdl/tib/scanner/BitDictionarySource.java +++ b/source/org/thdl/tib/scanner/BitDictionarySource.java @@ -17,7 +17,9 @@ Contributor(s): ______________________________________. */ package org.thdl.tib.scanner; -import java.io.*; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; /** Specifies a subset of dictionaries among a set of dictionaries. Supports a maximum of 30 dictionaries. diff --git a/source/org/thdl/tib/scanner/ByteDictionarySource.java b/source/org/thdl/tib/scanner/ByteDictionarySource.java index eb8e775..6e929a1 100644 --- a/source/org/thdl/tib/scanner/ByteDictionarySource.java +++ b/source/org/thdl/tib/scanner/ByteDictionarySource.java @@ -17,7 +17,9 @@ Contributor(s): ______________________________________. */ package org.thdl.tib.scanner; -import java.io.*; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; /** Specifies a subset of dictionaries among a set of dictionaries. Supports a maximum of 30 dictionaries. diff --git a/source/org/thdl/tib/scanner/CachedSyllableListTree.java b/source/org/thdl/tib/scanner/CachedSyllableListTree.java index 42f5fbe..b34a57f 100644 --- a/source/org/thdl/tib/scanner/CachedSyllableListTree.java +++ b/source/org/thdl/tib/scanner/CachedSyllableListTree.java @@ -17,8 +17,8 @@ Contributor(s): ______________________________________. */ package org.thdl.tib.scanner; -import java.io.*; -import org.thdl.util.*; +import org.thdl.util.SimplifiedLinkedList; +import org.thdl.util.SimplifiedListIterator; /** Provides recommended implementation of the {@link SyllableListTree} (currently most efficient memory-speed combination) loading diff --git a/source/org/thdl/tib/scanner/ConsoleScannerFilter.java b/source/org/thdl/tib/scanner/ConsoleScannerFilter.java index 7519316..230420c 100644 --- a/source/org/thdl/tib/scanner/ConsoleScannerFilter.java +++ b/source/org/thdl/tib/scanner/ConsoleScannerFilter.java @@ -17,10 +17,16 @@ Contributor(s): ______________________________________. */ package org.thdl.tib.scanner; -import org.thdl.util.*; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.net.URL; -import java.io.*; -import java.net.*; +import org.thdl.util.SimplifiedLinkedList; +import org.thdl.util.SimplifiedListIterator; /** Inputs a Tibetan text and displays the words with their definitions through the console over a shell. Use when no diff --git a/source/org/thdl/tib/scanner/CreateDatabaseWizard.java b/source/org/thdl/tib/scanner/CreateDatabaseWizard.java index b57c897..9d028a3 100644 --- a/source/org/thdl/tib/scanner/CreateDatabaseWizard.java +++ b/source/org/thdl/tib/scanner/CreateDatabaseWizard.java @@ -1,11 +1,30 @@ package org.thdl.tib.scanner; -import java.awt.*; -import java.awt.event.*; -import java.io.*; -import org.thdl.util.*; -import org.thdl.tib.scanner.*; -import javax.swing.*; +import java.awt.BorderLayout; +import java.awt.Button; +import java.awt.Choice; +import java.awt.Dialog; +import java.awt.FileDialog; +import java.awt.FlowLayout; +import java.awt.Frame; +import java.awt.GridLayout; +import java.awt.Label; +import java.awt.List; +import java.awt.Panel; +import java.awt.TextField; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStreamReader; +import java.io.PrintWriter; + +import javax.swing.JFileChooser; + +import org.thdl.util.SimplifiedLinkedList; class CreateDatabaseWizard extends Dialog implements ActionListener, ItemListener { diff --git a/source/org/thdl/tib/scanner/DictionaryFileFilter.java b/source/org/thdl/tib/scanner/DictionaryFileFilter.java index fcf7c29..1675617 100644 --- a/source/org/thdl/tib/scanner/DictionaryFileFilter.java +++ b/source/org/thdl/tib/scanner/DictionaryFileFilter.java @@ -1,7 +1,6 @@ package org.thdl.tib.scanner; -import java.io.*; -import javax.swing.filechooser.*; +import java.io.File; class DictionaryFileFilter extends javax.swing.filechooser.FileFilter { diff --git a/source/org/thdl/tib/scanner/DictionaryListSelectionListener.java b/source/org/thdl/tib/scanner/DictionaryListSelectionListener.java index 088b758..f2ac1b8 100644 --- a/source/org/thdl/tib/scanner/DictionaryListSelectionListener.java +++ b/source/org/thdl/tib/scanner/DictionaryListSelectionListener.java @@ -17,10 +17,12 @@ Contributor(s): ______________________________________. */ package org.thdl.tib.scanner; -import javax.swing.event.*; -import javax.swing.*; -import java.awt.*; -import javax.swing.table.*; +import java.awt.TextArea; + +import javax.swing.ListSelectionModel; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import javax.swing.table.TableModel; /** Used by the DictionaryTable to display the full definition of Tibetan word displayed in a table when its row is clicked. diff --git a/source/org/thdl/tib/scanner/DictionarySource.java b/source/org/thdl/tib/scanner/DictionarySource.java index fcc8251..11ad61d 100644 --- a/source/org/thdl/tib/scanner/DictionarySource.java +++ b/source/org/thdl/tib/scanner/DictionarySource.java @@ -17,7 +17,9 @@ Contributor(s): ______________________________________. */ package org.thdl.tib.scanner; -import java.io.*; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; /** Specifies a generic interface to access and process a subset of dictionaries among a set of dictionaries. diff --git a/source/org/thdl/tib/scanner/DictionaryTable.java b/source/org/thdl/tib/scanner/DictionaryTable.java index f4bcd3b..22537d2 100644 --- a/source/org/thdl/tib/scanner/DictionaryTable.java +++ b/source/org/thdl/tib/scanner/DictionaryTable.java @@ -17,10 +17,16 @@ Contributor(s): ______________________________________. */ package org.thdl.tib.scanner; -import javax.swing.*; -import javax.swing.table.*; -import javax.swing.event.*; -import java.awt.*; +import java.awt.Font; +import java.awt.FontMetrics; +import java.awt.TextArea; + +import javax.swing.JLabel; +import javax.swing.JTable; +import javax.swing.ListSelectionModel; +import javax.swing.table.TableCellRenderer; +import javax.swing.table.TableColumn; +import javax.swing.table.TableColumnModel; /** Table of two columns that displays a Tibetan word or phrase (in either Tibetan or Roman script) and the diff --git a/source/org/thdl/tib/scanner/DictionaryTableModel.java b/source/org/thdl/tib/scanner/DictionaryTableModel.java index b12270a..2a168a7 100644 --- a/source/org/thdl/tib/scanner/DictionaryTableModel.java +++ b/source/org/thdl/tib/scanner/DictionaryTableModel.java @@ -17,10 +17,10 @@ Contributor(s): ______________________________________. */ package org.thdl.tib.scanner; -import javax.swing.*; -import javax.swing.table.*; -import org.thdl.tib.text.TibTextUtils; +import javax.swing.table.AbstractTableModel; + import org.thdl.tib.text.DuffData; +import org.thdl.tib.text.TibTextUtils; /** Stores the words being displayed in a DictionaryTable. diff --git a/source/org/thdl/tib/scanner/DuffCellRenderer.java b/source/org/thdl/tib/scanner/DuffCellRenderer.java index 822bdef..6a89080 100644 --- a/source/org/thdl/tib/scanner/DuffCellRenderer.java +++ b/source/org/thdl/tib/scanner/DuffCellRenderer.java @@ -17,17 +17,21 @@ Contributor(s): ______________________________________. */ package org.thdl.tib.scanner; -import java.awt.*; -import javax.swing.*; -import javax.swing.table.TableCellRenderer; -import javax.swing.border.*; -import javax.swing.text.*; +import java.awt.Color; +import java.awt.Component; import java.io.Serializable; +import javax.swing.JComponent; +import javax.swing.JTable; +import javax.swing.UIManager; +import javax.swing.border.Border; +import javax.swing.border.EmptyBorder; +import javax.swing.table.TableCellRenderer; + import org.thdl.tib.input.DuffPane; -import org.thdl.util.ThdlDebug; -import org.thdl.tib.text.*; import org.thdl.tib.text.DuffData; +import org.thdl.tib.text.TibetanDocument; +import org.thdl.util.ThdlDebug; /** Used by DictionaryTable to display a Tibetan word or phrase (in either Roman or Tibetan script) in a single cell. diff --git a/source/org/thdl/tib/scanner/DuffScannerPanel.java b/source/org/thdl/tib/scanner/DuffScannerPanel.java index cefd292..c02e67f 100644 --- a/source/org/thdl/tib/scanner/DuffScannerPanel.java +++ b/source/org/thdl/tib/scanner/DuffScannerPanel.java @@ -17,13 +17,30 @@ Contributor(s): ______________________________________. */ package org.thdl.tib.scanner; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.event.*; -import javax.swing.table.*; -import org.thdl.tib.input.*; -import org.thdl.util.*; +import java.awt.BorderLayout; +import java.awt.CardLayout; +import java.awt.Choice; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.Frame; +import java.awt.GridLayout; +import java.awt.Label; +import java.awt.Panel; +import java.awt.TextArea; +import java.awt.event.FocusListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; + +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.event.TableModelEvent; + +import org.thdl.tib.input.DuffPane; +import org.thdl.tib.input.JskadKeyboardFactory; +import org.thdl.tib.input.JskadKeyboardManager; +import org.thdl.tib.input.PreferenceWindow; +import org.thdl.util.ThdlLazyException; +import org.thdl.util.ThdlOptions; /** Graphical interfase to be used by applications and applets to input a Tibetan text (in Roman or Tibetan script) and diff --git a/source/org/thdl/tib/scanner/FileSyllableListTree.java b/source/org/thdl/tib/scanner/FileSyllableListTree.java index cbd4996..b544601 100644 --- a/source/org/thdl/tib/scanner/FileSyllableListTree.java +++ b/source/org/thdl/tib/scanner/FileSyllableListTree.java @@ -17,8 +17,12 @@ Contributor(s): ______________________________________. */ package org.thdl.tib.scanner; -import java.io.*; -import org.thdl.util.*; +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.InputStreamReader; +import java.io.RandomAccessFile; + +import org.thdl.util.SimplifiedLinkedList; /** Searches the words directly in a file; not the preferred implementation. The search is too slow! diff --git a/source/org/thdl/tib/scanner/FilterHTMLDictionary.java b/source/org/thdl/tib/scanner/FilterHTMLDictionary.java index 325b8f8..51d623c 100644 --- a/source/org/thdl/tib/scanner/FilterHTMLDictionary.java +++ b/source/org/thdl/tib/scanner/FilterHTMLDictionary.java @@ -1,7 +1,12 @@ package org.thdl.tib.scanner; -import java.net.*; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.net.URL; class FilterHTMLDictionary { diff --git a/source/org/thdl/tib/scanner/LocalTibetanScanner.java b/source/org/thdl/tib/scanner/LocalTibetanScanner.java index c5b86f5..c7895e2 100644 --- a/source/org/thdl/tib/scanner/LocalTibetanScanner.java +++ b/source/org/thdl/tib/scanner/LocalTibetanScanner.java @@ -17,10 +17,8 @@ Contributor(s): ______________________________________. */ package org.thdl.tib.scanner; -import org.thdl.util.*; -import java.io.*; -import java.util.Vector; import java.util.Enumeration; +import java.util.Vector; /** Loads dictionary stored in tree format and searches for words recursively. How the the dictionary is loaded depends on which implementation of diff --git a/source/org/thdl/tib/scanner/MemorySyllableListTree.java b/source/org/thdl/tib/scanner/MemorySyllableListTree.java index 1ba593d..69e10aa 100644 --- a/source/org/thdl/tib/scanner/MemorySyllableListTree.java +++ b/source/org/thdl/tib/scanner/MemorySyllableListTree.java @@ -18,9 +18,13 @@ Contributor(s): ______________________________________. package org.thdl.tib.scanner; -import org.thdl.util.*; -import java.util.*; -import java.io.*; +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.InputStreamReader; +import java.io.PrintStream; + +import org.thdl.util.SimplifiedLinkedList; +import org.thdl.util.SimplifiedListIterator; /** Loads the whole dictionary into memory; not the preferred implementation. Provides the fastest search, but takes up to diff --git a/source/org/thdl/tib/scanner/OnLineScannerFilter.java b/source/org/thdl/tib/scanner/OnLineScannerFilter.java index c8d3a68..df80d39 100644 --- a/source/org/thdl/tib/scanner/OnLineScannerFilter.java +++ b/source/org/thdl/tib/scanner/OnLineScannerFilter.java @@ -18,14 +18,15 @@ Contributor(s): ______________________________________. package org.thdl.tib.scanner; -import org.thdl.util.*; -import org.thdl.tib.text.TibetanHTML; -import java.util.*; -import java.io.*; -import java.text.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.PrintWriter; +import java.util.MissingResourceException; +import java.util.ResourceBundle; + +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.thdl.util.ThdlOptions; /** Interfase to provide access to an on-line dictionary through a form in html; Inputs Tibetan text (Roman script only) and displays the diff --git a/source/org/thdl/tib/scanner/PocketPreferenceWindow.java b/source/org/thdl/tib/scanner/PocketPreferenceWindow.java index 7f84897..20deab6 100644 --- a/source/org/thdl/tib/scanner/PocketPreferenceWindow.java +++ b/source/org/thdl/tib/scanner/PocketPreferenceWindow.java @@ -18,8 +18,22 @@ Contributor(s): ______________________________________. package org.thdl.tib.scanner; -import java.awt.*; -import java.awt.event.*; +import java.awt.BorderLayout; +import java.awt.Button; +import java.awt.Choice; +import java.awt.Dialog; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Frame; +import java.awt.GraphicsEnvironment; +import java.awt.GridLayout; +import java.awt.Label; +import java.awt.Panel; +import java.awt.Toolkit; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; class PocketPreferenceWindow extends Dialog implements ActionListener, ItemListener { diff --git a/source/org/thdl/tib/scanner/PocketWhichDictionaryFrame.java b/source/org/thdl/tib/scanner/PocketWhichDictionaryFrame.java index a191350..68829f2 100644 --- a/source/org/thdl/tib/scanner/PocketWhichDictionaryFrame.java +++ b/source/org/thdl/tib/scanner/PocketWhichDictionaryFrame.java @@ -1,9 +1,19 @@ package org.thdl.tib.scanner; -import java.awt.*; -import java.awt.event.*; -import java.awt.image.*; -import java.io.*; +import java.awt.BorderLayout; +import java.awt.Checkbox; +import java.awt.CheckboxGroup; +import java.awt.Choice; +import java.awt.Dimension; +import java.awt.FileDialog; +import java.awt.FlowLayout; +import java.awt.Frame; +import java.awt.GridLayout; +import java.awt.Label; +import java.awt.Panel; +import java.awt.Toolkit; +import java.awt.event.ActionEvent; +import java.awt.event.ItemEvent; /** provides a friendly user interface when the command-line is not used for choosing a dictionary or connection to open. diff --git a/source/org/thdl/tib/scanner/PocketWindowScannerFilter.java b/source/org/thdl/tib/scanner/PocketWindowScannerFilter.java index a53f943..eab1e8c 100644 --- a/source/org/thdl/tib/scanner/PocketWindowScannerFilter.java +++ b/source/org/thdl/tib/scanner/PocketWindowScannerFilter.java @@ -18,13 +18,24 @@ Contributor(s): ______________________________________. package org.thdl.tib.scanner; -import java.awt.*; -import java.util.*; -import java.io.*; -import java.awt.event.*; -import java.awt.*; -import java.awt.datatransfer.*; -import org.thdl.util.*; +import java.awt.CheckboxMenuItem; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.GridLayout; +import java.awt.Menu; +import java.awt.MenuBar; +import java.awt.MenuItem; +import java.awt.TextArea; +import java.awt.TextComponent; +import java.awt.Toolkit; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.StringSelection; +import java.awt.datatransfer.Transferable; +import java.awt.event.ActionEvent; +import java.awt.event.FocusEvent; + +import org.thdl.util.ThdlOptions; /** Provides a graphical interfase to input Tibetan text (in Roman script) and displays the words (in Roman script) with their definitions. Use diff --git a/source/org/thdl/tib/scanner/RemoteScannerFilter.java b/source/org/thdl/tib/scanner/RemoteScannerFilter.java index 315be2c..3498834 100644 --- a/source/org/thdl/tib/scanner/RemoteScannerFilter.java +++ b/source/org/thdl/tib/scanner/RemoteScannerFilter.java @@ -17,13 +17,14 @@ Contributor(s): ______________________________________. */ package org.thdl.tib.scanner; -import org.thdl.util.*; -import java.util.*; -import java.io.*; -import java.text.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.util.ResourceBundle; + +import javax.servlet.GenericServlet; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; /** Running on the server, receives the tibetan text from applet/applications running on the client and sends them the words with their definitions through the Internet. diff --git a/source/org/thdl/tib/scanner/RemoteTibetanScanner.java b/source/org/thdl/tib/scanner/RemoteTibetanScanner.java index 40c2498..c7ec539 100644 --- a/source/org/thdl/tib/scanner/RemoteTibetanScanner.java +++ b/source/org/thdl/tib/scanner/RemoteTibetanScanner.java @@ -17,9 +17,14 @@ Contributor(s): ______________________________________. */ package org.thdl.tib.scanner; -import org.thdl.util.*; -import java.net.*; -import java.io.*; +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.PrintWriter; +import java.net.URL; +import java.net.URLConnection; + +import org.thdl.util.SimplifiedLinkedList; /** Used by applets and applications to access remote on-line dictionaries. Sends Tibetan text, and receives the words with their definitions. The diff --git a/source/org/thdl/tib/scanner/ScannerLogger.java b/source/org/thdl/tib/scanner/ScannerLogger.java index 8495321..9aa5268 100644 --- a/source/org/thdl/tib/scanner/ScannerLogger.java +++ b/source/org/thdl/tib/scanner/ScannerLogger.java @@ -17,8 +17,10 @@ Contributor(s): ______________________________________. */ package org.thdl.tib.scanner; -import java.io.*; -import java.util.*; +import java.io.FileOutputStream; +import java.io.PrintStream; +import java.util.Calendar; +import java.util.ResourceBundle; /** Designed to keep a log of the transactions taking place in the servlet version of the translation tool. diff --git a/source/org/thdl/tib/scanner/ScannerPanel.java b/source/org/thdl/tib/scanner/ScannerPanel.java index 2cb19f3..3b76cb3 100644 --- a/source/org/thdl/tib/scanner/ScannerPanel.java +++ b/source/org/thdl/tib/scanner/ScannerPanel.java @@ -17,9 +17,17 @@ Contributor(s): ______________________________________. */ package org.thdl.tib.scanner; -import java.awt.*; -import java.awt.event.*; -import java.io.*; +import java.awt.BorderLayout; +import java.awt.Button; +import java.awt.Checkbox; +import java.awt.FlowLayout; +import java.awt.Frame; +import java.awt.GridLayout; +import java.awt.Label; +import java.awt.Panel; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.FocusListener; /** Graphical interfase to be used by applications and applets to input a Tibetan text and displays the words with diff --git a/source/org/thdl/tib/scanner/SimpleScannerPanel.java b/source/org/thdl/tib/scanner/SimpleScannerPanel.java index a4db04a..9448e34 100644 --- a/source/org/thdl/tib/scanner/SimpleScannerPanel.java +++ b/source/org/thdl/tib/scanner/SimpleScannerPanel.java @@ -17,8 +17,17 @@ Contributor(s): ______________________________________. */ package org.thdl.tib.scanner; -import java.awt.*; -import java.awt.event.*; +import java.awt.BorderLayout; +import java.awt.CardLayout; +import java.awt.Font; +import java.awt.Frame; +import java.awt.GridLayout; +import java.awt.List; +import java.awt.Panel; +import java.awt.TextArea; +import java.awt.event.FocusListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; /** A non-Swing graphical interfase to be used by applications running on platforms that don't support Swing, diff --git a/source/org/thdl/tib/scanner/StrictDuffPane.java b/source/org/thdl/tib/scanner/StrictDuffPane.java index 2259d1b..3ded0eb 100644 --- a/source/org/thdl/tib/scanner/StrictDuffPane.java +++ b/source/org/thdl/tib/scanner/StrictDuffPane.java @@ -18,14 +18,20 @@ Contributor(s): ______________________________________. package org.thdl.tib.scanner; -import java.awt.datatransfer.*; -import java.io.*; -import javax.swing.*; -import javax.swing.text.*; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.UnsupportedFlavorException; +import java.io.IOException; +import java.io.InputStream; -import org.thdl.tib.input.*; -import org.thdl.tib.text.*; -import org.thdl.util.*; +import javax.swing.text.AttributeSet; +import javax.swing.text.BadLocationException; + +import org.thdl.tib.input.DuffPane; +import org.thdl.tib.text.TibetanDocument; +import org.thdl.util.RTFFixerInputStream; +import org.thdl.util.ThdlDebug; +import org.thdl.util.ThdlOptions; /** Identical to DuffPane except that it only supports Tibetan script in TibetanMachineWeb. No roman script can be inputted. If roman script is diff --git a/source/org/thdl/tib/scanner/SwingWhichDictionaryFrame.java b/source/org/thdl/tib/scanner/SwingWhichDictionaryFrame.java index cd860aa..da986e4 100644 --- a/source/org/thdl/tib/scanner/SwingWhichDictionaryFrame.java +++ b/source/org/thdl/tib/scanner/SwingWhichDictionaryFrame.java @@ -1,10 +1,19 @@ package org.thdl.tib.scanner; -import java.awt.*; -import java.awt.event.*; -import java.awt.image.*; -import java.io.*; -import javax.swing.*; +import java.awt.BorderLayout; +import java.awt.Checkbox; +import java.awt.CheckboxGroup; +import java.awt.Choice; +import java.awt.FileDialog; +import java.awt.FlowLayout; +import java.awt.Frame; +import java.awt.GridLayout; +import java.awt.Label; +import java.awt.Panel; +import java.awt.event.ActionEvent; +import java.awt.event.ItemEvent; + +import javax.swing.JFileChooser; /** provides a friendly user interface when the command-line is not used for choosing a dictionary or connection to open. diff --git a/source/org/thdl/tib/scanner/SwingWindowScannerFilter.java b/source/org/thdl/tib/scanner/SwingWindowScannerFilter.java index 819adfa..edf4996 100644 --- a/source/org/thdl/tib/scanner/SwingWindowScannerFilter.java +++ b/source/org/thdl/tib/scanner/SwingWindowScannerFilter.java @@ -18,14 +18,31 @@ Contributor(s): ______________________________________. package org.thdl.tib.scanner; -import java.awt.*; -import java.io.*; -import java.awt.event.*; -import java.awt.datatransfer.*; -import javax.swing.text.*; -import javax.swing.*; -import org.thdl.tib.input.*; -import org.thdl.util.*; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.GridLayout; +import java.awt.Menu; +import java.awt.MenuBar; +import java.awt.MenuItem; +import java.awt.TextArea; +import java.awt.TextComponent; +import java.awt.Toolkit; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.StringSelection; +import java.awt.datatransfer.Transferable; +import java.awt.event.ActionEvent; +import java.awt.event.FocusEvent; +import java.io.IOException; + +import javax.swing.JOptionPane; +import javax.swing.text.JTextComponent; + +import org.thdl.tib.input.DuffPane; +import org.thdl.tib.input.JskadKeyboard; +import org.thdl.util.SimpleFrame; +import org.thdl.util.ThdlActionListener; +import org.thdl.util.ThdlOptions; /** Provides a graphical interfase to input Tibetan text (Roman or Tibetan script) and displays the words (Roman or Tibetan script) diff --git a/source/org/thdl/tib/scanner/TibetanScanner.java b/source/org/thdl/tib/scanner/TibetanScanner.java index 2c8e34e..766a805 100644 --- a/source/org/thdl/tib/scanner/TibetanScanner.java +++ b/source/org/thdl/tib/scanner/TibetanScanner.java @@ -17,7 +17,9 @@ Contributor(s): ______________________________________. */ package org.thdl.tib.scanner; -import org.thdl.util.*; +import org.thdl.util.SimplifiedLinkedList; +import org.thdl.util.SimplifiedListIterator; +import org.thdl.util.ThdlVersion; /** Defines the core methods required to provide access to a dictionary; local or remote. diff --git a/source/org/thdl/tib/scanner/WhichDictionaryFrame.java b/source/org/thdl/tib/scanner/WhichDictionaryFrame.java index eda4416..f1c0e0f 100644 --- a/source/org/thdl/tib/scanner/WhichDictionaryFrame.java +++ b/source/org/thdl/tib/scanner/WhichDictionaryFrame.java @@ -1,10 +1,15 @@ package org.thdl.tib.scanner; -import java.awt.*; -import java.awt.event.*; -import java.awt.image.*; -import java.io.*; -import javax.swing.*; +import java.awt.Button; +import java.awt.Checkbox; +import java.awt.Choice; +import java.awt.Dialog; +import java.awt.Frame; +import java.awt.Label; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; /** provides a friendly user interface when the command-line is not used for choosing a dictionary or connection to open. diff --git a/source/org/thdl/tib/scanner/WindowScannerFilter.java b/source/org/thdl/tib/scanner/WindowScannerFilter.java index d27dcfa..f95459d 100644 --- a/source/org/thdl/tib/scanner/WindowScannerFilter.java +++ b/source/org/thdl/tib/scanner/WindowScannerFilter.java @@ -18,9 +18,20 @@ Contributor(s): ______________________________________. package org.thdl.tib.scanner; -import java.awt.*; -import java.awt.event.*; -import org.thdl.util.*; +import java.awt.CheckboxMenuItem; +import java.awt.Font; +import java.awt.Frame; +import java.awt.MenuItem; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.awt.event.WindowEvent; +import java.awt.event.WindowListener; + +import org.thdl.util.ThdlOptions; /** Provides a graphical interfase to input Tibetan text (Roman or Tibetan script) and displays the words (Roman or Tibetan script) diff --git a/source/org/thdl/tib/text/DuffCellRenderer.java b/source/org/thdl/tib/text/DuffCellRenderer.java index 3675961..e6e2ab4 100644 --- a/source/org/thdl/tib/text/DuffCellRenderer.java +++ b/source/org/thdl/tib/text/DuffCellRenderer.java @@ -18,18 +18,19 @@ Contributor(s): Edward Garrett. package org.thdl.tib.text; -import java.awt.*; -import javax.swing.*; -import javax.swing.table.TableCellRenderer; -import javax.swing.border.*; -import javax.swing.text.*; -import org.thdl.tib.input.DuffPane; -import org.thdl.tib.text.*; -import org.thdl.tib.text.DuffData; -import org.thdl.util.ThdlDebug; - +import java.awt.Color; +import java.awt.Component; import java.io.Serializable; +import javax.swing.JComponent; +import javax.swing.JTable; +import javax.swing.UIManager; +import javax.swing.border.Border; +import javax.swing.border.EmptyBorder; +import javax.swing.table.TableCellRenderer; + +import org.thdl.tib.input.DuffPane; + /** Used by DictionaryTable to display a Tibetan word or phrase (in either Roman or Tibetan script) in a single cell. diff --git a/source/org/thdl/tib/text/TibTextUtils.java b/source/org/thdl/tib/text/TibTextUtils.java index 94181c4..b9140c4 100644 --- a/source/org/thdl/tib/text/TibTextUtils.java +++ b/source/org/thdl/tib/text/TibTextUtils.java @@ -18,20 +18,20 @@ Contributor(s): ______________________________________. package org.thdl.tib.text; -import java.util.*; -import javax.swing.*; -import javax.swing.text.*; -import javax.swing.text.rtf.RTFEditorKit; -import java.io.*; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; -import org.thdl.util.ThdlDebug; -import org.thdl.tib.text.ttt.TTraits; -import org.thdl.tib.text.ttt.ACIPTraits; -import org.thdl.tib.text.ttt.EWTSTraits; -import org.thdl.tib.text.ttt.TConverter; import org.thdl.tib.text.tshegbar.LegalTshegBar; import org.thdl.tib.text.tshegbar.UnicodeConstants; import org.thdl.tib.text.tshegbar.UnicodeUtils; +import org.thdl.tib.text.ttt.ACIPTraits; +import org.thdl.tib.text.ttt.EWTSTraits; +import org.thdl.tib.text.ttt.TConverter; +import org.thdl.tib.text.ttt.TTraits; +import org.thdl.util.ThdlDebug; /** * Provides methods for converting back and forth between Extended diff --git a/source/org/thdl/tib/text/TibetanDocument.java b/source/org/thdl/tib/text/TibetanDocument.java index 30dc254..6340799 100644 --- a/source/org/thdl/tib/text/TibetanDocument.java +++ b/source/org/thdl/tib/text/TibetanDocument.java @@ -18,17 +18,30 @@ Contributor(s): ______________________________________. package org.thdl.tib.text; -import java.util.*; -import javax.swing.*; -import javax.swing.text.*; -import javax.swing.text.rtf.RTFEditorKit; -import java.io.*; import java.awt.Color; +import java.io.BufferedWriter; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.HashMap; + +import javax.swing.text.AbstractDocument; +import javax.swing.text.AttributeSet; +import javax.swing.text.BadLocationException; +import javax.swing.text.DefaultStyledDocument; +import javax.swing.text.Element; +import javax.swing.text.MutableAttributeSet; +import javax.swing.text.Position; +import javax.swing.text.SimpleAttributeSet; +import javax.swing.text.StyleConstants; +import javax.swing.text.StyleContext; +import javax.swing.text.rtf.RTFEditorKit; -import org.thdl.util.ThdlDebug; -import org.thdl.util.ThdlOptions; -import org.thdl.util.ThdlLazyException; import org.thdl.tib.text.tshegbar.UnicodeUtils; +import org.thdl.util.ThdlDebug; +import org.thdl.util.ThdlLazyException; +import org.thdl.util.ThdlOptions; /** Represents a character meant to be rendered in a certain font. * @author David Chandler diff --git a/source/org/thdl/tib/text/TibetanKeyboard.java b/source/org/thdl/tib/text/TibetanKeyboard.java index 9d4b871..a1b1886 100644 --- a/source/org/thdl/tib/text/TibetanKeyboard.java +++ b/source/org/thdl/tib/text/TibetanKeyboard.java @@ -18,10 +18,12 @@ Contributor(s): ______________________________________. package org.thdl.tib.text; -import java.util.*; -import java.io.*; -import java.lang.*; +import java.io.BufferedReader; +import java.io.InputStreamReader; import java.net.URL; +import java.util.HashMap; +import java.util.Map; +import java.util.StringTokenizer; import org.thdl.util.Trie; diff --git a/source/org/thdl/tib/text/TibetanLabelView.java b/source/org/thdl/tib/text/TibetanLabelView.java index ae7592e..e67093a 100644 --- a/source/org/thdl/tib/text/TibetanLabelView.java +++ b/source/org/thdl/tib/text/TibetanLabelView.java @@ -18,8 +18,10 @@ Contributor(s): ______________________________________. package org.thdl.tib.text; -import javax.swing.*; -import javax.swing.text.*; +import javax.swing.text.Element; +import javax.swing.text.LabelView; +import javax.swing.text.Segment; +import javax.swing.text.View; /** A TibetanLabelView is a LabelView that has its own idea, informed * by its knowledge of Tibetan, about where a good place to break diff --git a/source/org/thdl/tib/text/TibetanMachineWeb.java b/source/org/thdl/tib/text/TibetanMachineWeb.java index fcc2d1b..3c7366c 100644 --- a/source/org/thdl/tib/text/TibetanMachineWeb.java +++ b/source/org/thdl/tib/text/TibetanMachineWeb.java @@ -19,20 +19,26 @@ Contributor(s): ______________________________________. package org.thdl.tib.text; -import java.util.*; -import java.net.URL; -import java.io.*; -import java.lang.*; import java.awt.Font; -import java.awt.event.KeyEvent; -import javax.swing.text.*; -import java.awt.font.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.URL; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.StringTokenizer; + +import javax.swing.text.SimpleAttributeSet; +import javax.swing.text.StyleConstants; -import org.thdl.util.ThdlDebug; -import org.thdl.util.ThdlLazyException; -import org.thdl.util.Trie; -import org.thdl.util.ThdlOptions; import org.thdl.tib.text.tshegbar.UnicodeUtils; +import org.thdl.util.ThdlDebug; +import org.thdl.util.ThdlOptions; +import org.thdl.util.Trie; /** * Interfaces between Extended Wylie and the TibetanMachineWeb fonts. diff --git a/source/org/thdl/tib/text/TibetanRTFEditorKit.java b/source/org/thdl/tib/text/TibetanRTFEditorKit.java index 0d50ba6..0b95764 100644 --- a/source/org/thdl/tib/text/TibetanRTFEditorKit.java +++ b/source/org/thdl/tib/text/TibetanRTFEditorKit.java @@ -18,8 +18,7 @@ Contributor(s): ______________________________________. package org.thdl.tib.text; -import javax.swing.*; -import javax.swing.text.*; +import javax.swing.text.ViewFactory; import javax.swing.text.rtf.RTFEditorKit; /** An EditorKit that is cognizant of the line-wrapping rules for diff --git a/source/org/thdl/tib/text/TibetanRTFViewFactory.java b/source/org/thdl/tib/text/TibetanRTFViewFactory.java index ac4c991..063a9cf 100644 --- a/source/org/thdl/tib/text/TibetanRTFViewFactory.java +++ b/source/org/thdl/tib/text/TibetanRTFViewFactory.java @@ -18,8 +18,10 @@ Contributor(s): ______________________________________. package org.thdl.tib.text; -import javax.swing.*; -import javax.swing.text.*; +import javax.swing.text.AbstractDocument; +import javax.swing.text.Element; +import javax.swing.text.View; +import javax.swing.text.ViewFactory; import org.thdl.util.ThdlOptions; diff --git a/source/org/thdl/tib/text/TranslitTuple.java b/source/org/thdl/tib/text/TranslitTuple.java index b1968c1..53b49b2 100644 --- a/source/org/thdl/tib/text/TranslitTuple.java +++ b/source/org/thdl/tib/text/TranslitTuple.java @@ -18,7 +18,6 @@ Contributor(s): ______________________________________. package org.thdl.tib.text; -import java.util.Vector; /** * A stretch of Roman transliteration all in a certain font size. diff --git a/source/org/thdl/tib/text/tshegbar/UnicodeReader.java b/source/org/thdl/tib/text/tshegbar/UnicodeReader.java index ab21b3e..4734f66 100644 --- a/source/org/thdl/tib/text/tshegbar/UnicodeReader.java +++ b/source/org/thdl/tib/text/tshegbar/UnicodeReader.java @@ -18,7 +18,6 @@ Contributor(s): ______________________________________. package org.thdl.tib.text.tshegbar; -import java.io.InputStream; /** A UnicodeReader attempts to read from an InputStream and forms our * TTBIR, our Tibetan Tsheg Bar Internal Representation. You diff --git a/source/org/thdl/tib/text/ttt/EWTSTest.java b/source/org/thdl/tib/text/ttt/EWTSTest.java index 02a9d08..4528cb4 100644 --- a/source/org/thdl/tib/text/ttt/EWTSTest.java +++ b/source/org/thdl/tib/text/ttt/EWTSTest.java @@ -23,9 +23,9 @@ import java.util.ArrayList; import junit.framework.TestCase; -import org.thdl.util.ThdlOptions; import org.thdl.tib.text.TibetanDocument; import org.thdl.tib.text.tshegbar.UnicodeUtils; +import org.thdl.util.ThdlOptions; /** Tests this package's ability to understand EWTS and turn it into * the appropriate TMW or Unicode. diff --git a/source/org/thdl/tib/text/ttt/EWTSTraits.java b/source/org/thdl/tib/text/ttt/EWTSTraits.java index 35149db..a4d12aa 100644 --- a/source/org/thdl/tib/text/ttt/EWTSTraits.java +++ b/source/org/thdl/tib/text/ttt/EWTSTraits.java @@ -23,11 +23,11 @@ package org.thdl.tib.text.ttt; import java.util.ArrayList; import java.util.HashMap; -import org.thdl.tib.text.tshegbar.UnicodeUtils; import org.thdl.tib.text.DuffCode; import org.thdl.tib.text.THDLWylieConstants; import org.thdl.tib.text.TibTextUtils; import org.thdl.tib.text.TibetanMachineWeb; +import org.thdl.tib.text.tshegbar.UnicodeUtils; import org.thdl.util.ThdlDebug; /** A singleton class that should contain (but due to laziness and diff --git a/source/org/thdl/tib/text/ttt/TConverter.java b/source/org/thdl/tib/text/ttt/TConverter.java index 8bf797c..e77640f 100644 --- a/source/org/thdl/tib/text/ttt/TConverter.java +++ b/source/org/thdl/tib/text/ttt/TConverter.java @@ -27,9 +27,9 @@ import java.io.OutputStreamWriter; import java.util.ArrayList; import org.thdl.tib.text.DuffCode; +import org.thdl.tib.text.THDLWylieConstants; import org.thdl.tib.text.TibetanDocument; import org.thdl.tib.text.TibetanMachineWeb; -import org.thdl.tib.text.THDLWylieConstants; import org.thdl.util.ThdlDebug; import org.thdl.util.ThdlOptions; diff --git a/source/org/thdl/tib/text/ttt/TPairList.java b/source/org/thdl/tib/text/ttt/TPairList.java index 4431571..0dd9f09 100644 --- a/source/org/thdl/tib/text/ttt/TPairList.java +++ b/source/org/thdl/tib/text/ttt/TPairList.java @@ -21,7 +21,6 @@ package org.thdl.tib.text.ttt; import java.util.ArrayList; import java.util.HashMap; -import org.thdl.tib.text.tshegbar.UnicodeUtils; import org.thdl.tib.text.TGCPair; import org.thdl.tib.text.TibetanMachineWeb; import org.thdl.util.ThdlDebug; diff --git a/source/org/thdl/tib/text/ttt/TPairListFactory.java b/source/org/thdl/tib/text/ttt/TPairListFactory.java index e1a791d..6fb9e9a 100644 --- a/source/org/thdl/tib/text/ttt/TPairListFactory.java +++ b/source/org/thdl/tib/text/ttt/TPairListFactory.java @@ -21,11 +21,11 @@ Contributor(s): ______________________________________. package org.thdl.tib.text.ttt; import java.util.Arrays; -import java.util.List; import java.util.Comparator; +import java.util.List; -import org.thdl.tib.text.TibetanMachineWeb; import org.thdl.tib.text.THDLWylieConstants; +import org.thdl.tib.text.TibetanMachineWeb; /** A factory for creating {@link TPairList TPairLists} from * Strings of ACIP. diff --git a/source/org/thdl/tib/text/ttt/TStackList.java b/source/org/thdl/tib/text/ttt/TStackList.java index 502d178..5ba5d3b 100644 --- a/source/org/thdl/tib/text/ttt/TStackList.java +++ b/source/org/thdl/tib/text/ttt/TStackList.java @@ -21,7 +21,6 @@ package org.thdl.tib.text.ttt; import java.util.ArrayList; import java.util.ListIterator; -import org.thdl.util.ThdlDebug; import org.thdl.tib.text.TGCList; import org.thdl.tib.text.TibTextUtils; diff --git a/source/org/thdl/tib/text/ttt/TString.java b/source/org/thdl/tib/text/ttt/TString.java index c7f51d8..e4f243b 100644 --- a/source/org/thdl/tib/text/ttt/TString.java +++ b/source/org/thdl/tib/text/ttt/TString.java @@ -20,8 +20,8 @@ package org.thdl.tib.text.ttt; import java.util.HashSet; -import org.thdl.tib.text.tshegbar.UnicodeUtils; import org.thdl.tib.text.THDLWylieConstants; +import org.thdl.tib.text.tshegbar.UnicodeUtils; import org.thdl.util.ThdlDebug; import org.thdl.util.ThdlOptions;