X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Ffts%2Fcore%2FGFTSPanel.java;h=c9ee297e0258e44f81451f63c5207af8f43d04e5;hb=e1976b4025f648431974e7ddcb2be93115688abd;hp=67983a12e975bc6af4879007b179458a6db612e8;hpb=007af0c9001900071f6d8e9214143f79e10f4938;p=jalview.git diff --git a/src/jalview/fts/core/GFTSPanel.java b/src/jalview/fts/core/GFTSPanel.java index 67983a1..c9ee297 100644 --- a/src/jalview/fts/core/GFTSPanel.java +++ b/src/jalview/fts/core/GFTSPanel.java @@ -35,6 +35,8 @@ import java.awt.CardLayout; import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; @@ -57,11 +59,13 @@ import javax.swing.JScrollPane; import javax.swing.JTabbedPane; import javax.swing.JTable; import javax.swing.JTextField; +import javax.swing.Timer; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.table.DefaultTableModel; +import javax.swing.table.TableColumn; /** * This class provides the swing GUI layout for FTS Panel and implements most of @@ -87,14 +91,65 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI protected JButton btn_cancel = new JButton(); - protected JTextField txt_search = new JTextField(20); + protected JTextField txt_search = new JTextField(35); protected SequenceFetcher seqFetcher; protected Collection wantedFields; + private String lastSearchTerm = ""; + + protected JButton btn_next_page = new JButton(); + + protected JButton btn_prev_page = new JButton(); + private JTable tbl_summary = new JTable() { + private boolean inLayout; + + @Override + public boolean getScrollableTracksViewportWidth() + { + return hasExcessWidth(); + + } + + @Override + public void doLayout() + { + if (hasExcessWidth()) + { + autoResizeMode = AUTO_RESIZE_SUBSEQUENT_COLUMNS; + } + inLayout = true; + super.doLayout(); + inLayout = false; + autoResizeMode = AUTO_RESIZE_OFF; + } + + protected boolean hasExcessWidth() + { + return getPreferredSize().width < getParent().getWidth(); + } + + @Override + public void columnMarginChanged(ChangeEvent e) + { + if (isEditing()) + { + removeEditor(); + } + TableColumn resizingColumn = getTableHeader().getResizingColumn(); + // Need to do this here, before the parent's + // layout manager calls getPreferredSize(). + if (resizingColumn != null && autoResizeMode == AUTO_RESIZE_OFF + && !inLayout) + { + resizingColumn.setPreferredWidth(resizingColumn.getWidth()); + } + resizeAndRepaint(); + } + @Override public String getToolTipText(MouseEvent evt) { @@ -175,7 +230,6 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI lbl_loading.setVisible(false); lbl_loading.setFont(new java.awt.Font("Verdana", 0, 12)); - tbl_summary.setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS); tbl_summary.setAutoCreateRowSorter(true); tbl_summary.getTableHeader().setReorderingAllowed(false); tbl_summary.addMouseListener(new MouseAdapter() @@ -272,6 +326,63 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI } }); + btn_next_page.setEnabled(false); + btn_next_page.setFont(new java.awt.Font("Verdana", 0, 12)); + btn_next_page.setText(MessageManager.getString("action.next_page")); + btn_next_page.addActionListener(new java.awt.event.ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + nextPageAction(); + } + }); + btn_next_page.addKeyListener(new KeyAdapter() + { + @Override + public void keyPressed(KeyEvent evt) + { + if (evt.getKeyCode() == KeyEvent.VK_ENTER) + { + nextPageAction(); + } + } + }); + + btn_prev_page.setEnabled(false); + btn_prev_page.setFont(new java.awt.Font("Verdana", 0, 12)); + btn_prev_page.setText(MessageManager.getString("action.prev_page")); + btn_prev_page.addActionListener(new java.awt.event.ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + prevPageAction(); + } + }); + btn_prev_page.addKeyListener(new KeyAdapter() + { + @Override + public void keyPressed(KeyEvent evt) + { + if (evt.getKeyCode() == KeyEvent.VK_ENTER) + { + prevPageAction(); + } + } + }); + + if (isPaginationEnabled()) + { + btn_prev_page.setVisible(true); + btn_next_page.setVisible(true); + } + else + { + btn_prev_page.setVisible(false); + btn_next_page.setVisible(false); + } + 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() @@ -293,10 +404,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI } } }); - - scrl_searchResult.setPreferredSize(new Dimension(500, 300)); - scrl_searchResult - .setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + scrl_searchResult.setPreferredSize(new Dimension(800, 400)); cmb_searchTarget.setFont(new java.awt.Font("Verdana", 0, 12)); cmb_searchTarget.addActionListener(new ActionListener() @@ -345,7 +453,9 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI { return; } - if ("pdb id".equalsIgnoreCase(getCmbSearchTarget() + String primaryKeyName = getFTSRestClient().getPrimaryKeyColumn() + .getName(); + if (primaryKeyName.equalsIgnoreCase(getCmbSearchTarget() .getSelectedItem().toString())) { transferToSequenceFetcher(txt_search.getText()); @@ -354,24 +464,33 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI } }); - txt_search.getDocument().addDocumentListener(new DocumentListener() + final DeferredTextInputListener listener = new DeferredTextInputListener( + 2500, + new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + if (!getTypedText().equalsIgnoreCase(lastSearchTerm)) + { + searchAction(); + lastSearchTerm = getTypedText(); + } + } + }, false); + txt_search.getDocument().addDocumentListener(listener); + txt_search.addFocusListener(new FocusListener() { @Override - public void insertUpdate(DocumentEvent e) - { - searchAction(); - } - - @Override - public void removeUpdate(DocumentEvent e) + public void focusGained(FocusEvent e) { - searchAction(); + listener.start(); } @Override - public void changedUpdate(DocumentEvent e) + public void focusLost(FocusEvent e) { - searchAction(); + listener.stop(); } }); @@ -419,7 +538,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI } }; tabbedPane.addChangeListener(changeListener); - tabbedPane.setPreferredSize(new Dimension(500, 300)); + tabbedPane.setPreferredSize(new Dimension(800, 400)); tabbedPane.add(searchTabTitle, scrl_searchResult); tabbedPane.add(configureCols, new FTSDataColumnPreferences( PreferenceSource.SEARCH_SUMMARY, getFTSRestClient())); @@ -433,6 +552,8 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI pnl_inputs.add(txt_search); pnl_inputs.add(lbl_loading); pnl_inputs.add(lbl_warning); + pnl_inputs.add(btn_prev_page); + pnl_inputs.add(btn_next_page); this.setLayout(mainLayout); this.add(pnl_inputs, java.awt.BorderLayout.NORTH); @@ -441,7 +562,48 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI mainFrame.setVisible(true); mainFrame.setContentPane(this); mainFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); - Desktop.addInternalFrame(mainFrame, getFTSFrameTitle(), 800, 400); + Desktop.addInternalFrame(mainFrame, getFTSFrameTitle(), 900, 500); + } + + public class DeferredTextInputListener implements DocumentListener + { + private final Timer swingTimer; + + public DeferredTextInputListener(int timeOut, ActionListener listener, + boolean repeats) + { + swingTimer = new Timer(timeOut, listener); + swingTimer.setRepeats(repeats); + } + + public void start() + { + swingTimer.start(); + } + + public void stop() + { + swingTimer.stop(); + } + + @Override + public void insertUpdate(DocumentEvent e) + { + swingTimer.restart(); + } + + @Override + public void removeUpdate(DocumentEvent e) + { + swingTimer.restart(); + } + + @Override + public void changedUpdate(DocumentEvent e) + { + swingTimer.restart(); + } + } public boolean wantedFieldsUpdated()