From ff130e6fb1b2e3bb20674e15c2292e659be9d612 Mon Sep 17 00:00:00 2001 From: dchandler Date: Mon, 28 Feb 2005 01:37:54 +0000 Subject: [PATCH] Organized imports in Eclipse. --- source/org/thdl/tib/bibl/DiacriticPanel.java | 19 +++---- source/org/thdl/tib/bibl/DiscDialog.java | 57 ++++++++++++++++--- source/org/thdl/tib/bibl/DoxWindow.java | 26 +++++++-- source/org/thdl/tib/bibl/ElementList.java | 4 +- source/org/thdl/tib/bibl/ElementStyle.java | 1 - .../org/thdl/tib/bibl/GenericTibFactory.java | 5 +- source/org/thdl/tib/bibl/IDFactory.java | 7 ++- source/org/thdl/tib/bibl/IntroSign.java | 3 +- source/org/thdl/tib/bibl/TTFileView.java | 11 ++-- source/org/thdl/tib/bibl/TextPane.java | 16 ++++-- source/org/thdl/tib/bibl/TibAction.java | 1 - source/org/thdl/tib/bibl/TibConstants.java | 10 ++-- source/org/thdl/tib/bibl/TibDTDResolver.java | 2 +- source/org/thdl/tib/bibl/TibDialog.java | 16 ++++-- source/org/thdl/tib/bibl/TibDoc.java | 14 ++--- source/org/thdl/tib/bibl/TibFrame.java | 35 +++++++++--- source/org/thdl/tib/bibl/TibTable.java | 25 +++++--- source/org/thdl/tib/bibl/TiblEdit.java | 42 ++++++++++---- source/org/thdl/tib/bibl/TitleFactory.java | 7 ++- source/org/thdl/tib/bibl/TitleParser.java | 8 +-- source/org/thdl/tib/bibl/XMLDoc.java | 8 +-- source/org/thdl/tib/bibl/XMLFilter.java | 4 +- source/org/thdl/tib/bibl/XMLReader.java | 13 ++--- 23 files changed, 220 insertions(+), 114 deletions(-) diff --git a/source/org/thdl/tib/bibl/DiacriticPanel.java b/source/org/thdl/tib/bibl/DiacriticPanel.java index c970cc4..c611e81 100644 --- a/source/org/thdl/tib/bibl/DiacriticPanel.java +++ b/source/org/thdl/tib/bibl/DiacriticPanel.java @@ -24,25 +24,20 @@ import java.awt.Dimension; import java.awt.GridLayout; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -//import java.awt.event.WindowAdapter; -//import java.awt.event.WindowEvent; -import java.io.File; -import java.io.FileReader; import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.IOException; +import java.io.InputStreamReader; import java.net.URL; -import javax.swing.SwingConstants; + +import javax.swing.BorderFactory; +import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JPanel; -import javax.swing.JFrame; -import javax.swing.JScrollPane; -import javax.swing.ScrollPaneConstants; -import javax.swing.BorderFactory; +import javax.swing.SwingConstants; import javax.swing.border.CompoundBorder; -import javax.swing.border.EmptyBorder; import javax.swing.border.LineBorder; -import javax.swing.text.*; +import javax.swing.text.BadLocationException; +import javax.swing.text.JTextComponent; /** *

This class creates a panel that displays all the relevant diff --git a/source/org/thdl/tib/bibl/DiscDialog.java b/source/org/thdl/tib/bibl/DiscDialog.java index cfb1ffa..e42a0a3 100644 --- a/source/org/thdl/tib/bibl/DiscDialog.java +++ b/source/org/thdl/tib/bibl/DiscDialog.java @@ -18,15 +18,54 @@ Contributor(s): ______________________________________. package org.thdl.tib.bibl; -import javax.swing.*; -import javax.swing.event.*; -import javax.swing.border.*; -import javax.swing.text.*; -import javax.swing.text.StyleContext.*; -import java.awt.*; -import java.awt.event.*; -import java.util.*; -import org.jdom.*; +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Event; +import java.awt.Font; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Vector; + +import javax.swing.Action; +import javax.swing.BorderFactory; +import javax.swing.BoxLayout; +import javax.swing.DefaultComboBoxModel; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.JMenuBar; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JSplitPane; +import javax.swing.JTextPane; +import javax.swing.JToolBar; +import javax.swing.KeyStroke; +import javax.swing.ListCellRenderer; +import javax.swing.SwingConstants; +import javax.swing.WindowConstants; +import javax.swing.border.CompoundBorder; +import javax.swing.border.EmptyBorder; +import javax.swing.border.LineBorder; +import javax.swing.text.AttributeSet; +import javax.swing.text.BadLocationException; +import javax.swing.text.JTextComponent; +import javax.swing.text.Keymap; +import javax.swing.text.Style; +import javax.swing.text.StyleConstants; +import javax.swing.text.StyledDocument; +import javax.swing.text.StyledEditorKit; +import javax.swing.text.StyleContext.NamedStyle; /** * This extension of JDialog is used for entering in discussion concerning a specific title in a Tibbibl document. diff --git a/source/org/thdl/tib/bibl/DoxWindow.java b/source/org/thdl/tib/bibl/DoxWindow.java index 861674e..67f3296 100644 --- a/source/org/thdl/tib/bibl/DoxWindow.java +++ b/source/org/thdl/tib/bibl/DoxWindow.java @@ -18,12 +18,28 @@ Contributor(s): ______________________________________. package org.thdl.tib.bibl; -import javax.swing.*; -import javax.swing.border.*; -import java.awt.*; -import java.awt.event.*; -import java.util.StringTokenizer; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.GridLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.util.NoSuchElementException; +import java.util.StringTokenizer; + +import javax.swing.ButtonGroup; +import javax.swing.DefaultComboBoxModel; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.JTextArea; +import javax.swing.JTextField; +import javax.swing.UIManager; +import javax.swing.WindowConstants; +import javax.swing.border.EmptyBorder; /** * This class displays a separate window with information concerning a texts doxographical category and it diff --git a/source/org/thdl/tib/bibl/ElementList.java b/source/org/thdl/tib/bibl/ElementList.java index eb58200..bb5c72e 100644 --- a/source/org/thdl/tib/bibl/ElementList.java +++ b/source/org/thdl/tib/bibl/ElementList.java @@ -18,8 +18,8 @@ Contributor(s): ______________________________________. package org.thdl.tib.bibl; -import java.util.*; -import org.jdom.*; +import java.util.Iterator; +import java.util.Vector; /** *

diff --git a/source/org/thdl/tib/bibl/ElementStyle.java b/source/org/thdl/tib/bibl/ElementStyle.java index dabbcb3..e5fc38a 100644 --- a/source/org/thdl/tib/bibl/ElementStyle.java +++ b/source/org/thdl/tib/bibl/ElementStyle.java @@ -18,7 +18,6 @@ Contributor(s): ______________________________________. package org.thdl.tib.bibl; -import org.jdom.*; /** * This wrapper class associates a String of text with a Style (as defined in {@link TibConstants} [MAYBE]) and a particular diff --git a/source/org/thdl/tib/bibl/GenericTibFactory.java b/source/org/thdl/tib/bibl/GenericTibFactory.java index caa5e99..805ec49 100644 --- a/source/org/thdl/tib/bibl/GenericTibFactory.java +++ b/source/org/thdl/tib/bibl/GenericTibFactory.java @@ -18,9 +18,8 @@ Contributor(s): ______________________________________. package org.thdl.tib.bibl; -import java.util.*; -import org.jdom.*; -import org.jdom.output.*; +import java.util.Iterator; +import java.util.Vector; /** * This abstract class is extended by both {@link IDFactory} and {@link TitleFactory}, and provides general functionality diff --git a/source/org/thdl/tib/bibl/IDFactory.java b/source/org/thdl/tib/bibl/IDFactory.java index 16b1fa4..ad0c9e0 100644 --- a/source/org/thdl/tib/bibl/IDFactory.java +++ b/source/org/thdl/tib/bibl/IDFactory.java @@ -18,9 +18,10 @@ Contributor(s): ______________________________________. package org.thdl.tib.bibl; -import java.util.*; -import org.jdom.*; -import org.jdom.output.*; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.StringTokenizer; +import java.util.Vector; /** * Like its sister class, {@link TitleFactory}, this class is used to access and display the information diff --git a/source/org/thdl/tib/bibl/IntroSign.java b/source/org/thdl/tib/bibl/IntroSign.java index 1b1311e..7c19337 100644 --- a/source/org/thdl/tib/bibl/IntroSign.java +++ b/source/org/thdl/tib/bibl/IntroSign.java @@ -24,13 +24,14 @@ import java.awt.Dimension; import java.awt.Font; import java.awt.GridLayout; import java.awt.Toolkit; + import javax.swing.BorderFactory; import javax.swing.ImageIcon; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JPanel; -import javax.swing.border.Border; import javax.swing.border.BevelBorder; +import javax.swing.border.Border; /** * This class displays the initial splash screen upon opening the program. diff --git a/source/org/thdl/tib/bibl/TTFileView.java b/source/org/thdl/tib/bibl/TTFileView.java index 14ef9cc..7b8db7f 100644 --- a/source/org/thdl/tib/bibl/TTFileView.java +++ b/source/org/thdl/tib/bibl/TTFileView.java @@ -18,13 +18,10 @@ Contributor(s): ______________________________________. package org.thdl.tib.bibl; -import java.io.*; -import java.util.*; -import javax.swing.*; -import javax.swing.filechooser.*; -import org.jdom.*; -import org.jdom.input.*; -import org.jdom.output.*; +import java.io.File; +import java.util.Hashtable; + +import javax.swing.filechooser.FileView; //import org.thdl.tib.bibl.shared.*; /** diff --git a/source/org/thdl/tib/bibl/TextPane.java b/source/org/thdl/tib/bibl/TextPane.java index 71b54ed..6031721 100644 --- a/source/org/thdl/tib/bibl/TextPane.java +++ b/source/org/thdl/tib/bibl/TextPane.java @@ -18,14 +18,18 @@ Contributor(s): ______________________________________. package org.thdl.tib.bibl; -import java.util.*; import java.awt.Color; import java.awt.Insets; -import javax.swing.*; -import javax.swing.event.*; -import javax.swing.text.*; -import org.jdom.*; -import org.jdom.output.*; +import java.util.Iterator; +import java.util.Vector; + +import javax.swing.JScrollPane; +import javax.swing.JTextPane; +import javax.swing.text.BadLocationException; +import javax.swing.text.DefaultStyledDocument; +import javax.swing.text.Style; +import javax.swing.text.StyleConstants; +import javax.swing.text.StyleContext; //import org.thdl.tib.bibl.shared.*; diff --git a/source/org/thdl/tib/bibl/TibAction.java b/source/org/thdl/tib/bibl/TibAction.java index 1855202..7a93bd3 100644 --- a/source/org/thdl/tib/bibl/TibAction.java +++ b/source/org/thdl/tib/bibl/TibAction.java @@ -19,7 +19,6 @@ Contributor(s): ______________________________________. package org.thdl.tib.bibl; import javax.swing.AbstractAction; -import java.io.File; /** * This extension of javax.swing.AbstractAction is used for the various menus in {@link TibFrame}. It assigns two diff --git a/source/org/thdl/tib/bibl/TibConstants.java b/source/org/thdl/tib/bibl/TibConstants.java index 8ef9f8a..1dda135 100644 --- a/source/org/thdl/tib/bibl/TibConstants.java +++ b/source/org/thdl/tib/bibl/TibConstants.java @@ -18,10 +18,12 @@ Contributor(s): ______________________________________. package org.thdl.tib.bibl; -import java.io.*; -import java.awt.*; -import javax.swing.*; -import java.util.Hashtable; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.Insets; + +import javax.swing.JOptionPane; /** * This interface contains all the constants used throughout the TiblEdit program. They are roughly organized diff --git a/source/org/thdl/tib/bibl/TibDTDResolver.java b/source/org/thdl/tib/bibl/TibDTDResolver.java index 08d6792..cc93a93 100644 --- a/source/org/thdl/tib/bibl/TibDTDResolver.java +++ b/source/org/thdl/tib/bibl/TibDTDResolver.java @@ -19,7 +19,7 @@ Contributor(s): ______________________________________. package org.thdl.tib.bibl; import org.xml.sax.EntityResolver; - import org.xml.sax.InputSource; +import org.xml.sax.InputSource; /* FIXMEDOC. * diff --git a/source/org/thdl/tib/bibl/TibDialog.java b/source/org/thdl/tib/bibl/TibDialog.java index d060e6b..ccb6e99 100644 --- a/source/org/thdl/tib/bibl/TibDialog.java +++ b/source/org/thdl/tib/bibl/TibDialog.java @@ -18,11 +18,17 @@ Contributor(s): ______________________________________. package org.thdl.tib.bibl; -import java.awt.*; -import java.awt.event.*; -import java.util.*; -import javax.swing.*; -import javax.swing.event.*; +import java.awt.GridLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.Hashtable; +import java.util.Vector; + +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JTextField; /** diff --git a/source/org/thdl/tib/bibl/TibDoc.java b/source/org/thdl/tib/bibl/TibDoc.java index 04e0ed2..37fedfe 100644 --- a/source/org/thdl/tib/bibl/TibDoc.java +++ b/source/org/thdl/tib/bibl/TibDoc.java @@ -18,14 +18,12 @@ Contributor(s): ______________________________________. package org.thdl.tib.bibl; -import java.util.*; -import javax.swing.text.StyledDocument; -import javax.swing.text.Style; -import javax.swing.text.AttributeSet; -import javax.swing.text.BadLocationException; -import org.jdom.*; -import org.jdom.input.*; -import org.jdom.output.*; +import java.util.Iterator; +import java.util.StringTokenizer; +import java.util.Vector; + +import org.jdom.DocType; +import org.jdom.Element; /** *

diff --git a/source/org/thdl/tib/bibl/TibFrame.java b/source/org/thdl/tib/bibl/TibFrame.java index 10a1e49..cd45480 100644 --- a/source/org/thdl/tib/bibl/TibFrame.java +++ b/source/org/thdl/tib/bibl/TibFrame.java @@ -18,17 +18,38 @@ Contributor(s): ______________________________________. package org.thdl.tib.bibl; -import java.awt.Event; -import java.awt.event.*; -import java.awt.Color; import java.awt.Dimension; +import java.awt.Event; import java.awt.Toolkit; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ComponentAdapter; +import java.awt.event.ComponentEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; import java.io.File; -import java.util.Vector; import java.util.Iterator; -import javax.swing.*; -import javax.swing.text.*; -import javax.swing.event.*; +import java.util.Vector; + +import javax.swing.Action; +import javax.swing.JCheckBoxMenuItem; +import javax.swing.JComponent; +import javax.swing.JFrame; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JSplitPane; +import javax.swing.JTable; +import javax.swing.KeyStroke; +import javax.swing.event.CaretEvent; +import javax.swing.event.CaretListener; +import javax.swing.text.EditorKit; +import javax.swing.text.Style; /** *

diff --git a/source/org/thdl/tib/bibl/TibTable.java b/source/org/thdl/tib/bibl/TibTable.java index 800847a..2cdec27 100644 --- a/source/org/thdl/tib/bibl/TibTable.java +++ b/source/org/thdl/tib/bibl/TibTable.java @@ -18,17 +18,26 @@ Contributor(s): ______________________________________. package org.thdl.tib.bibl; -import java.awt.*; -import java.awt.event.*; +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.GridLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.util.Hashtable; -import java.util.Vector; import java.util.Iterator; import java.util.Observable; -import java.util.Observer; -import javax.swing.*; -import javax.swing.text.*; -import javax.swing.table.*; -import org.jdom.*; +import java.util.Vector; + +import javax.swing.JButton; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JSplitPane; +import javax.swing.JTable; +import javax.swing.table.AbstractTableModel; +import javax.swing.table.DefaultTableCellRenderer; /** * This element is a wrapper element for a JTable that sets up two kinds of tables for editing a Tibbibl--one for diff --git a/source/org/thdl/tib/bibl/TiblEdit.java b/source/org/thdl/tib/bibl/TiblEdit.java index 45de5e5..6cf30a7 100644 --- a/source/org/thdl/tib/bibl/TiblEdit.java +++ b/source/org/thdl/tib/bibl/TiblEdit.java @@ -20,16 +20,38 @@ package org.thdl.tib.bibl; import java.awt.Dimension; import java.awt.HeadlessException; -import java.beans.*; -import java.io.*; -import java.util.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.event.*; -import javax.swing.text.*; -import org.jdom.*; -import org.jdom.input.*; -import org.jdom.output.*; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.DataOutputStream; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintStream; +import java.io.PrintWriter; +import java.util.Calendar; +import java.util.Enumeration; +import java.util.GregorianCalendar; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.List; +import java.util.Observable; +import java.util.Observer; +import java.util.StringTokenizer; +import java.util.Vector; + +import javax.swing.JFileChooser; +import javax.swing.JOptionPane; +import javax.swing.UIManager; +import javax.swing.text.BadLocationException; + +import org.jdom.output.XMLOutputter; /** *

diff --git a/source/org/thdl/tib/bibl/TitleFactory.java b/source/org/thdl/tib/bibl/TitleFactory.java index 6066838..240d8ad 100644 --- a/source/org/thdl/tib/bibl/TitleFactory.java +++ b/source/org/thdl/tib/bibl/TitleFactory.java @@ -18,9 +18,10 @@ Contributor(s): ______________________________________. package org.thdl.tib.bibl; -import java.util.*; -import org.jdom.*; -import org.jdom.output.*; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.List; +import java.util.Vector; /** * The TitleFactory class extends the GenericTibFactory to provide means for locating and manipulating title elements diff --git a/source/org/thdl/tib/bibl/TitleParser.java b/source/org/thdl/tib/bibl/TitleParser.java index 0f1e8e2..15099b9 100644 --- a/source/org/thdl/tib/bibl/TitleParser.java +++ b/source/org/thdl/tib/bibl/TitleParser.java @@ -18,10 +18,10 @@ Contributor(s): ______________________________________. package org.thdl.tib.bibl; -import java.util.*; -import org.jdom.*; -import org.jdom.input.*; -import org.jdom.output.*; +import java.util.Iterator; +import java.util.NoSuchElementException; +import java.util.StringTokenizer; +import java.util.Vector; /** * diff --git a/source/org/thdl/tib/bibl/XMLDoc.java b/source/org/thdl/tib/bibl/XMLDoc.java index 54a7b88..b3ba021 100644 --- a/source/org/thdl/tib/bibl/XMLDoc.java +++ b/source/org/thdl/tib/bibl/XMLDoc.java @@ -18,10 +18,10 @@ Contributor(s): ______________________________________. package org.thdl.tib.bibl; -import java.util.*; -import org.jdom.*; -import org.jdom.input.*; -import org.jdom.output.*; +import java.util.Iterator; +import java.util.Vector; + +import org.jdom.Element; /** * This class extends org.jdom.Document to provide added XML functionality, such as locating specific elements. diff --git a/source/org/thdl/tib/bibl/XMLFilter.java b/source/org/thdl/tib/bibl/XMLFilter.java index 8653aad..17262ae 100644 --- a/source/org/thdl/tib/bibl/XMLFilter.java +++ b/source/org/thdl/tib/bibl/XMLFilter.java @@ -19,8 +19,8 @@ Contributor(s): ______________________________________. package org.thdl.tib.bibl; import java.io.File; -import javax.swing.*; -import javax.swing.filechooser.*; + +import javax.swing.filechooser.FileFilter; //import org.thdl.tib.bibl.shared.*; /** diff --git a/source/org/thdl/tib/bibl/XMLReader.java b/source/org/thdl/tib/bibl/XMLReader.java index f3887cc..3260721 100644 --- a/source/org/thdl/tib/bibl/XMLReader.java +++ b/source/org/thdl/tib/bibl/XMLReader.java @@ -18,14 +18,11 @@ Contributor(s): ______________________________________. package org.thdl.tib.bibl; -import java.io.*; -import java.util.*; -import javax.swing.*; -import javax.swing.filechooser.*; -import org.jdom.*; -import org.jdom.input.*; -import org.jdom.output.*; -import org.xml.sax.*; +import java.io.File; +import java.util.Observable; + +import org.jdom.JDOMException; +import org.jdom.input.SAXBuilder; //import org.thdl.tib.bibl.shared.*; /**