X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FJVDialog.java;h=a7cc83ff03321fa36580ce0562ffd83b86459e56;hb=refs%2Fheads%2Freleases%2FRelease_2_10_0_Branch;hp=b8e0abc1ac3921c68295285241b6b907a855e3cb;hpb=bd033a98fbd26a1fac258df761b1f26b1d2fb178;p=jalview.git

diff --git a/src/jalview/appletgui/JVDialog.java b/src/jalview/appletgui/JVDialog.java
index b8e0abc..a7cc83f 100644
--- a/src/jalview/appletgui/JVDialog.java
+++ b/src/jalview/appletgui/JVDialog.java
@@ -1,79 +1,111 @@
-/*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-package jalview.appletgui;
-
-import java.awt.*;
-import java.awt.event.*;
-
-public class JVDialog extends Dialog implements ActionListener
-{
-  AlignmentPanel ap;
-  Panel buttonPanel;
-  Button ok = new Button("Accept");
-  Button cancel = new Button("Cancel");
-  boolean accept = false;
-  Frame owner;
-
-  public JVDialog(Frame owner,
-                  String title,
-                  boolean modal,
-                  int width, int height)
-  {
-      super(owner, title, modal);
-      this.owner = owner;
-
-      height += owner.getInsets().top + getInsets().bottom;
-
-      setBounds(owner.getBounds().x
-                + (owner.getSize().width - width) / 2,
-                owner.getBounds().y
-                + (owner.getSize().height - height) / 2,
-                width, height);
-  }
-
-  void setMainPanel(Panel panel)
-  {
-    add(panel, BorderLayout.NORTH);
-
-    buttonPanel = new Panel(new FlowLayout());
-
-    buttonPanel.add(ok);
-    buttonPanel.add(cancel);
-    ok.addActionListener(this);
-    cancel.addActionListener(this);
-
-    add(buttonPanel, BorderLayout.SOUTH);
-
-    pack();
-
-  }
-
-  public void actionPerformed(ActionEvent evt)
-  {
-    if (evt.getSource() == ok)
-    {
-      accept = true;
-    }
-
-    setVisible(false);
-  }
-
-
-}
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
+package jalview.appletgui;
+
+import java.awt.BorderLayout;
+import java.awt.Button;
+import java.awt.Dialog;
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.Panel;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+public class JVDialog extends Dialog implements ActionListener
+{
+  AlignmentPanel ap;
+
+  Panel buttonPanel;
+
+  Button ok = new Button("Accept");
+
+  Button cancel = new Button("Cancel");
+
+  boolean accept = false;
+
+  Frame owner;
+
+  public JVDialog(Frame owner, String title, boolean modal, int width,
+          int height)
+  {
+    super(owner, title, modal);
+    this.owner = owner;
+
+    height += owner.getInsets().top + getInsets().bottom;
+
+    setBounds(owner.getBounds().x + (owner.getSize().width - width) / 2,
+            owner.getBounds().y + (owner.getSize().height - height) / 2,
+            width, height);
+  }
+
+  public JVDialog(Frame owner, Panel mainPanel, String title,
+          boolean modal, int width, int height)
+  {
+    super(owner, title, modal);
+    this.owner = owner;
+
+    height += owner.getInsets().top + getInsets().bottom;
+
+    setBounds(owner.getBounds().x + (owner.getSize().width - width) / 2,
+            owner.getBounds().y + (owner.getSize().height - height) / 2,
+            width, height);
+    setMainPanel(mainPanel);
+  }
+
+  void setMainPanel(Panel panel)
+  {
+    add(panel, BorderLayout.NORTH);
+
+    buttonPanel = new Panel(new FlowLayout());
+
+    buttonPanel.add(ok);
+    buttonPanel.add(cancel);
+    ok.addActionListener(this);
+    cancel.addActionListener(this);
+    add(buttonPanel, BorderLayout.SOUTH);
+
+    addWindowListener(new WindowAdapter()
+    {
+      public void windowClosing(WindowEvent ev)
+      {
+        setVisible(false);
+        dispose();
+      }
+    });
+
+    pack();
+
+  }
+
+  public void actionPerformed(ActionEvent evt)
+  {
+    if (evt.getSource() == ok)
+    {
+      accept = true;
+    }
+
+    setVisible(false);
+    dispose();
+  }
+
+}