X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJalviewDialog.java;h=ac5bb6725265bb6c007c91685c44ff9b8f5269dd;hb=4cf0508ac56ebb01fbd51b547ea9f4a682ca97fb;hp=eee5ffe3a98fd2d3b23060fd3cf99bb9af768ea2;hpb=a45774ee31d9f35d4eff46d54d7deab719afb092;p=jalview.git

diff --git a/src/jalview/gui/JalviewDialog.java b/src/jalview/gui/JalviewDialog.java
index eee5ffe..ac5bb67 100644
--- a/src/jalview/gui/JalviewDialog.java
+++ b/src/jalview/gui/JalviewDialog.java
@@ -1,20 +1,21 @@
-/*******************************************************************************
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
- *
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Copyright (C) 2014 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.gui;
 
 import java.awt.Container;
@@ -29,19 +30,24 @@ 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)
@@ -62,23 +68,25 @@ public abstract class JalviewDialog extends JPanel
     }
   }
 
-  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()
@@ -101,55 +109,56 @@ public abstract class JalviewDialog extends JPanel
     });
     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
    */
@@ -163,9 +172,11 @@ public abstract class JalviewDialog extends JPanel
     {
     }
   }
-  
+
   protected abstract void raiseClosed();
+
   protected abstract void okPressed();
+
   protected abstract void cancelPressed();
-  
+
 }