tidy

uk/ac/sanger/artemis/components/MessageFrame.java

@@ -20,34 +20,35 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/MessageFrame.java,v 1.1 2004-06-09 09:47:08 tjc Exp $
  **/
 
 package uk.ac.sanger.artemis.components;
 
-import uk.ac.sanger.artemis.Options;
+import java.awt.Dimension;
+import java.awt.Point;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
 
-import java.awt.*;
-import java.awt.event.*;
-
-import javax.swing.*;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
 
 /**
  *  A popup JFrame box that displays a message and has an OK JButton.
- *
  *  @author Kim Rutherford
- *  @version $Id: MessageFrame.java,v 1.1 2004-06-09 09:47:08 tjc Exp $
  **/
-
 public class MessageFrame extends JFrame {
+  private static final long serialVersionUID = 1L;
+
   /**
    *  Create a new MessageFrame component.
    *  @param message The message to display in the JDialog and it's title.
    **/
   public MessageFrame (final String message) {
     this (message, message);
-
-    this.message = new JLabel (message);
   }
 
   /**
@@ -55,52 +56,32 @@ public class MessageFrame extends JFrame {
    *  @param title The title of the new dialog JFrame.
    *  @param message The message to display in the JDialog.
    **/
-  public MessageFrame (final String title,
-                       final String message) {
+  protected MessageFrame (final String title,
+                          final String message) {
     super (title);
-
-    this.message = new JLabel (message);
+    setDefaultCloseOperation(DISPOSE_ON_CLOSE);
+   
+    getContentPane ().add (new JLabel (message), "North");
     
-    getContentPane ().add (this.message, "North");
-
-    final JPanel panel = new JPanel ();
-
-    panel.add (ok_button);
+    final JButton ok_button = new JButton ("OK");
     ok_button.addActionListener (new ActionListener () {
       public void actionPerformed (ActionEvent e) {
         MessageFrame.this.dispose ();
       }
     });
 
-    addWindowListener (new WindowAdapter () {
-      public void windowClosing (WindowEvent event) {
-        MessageFrame.this.dispose ();
-      }
-    });
-
     addKeyListener (new KeyAdapter () {
       public void keyTyped(final KeyEvent e) {
         MessageFrame.this.dispose ();
       }
     });
     
-    getContentPane ().add (panel, "South");
+    getContentPane ().add (ok_button, "South");
     pack ();
     
     final Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
     setLocation (new Point ((screen.width - getSize ().width) / 2,
                             (screen.height - getSize ().height) / 2));
-
     setVisible (true);
   }
-
-  final private JButton ok_button = new JButton ("OK");
-
-  /**
-   *  This is the message displayed above the OK button.  It can be set with
-   *  setMessage ().
-   **/
-  private JLabel message;
 }
-
-