From 7e6fc68efa5cc08397afa664eda2683d65102101 Mon Sep 17 00:00:00 2001 From: Peter Riewe Date: Thu, 27 Oct 2022 09:39:00 -0400 Subject: [PATCH 1/2] Import cleanup --- src/main/java/hexgui/Main.java | 7 ++- src/main/java/hexgui/game/Clock.java | 9 ++-- src/main/java/hexgui/game/GameInfo.java | 2 +- src/main/java/hexgui/game/Node.java | 1 + src/main/java/hexgui/gui/AboutDialog.java | 8 ++-- src/main/java/hexgui/gui/AnalyzeDialog.java | 46 ++++--------------- src/main/java/hexgui/gui/BoardDrawerBase.java | 15 ++---- .../java/hexgui/gui/BoardDrawerDiamond.java | 3 +- src/main/java/hexgui/gui/BoardDrawerFlat.java | 3 +- .../java/hexgui/gui/BoardDrawerFlat2.java | 3 +- src/main/java/hexgui/gui/BoardDrawerGo.java | 3 +- src/main/java/hexgui/gui/BoardDrawerY.java | 3 +- src/main/java/hexgui/gui/BoardSizeDialog.java | 4 +- .../java/hexgui/gui/ChooseProgramDialog.java | 8 ++-- src/main/java/hexgui/gui/Comment.java | 5 +- .../java/hexgui/gui/EditProgramDialog.java | 6 ++- src/main/java/hexgui/gui/FileDialogs.java | 7 ++- src/main/java/hexgui/gui/GameInfoPanel.java | 6 +-- src/main/java/hexgui/gui/GuiBoard.java | 17 +++++-- src/main/java/hexgui/gui/GuiField.java | 17 +++---- src/main/java/hexgui/gui/GuiMenuBar.java | 6 +-- src/main/java/hexgui/gui/GuiPreferences.java | 4 +- src/main/java/hexgui/gui/GuiRunnable.java | 1 - src/main/java/hexgui/gui/GuiToolBar.java | 9 ++-- src/main/java/hexgui/gui/GuiUtil.java | 35 +++----------- src/main/java/hexgui/gui/HexGui.java | 22 +++++---- src/main/java/hexgui/gui/HtpShell.java | 7 +-- src/main/java/hexgui/gui/MessageDialogs.java | 14 ++---- src/main/java/hexgui/gui/ParameterDialog.java | 28 +++-------- .../java/hexgui/gui/PreferencesDialog.java | 8 ++-- src/main/java/hexgui/gui/Print.java | 2 +- src/main/java/hexgui/gui/PrintPreview.java | 14 +++--- src/main/java/hexgui/gui/Program.java | 1 + .../java/hexgui/gui/RemoteProgramDialog.java | 4 +- src/main/java/hexgui/gui/ShowAnalyzeText.java | 5 +- src/main/java/hexgui/gui/ShowError.java | 4 +- src/main/java/hexgui/gui/StatusBar.java | 7 +-- src/main/java/hexgui/gui/TextViewer.java | 21 +++------ src/main/java/hexgui/gui/VCDisplayDialog.java | 13 ++++-- src/main/java/hexgui/htp/AnalyzeCommand.java | 7 +-- .../java/hexgui/htp/AnalyzeDefinition.java | 1 + src/main/java/hexgui/htp/HtpController.java | 8 +--- src/main/java/hexgui/sgf/GameFileFilter.java | 3 +- src/main/java/hexgui/sgf/SgfReader.java | 10 ++-- src/main/java/hexgui/sgf/SgfWriter.java | 6 ++- src/main/java/hexgui/util/BoardLayout.java | 2 - src/main/java/hexgui/util/Options.java | 4 +- .../hexgui/util/RadialGradientContext.java | 3 +- .../java/hexgui/util/RadialGradientPaint.java | 6 +-- .../java/hexgui/util/SpringUtilities.java | 3 +- src/main/java/hexgui/util/StringUtils.java | 1 + src/main/resources/hexgui/images/hexgui.svg | 39 ++++++++-------- src/main/resources/hexgui/images/hint.svg | 31 ++++++------- 53 files changed, 200 insertions(+), 302 deletions(-) diff --git a/src/main/java/hexgui/Main.java b/src/main/java/hexgui/Main.java index bded38e..5ff7e14 100644 --- a/src/main/java/hexgui/Main.java +++ b/src/main/java/hexgui/Main.java @@ -7,11 +7,10 @@ import hexgui.gui.HexGui; import hexgui.util.Options; import hexgui.version.Version; -import java.awt.*; -import java.awt.event.*; -import java.io.*; -import java.util.*; + import javax.swing.*; +import java.io.File; +import java.util.ArrayList; public final class Main { static final String LOOKANDFEEL = "System"; diff --git a/src/main/java/hexgui/game/Clock.java b/src/main/java/hexgui/game/Clock.java index c72b77f..f54898b 100644 --- a/src/main/java/hexgui/game/Clock.java +++ b/src/main/java/hexgui/game/Clock.java @@ -4,12 +4,9 @@ package hexgui.game; -import hexgui.hex.*; -import java.awt.*; -import java.awt.event.*; -import java.io.*; -import java.net.*; -import javax.swing.Timer; +import javax.swing.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; public class Clock implements ActionListener { public interface Listener { diff --git a/src/main/java/hexgui/game/GameInfo.java b/src/main/java/hexgui/game/GameInfo.java index ad23d90..8ee6bba 100644 --- a/src/main/java/hexgui/game/GameInfo.java +++ b/src/main/java/hexgui/game/GameInfo.java @@ -4,7 +4,7 @@ package hexgui.game; -import java.awt.Dimension; +import java.awt.*; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/game/Node.java b/src/main/java/hexgui/game/Node.java index 8dd23e6..3be9def 100644 --- a/src/main/java/hexgui/game/Node.java +++ b/src/main/java/hexgui/game/Node.java @@ -7,6 +7,7 @@ import hexgui.hex.HexColor; import hexgui.hex.HexPoint; import hexgui.hex.Move; + import java.util.Iterator; import java.util.Map; import java.util.TreeMap; diff --git a/src/main/java/hexgui/gui/AboutDialog.java b/src/main/java/hexgui/gui/AboutDialog.java index ca09ea7..49c9b87 100644 --- a/src/main/java/hexgui/gui/AboutDialog.java +++ b/src/main/java/hexgui/gui/AboutDialog.java @@ -1,12 +1,14 @@ package hexgui.gui; import hexgui.version.Version; -import java.awt.*; -import java.awt.event.*; -import java.net.URL; + import javax.swing.*; import javax.swing.border.EtchedBorder; import javax.swing.text.html.HTMLEditorKit; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.net.URL; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/AnalyzeDialog.java b/src/main/java/hexgui/gui/AnalyzeDialog.java index ee34d02..bd21c44 100644 --- a/src/main/java/hexgui/gui/AnalyzeDialog.java +++ b/src/main/java/hexgui/gui/AnalyzeDialog.java @@ -2,53 +2,23 @@ package hexgui.gui; -import static hexgui.hex.HexColor.BLACK; -import static hexgui.hex.HexColor.EMPTY; -import static hexgui.hex.HexColor.WHITE; - import hexgui.hex.HexColor; import hexgui.hex.HexPoint; import hexgui.htp.AnalyzeCommand; import hexgui.htp.AnalyzeDefinition; import hexgui.htp.AnalyzeType; -// import hexgui.htp.GtpResponseFormatError; -// import hexgui.htp.GtpUtil; import hexgui.util.Platform; import hexgui.util.PrefUtil; -import java.awt.BorderLayout; -import java.awt.Container; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Frame; -import java.awt.GridLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.FocusAdapter; -import java.awt.event.FocusEvent; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -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.io.File; -import java.util.ArrayList; -import javax.swing.Box; -import javax.swing.ButtonGroup; -import javax.swing.JButton; -import javax.swing.JCheckBox; -import javax.swing.JComboBox; -import javax.swing.JComponent; -import javax.swing.JDialog; -import javax.swing.JList; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JRadioButton; -import javax.swing.JScrollPane; -import javax.swing.ListSelectionModel; + +import javax.swing.*; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; +import java.awt.*; +import java.awt.event.*; +import java.io.File; +import java.util.ArrayList; + +import static hexgui.hex.HexColor.*; /** Dialog for selecting an AnalyzeCommand. */ public final class AnalyzeDialog extends JDialog implements ActionListener, ListSelectionListener { diff --git a/src/main/java/hexgui/gui/BoardDrawerBase.java b/src/main/java/hexgui/gui/BoardDrawerBase.java index f1027ea..3fa4d36 100644 --- a/src/main/java/hexgui/gui/BoardDrawerBase.java +++ b/src/main/java/hexgui/gui/BoardDrawerBase.java @@ -7,20 +7,11 @@ import hexgui.hex.HexColor; import hexgui.hex.HexPoint; import hexgui.util.Pair; -import java.awt.AlphaComposite; -import java.awt.Color; -import java.awt.Font; -import java.awt.FontMetrics; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Image; -import java.awt.Point; -import java.awt.Polygon; -import java.awt.RenderingHints; -import java.awt.event.*; + +import javax.swing.*; +import java.awt.*; import java.net.URL; import java.util.Vector; -import javax.swing.*; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/BoardDrawerDiamond.java b/src/main/java/hexgui/gui/BoardDrawerDiamond.java index 1c120fd..459b0c0 100644 --- a/src/main/java/hexgui/gui/BoardDrawerDiamond.java +++ b/src/main/java/hexgui/gui/BoardDrawerDiamond.java @@ -6,9 +6,8 @@ import hexgui.hex.HexPoint; import hexgui.util.Hexagon; + import java.awt.*; -import java.awt.event.*; -import javax.swing.*; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/BoardDrawerFlat.java b/src/main/java/hexgui/gui/BoardDrawerFlat.java index 705f282..4c637eb 100644 --- a/src/main/java/hexgui/gui/BoardDrawerFlat.java +++ b/src/main/java/hexgui/gui/BoardDrawerFlat.java @@ -6,9 +6,8 @@ import hexgui.hex.HexPoint; import hexgui.util.Hexagon; + import java.awt.*; -import java.awt.event.*; -import javax.swing.*; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/BoardDrawerFlat2.java b/src/main/java/hexgui/gui/BoardDrawerFlat2.java index 0a1e97a..86e9ab9 100644 --- a/src/main/java/hexgui/gui/BoardDrawerFlat2.java +++ b/src/main/java/hexgui/gui/BoardDrawerFlat2.java @@ -6,9 +6,8 @@ import hexgui.hex.HexPoint; import hexgui.util.Hexagon; + import java.awt.*; -import java.awt.event.*; -import javax.swing.*; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/BoardDrawerGo.java b/src/main/java/hexgui/gui/BoardDrawerGo.java index 120facb..068f188 100644 --- a/src/main/java/hexgui/gui/BoardDrawerGo.java +++ b/src/main/java/hexgui/gui/BoardDrawerGo.java @@ -5,9 +5,8 @@ package hexgui.gui; import hexgui.hex.HexPoint; + import java.awt.*; -import java.awt.event.*; -import javax.swing.*; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/BoardDrawerY.java b/src/main/java/hexgui/gui/BoardDrawerY.java index 1b805e7..06bdf26 100644 --- a/src/main/java/hexgui/gui/BoardDrawerY.java +++ b/src/main/java/hexgui/gui/BoardDrawerY.java @@ -3,9 +3,8 @@ import hexgui.hex.HexPoint; import hexgui.util.Hexagon; + import java.awt.*; -import java.awt.event.*; -import javax.swing.*; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/BoardSizeDialog.java b/src/main/java/hexgui/gui/BoardSizeDialog.java index c3db091..b59b06a 100644 --- a/src/main/java/hexgui/gui/BoardSizeDialog.java +++ b/src/main/java/hexgui/gui/BoardSizeDialog.java @@ -4,10 +4,8 @@ package hexgui.gui; -import hexgui.hex.*; -import java.awt.*; -import java.awt.event.*; import javax.swing.*; +import java.awt.*; /** Dialog for entering a board size. */ public final class BoardSizeDialog { diff --git a/src/main/java/hexgui/gui/ChooseProgramDialog.java b/src/main/java/hexgui/gui/ChooseProgramDialog.java index 620a56e..eb98654 100644 --- a/src/main/java/hexgui/gui/ChooseProgramDialog.java +++ b/src/main/java/hexgui/gui/ChooseProgramDialog.java @@ -4,12 +4,12 @@ package hexgui.gui; -import hexgui.hex.*; -import java.awt.*; -import java.awt.event.*; -import java.util.Vector; import javax.swing.*; import javax.swing.text.html.HTMLEditorKit; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.Vector; /** The actual dialog. */ class ChooseProgramDialog extends JDialog implements ActionListener { diff --git a/src/main/java/hexgui/gui/Comment.java b/src/main/java/hexgui/gui/Comment.java index fae2d24..5209f5c 100644 --- a/src/main/java/hexgui/gui/Comment.java +++ b/src/main/java/hexgui/gui/Comment.java @@ -4,13 +4,10 @@ package hexgui.gui; -import java.awt.*; -import java.awt.event.*; -import java.io.*; -import java.util.*; import javax.swing.*; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; +import java.awt.*; /** Displays comment for current node. */ public class Comment extends JScrollPane implements DocumentListener { diff --git a/src/main/java/hexgui/gui/EditProgramDialog.java b/src/main/java/hexgui/gui/EditProgramDialog.java index 6080811..cb61893 100644 --- a/src/main/java/hexgui/gui/EditProgramDialog.java +++ b/src/main/java/hexgui/gui/EditProgramDialog.java @@ -5,10 +5,12 @@ package hexgui.gui; import hexgui.util.SpringUtilities; -import java.awt.*; -import java.awt.event.*; + import javax.swing.*; import javax.swing.text.html.HTMLEditorKit; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; /** Dialog for adding/editing new programs. */ public final class EditProgramDialog extends JDialog implements ActionListener { diff --git a/src/main/java/hexgui/gui/FileDialogs.java b/src/main/java/hexgui/gui/FileDialogs.java index 37c4441..99de4d9 100644 --- a/src/main/java/hexgui/gui/FileDialogs.java +++ b/src/main/java/hexgui/gui/FileDialogs.java @@ -4,12 +4,11 @@ import hexgui.sgf.GameFileFilter; import hexgui.util.Platform; -import java.awt.Component; -import java.awt.FileDialog; -import java.awt.Frame; + +import javax.swing.*; +import java.awt.*; import java.io.File; import java.text.MessageFormat; -import javax.swing.JFileChooser; /** File dialogs. */ public final class FileDialogs { diff --git a/src/main/java/hexgui/gui/GameInfoPanel.java b/src/main/java/hexgui/gui/GameInfoPanel.java index 0dbf3c2..2b60876 100644 --- a/src/main/java/hexgui/gui/GameInfoPanel.java +++ b/src/main/java/hexgui/gui/GameInfoPanel.java @@ -6,12 +6,10 @@ import hexgui.game.Clock; import hexgui.hex.HexColor; + +import javax.swing.*; import java.awt.*; -import java.awt.event.*; -import java.io.*; import java.net.URL; -import java.util.*; -import javax.swing.*; /** Displays info about the current game. */ public class GameInfoPanel extends JPanel { diff --git a/src/main/java/hexgui/gui/GuiBoard.java b/src/main/java/hexgui/gui/GuiBoard.java index ea0cae4..4db7f87 100644 --- a/src/main/java/hexgui/gui/GuiBoard.java +++ b/src/main/java/hexgui/gui/GuiBoard.java @@ -5,10 +5,19 @@ package hexgui.gui; import hexgui.game.Node; -import hexgui.hex.*; -import hexgui.util.*; +import hexgui.hex.HexColor; +import hexgui.hex.HexPoint; +import hexgui.hex.VC; +import hexgui.util.BoardLayout; +import hexgui.util.Pair; +import hexgui.util.StringUtils; + +import javax.swing.*; +import javax.swing.border.EtchedBorder; import java.awt.*; -import java.awt.event.*; +import java.awt.event.ActionEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import java.awt.print.PageFormat; import java.awt.print.Printable; import java.awt.print.PrinterException; @@ -17,8 +26,6 @@ import java.util.Map; import java.util.TreeMap; import java.util.Vector; -import javax.swing.*; -import javax.swing.border.EtchedBorder; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/GuiField.java b/src/main/java/hexgui/gui/GuiField.java index 0813301..2f04eb7 100644 --- a/src/main/java/hexgui/gui/GuiField.java +++ b/src/main/java/hexgui/gui/GuiField.java @@ -4,17 +4,12 @@ package hexgui.gui; -import hexgui.hex.*; -import hexgui.util.*; -import java.awt.AlphaComposite; -import java.awt.Color; -import java.awt.Font; -import java.awt.FontMetrics; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.event.*; -import java.awt.geom.*; -import javax.swing.*; +import hexgui.hex.HexColor; +import hexgui.hex.HexPoint; +import hexgui.util.RadialGradientPaint; + +import java.awt.*; +import java.awt.geom.Point2D; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/GuiMenuBar.java b/src/main/java/hexgui/gui/GuiMenuBar.java index 739573a..3d49c33 100644 --- a/src/main/java/hexgui/gui/GuiMenuBar.java +++ b/src/main/java/hexgui/gui/GuiMenuBar.java @@ -5,10 +5,10 @@ package hexgui.gui; -import java.awt.*; -import java.awt.event.*; -import java.util.*; import javax.swing.*; +import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; +import java.util.Enumeration; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/GuiPreferences.java b/src/main/java/hexgui/gui/GuiPreferences.java index 31bb079..4976d2d 100644 --- a/src/main/java/hexgui/gui/GuiPreferences.java +++ b/src/main/java/hexgui/gui/GuiPreferences.java @@ -4,9 +4,7 @@ package hexgui.gui; -import java.io.*; -import java.util.*; -import java.util.prefs.*; +import java.util.prefs.Preferences; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/GuiRunnable.java b/src/main/java/hexgui/gui/GuiRunnable.java index f56cc84..2df09a4 100644 --- a/src/main/java/hexgui/gui/GuiRunnable.java +++ b/src/main/java/hexgui/gui/GuiRunnable.java @@ -1,6 +1,5 @@ package hexgui.gui; -import java.util.*; import javax.swing.*; /** diff --git a/src/main/java/hexgui/gui/GuiToolBar.java b/src/main/java/hexgui/gui/GuiToolBar.java index 9db9aeb..04799fe 100644 --- a/src/main/java/hexgui/gui/GuiToolBar.java +++ b/src/main/java/hexgui/gui/GuiToolBar.java @@ -5,11 +5,12 @@ package hexgui.gui; import hexgui.game.Node; -import java.awt.*; -import java.awt.event.*; -import java.net.URL; -import java.util.*; + import javax.swing.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; +import java.net.URL; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/GuiUtil.java b/src/main/java/hexgui/gui/GuiUtil.java index 9c7a80d..05cab7b 100644 --- a/src/main/java/hexgui/gui/GuiUtil.java +++ b/src/main/java/hexgui/gui/GuiUtil.java @@ -3,40 +3,17 @@ package hexgui.gui; import hexgui.util.Platform; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.Frame; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.KeyboardFocusManager; -import java.awt.RenderingHints; -import java.awt.Toolkit; -import java.awt.Window; -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.io.IOException; -import java.net.URL; -import javax.swing.BorderFactory; -import javax.swing.Box; -import javax.swing.ImageIcon; -import javax.swing.InputMap; -import javax.swing.JButton; -import javax.swing.JComponent; -import javax.swing.JFrame; -import javax.swing.JTextField; -import javax.swing.JTextPane; -import javax.swing.KeyStroke; -import javax.swing.SwingUtilities; + +import javax.swing.*; import javax.swing.border.Border; import javax.swing.text.Style; import javax.swing.text.StyleConstants; import javax.swing.text.StyleContext; import javax.swing.text.StyledDocument; +import java.awt.*; +import java.awt.datatransfer.*; +import java.io.IOException; +import java.net.URL; /** GUI utility classes and static functions. */ public class GuiUtil { diff --git a/src/main/java/hexgui/gui/HexGui.java b/src/main/java/hexgui/gui/HexGui.java index 391a2ac..be7a1e1 100644 --- a/src/main/java/hexgui/gui/HexGui.java +++ b/src/main/java/hexgui/gui/HexGui.java @@ -1,16 +1,10 @@ package hexgui.gui; -import static java.text.MessageFormat.format; - import hexgui.game.Clock; import hexgui.game.GameInfo; import hexgui.game.Node; import hexgui.hex.*; -import hexgui.htp.AnalyzeCommand; -import hexgui.htp.AnalyzeDefinition; -import hexgui.htp.AnalyzeType; -import hexgui.htp.HtpController; -import hexgui.htp.HtpError; +import hexgui.htp.*; import hexgui.sgf.SgfReader; import hexgui.sgf.SgfWriter; import hexgui.util.ErrorMessage; @@ -18,14 +12,22 @@ import hexgui.util.StreamCopy; import hexgui.util.StringUtils; import hexgui.version.Version; + +import javax.swing.*; import java.awt.*; -import java.awt.event.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; import java.io.*; -import java.net.*; +import java.net.Socket; +import java.net.URL; +import java.net.UnknownHostException; import java.util.*; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.Semaphore; -import javax.swing.*; + +import static java.text.MessageFormat.format; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/HtpShell.java b/src/main/java/hexgui/gui/HtpShell.java index 3ddf53f..2649c28 100644 --- a/src/main/java/hexgui/gui/HtpShell.java +++ b/src/main/java/hexgui/gui/HtpShell.java @@ -4,12 +4,13 @@ package hexgui.gui; -import hexgui.hex.*; import hexgui.htp.HtpController; -import java.awt.*; -import java.awt.event.*; + import javax.swing.*; import javax.swing.text.*; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; /** Non-modal dialog displaying the communication between HexGui and a HTP compatible program. */ public class HtpShell extends JDialog implements ActionListener, HtpController.IOInterface { diff --git a/src/main/java/hexgui/gui/MessageDialogs.java b/src/main/java/hexgui/gui/MessageDialogs.java index 964e53e..e5f41cd 100644 --- a/src/main/java/hexgui/gui/MessageDialogs.java +++ b/src/main/java/hexgui/gui/MessageDialogs.java @@ -2,21 +2,17 @@ package hexgui.gui; -import static hexgui.gui.GuiUtil.insertLineBreaks; - import hexgui.util.Platform; import hexgui.util.PrefUtil; import hexgui.util.StringUtils; -import java.awt.Component; + +import javax.swing.*; +import java.awt.*; import java.util.Set; import java.util.TreeSet; import java.util.prefs.Preferences; -import javax.swing.Box; -import javax.swing.JCheckBox; -import javax.swing.JComponent; -import javax.swing.JDialog; -import javax.swing.JLabel; -import javax.swing.JOptionPane; + +import static hexgui.gui.GuiUtil.insertLineBreaks; /** Simple message dialogs. */ public final class MessageDialogs { diff --git a/src/main/java/hexgui/gui/ParameterDialog.java b/src/main/java/hexgui/gui/ParameterDialog.java index ce6daf9..9ab7882 100644 --- a/src/main/java/hexgui/gui/ParameterDialog.java +++ b/src/main/java/hexgui/gui/ParameterDialog.java @@ -2,24 +2,15 @@ package hexgui.gui; -import static java.lang.Math.max; -import static javax.swing.JOptionPane.OK_CANCEL_OPTION; -import static javax.swing.JOptionPane.PLAIN_MESSAGE; -import static javax.swing.JOptionPane.UNINITIALIZED_VALUE; -import static javax.swing.JOptionPane.VALUE_PROPERTY; - import hexgui.htp.AnalyzeUtil; import hexgui.htp.HtpController; import hexgui.htp.HtpError; import hexgui.htp.ParameterType; import hexgui.util.ObjectUtil; import hexgui.util.StringUtils; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Insets; + +import javax.swing.*; +import java.awt.*; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; @@ -29,16 +20,9 @@ import java.io.StringReader; import java.text.MessageFormat; import java.util.ArrayList; -import javax.swing.Box; -import javax.swing.JCheckBox; -import javax.swing.JComboBox; -import javax.swing.JDialog; -import javax.swing.JLabel; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JSeparator; -import javax.swing.JTextField; -import javax.swing.SwingConstants; + +import static java.lang.Math.max; +import static javax.swing.JOptionPane.*; /** Dialog for editing parameters in response to an analyze command of type param. */ public class ParameterDialog { diff --git a/src/main/java/hexgui/gui/PreferencesDialog.java b/src/main/java/hexgui/gui/PreferencesDialog.java index 9fbd960..6aedb78 100644 --- a/src/main/java/hexgui/gui/PreferencesDialog.java +++ b/src/main/java/hexgui/gui/PreferencesDialog.java @@ -4,10 +4,12 @@ package hexgui.gui; -import hexgui.hex.*; -import java.awt.*; -import java.awt.event.*; import javax.swing.*; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; /** Dialog for changes user preferences. */ public final class PreferencesDialog extends JDialog implements ItemListener, ActionListener { diff --git a/src/main/java/hexgui/gui/Print.java b/src/main/java/hexgui/gui/Print.java index d0dd0e9..9c14928 100644 --- a/src/main/java/hexgui/gui/Print.java +++ b/src/main/java/hexgui/gui/Print.java @@ -3,7 +3,7 @@ // ---------------------------------------------------------------------------- package hexgui.gui; -import java.awt.Component; +import java.awt.*; import java.awt.print.Printable; import java.awt.print.PrinterJob; diff --git a/src/main/java/hexgui/gui/PrintPreview.java b/src/main/java/hexgui/gui/PrintPreview.java index 75816d2..a3713cd 100644 --- a/src/main/java/hexgui/gui/PrintPreview.java +++ b/src/main/java/hexgui/gui/PrintPreview.java @@ -9,14 +9,16 @@ package hexgui.gui; +import javax.swing.*; +import javax.swing.border.AbstractBorder; +import javax.swing.border.LineBorder; +import javax.swing.table.JTableHeader; +import javax.swing.table.TableModel; import java.awt.*; -import java.awt.event.*; -import java.awt.image.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.image.BufferedImage; import java.awt.print.*; -import javax.swing.*; -import javax.swing.border.*; -import javax.swing.event.*; -import javax.swing.table.*; public class PrintPreview extends JPanel implements ActionListener { static final double INITIAL_SCALE_DIVISOR = 1.0; // scale factor diff --git a/src/main/java/hexgui/gui/Program.java b/src/main/java/hexgui/gui/Program.java index c37f3e2..db081e0 100644 --- a/src/main/java/hexgui/gui/Program.java +++ b/src/main/java/hexgui/gui/Program.java @@ -5,6 +5,7 @@ package hexgui.gui; import hexgui.util.PrefUtil; + import java.util.Vector; import java.util.prefs.Preferences; diff --git a/src/main/java/hexgui/gui/RemoteProgramDialog.java b/src/main/java/hexgui/gui/RemoteProgramDialog.java index b48abdc..1d1b658 100644 --- a/src/main/java/hexgui/gui/RemoteProgramDialog.java +++ b/src/main/java/hexgui/gui/RemoteProgramDialog.java @@ -4,10 +4,8 @@ package hexgui.gui; -import hexgui.hex.*; -import java.awt.*; -import java.awt.event.*; import javax.swing.*; +import java.awt.*; /** Dialog for entering a remote program hostname. FIXME: allow port to be set. */ public final class RemoteProgramDialog { diff --git a/src/main/java/hexgui/gui/ShowAnalyzeText.java b/src/main/java/hexgui/gui/ShowAnalyzeText.java index 6b148a8..1713d23 100644 --- a/src/main/java/hexgui/gui/ShowAnalyzeText.java +++ b/src/main/java/hexgui/gui/ShowAnalyzeText.java @@ -4,9 +4,8 @@ import hexgui.hex.HexPoint; import hexgui.htp.AnalyzeType; -// import hexgui.htp.GtpUtil; -// import hexgui.gui.GuiBoardUtil; -import java.awt.Frame; + +import java.awt.*; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; diff --git a/src/main/java/hexgui/gui/ShowError.java b/src/main/java/hexgui/gui/ShowError.java index 7fba3e0..0bcde9c 100644 --- a/src/main/java/hexgui/gui/ShowError.java +++ b/src/main/java/hexgui/gui/ShowError.java @@ -4,8 +4,8 @@ package hexgui.gui; -import java.awt.Component; -import javax.swing.JOptionPane; +import javax.swing.*; +import java.awt.*; /** Displays a simple error message dialog. */ public class ShowError { diff --git a/src/main/java/hexgui/gui/StatusBar.java b/src/main/java/hexgui/gui/StatusBar.java index 45c4061..50e6b23 100644 --- a/src/main/java/hexgui/gui/StatusBar.java +++ b/src/main/java/hexgui/gui/StatusBar.java @@ -4,14 +4,11 @@ package hexgui.gui; +import javax.swing.*; +import javax.swing.border.EtchedBorder; import java.awt.*; -import java.awt.event.*; -import java.io.*; import java.text.DecimalFormat; import java.text.NumberFormat; -import java.util.*; -import javax.swing.*; -import javax.swing.border.EtchedBorder; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/TextViewer.java b/src/main/java/hexgui/gui/TextViewer.java index 72d11b0..a2b6f0a 100644 --- a/src/main/java/hexgui/gui/TextViewer.java +++ b/src/main/java/hexgui/gui/TextViewer.java @@ -2,26 +2,17 @@ package hexgui.gui; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Container; -import java.awt.Dialog; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.Toolkit; +import javax.swing.*; +import javax.swing.event.CaretEvent; +import javax.swing.event.CaretListener; +import javax.swing.text.BadLocationException; +import javax.swing.text.Document; +import java.awt.*; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.swing.JDialog; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTextPane; -import javax.swing.event.CaretEvent; -import javax.swing.event.CaretListener; -import javax.swing.text.BadLocationException; -import javax.swing.text.Document; /** * Dialog for displaying text. Allows syntax highlighting for analyze commands of type diff --git a/src/main/java/hexgui/gui/VCDisplayDialog.java b/src/main/java/hexgui/gui/VCDisplayDialog.java index 7eae615..a405421 100644 --- a/src/main/java/hexgui/gui/VCDisplayDialog.java +++ b/src/main/java/hexgui/gui/VCDisplayDialog.java @@ -4,14 +4,17 @@ package hexgui.gui; -import hexgui.hex.*; -import java.awt.*; -import java.awt.event.*; -import java.util.*; +import hexgui.hex.VC; + import javax.swing.*; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import javax.swing.text.*; +import java.awt.*; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.util.Vector; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/htp/AnalyzeCommand.java b/src/main/java/hexgui/htp/AnalyzeCommand.java index c0eca69..563222c 100644 --- a/src/main/java/hexgui/htp/AnalyzeCommand.java +++ b/src/main/java/hexgui/htp/AnalyzeCommand.java @@ -2,15 +2,16 @@ package hexgui.htp; -import static hexgui.hex.HexColor.BLACK; -import static hexgui.hex.HexColor.WHITE; - import hexgui.hex.ConstPointList; import hexgui.hex.HexColor; import hexgui.hex.HexPoint; import hexgui.hex.PointList; + import java.io.File; +import static hexgui.hex.HexColor.BLACK; +import static hexgui.hex.HexColor.WHITE; + /** * Concrete analyze command including data for wildcard replacements. See GoGui documentation, * chapter "Analyze Commands" diff --git a/src/main/java/hexgui/htp/AnalyzeDefinition.java b/src/main/java/hexgui/htp/AnalyzeDefinition.java index a16758b..c4a3f7b 100644 --- a/src/main/java/hexgui/htp/AnalyzeDefinition.java +++ b/src/main/java/hexgui/htp/AnalyzeDefinition.java @@ -4,6 +4,7 @@ import hexgui.util.ErrorMessage; import hexgui.util.StringUtils; + import java.io.BufferedReader; import java.io.IOException; import java.io.Reader; diff --git a/src/main/java/hexgui/htp/HtpController.java b/src/main/java/hexgui/htp/HtpController.java index bd53676..40d94f8 100644 --- a/src/main/java/hexgui/htp/HtpController.java +++ b/src/main/java/hexgui/htp/HtpController.java @@ -5,12 +5,8 @@ package hexgui.htp; import hexgui.util.StringUtils; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.PrintStream; + +import java.io.*; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/sgf/GameFileFilter.java b/src/main/java/hexgui/sgf/GameFileFilter.java index 8cc4455..50cac82 100644 --- a/src/main/java/hexgui/sgf/GameFileFilter.java +++ b/src/main/java/hexgui/sgf/GameFileFilter.java @@ -3,8 +3,9 @@ package hexgui.sgf; import hexgui.util.FileUtil; -import java.io.File; + import javax.swing.filechooser.FileFilter; +import java.io.File; /** Swing file filter for SGF or Jago XML files. */ public class GameFileFilter extends FileFilter { diff --git a/src/main/java/hexgui/sgf/SgfReader.java b/src/main/java/hexgui/sgf/SgfReader.java index d16ca11..8dfe0f4 100644 --- a/src/main/java/hexgui/sgf/SgfReader.java +++ b/src/main/java/hexgui/sgf/SgfReader.java @@ -4,16 +4,18 @@ package hexgui.sgf; -import static java.text.MessageFormat.format; - import hexgui.game.GameInfo; import hexgui.game.Node; import hexgui.hex.HexColor; import hexgui.hex.HexPoint; import hexgui.hex.Move; -import java.awt.Dimension; + +import java.awt.*; import java.io.*; -import java.util.*; +import java.util.Locale; +import java.util.Vector; + +import static java.text.MessageFormat.format; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/sgf/SgfWriter.java b/src/main/java/hexgui/sgf/SgfWriter.java index 974ae71..a03b049 100644 --- a/src/main/java/hexgui/sgf/SgfWriter.java +++ b/src/main/java/hexgui/sgf/SgfWriter.java @@ -10,8 +10,10 @@ import hexgui.hex.HexPoint; import hexgui.hex.Move; import hexgui.version.Version; -import java.awt.Dimension; -import java.io.*; + +import java.awt.*; +import java.io.OutputStream; +import java.io.PrintStream; import java.util.Iterator; import java.util.Map; import java.util.Vector; diff --git a/src/main/java/hexgui/util/BoardLayout.java b/src/main/java/hexgui/util/BoardLayout.java index 2f83437..8dfa19f 100644 --- a/src/main/java/hexgui/util/BoardLayout.java +++ b/src/main/java/hexgui/util/BoardLayout.java @@ -5,8 +5,6 @@ package hexgui.util; import java.awt.*; -import java.awt.event.*; -import javax.swing.*; public class BoardLayout implements LayoutManager { public void addLayoutComponent(String name, Component comp) {} diff --git a/src/main/java/hexgui/util/Options.java b/src/main/java/hexgui/util/Options.java index ce12373..c3efcf2 100644 --- a/src/main/java/hexgui/util/Options.java +++ b/src/main/java/hexgui/util/Options.java @@ -1,7 +1,9 @@ package hexgui.util; import java.io.*; -import java.util.*; +import java.util.ArrayList; +import java.util.Map; +import java.util.TreeMap; /** Parser for command line options. Options begin with a single '-' character. */ public class Options { diff --git a/src/main/java/hexgui/util/RadialGradientContext.java b/src/main/java/hexgui/util/RadialGradientContext.java index b7eddd8..4c6caff 100644 --- a/src/main/java/hexgui/util/RadialGradientContext.java +++ b/src/main/java/hexgui/util/RadialGradientContext.java @@ -4,8 +4,7 @@ package hexgui.util; -import java.awt.Color; -import java.awt.PaintContext; +import java.awt.*; import java.awt.geom.Point2D; import java.awt.image.ColorModel; import java.awt.image.Raster; diff --git a/src/main/java/hexgui/util/RadialGradientPaint.java b/src/main/java/hexgui/util/RadialGradientPaint.java index 48e0322..3191d8d 100644 --- a/src/main/java/hexgui/util/RadialGradientPaint.java +++ b/src/main/java/hexgui/util/RadialGradientPaint.java @@ -4,11 +4,7 @@ package hexgui.util; -import java.awt.Color; -import java.awt.Paint; -import java.awt.PaintContext; -import java.awt.Rectangle; -import java.awt.RenderingHints; +import java.awt.*; import java.awt.geom.AffineTransform; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; diff --git a/src/main/java/hexgui/util/SpringUtilities.java b/src/main/java/hexgui/util/SpringUtilities.java index e515b48..8632d44 100644 --- a/src/main/java/hexgui/util/SpringUtilities.java +++ b/src/main/java/hexgui/util/SpringUtilities.java @@ -31,9 +31,8 @@ package hexgui.util; -import java.awt.*; import javax.swing.*; -import javax.swing.SpringLayout; +import java.awt.*; /** * A 1.4 file that provides utility methods for creating form- or grid-style layouts with diff --git a/src/main/java/hexgui/util/StringUtils.java b/src/main/java/hexgui/util/StringUtils.java index 7204f90..afcef4f 100644 --- a/src/main/java/hexgui/util/StringUtils.java +++ b/src/main/java/hexgui/util/StringUtils.java @@ -3,6 +3,7 @@ import hexgui.hex.HexColor; import hexgui.hex.HexPoint; import hexgui.hex.VC; + import java.io.StringReader; import java.util.ArrayList; import java.util.Vector; diff --git a/src/main/resources/hexgui/images/hexgui.svg b/src/main/resources/hexgui/images/hexgui.svg index f34ec64..f2f1ef1 100644 --- a/src/main/resources/hexgui/images/hexgui.svg +++ b/src/main/resources/hexgui/images/hexgui.svg @@ -2,26 +2,25 @@ + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="48px" + height="48px" + id="svg2797" + sodipodi:version="0.32" + inkscape:version="0.48.0 r9654" + sodipodi:docname="tmp.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:modified="true" + version="1.1" + inkscape:export-filename="/home/markus/hexgui.png" + inkscape:export-xdpi="102.86" + inkscape:export-ydpi="102.86"> + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="48px" + height="48px" + id="svg2985" + version="1.1" + inkscape:version="0.48.0 r9654" + inkscape:export-filename="/home/markus/hint.png" + inkscape:export-xdpi="45" + inkscape:export-ydpi="45" + sodipodi:docname="hint.svg"> Date: Thu, 27 Oct 2022 13:41:43 +0000 Subject: [PATCH 2/2] Format code with google-java-format --- src/main/java/hexgui/Main.java | 3 +-- src/main/java/hexgui/game/Clock.java | 2 +- src/main/java/hexgui/game/Node.java | 1 - src/main/java/hexgui/gui/AboutDialog.java | 7 +++---- src/main/java/hexgui/gui/AnalyzeDialog.java | 11 +++++------ src/main/java/hexgui/gui/BoardDrawerBase.java | 3 +-- src/main/java/hexgui/gui/BoardDrawerDiamond.java | 1 - src/main/java/hexgui/gui/BoardDrawerFlat.java | 1 - src/main/java/hexgui/gui/BoardDrawerFlat2.java | 1 - src/main/java/hexgui/gui/BoardDrawerGo.java | 1 - src/main/java/hexgui/gui/BoardDrawerY.java | 1 - src/main/java/hexgui/gui/BoardSizeDialog.java | 2 +- src/main/java/hexgui/gui/ChooseProgramDialog.java | 4 ++-- src/main/java/hexgui/gui/Comment.java | 2 +- src/main/java/hexgui/gui/EditProgramDialog.java | 5 ++--- src/main/java/hexgui/gui/FileDialogs.java | 3 +-- src/main/java/hexgui/gui/GameInfoPanel.java | 3 +-- src/main/java/hexgui/gui/GuiBoard.java | 5 ++--- src/main/java/hexgui/gui/GuiField.java | 1 - src/main/java/hexgui/gui/GuiMenuBar.java | 3 +-- src/main/java/hexgui/gui/GuiToolBar.java | 3 +-- src/main/java/hexgui/gui/GuiUtil.java | 9 ++++----- src/main/java/hexgui/gui/HexGui.java | 7 +++---- src/main/java/hexgui/gui/HtpShell.java | 5 ++--- src/main/java/hexgui/gui/MessageDialogs.java | 7 +++---- src/main/java/hexgui/gui/ParameterDialog.java | 9 ++++----- src/main/java/hexgui/gui/PreferencesDialog.java | 2 +- src/main/java/hexgui/gui/PrintPreview.java | 10 +++++----- src/main/java/hexgui/gui/Program.java | 1 - src/main/java/hexgui/gui/RemoteProgramDialog.java | 2 +- src/main/java/hexgui/gui/ShowAnalyzeText.java | 1 - src/main/java/hexgui/gui/ShowError.java | 2 +- src/main/java/hexgui/gui/StatusBar.java | 4 ++-- src/main/java/hexgui/gui/TextViewer.java | 10 +++++----- src/main/java/hexgui/gui/VCDisplayDialog.java | 7 +++---- src/main/java/hexgui/htp/AnalyzeCommand.java | 7 +++---- src/main/java/hexgui/htp/AnalyzeDefinition.java | 1 - src/main/java/hexgui/htp/HtpController.java | 1 - src/main/java/hexgui/sgf/GameFileFilter.java | 3 +-- src/main/java/hexgui/sgf/SgfReader.java | 5 ++--- src/main/java/hexgui/sgf/SgfWriter.java | 1 - src/main/java/hexgui/util/SpringUtilities.java | 2 +- src/main/java/hexgui/util/StringUtils.java | 1 - 43 files changed, 64 insertions(+), 96 deletions(-) diff --git a/src/main/java/hexgui/Main.java b/src/main/java/hexgui/Main.java index 5ff7e14..d8bfe93 100644 --- a/src/main/java/hexgui/Main.java +++ b/src/main/java/hexgui/Main.java @@ -7,10 +7,9 @@ import hexgui.gui.HexGui; import hexgui.util.Options; import hexgui.version.Version; - -import javax.swing.*; import java.io.File; import java.util.ArrayList; +import javax.swing.*; public final class Main { static final String LOOKANDFEEL = "System"; diff --git a/src/main/java/hexgui/game/Clock.java b/src/main/java/hexgui/game/Clock.java index f54898b..ef8bdaa 100644 --- a/src/main/java/hexgui/game/Clock.java +++ b/src/main/java/hexgui/game/Clock.java @@ -4,9 +4,9 @@ package hexgui.game; -import javax.swing.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import javax.swing.*; public class Clock implements ActionListener { public interface Listener { diff --git a/src/main/java/hexgui/game/Node.java b/src/main/java/hexgui/game/Node.java index 3be9def..8dd23e6 100644 --- a/src/main/java/hexgui/game/Node.java +++ b/src/main/java/hexgui/game/Node.java @@ -7,7 +7,6 @@ import hexgui.hex.HexColor; import hexgui.hex.HexPoint; import hexgui.hex.Move; - import java.util.Iterator; import java.util.Map; import java.util.TreeMap; diff --git a/src/main/java/hexgui/gui/AboutDialog.java b/src/main/java/hexgui/gui/AboutDialog.java index 49c9b87..8f20970 100644 --- a/src/main/java/hexgui/gui/AboutDialog.java +++ b/src/main/java/hexgui/gui/AboutDialog.java @@ -1,14 +1,13 @@ package hexgui.gui; import hexgui.version.Version; - -import javax.swing.*; -import javax.swing.border.EtchedBorder; -import javax.swing.text.html.HTMLEditorKit; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.net.URL; +import javax.swing.*; +import javax.swing.border.EtchedBorder; +import javax.swing.text.html.HTMLEditorKit; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/AnalyzeDialog.java b/src/main/java/hexgui/gui/AnalyzeDialog.java index bd21c44..1c3292d 100644 --- a/src/main/java/hexgui/gui/AnalyzeDialog.java +++ b/src/main/java/hexgui/gui/AnalyzeDialog.java @@ -2,6 +2,8 @@ package hexgui.gui; +import static hexgui.hex.HexColor.*; + import hexgui.hex.HexColor; import hexgui.hex.HexPoint; import hexgui.htp.AnalyzeCommand; @@ -9,16 +11,13 @@ import hexgui.htp.AnalyzeType; import hexgui.util.Platform; import hexgui.util.PrefUtil; - -import javax.swing.*; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; import java.awt.*; import java.awt.event.*; import java.io.File; import java.util.ArrayList; - -import static hexgui.hex.HexColor.*; +import javax.swing.*; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; /** Dialog for selecting an AnalyzeCommand. */ public final class AnalyzeDialog extends JDialog implements ActionListener, ListSelectionListener { diff --git a/src/main/java/hexgui/gui/BoardDrawerBase.java b/src/main/java/hexgui/gui/BoardDrawerBase.java index 3fa4d36..0976130 100644 --- a/src/main/java/hexgui/gui/BoardDrawerBase.java +++ b/src/main/java/hexgui/gui/BoardDrawerBase.java @@ -7,11 +7,10 @@ import hexgui.hex.HexColor; import hexgui.hex.HexPoint; import hexgui.util.Pair; - -import javax.swing.*; import java.awt.*; import java.net.URL; import java.util.Vector; +import javax.swing.*; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/BoardDrawerDiamond.java b/src/main/java/hexgui/gui/BoardDrawerDiamond.java index 459b0c0..9afbaf0 100644 --- a/src/main/java/hexgui/gui/BoardDrawerDiamond.java +++ b/src/main/java/hexgui/gui/BoardDrawerDiamond.java @@ -6,7 +6,6 @@ import hexgui.hex.HexPoint; import hexgui.util.Hexagon; - import java.awt.*; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/BoardDrawerFlat.java b/src/main/java/hexgui/gui/BoardDrawerFlat.java index 4c637eb..3bb7ab9 100644 --- a/src/main/java/hexgui/gui/BoardDrawerFlat.java +++ b/src/main/java/hexgui/gui/BoardDrawerFlat.java @@ -6,7 +6,6 @@ import hexgui.hex.HexPoint; import hexgui.util.Hexagon; - import java.awt.*; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/BoardDrawerFlat2.java b/src/main/java/hexgui/gui/BoardDrawerFlat2.java index 86e9ab9..48f9486 100644 --- a/src/main/java/hexgui/gui/BoardDrawerFlat2.java +++ b/src/main/java/hexgui/gui/BoardDrawerFlat2.java @@ -6,7 +6,6 @@ import hexgui.hex.HexPoint; import hexgui.util.Hexagon; - import java.awt.*; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/BoardDrawerGo.java b/src/main/java/hexgui/gui/BoardDrawerGo.java index 068f188..d143dad 100644 --- a/src/main/java/hexgui/gui/BoardDrawerGo.java +++ b/src/main/java/hexgui/gui/BoardDrawerGo.java @@ -5,7 +5,6 @@ package hexgui.gui; import hexgui.hex.HexPoint; - import java.awt.*; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/BoardDrawerY.java b/src/main/java/hexgui/gui/BoardDrawerY.java index 06bdf26..cc23c79 100644 --- a/src/main/java/hexgui/gui/BoardDrawerY.java +++ b/src/main/java/hexgui/gui/BoardDrawerY.java @@ -3,7 +3,6 @@ import hexgui.hex.HexPoint; import hexgui.util.Hexagon; - import java.awt.*; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/BoardSizeDialog.java b/src/main/java/hexgui/gui/BoardSizeDialog.java index b59b06a..a7159d5 100644 --- a/src/main/java/hexgui/gui/BoardSizeDialog.java +++ b/src/main/java/hexgui/gui/BoardSizeDialog.java @@ -4,8 +4,8 @@ package hexgui.gui; -import javax.swing.*; import java.awt.*; +import javax.swing.*; /** Dialog for entering a board size. */ public final class BoardSizeDialog { diff --git a/src/main/java/hexgui/gui/ChooseProgramDialog.java b/src/main/java/hexgui/gui/ChooseProgramDialog.java index eb98654..b8f4716 100644 --- a/src/main/java/hexgui/gui/ChooseProgramDialog.java +++ b/src/main/java/hexgui/gui/ChooseProgramDialog.java @@ -4,12 +4,12 @@ package hexgui.gui; -import javax.swing.*; -import javax.swing.text.html.HTMLEditorKit; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.Vector; +import javax.swing.*; +import javax.swing.text.html.HTMLEditorKit; /** The actual dialog. */ class ChooseProgramDialog extends JDialog implements ActionListener { diff --git a/src/main/java/hexgui/gui/Comment.java b/src/main/java/hexgui/gui/Comment.java index 5209f5c..8e271f0 100644 --- a/src/main/java/hexgui/gui/Comment.java +++ b/src/main/java/hexgui/gui/Comment.java @@ -4,10 +4,10 @@ package hexgui.gui; +import java.awt.*; import javax.swing.*; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -import java.awt.*; /** Displays comment for current node. */ public class Comment extends JScrollPane implements DocumentListener { diff --git a/src/main/java/hexgui/gui/EditProgramDialog.java b/src/main/java/hexgui/gui/EditProgramDialog.java index cb61893..dc45c41 100644 --- a/src/main/java/hexgui/gui/EditProgramDialog.java +++ b/src/main/java/hexgui/gui/EditProgramDialog.java @@ -5,12 +5,11 @@ package hexgui.gui; import hexgui.util.SpringUtilities; - -import javax.swing.*; -import javax.swing.text.html.HTMLEditorKit; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import javax.swing.*; +import javax.swing.text.html.HTMLEditorKit; /** Dialog for adding/editing new programs. */ public final class EditProgramDialog extends JDialog implements ActionListener { diff --git a/src/main/java/hexgui/gui/FileDialogs.java b/src/main/java/hexgui/gui/FileDialogs.java index 99de4d9..608a05e 100644 --- a/src/main/java/hexgui/gui/FileDialogs.java +++ b/src/main/java/hexgui/gui/FileDialogs.java @@ -4,11 +4,10 @@ import hexgui.sgf.GameFileFilter; import hexgui.util.Platform; - -import javax.swing.*; import java.awt.*; import java.io.File; import java.text.MessageFormat; +import javax.swing.*; /** File dialogs. */ public final class FileDialogs { diff --git a/src/main/java/hexgui/gui/GameInfoPanel.java b/src/main/java/hexgui/gui/GameInfoPanel.java index 2b60876..2ca654c 100644 --- a/src/main/java/hexgui/gui/GameInfoPanel.java +++ b/src/main/java/hexgui/gui/GameInfoPanel.java @@ -6,10 +6,9 @@ import hexgui.game.Clock; import hexgui.hex.HexColor; - -import javax.swing.*; import java.awt.*; import java.net.URL; +import javax.swing.*; /** Displays info about the current game. */ public class GameInfoPanel extends JPanel { diff --git a/src/main/java/hexgui/gui/GuiBoard.java b/src/main/java/hexgui/gui/GuiBoard.java index 4db7f87..14e253f 100644 --- a/src/main/java/hexgui/gui/GuiBoard.java +++ b/src/main/java/hexgui/gui/GuiBoard.java @@ -11,9 +11,6 @@ import hexgui.util.BoardLayout; import hexgui.util.Pair; import hexgui.util.StringUtils; - -import javax.swing.*; -import javax.swing.border.EtchedBorder; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; @@ -26,6 +23,8 @@ import java.util.Map; import java.util.TreeMap; import java.util.Vector; +import javax.swing.*; +import javax.swing.border.EtchedBorder; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/GuiField.java b/src/main/java/hexgui/gui/GuiField.java index 2f04eb7..48d1f08 100644 --- a/src/main/java/hexgui/gui/GuiField.java +++ b/src/main/java/hexgui/gui/GuiField.java @@ -7,7 +7,6 @@ import hexgui.hex.HexColor; import hexgui.hex.HexPoint; import hexgui.util.RadialGradientPaint; - import java.awt.*; import java.awt.geom.Point2D; diff --git a/src/main/java/hexgui/gui/GuiMenuBar.java b/src/main/java/hexgui/gui/GuiMenuBar.java index 3d49c33..cd3971f 100644 --- a/src/main/java/hexgui/gui/GuiMenuBar.java +++ b/src/main/java/hexgui/gui/GuiMenuBar.java @@ -4,11 +4,10 @@ package hexgui.gui; - -import javax.swing.*; import java.awt.event.ActionListener; import java.awt.event.KeyEvent; import java.util.Enumeration; +import javax.swing.*; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/GuiToolBar.java b/src/main/java/hexgui/gui/GuiToolBar.java index 04799fe..ede7611 100644 --- a/src/main/java/hexgui/gui/GuiToolBar.java +++ b/src/main/java/hexgui/gui/GuiToolBar.java @@ -5,12 +5,11 @@ package hexgui.gui; import hexgui.game.Node; - -import javax.swing.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyEvent; import java.net.URL; +import javax.swing.*; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/GuiUtil.java b/src/main/java/hexgui/gui/GuiUtil.java index 05cab7b..6b73608 100644 --- a/src/main/java/hexgui/gui/GuiUtil.java +++ b/src/main/java/hexgui/gui/GuiUtil.java @@ -3,17 +3,16 @@ package hexgui.gui; import hexgui.util.Platform; - +import java.awt.*; +import java.awt.datatransfer.*; +import java.io.IOException; +import java.net.URL; import javax.swing.*; import javax.swing.border.Border; import javax.swing.text.Style; import javax.swing.text.StyleConstants; import javax.swing.text.StyleContext; import javax.swing.text.StyledDocument; -import java.awt.*; -import java.awt.datatransfer.*; -import java.io.IOException; -import java.net.URL; /** GUI utility classes and static functions. */ public class GuiUtil { diff --git a/src/main/java/hexgui/gui/HexGui.java b/src/main/java/hexgui/gui/HexGui.java index be7a1e1..3406009 100644 --- a/src/main/java/hexgui/gui/HexGui.java +++ b/src/main/java/hexgui/gui/HexGui.java @@ -1,5 +1,7 @@ package hexgui.gui; +import static java.text.MessageFormat.format; + import hexgui.game.Clock; import hexgui.game.GameInfo; import hexgui.game.Node; @@ -12,8 +14,6 @@ import hexgui.util.StreamCopy; import hexgui.util.StringUtils; import hexgui.version.Version; - -import javax.swing.*; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -26,8 +26,7 @@ import java.util.*; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.Semaphore; - -import static java.text.MessageFormat.format; +import javax.swing.*; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/HtpShell.java b/src/main/java/hexgui/gui/HtpShell.java index 2649c28..6f77114 100644 --- a/src/main/java/hexgui/gui/HtpShell.java +++ b/src/main/java/hexgui/gui/HtpShell.java @@ -5,12 +5,11 @@ package hexgui.gui; import hexgui.htp.HtpController; - -import javax.swing.*; -import javax.swing.text.*; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import javax.swing.*; +import javax.swing.text.*; /** Non-modal dialog displaying the communication between HexGui and a HTP compatible program. */ public class HtpShell extends JDialog implements ActionListener, HtpController.IOInterface { diff --git a/src/main/java/hexgui/gui/MessageDialogs.java b/src/main/java/hexgui/gui/MessageDialogs.java index e5f41cd..febd181 100644 --- a/src/main/java/hexgui/gui/MessageDialogs.java +++ b/src/main/java/hexgui/gui/MessageDialogs.java @@ -2,17 +2,16 @@ package hexgui.gui; +import static hexgui.gui.GuiUtil.insertLineBreaks; + import hexgui.util.Platform; import hexgui.util.PrefUtil; import hexgui.util.StringUtils; - -import javax.swing.*; import java.awt.*; import java.util.Set; import java.util.TreeSet; import java.util.prefs.Preferences; - -import static hexgui.gui.GuiUtil.insertLineBreaks; +import javax.swing.*; /** Simple message dialogs. */ public final class MessageDialogs { diff --git a/src/main/java/hexgui/gui/ParameterDialog.java b/src/main/java/hexgui/gui/ParameterDialog.java index 9ab7882..777a0a9 100644 --- a/src/main/java/hexgui/gui/ParameterDialog.java +++ b/src/main/java/hexgui/gui/ParameterDialog.java @@ -2,14 +2,15 @@ package hexgui.gui; +import static java.lang.Math.max; +import static javax.swing.JOptionPane.*; + import hexgui.htp.AnalyzeUtil; import hexgui.htp.HtpController; import hexgui.htp.HtpError; import hexgui.htp.ParameterType; import hexgui.util.ObjectUtil; import hexgui.util.StringUtils; - -import javax.swing.*; import java.awt.*; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; @@ -20,9 +21,7 @@ import java.io.StringReader; import java.text.MessageFormat; import java.util.ArrayList; - -import static java.lang.Math.max; -import static javax.swing.JOptionPane.*; +import javax.swing.*; /** Dialog for editing parameters in response to an analyze command of type param. */ public class ParameterDialog { diff --git a/src/main/java/hexgui/gui/PreferencesDialog.java b/src/main/java/hexgui/gui/PreferencesDialog.java index 6aedb78..2cde78a 100644 --- a/src/main/java/hexgui/gui/PreferencesDialog.java +++ b/src/main/java/hexgui/gui/PreferencesDialog.java @@ -4,12 +4,12 @@ package hexgui.gui; -import javax.swing.*; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import javax.swing.*; /** Dialog for changes user preferences. */ public final class PreferencesDialog extends JDialog implements ItemListener, ActionListener { diff --git a/src/main/java/hexgui/gui/PrintPreview.java b/src/main/java/hexgui/gui/PrintPreview.java index a3713cd..7365b89 100644 --- a/src/main/java/hexgui/gui/PrintPreview.java +++ b/src/main/java/hexgui/gui/PrintPreview.java @@ -9,16 +9,16 @@ package hexgui.gui; -import javax.swing.*; -import javax.swing.border.AbstractBorder; -import javax.swing.border.LineBorder; -import javax.swing.table.JTableHeader; -import javax.swing.table.TableModel; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.image.BufferedImage; import java.awt.print.*; +import javax.swing.*; +import javax.swing.border.AbstractBorder; +import javax.swing.border.LineBorder; +import javax.swing.table.JTableHeader; +import javax.swing.table.TableModel; public class PrintPreview extends JPanel implements ActionListener { static final double INITIAL_SCALE_DIVISOR = 1.0; // scale factor diff --git a/src/main/java/hexgui/gui/Program.java b/src/main/java/hexgui/gui/Program.java index db081e0..c37f3e2 100644 --- a/src/main/java/hexgui/gui/Program.java +++ b/src/main/java/hexgui/gui/Program.java @@ -5,7 +5,6 @@ package hexgui.gui; import hexgui.util.PrefUtil; - import java.util.Vector; import java.util.prefs.Preferences; diff --git a/src/main/java/hexgui/gui/RemoteProgramDialog.java b/src/main/java/hexgui/gui/RemoteProgramDialog.java index 1d1b658..981020b 100644 --- a/src/main/java/hexgui/gui/RemoteProgramDialog.java +++ b/src/main/java/hexgui/gui/RemoteProgramDialog.java @@ -4,8 +4,8 @@ package hexgui.gui; -import javax.swing.*; import java.awt.*; +import javax.swing.*; /** Dialog for entering a remote program hostname. FIXME: allow port to be set. */ public final class RemoteProgramDialog { diff --git a/src/main/java/hexgui/gui/ShowAnalyzeText.java b/src/main/java/hexgui/gui/ShowAnalyzeText.java index 1713d23..57b69e4 100644 --- a/src/main/java/hexgui/gui/ShowAnalyzeText.java +++ b/src/main/java/hexgui/gui/ShowAnalyzeText.java @@ -4,7 +4,6 @@ import hexgui.hex.HexPoint; import hexgui.htp.AnalyzeType; - import java.awt.*; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; diff --git a/src/main/java/hexgui/gui/ShowError.java b/src/main/java/hexgui/gui/ShowError.java index 0bcde9c..3b5f9aa 100644 --- a/src/main/java/hexgui/gui/ShowError.java +++ b/src/main/java/hexgui/gui/ShowError.java @@ -4,8 +4,8 @@ package hexgui.gui; -import javax.swing.*; import java.awt.*; +import javax.swing.*; /** Displays a simple error message dialog. */ public class ShowError { diff --git a/src/main/java/hexgui/gui/StatusBar.java b/src/main/java/hexgui/gui/StatusBar.java index 50e6b23..fb20783 100644 --- a/src/main/java/hexgui/gui/StatusBar.java +++ b/src/main/java/hexgui/gui/StatusBar.java @@ -4,11 +4,11 @@ package hexgui.gui; -import javax.swing.*; -import javax.swing.border.EtchedBorder; import java.awt.*; import java.text.DecimalFormat; import java.text.NumberFormat; +import javax.swing.*; +import javax.swing.border.EtchedBorder; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/gui/TextViewer.java b/src/main/java/hexgui/gui/TextViewer.java index a2b6f0a..8132a6d 100644 --- a/src/main/java/hexgui/gui/TextViewer.java +++ b/src/main/java/hexgui/gui/TextViewer.java @@ -2,17 +2,17 @@ package hexgui.gui; -import javax.swing.*; -import javax.swing.event.CaretEvent; -import javax.swing.event.CaretListener; -import javax.swing.text.BadLocationException; -import javax.swing.text.Document; import java.awt.*; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.swing.*; +import javax.swing.event.CaretEvent; +import javax.swing.event.CaretListener; +import javax.swing.text.BadLocationException; +import javax.swing.text.Document; /** * Dialog for displaying text. Allows syntax highlighting for analyze commands of type diff --git a/src/main/java/hexgui/gui/VCDisplayDialog.java b/src/main/java/hexgui/gui/VCDisplayDialog.java index a405421..d808b81 100644 --- a/src/main/java/hexgui/gui/VCDisplayDialog.java +++ b/src/main/java/hexgui/gui/VCDisplayDialog.java @@ -5,16 +5,15 @@ package hexgui.gui; import hexgui.hex.VC; - -import javax.swing.*; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; import java.awt.*; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.util.Vector; +import javax.swing.*; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/htp/AnalyzeCommand.java b/src/main/java/hexgui/htp/AnalyzeCommand.java index 563222c..c0eca69 100644 --- a/src/main/java/hexgui/htp/AnalyzeCommand.java +++ b/src/main/java/hexgui/htp/AnalyzeCommand.java @@ -2,16 +2,15 @@ package hexgui.htp; +import static hexgui.hex.HexColor.BLACK; +import static hexgui.hex.HexColor.WHITE; + import hexgui.hex.ConstPointList; import hexgui.hex.HexColor; import hexgui.hex.HexPoint; import hexgui.hex.PointList; - import java.io.File; -import static hexgui.hex.HexColor.BLACK; -import static hexgui.hex.HexColor.WHITE; - /** * Concrete analyze command including data for wildcard replacements. See GoGui documentation, * chapter "Analyze Commands" diff --git a/src/main/java/hexgui/htp/AnalyzeDefinition.java b/src/main/java/hexgui/htp/AnalyzeDefinition.java index c4a3f7b..a16758b 100644 --- a/src/main/java/hexgui/htp/AnalyzeDefinition.java +++ b/src/main/java/hexgui/htp/AnalyzeDefinition.java @@ -4,7 +4,6 @@ import hexgui.util.ErrorMessage; import hexgui.util.StringUtils; - import java.io.BufferedReader; import java.io.IOException; import java.io.Reader; diff --git a/src/main/java/hexgui/htp/HtpController.java b/src/main/java/hexgui/htp/HtpController.java index 40d94f8..4255ff6 100644 --- a/src/main/java/hexgui/htp/HtpController.java +++ b/src/main/java/hexgui/htp/HtpController.java @@ -5,7 +5,6 @@ package hexgui.htp; import hexgui.util.StringUtils; - import java.io.*; // ---------------------------------------------------------------------------- diff --git a/src/main/java/hexgui/sgf/GameFileFilter.java b/src/main/java/hexgui/sgf/GameFileFilter.java index 50cac82..8cc4455 100644 --- a/src/main/java/hexgui/sgf/GameFileFilter.java +++ b/src/main/java/hexgui/sgf/GameFileFilter.java @@ -3,9 +3,8 @@ package hexgui.sgf; import hexgui.util.FileUtil; - -import javax.swing.filechooser.FileFilter; import java.io.File; +import javax.swing.filechooser.FileFilter; /** Swing file filter for SGF or Jago XML files. */ public class GameFileFilter extends FileFilter { diff --git a/src/main/java/hexgui/sgf/SgfReader.java b/src/main/java/hexgui/sgf/SgfReader.java index 8dfe0f4..8f597f4 100644 --- a/src/main/java/hexgui/sgf/SgfReader.java +++ b/src/main/java/hexgui/sgf/SgfReader.java @@ -4,19 +4,18 @@ package hexgui.sgf; +import static java.text.MessageFormat.format; + import hexgui.game.GameInfo; import hexgui.game.Node; import hexgui.hex.HexColor; import hexgui.hex.HexPoint; import hexgui.hex.Move; - import java.awt.*; import java.io.*; import java.util.Locale; import java.util.Vector; -import static java.text.MessageFormat.format; - // ---------------------------------------------------------------------------- /** diff --git a/src/main/java/hexgui/sgf/SgfWriter.java b/src/main/java/hexgui/sgf/SgfWriter.java index a03b049..b344f9f 100644 --- a/src/main/java/hexgui/sgf/SgfWriter.java +++ b/src/main/java/hexgui/sgf/SgfWriter.java @@ -10,7 +10,6 @@ import hexgui.hex.HexPoint; import hexgui.hex.Move; import hexgui.version.Version; - import java.awt.*; import java.io.OutputStream; import java.io.PrintStream; diff --git a/src/main/java/hexgui/util/SpringUtilities.java b/src/main/java/hexgui/util/SpringUtilities.java index 8632d44..f77d261 100644 --- a/src/main/java/hexgui/util/SpringUtilities.java +++ b/src/main/java/hexgui/util/SpringUtilities.java @@ -31,8 +31,8 @@ package hexgui.util; -import javax.swing.*; import java.awt.*; +import javax.swing.*; /** * A 1.4 file that provides utility methods for creating form- or grid-style layouts with diff --git a/src/main/java/hexgui/util/StringUtils.java b/src/main/java/hexgui/util/StringUtils.java index afcef4f..7204f90 100644 --- a/src/main/java/hexgui/util/StringUtils.java +++ b/src/main/java/hexgui/util/StringUtils.java @@ -3,7 +3,6 @@ import hexgui.hex.HexColor; import hexgui.hex.HexPoint; import hexgui.hex.VC; - import java.io.StringReader; import java.util.ArrayList; import java.util.Vector;