X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGPDBSearchPanel.java;h=7543b53290830dc96288618efc37baad556c2cc4;hb=abcfb92b105fb0bac6648c863c4141d691635e2a;hp=5593d5c0a888661ca23e9afd42c78d824f917aa0;hpb=d9cedb863c0d5b665b8cdde3f8791d8a96030c6b;p=jalview.git diff --git a/src/jalview/jbgui/GPDBSearchPanel.java b/src/jalview/jbgui/GPDBSearchPanel.java index 5593d5c..7543b53 100644 --- a/src/jalview/jbgui/GPDBSearchPanel.java +++ b/src/jalview/jbgui/GPDBSearchPanel.java @@ -22,24 +22,34 @@ package jalview.jbgui; import jalview.gui.Desktop; +import jalview.gui.JvSwingUtils; +import jalview.jbgui.PDBDocFieldPreferences.PreferenceSource; import jalview.util.MessageManager; import jalview.ws.dbsources.PDBRestClient.PDBDocField; -import jalview.ws.uimodel.PDBRestResponse.PDBResponseSummary; import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +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; import javax.swing.JComboBox; import javax.swing.JFrame; import javax.swing.JInternalFrame; -import javax.swing.JList; +import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JScrollPane; +import javax.swing.JTabbedPane; +import javax.swing.JTable; import javax.swing.JTextField; -import javax.swing.ListSelectionModel; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; @@ -62,15 +72,54 @@ 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 JList lst_searchResult = new JList(); - protected JScrollPane scrl_searchResult = new JScrollPane( - lst_searchResult); + 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 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( + PreferenceSource.SEARCH_SUMMARY); private JPanel pnl_actions = new JPanel(); @@ -80,6 +129,8 @@ public abstract class GPDBSearchPanel extends JPanel private BorderLayout mainLayout = new BorderLayout(); + protected PDBDocField[] previousWantedFields; + public GPDBSearchPanel() { try @@ -100,6 +151,47 @@ public abstract class GPDBSearchPanel extends JPanel */ private void jbInit() throws Exception { + 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 + btn_ok_ActionPerformed(); + break; + case KeyEvent.VK_TAB: // tab key + btn_back.requestFocus(); + default: + return; + } + } + }); + btn_back.setFont(new java.awt.Font("Verdana", 0, 12)); btn_back.setText(MessageManager.getString("action.back")); btn_back.addActionListener(new java.awt.event.ActionListener() @@ -109,6 +201,19 @@ public abstract class GPDBSearchPanel extends JPanel 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)); btn_ok.setText(MessageManager.getString("action.ok")); btn_ok.addActionListener(new java.awt.event.ActionListener() @@ -118,6 +223,18 @@ public abstract class GPDBSearchPanel extends JPanel 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() @@ -127,18 +244,21 @@ public abstract class GPDBSearchPanel extends JPanel btn_cancel_ActionPerformed(); } }); - pnl_actions.add(btn_back); - pnl_actions.add(btn_ok); - pnl_actions.add(btn_cancel); + btn_cancel.addKeyListener(new KeyAdapter() + { + @Override + public void keyPressed(KeyEvent evt) + { + if (evt.getKeyCode() == KeyEvent.VK_ENTER) + { + btn_cancel_ActionPerformed(); + } + } + }); - lst_searchResult - .setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); - lst_searchResult.setLayoutOrientation(JList.VERTICAL); - lst_searchResult.setVisibleRowCount(-1); scrl_searchResult.setPreferredSize(new Dimension(500, 300)); scrl_searchResult .setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); - pnl_results.add(scrl_searchResult); cmb_searchTarget.setFont(new java.awt.Font("Verdana", 0, 12)); cmb_searchTarget.addActionListener(new ActionListener() @@ -146,6 +266,27 @@ public abstract class GPDBSearchPanel extends JPanel @Override public void actionPerformed(ActionEvent e) { + String tooltipText; + if ("all".equalsIgnoreCase(getCmbSearchTarget().getSelectedItem() + .toString())) + { + tooltipText = MessageManager.getString("label.search_all"); + } + else if ("pdb id".equalsIgnoreCase(getCmbSearchTarget() + .getSelectedItem().toString())) + { + tooltipText = MessageManager + .getString("label.separate_multiple_accession_ids"); + } + else + { + tooltipText = MessageManager.formatMessage( + "label.separate_multiple_query_values", + new Object[] { getCmbSearchTarget().getSelectedItem() + .toString() }); + } + txt_search.setToolTipText(JvSwingUtils.wrapTooltip(true, + tooltipText)); txt_search_ActionPerformed(); } }); @@ -153,6 +294,28 @@ public abstract class GPDBSearchPanel extends JPanel populateCmbSearchTargetOptions(); txt_search.setFont(new java.awt.Font("Verdana", 0, 12)); + + txt_search.addKeyListener(new KeyAdapter() + { + @Override + public void keyPressed(KeyEvent e) + { + if (e.getKeyCode() == KeyEvent.VK_ENTER) + { + if (txt_search.getText() == null + || txt_search.getText().isEmpty()) + { + return; + } + if ("pdb id".equalsIgnoreCase(getCmbSearchTarget() + .getSelectedItem().toString())) + { + transferToSequenceFetcher(txt_search.getText()); + } + } + } + }); + txt_search.getDocument().addDocumentListener(new DocumentListener() { @Override @@ -174,8 +337,54 @@ public abstract class GPDBSearchPanel extends JPanel } }); + 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) + { + 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)) + { + 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(configureCols, pdbDocFieldPrefs); + + pnl_actions.add(btn_back); + pnl_actions.add(btn_ok); + pnl_actions.add(btn_cancel); + + 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); this.add(pnl_inputs, java.awt.BorderLayout.NORTH); @@ -187,6 +396,48 @@ public abstract class GPDBSearchPanel extends JPanel 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) + { + btn_ok.setEnabled(true); + } + else + { + btn_ok.setEnabled(false); + } + } + + public JComboBox getCmbSearchTarget() + { + return cmb_searchTarget; + } + + public JTextField getTxtSearch() + { + return txt_search; + } + + public JInternalFrame getMainFrame() + { + return mainFrame; + } + + public abstract void transferToSequenceFetcher(String ids); + public abstract void txt_search_ActionPerformed(); public abstract void btn_ok_ActionPerformed(); @@ -195,6 +446,6 @@ public abstract class GPDBSearchPanel extends JPanel public abstract void btn_cancel_ActionPerformed(); - protected abstract void populateCmbSearchTargetOptions(); + public abstract void populateCmbSearchTargetOptions(); }