X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGPDBSearchPanel.java;h=a10599927a484d8d1e4fcd729161600d560fada9;hb=6fb341da6a316869ba5fc87c146c30d1279f06fa;hp=c235560454d47ffbd5a8f13141d85862cd8684fa;hpb=2771b2433e6a8dfe171bc9d765381e287f8f221a;p=jalview.git diff --git a/src/jalview/jbgui/GPDBSearchPanel.java b/src/jalview/jbgui/GPDBSearchPanel.java index c235560..a105999 100644 --- a/src/jalview/jbgui/GPDBSearchPanel.java +++ b/src/jalview/jbgui/GPDBSearchPanel.java @@ -35,6 +35,7 @@ import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.util.Arrays; import javax.swing.ImageIcon; import javax.swing.JButton; @@ -71,23 +72,50 @@ public abstract class GPDBSearchPanel extends JPanel protected JButton btn_ok = new JButton(); protected JButton btn_back = new JButton(); - + protected JButton btn_cancel = new JButton(); - + protected JTextField txt_search = new JTextField(20); - - protected JTable tbl_summary = new JTable(); + + protected JTable tbl_summary = new JTable() + { + public String getToolTipText(MouseEvent evt) + { + String toolTipText = null; + java.awt.Point pnt = evt.getPoint(); + int rowIndex = rowAtPoint(pnt); + int colIndex = columnAtPoint(pnt); + + try + { + toolTipText = getValueAt(rowIndex, colIndex).toString(); + } catch (Exception e) + { + e.printStackTrace(); + } + toolTipText = (toolTipText == null ? null + : (toolTipText.length() > 500 ? JvSwingUtils.wrapTooltip( + true, toolTipText.subSequence(0, 500) + "...") + : JvSwingUtils.wrapTooltip(true, toolTipText))); + + return toolTipText; + } + }; protected StringBuilder errorWarning = new StringBuilder(); - protected JScrollPane scrl_searchResult = new JScrollPane( -tbl_summary); + protected JScrollPane scrl_searchResult = new JScrollPane(tbl_summary); protected ImageIcon warningImage = new ImageIcon(getClass().getResource( "/images/warning.gif")); + protected ImageIcon loadingImage = new ImageIcon(getClass().getResource( + "/images/loading.gif")); + protected JLabel lbl_warning = new JLabel(warningImage); + protected JLabel lbl_loading = new JLabel(loadingImage); + private JTabbedPane tabbedPane = new JTabbedPane(); private PDBDocFieldPreferences pdbDocFieldPrefs = new PDBDocFieldPreferences( @@ -101,6 +129,8 @@ tbl_summary); private BorderLayout mainLayout = new BorderLayout(); + protected PDBDocField[] previousWantedFields; + public GPDBSearchPanel() { try @@ -123,19 +153,57 @@ tbl_summary); { lbl_warning.setVisible(false); lbl_warning.setFont(new java.awt.Font("Verdana", 0, 12)); + lbl_loading.setVisible(false); + lbl_loading.setFont(new java.awt.Font("Verdana", 0, 12)); tbl_summary.setAutoCreateRowSorter(true); + tbl_summary.getTableHeader().setReorderingAllowed(false); tbl_summary.addMouseListener(new MouseAdapter() { public void mouseClicked(MouseEvent e) { validateSelection(); } + public void mouseReleased(MouseEvent e) { validateSelection(); } }); + tbl_summary.addKeyListener(new KeyAdapter() + { + @Override + public void keyPressed(KeyEvent evt) + { + validateSelection(); + switch (evt.getKeyCode()) + { + case KeyEvent.VK_ESCAPE: // escape key + btn_back_ActionPerformed(); + break; + case KeyEvent.VK_ENTER: // enter key + if (btn_ok.isEnabled()) + { + btn_ok_ActionPerformed(); + } + evt.consume(); + break; + case KeyEvent.VK_TAB: // tab key + if (evt.isShiftDown()) + { + tabbedPane.requestFocus(); + } + else + { + btn_back.requestFocus(); + } + evt.consume(); + break; + default: + return; + } + } + }); btn_back.setFont(new java.awt.Font("Verdana", 0, 12)); btn_back.setText(MessageManager.getString("action.back")); @@ -146,6 +214,17 @@ tbl_summary); btn_back_ActionPerformed(); } }); + btn_back.addKeyListener(new KeyAdapter() + { + @Override + public void keyPressed(KeyEvent evt) + { + if (evt.getKeyCode() == KeyEvent.VK_ENTER) + { + btn_back_ActionPerformed(); + } + } + }); btn_ok.setEnabled(false); btn_ok.setFont(new java.awt.Font("Verdana", 0, 12)); @@ -157,6 +236,18 @@ tbl_summary); btn_ok_ActionPerformed(); } }); + btn_ok.addKeyListener(new KeyAdapter() + { + @Override + public void keyPressed(KeyEvent evt) + { + if (evt.getKeyCode() == KeyEvent.VK_ENTER) + { + btn_ok_ActionPerformed(); + } + } + }); + btn_cancel.setFont(new java.awt.Font("Verdana", 0, 12)); btn_cancel.setText(MessageManager.getString("action.cancel")); btn_cancel.addActionListener(new java.awt.event.ActionListener() @@ -166,7 +257,17 @@ tbl_summary); btn_cancel_ActionPerformed(); } }); - + btn_cancel.addKeyListener(new KeyAdapter() + { + @Override + public void keyPressed(KeyEvent evt) + { + if (evt.getKeyCode() == KeyEvent.VK_ENTER) + { + btn_cancel_ActionPerformed(); + } + } + }); scrl_searchResult.setPreferredSize(new Dimension(500, 300)); scrl_searchResult @@ -193,8 +294,9 @@ tbl_summary); else { tooltipText = MessageManager.formatMessage( - "label.separate_multiple_query_values", new Object[] - { getCmbSearchTarget().getSelectedItem().toString() }); + "label.separate_multiple_query_values", + new Object[] { getCmbSearchTarget().getSelectedItem() + .toString() }); } txt_search.setToolTipText(JvSwingUtils.wrapTooltip(true, tooltipText)); @@ -204,7 +306,6 @@ tbl_summary); populateCmbSearchTargetOptions(); - txt_search.setFont(new java.awt.Font("Verdana", 0, 12)); txt_search.addKeyListener(new KeyAdapter() @@ -251,6 +352,8 @@ tbl_summary); final String searchTabTitle = MessageManager .getString("label.search_result"); + final String configureCols = MessageManager + .getString("label.configure_displayed_columns"); ChangeListener changeListener = new ChangeListener() { public void stateChanged(ChangeEvent changeEvent) @@ -258,18 +361,33 @@ tbl_summary); JTabbedPane sourceTabbedPane = (JTabbedPane) changeEvent .getSource(); int index = sourceTabbedPane.getSelectedIndex(); + if (sourceTabbedPane.getTitleAt(index).equals(configureCols)) + { + btn_back.setEnabled(false); + btn_cancel.setEnabled(false); + btn_ok.setEnabled(false); + previousWantedFields = PDBDocFieldPreferences + .getSearchSummaryFields().toArray(new PDBDocField[0]); + } if (sourceTabbedPane.getTitleAt(index).equals(searchTabTitle)) { - txt_search_ActionPerformed(); + btn_back.setEnabled(true); + btn_cancel.setEnabled(true); + if (wantedFieldsUpdated()) + { + txt_search_ActionPerformed(); + } + else + { + validateSelection(); + } } } }; tabbedPane.addChangeListener(changeListener); tabbedPane.setPreferredSize(new Dimension(500, 300)); tabbedPane.add(searchTabTitle, scrl_searchResult); - tabbedPane.add( - MessageManager.getString("label.configure_displayed_columns"), - pdbDocFieldPrefs); + tabbedPane.add(configureCols, pdbDocFieldPrefs); pnl_actions.add(btn_back); pnl_actions.add(btn_ok); @@ -278,6 +396,7 @@ tbl_summary); pnl_results.add(tabbedPane); pnl_inputs.add(cmb_searchTarget); pnl_inputs.add(txt_search); + pnl_inputs.add(lbl_loading); pnl_inputs.add(lbl_warning); this.setLayout(mainLayout); @@ -290,6 +409,19 @@ tbl_summary); Desktop.addInternalFrame(mainFrame, frameTitle, 800, 400); } + public boolean wantedFieldsUpdated() + { + if (previousWantedFields == null) + { + return true; + } + + return Arrays.equals(PDBDocFieldPreferences.getSearchSummaryFields() + .toArray(new PDBDocField[0]), previousWantedFields) ? false + : true; + + } + public void validateSelection() { if (tbl_summary.getSelectedRows().length > 0) @@ -301,6 +433,7 @@ tbl_summary); btn_ok.setEnabled(false); } } + public JComboBox getCmbSearchTarget() { return cmb_searchTarget;