X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FJVDialog.java;h=261f1c221b7b9abc6f433c2d39c51a86a4b6ad27;hb=838e4f91d4a53dd315640dbc9ff6ef7a815ee576;hp=4e002e84224baec0eeadd52bddbe74357938d2ea;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git
diff --git a/src/jalview/appletgui/JVDialog.java b/src/jalview/appletgui/JVDialog.java
index 4e002e8..261f1c2 100644
--- a/src/jalview/appletgui/JVDialog.java
+++ b/src/jalview/appletgui/JVDialog.java
@@ -1,25 +1,35 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
+ * Copyright (C) 2015 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.
+ * 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 .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.appletgui;
-import java.awt.*;
-import java.awt.event.*;
+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
{
@@ -48,6 +58,20 @@ public class JVDialog extends Dialog implements ActionListener
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);
@@ -58,9 +82,17 @@ public class JVDialog extends Dialog implements ActionListener
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();
}
@@ -73,6 +105,7 @@ public class JVDialog extends Dialog implements ActionListener
}
setVisible(false);
+ dispose();
}
}