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
JAL-2315 Clear sequenceURLLinks if all sequence links are removed.
[jalview.git]
/
src
/
jalview
/
gui
/
JDatabaseTree.java
diff --git
a/src/jalview/gui/JDatabaseTree.java
b/src/jalview/gui/JDatabaseTree.java
index
6d8c4e0
..
2a3d788
100644
(file)
--- a/
src/jalview/gui/JDatabaseTree.java
+++ b/
src/jalview/gui/JDatabaseTree.java
@@
-26,7
+26,6
@@
import jalview.ws.seqfetcher.DbSourceProxy;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.BorderLayout;
import java.awt.Component;
-import java.awt.Container;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.GridLayout;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.GridLayout;
@@
-34,6
+33,8
@@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Hashtable;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Hashtable;
@@
-73,7
+74,7
@@
public class JDatabaseTree extends JalviewDialog implements KeyListener
@Override
public void actionPerformed(ActionEvent arg0)
{
@Override
public void actionPerformed(ActionEvent arg0)
{
- showDialog(null);
+ showDialog();
}
});
return viewdbs;
}
});
return viewdbs;
@@
-169,6
+170,19
@@
public class JDatabaseTree extends JalviewDialog implements KeyListener
_setSelectionState();
}
});
_setSelectionState();
}
});
+ dbviews.addMouseListener(new MouseAdapter()
+ {
+
+ @Override
+ public void mousePressed(MouseEvent e)
+ {
+ if (e.getClickCount() == 2)
+ {
+ okPressed();
+ closeDialog();
+ }
+ }
+ });
JPanel jc = new JPanel(new BorderLayout()), j = new JPanel(
new FlowLayout());
jc.add(svp, BorderLayout.CENTER);
JPanel jc = new JPanel(new BorderLayout()), j = new JPanel(
new FlowLayout());
jc.add(svp, BorderLayout.CENTER);
@@
-309,7
+323,6
@@
public class JDatabaseTree extends JalviewDialog implements KeyListener
protected void okPressed()
{
_setSelectionState();
protected void okPressed()
{
_setSelectionState();
- closeDialog();
}
@Override
}
@Override
@@
-321,7
+334,7
@@
public class JDatabaseTree extends JalviewDialog implements KeyListener
closeDialog();
}
closeDialog();
}
- private void showDialog(Container parent)
+ void showDialog()
{
oldselection = selection;
oldtsel = tsel;
{
oldselection = selection;
oldtsel = tsel;
@@
-558,6
+571,7
@@
public class JDatabaseTree extends JalviewDialog implements KeyListener
{
action = arg0.getKeyCode();
okPressed();
{
action = arg0.getKeyCode();
okPressed();
+ closeDialog();
}
if (!arg0.isConsumed() && arg0.getKeyChar() == KeyEvent.VK_ESCAPE)
{
}
if (!arg0.isConsumed() && arg0.getKeyChar() == KeyEvent.VK_ESCAPE)
{