git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into bug/JAL-2225mapMultipleChains
[jalview.git]
/
src
/
jalview
/
gui
/
JalviewDialog.java
diff --git
a/src/jalview/gui/JalviewDialog.java
b/src/jalview/gui/JalviewDialog.java
index
895abcb
..
05f5ffc
100644
(file)
--- a/
src/jalview/gui/JalviewDialog.java
+++ b/
src/jalview/gui/JalviewDialog.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-23,6
+23,7
@@
package jalview.gui;
import jalview.util.MessageManager;
import java.awt.Container;
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;
import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@
-59,6
+60,7
@@
public abstract class JalviewDialog extends JPanel
new Thread(new Runnable()
{
new Thread(new Runnable()
{
+ @Override
public void run()
{
frame.setVisible(true);
public void run()
{
frame.setVisible(true);
@@
-88,6
+90,9
@@
public abstract class JalviewDialog extends JPanel
{
frame.setSize(width, height);
}
{
frame.setSize(width, height);
}
+ int minWidth = width - 100;
+ int minHeight = height - 100;
+ frame.setMinimumSize(new Dimension(minWidth, minHeight));
frame.setContentPane(content);
this.block = block;
frame.setContentPane(content);
this.block = block;
@@
-95,6
+100,7
@@
public abstract class JalviewDialog extends JPanel
ok.setText(MessageManager.getString("action.ok"));
ok.addActionListener(new ActionListener()
{
ok.setText(MessageManager.getString("action.ok"));
ok.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
okPressed();
public void actionPerformed(ActionEvent e)
{
okPressed();
@@
-105,6
+111,7
@@
public abstract class JalviewDialog extends JPanel
cancel.setText(MessageManager.getString("action.cancel"));
cancel.addActionListener(new ActionListener()
{
cancel.setText(MessageManager.getString("action.cancel"));
cancel.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
cancelPressed();
public void actionPerformed(ActionEvent e)
{
cancelPressed();