X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FJalviewDialog.java;h=05f5ffca186fc8e470cd818ddb5ee492f97c6a93;hb=bd894ca9f2aae448653d7431ab8a170e1105e85c;hp=833af151f78ca649ced6df3d27c54c3743811cf2;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git
diff --git a/src/jalview/gui/JalviewDialog.java b/src/jalview/gui/JalviewDialog.java
index 833af15..05f5ffc 100644
--- a/src/jalview/gui/JalviewDialog.java
+++ b/src/jalview/gui/JalviewDialog.java
@@ -1,23 +1,29 @@
-/*******************************************************************************
- * 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
- *
+/*
+ * 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.
- *
+ * 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.gui;
+import jalview.util.MessageManager;
+
import java.awt.Container;
+import java.awt.Dimension;
import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -29,19 +35,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)
@@ -49,6 +60,7 @@ public abstract class JalviewDialog extends JPanel
new Thread(new Runnable()
{
+ @Override
public void run()
{
frame.setVisible(true);
@@ -62,27 +74,33 @@ 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 {
- frame.setSize(width,height);
+ 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);
+ }
+ int minWidth = width - 100;
+ int minHeight = height - 100;
+ frame.setMinimumSize(new Dimension(minWidth, minHeight));
frame.setContentPane(content);
this.block = block;
-
+
ok.setOpaque(false);
- ok.setText("OK");
+ ok.setText(MessageManager.getString("action.ok"));
ok.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
okPressed();
@@ -90,9 +108,10 @@ public abstract class JalviewDialog extends JPanel
}
});
cancel.setOpaque(false);
- cancel.setText("Cancel");
+ cancel.setText(MessageManager.getString("action.cancel"));
cancel.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
cancelPressed();
@@ -101,55 +120,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 +183,11 @@ public abstract class JalviewDialog extends JPanel
{
}
}
-
+
protected abstract void raiseClosed();
+
protected abstract void okPressed();
+
protected abstract void cancelPressed();
-
+
}