X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJalviewDialog.java;h=d034fd25ae63ba6392d7d13cbc405025c7b2eee9;hb=b57a02c25e335d033c97f8a6bacd6b54f62bd2b6;hp=4630cfc39eb13701c9f3b8ad5f133cf86066dd66;hpb=0b98ba19a0f12809fc43899cf299e0408d30d587;p=jalview.git

diff --git a/src/jalview/gui/JalviewDialog.java b/src/jalview/gui/JalviewDialog.java
index 4630cfc..d034fd2 100644
--- a/src/jalview/gui/JalviewDialog.java
+++ b/src/jalview/gui/JalviewDialog.java
@@ -1,28 +1,52 @@
+/*******************************************************************************
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ *
+ * 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/>.
+ *******************************************************************************/
 package jalview.gui;
 
 import java.awt.Container;
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
 
 import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JPanel;
 
 /**
- * Boilerplate dialog class. Implements basic functionality necessary for model blocking/non-blocking dialogs
- * with an OK and Cancel button ready to add to the content pane.
+ * Boilerplate dialog class. Implements basic functionality necessary for model
+ * blocking/non-blocking dialogs with an OK and Cancel button ready to add to
+ * the content pane.
+ * 
  * @author jimp
- *
+ * 
  */
 public abstract class JalviewDialog extends JPanel
 {
 
   protected JDialog frame;
+
   protected JButton ok = new JButton();
+
   protected JButton cancel = new JButton();
-  boolean block=false;
-  
+
+  boolean block = false;
+
   public void waitForInput()
   {
     if (!block)
@@ -32,34 +56,36 @@ public abstract class JalviewDialog extends JPanel
 
         public void run()
         {
-          frame.show();
+          frame.setVisible(true);
         }
 
       }).start();
     }
     else
     {
-      frame.show();
+      frame.setVisible(true);
     }
   }
 
-  protected void initDialogFrame(Container content,
-          boolean modal, boolean block, String title, int width, int height)
+  protected void initDialogFrame(Container content, boolean modal,
+          boolean block, String title, int width, int height)
   {
-    
-    frame = new JDialog(Desktop.instance, true);
+
+    frame = new JDialog(Desktop.instance, modal);
     frame.setTitle(title);
-    if (Desktop.instance!=null)
+    if (Desktop.instance != null)
+    {
+      Rectangle deskr = Desktop.instance.getBounds();
+      frame.setBounds(new Rectangle((int) (deskr.getCenterX() - width / 2),
+              (int) (deskr.getCenterY() - height / 2), width, height));
+    }
+    else
     {
-    Rectangle deskr = Desktop.instance.getBounds();
-    frame.setBounds(new Rectangle((int) (deskr.getCenterX() - width/2),
-            (int) (deskr.getCenterY() - height/2), width, height));
-    } else {
-      frame.setSize(width,height);
+      frame.setSize(width, height);
     }
     frame.setContentPane(content);
     this.block = block;
-    
+
     ok.setOpaque(false);
     ok.setText("OK");
     ok.addActionListener(new ActionListener()
@@ -80,8 +106,58 @@ public abstract class JalviewDialog extends JPanel
         closeDialog();
       }
     });
+    frame.addWindowListener(new WindowListener()
+    {
+
+      @Override
+      public void windowOpened(WindowEvent e)
+      {
+        // TODO Auto-generated method stub
+
+      }
+
+      @Override
+      public void windowIconified(WindowEvent e)
+      {
+        // TODO Auto-generated method stub
 
+      }
+
+      @Override
+      public void windowDeiconified(WindowEvent e)
+      {
+        // TODO Auto-generated method stub
+
+      }
+
+      @Override
+      public void windowDeactivated(WindowEvent e)
+      {
+        // TODO Auto-generated method stub
+
+      }
+
+      @Override
+      public void windowClosing(WindowEvent e)
+      {
+        // user has cancelled the dialog
+        closeDialog();
+      }
+
+      @Override
+      public void windowClosed(WindowEvent e)
+      {
+      }
+
+      @Override
+      public void windowActivated(WindowEvent e)
+      {
+        // TODO Auto-generated method stub
+
+      }
+    });
   }
+
   /**
    * clean up and raise the 'dialog closed' event by calling raiseClosed
    */
@@ -95,9 +171,11 @@ public abstract class JalviewDialog extends JPanel
     {
     }
   }
-  
+
   protected abstract void raiseClosed();
+
   protected abstract void okPressed();
+
   protected abstract void cancelPressed();
-  
+
 }