X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Ffts%2Fcore%2FGFTSPanel.java;h=c0d005fa4e1fad6813a997070756be5cf918fd44;hb=refs%2Fheads%2Freleases%2FRelease_2_10_2_Branch;hp=4dc61f01c2fb84f2d2c726e1643a3c943ea30963;hpb=7069dfb8eacf6405040429bb74ffc109706ddc49;p=jalview.git diff --git a/src/jalview/fts/core/GFTSPanel.java b/src/jalview/fts/core/GFTSPanel.java index 4dc61f0..c0d005f 100644 --- a/src/jalview/fts/core/GFTSPanel.java +++ b/src/jalview/fts/core/GFTSPanel.java @@ -28,6 +28,7 @@ import jalview.gui.Desktop; import jalview.gui.IProgressIndicator; import jalview.gui.JvSwingUtils; import jalview.gui.SequenceFetcher; +import jalview.io.cache.JvCacheableInputBox; import jalview.util.MessageManager; import java.awt.BorderLayout; @@ -35,8 +36,11 @@ import java.awt.CardLayout; import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; @@ -60,14 +64,15 @@ import javax.swing.JPanel; 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.event.InternalFrameEvent; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableColumn; +import javax.swing.text.JTextComponent; /** * This class provides the swing GUI layout for FTS Panel and implements most of @@ -83,7 +88,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI protected JInternalFrame mainFrame = new JInternalFrame( getFTSFrameTitle()); - protected IProgressIndicator progressIdicator; + protected IProgressIndicator progressIndicator; protected JComboBox cmb_searchTarget = new JComboBox(); @@ -93,7 +98,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI protected JButton btn_cancel = new JButton(); - protected JTextField txt_search = new JTextField(30); + protected JvCacheableInputBox txt_search; protected SequenceFetcher seqFetcher; @@ -107,14 +112,14 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI protected StringBuilder errorWarning = new StringBuilder(); - protected ImageIcon warningImage = new ImageIcon(getClass().getResource( - "/images/warning.gif")); + protected ImageIcon warningImage = new ImageIcon( + getClass().getResource("/images/warning.gif")); - protected ImageIcon loadingImage = new ImageIcon(getClass().getResource( - "/images/loading.gif")); + protected ImageIcon loadingImage = new ImageIcon( + getClass().getResource("/images/loading.gif")); - protected ImageIcon balnkPlaceholderImage = new ImageIcon(getClass() - .getResource("/images/blank_16x16_placeholder.png")); + protected ImageIcon balnkPlaceholderImage = new ImageIcon( + getClass().getResource("/images/blank_16x16_placeholder.png")); protected JLabel lbl_warning = new JLabel(warningImage); @@ -144,6 +149,10 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI protected HashSet paginatorCart = new HashSet(); + private static final int MIN_WIDTH = 670; + + private static final int MIN_HEIGHT = 300; + protected static final DecimalFormat totalNumberformatter = new DecimalFormat( "###,###"); @@ -190,6 +199,8 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI && !inLayout) { resizingColumn.setPreferredWidth(resizingColumn.getWidth()); + String colHeader = resizingColumn.getHeaderValue().toString(); + getTempUserPrefs().put(colHeader, resizingColumn.getWidth()); } resizeAndRepaint(); } @@ -215,13 +226,15 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI e.printStackTrace(); } toolTipText = (toolTipText == null ? null - : (toolTipText.length() > 500 ? JvSwingUtils.wrapTooltip( - true, toolTipText.subSequence(0, 500) + "...") + : (toolTipText.length() > 500 + ? JvSwingUtils.wrapTooltip(true, + toolTipText.subSequence(0, 500) + "...") : JvSwingUtils.wrapTooltip(true, toolTipText))); return toolTipText; } }; + protected JScrollPane scrl_searchResult = new JScrollPane(tbl_summary); public GFTSPanel() @@ -229,6 +242,15 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI try { jbInit(); + mainFrame.setMinimumSize(new Dimension(MIN_WIDTH, MIN_HEIGHT)); + mainFrame.addFocusListener(new FocusAdapter() + { + @Override + public void focusGained(FocusEvent e) + { + txt_search.requestFocusInWindow(); + } + }); mainFrame.invalidate(); mainFrame.pack(); } catch (Exception e) @@ -244,6 +266,13 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI */ private void jbInit() throws Exception { + + txt_search = new JvCacheableInputBox(getCacheKey()); + populateCmbSearchTargetOptions(); + Integer width = getTempUserPrefs().get("FTSPanel.width") == null ? 800 + : getTempUserPrefs().get("FTSPanel.width"); + Integer height = getTempUserPrefs().get("FTSPanel.height") == null ? 400 + : getTempUserPrefs().get("FTSPanel.height"); lbl_warning.setVisible(false); lbl_warning.setFont(new java.awt.Font("Verdana", 0, 12)); lbl_loading.setVisible(false); @@ -347,8 +376,8 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI } }); btn_next_page.setEnabled(false); - btn_next_page.setToolTipText(MessageManager - .getString("label.next_page_tooltop")); + btn_next_page.setToolTipText( + MessageManager.getString("label.next_page_tooltip")); 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() @@ -372,8 +401,8 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI }); btn_prev_page.setEnabled(false); - btn_prev_page.setToolTipText(MessageManager - .getString("label.prev_page_tooltop")); + btn_prev_page.setToolTipText( + MessageManager.getString("label.prev_page_tooltip")); 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() @@ -428,82 +457,83 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI } } }); - scrl_searchResult.setPreferredSize(new Dimension(800, 400)); + scrl_searchResult.setPreferredSize(new Dimension(width, height)); cmb_searchTarget.setFont(new java.awt.Font("Verdana", 0, 12)); - cmb_searchTarget.addActionListener(new ActionListener() - { - @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)); - searchAction(true); - } - }); - - populateCmbSearchTargetOptions(); - - txt_search.setFont(new java.awt.Font("Verdana", 0, 12)); - - txt_search.addKeyListener(new KeyAdapter() + cmb_searchTarget.addItemListener(new ItemListener() { @Override - public void keyPressed(KeyEvent e) + public void itemStateChanged(ItemEvent e) { - if (e.getKeyCode() == KeyEvent.VK_ENTER) + if (e.getStateChange() == ItemEvent.SELECTED) { - if (txt_search.getText() == null - || txt_search.getText().isEmpty()) + String tooltipText; + if ("all".equalsIgnoreCase( + getCmbSearchTarget().getSelectedItem().toString())) { - return; + tooltipText = MessageManager.getString("label.search_all"); } - String primaryKeyName = getFTSRestClient().getPrimaryKeyColumn() - .getName(); - if (primaryKeyName.equalsIgnoreCase(getCmbSearchTarget() - .getSelectedItem().toString())) + else if ("pdb id".equalsIgnoreCase( + getCmbSearchTarget().getSelectedItem().toString())) + { + tooltipText = MessageManager + .getString("label.separate_multiple_accession_ids"); + } + else { - transferToSequenceFetcher(txt_search.getText()); + tooltipText = MessageManager.formatMessage( + "label.separate_multiple_query_values", new Object[] + { getCmbSearchTarget().getSelectedItem().toString() }); } + txt_search.setToolTipText( + JvSwingUtils.wrapTooltip(true, tooltipText)); + searchAction(true); } } }); + txt_search.setFont(new java.awt.Font("Verdana", 0, 12)); + + txt_search.getEditor().getEditorComponent() + .addKeyListener(new KeyAdapter() + { + @Override + public void keyPressed(KeyEvent e) + { + if (e.getKeyCode() == KeyEvent.VK_ENTER) + { + if (getTypedText() == null || getTypedText().isEmpty()) + { + return; + } + String primaryKeyName = getFTSRestClient() + .getPrimaryKeyColumn().getName(); + if (primaryKeyName.equalsIgnoreCase(getCmbSearchTarget() + .getSelectedItem().toString())) + { + transferToSequenceFetcher(getTypedText()); + } + } + } + }); final DeferredTextInputListener listener = new DeferredTextInputListener( - 1500, - new ActionListener() + 1500, new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - if (!getTypedText().equalsIgnoreCase(lastSearchTerm)) + String typed = getTypedText(); + if (!typed.equalsIgnoreCase(lastSearchTerm)) { searchAction(true); paginatorCart.clear(); - lastSearchTerm = getTypedText(); + lastSearchTerm = typed; } } }, false); - txt_search.getDocument().addDocumentListener(listener); + ((JTextComponent) txt_search.getEditor().getEditorComponent()) + .getDocument().addDocumentListener(listener); + txt_search.addFocusListener(new FocusListener() { @Override @@ -515,7 +545,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI @Override public void focusLost(FocusEvent e) { -// listener.stop(); + // listener.stop(); } }); @@ -548,7 +578,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI txt_search.setEnabled(false); cmb_searchTarget.setEnabled(false); previousWantedFields = getFTSRestClient() - .getAllDefaulDisplayedDataColumns() + .getAllDefaultDisplayedFTSDataColumns() .toArray(new Object[0]); } if (sourceTabbedPane.getTitleAt(index).equals(searchTabTitle)) @@ -571,7 +601,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI } }; tabbedPane.addChangeListener(changeListener); - tabbedPane.setPreferredSize(new Dimension(800, 400)); + tabbedPane.setPreferredSize(new Dimension(width, height)); tabbedPane.add(searchTabTitle, scrl_searchResult); tabbedPane.add(configureCols, new FTSDataColumnPreferences( PreferenceSource.SEARCH_SUMMARY, getFTSRestClient())); @@ -596,7 +626,35 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI mainFrame.setVisible(true); mainFrame.setContentPane(this); mainFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); - Desktop.addInternalFrame(mainFrame, getFTSFrameTitle(), 900, 500); + mainFrame.addInternalFrameListener( + new javax.swing.event.InternalFrameAdapter() + { + @Override + public void internalFrameClosing(InternalFrameEvent e) + { + closeAction(); + } + }); + mainFrame.setVisible(true); + mainFrame.setContentPane(this); + mainFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + Integer x = getTempUserPrefs().get("FTSPanel.x"); + Integer y = getTempUserPrefs().get("FTSPanel.y"); + if (x != null && y != null) + { + mainFrame.setLocation(x, y); + } + Desktop.addInternalFrame(mainFrame, getFTSFrameTitle(), width, height); + } + + protected void closeAction() + { + getTempUserPrefs().put("FTSPanel.width", this.getWidth()); + getTempUserPrefs().put("FTSPanel.height", pnl_results.getHeight()); + getTempUserPrefs().put("FTSPanel.x", mainFrame.getX()); + getTempUserPrefs().put("FTSPanel.y", mainFrame.getY()); + mainFrame.dispose(); + txt_search.persistCache(); } public class DeferredTextInputListener implements DocumentListener @@ -644,13 +702,12 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI { if (previousWantedFields == null) { - return true; + return false; } return Arrays.equals(getFTSRestClient() - .getAllDefaulDisplayedDataColumns() - .toArray(new Object[0]), previousWantedFields) ? false - : true; + .getAllDefaultDisplayedFTSDataColumns().toArray(new Object[0]), + previousWantedFields) ? false : true; } @@ -672,7 +729,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI return cmb_searchTarget; } - public JTextField getTxtSearch() + public JComboBox getTxtSearch() { return txt_search; } @@ -711,16 +768,16 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI { lbl_loading.setVisible(false); lbl_blank.setVisible(false); - lbl_warning.setToolTipText(JvSwingUtils.wrapTooltip(true, - errorWarning.toString())); + lbl_warning.setToolTipText( + JvSwingUtils.wrapTooltip(true, errorWarning.toString())); lbl_warning.setVisible(true); } } protected void btn_back_ActionPerformed() { - mainFrame.dispose(); - new SequenceFetcher(progressIdicator); + closeAction(); + new SequenceFetcher(progressIndicator); } protected void disableActionButtons() @@ -732,7 +789,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI protected void btn_cancel_ActionPerformed() { - mainFrame.dispose(); + closeAction(); } /** @@ -766,10 +823,8 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI } } - public void transferToSequenceFetcher(String ids) { - // mainFrame.dispose(); seqFetcher.getTextArea().setText(ids); Thread worker = new Thread(seqFetcher); worker.start(); @@ -778,7 +833,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI @Override public String getTypedText() { - return txt_search.getText().trim(); + return txt_search.getUserInput(); } @Override @@ -829,6 +884,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI { lbl_blank.setVisible(!isSearchInProgress); lbl_loading.setVisible(isSearchInProgress); + txt_search.setEditable(!isSearchInProgress); } @Override @@ -861,8 +917,8 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI int totalRows = resultTable.getRowCount(); try { - primaryKeyColIndex = getFTSRestClient().getPrimaryKeyColumIndex( - wantedFields, false); + primaryKeyColIndex = getFTSRestClient() + .getPrimaryKeyColumIndex(wantedFields, false); } catch (Exception e) { e.printStackTrace(); @@ -879,12 +935,10 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI int[] selectedRows = resultTable.getSelectedRows(); for (int summaryRow : selectedRows) { - String idStr = resultTable.getValueAt(summaryRow, - primaryKeyColIndex).toString(); + String idStr = resultTable.getValueAt(summaryRow, primaryKeyColIndex) + .toString(); paginatorCart.add(idStr); } - // System.out.println("Paginator shopping cart size : " - // + paginatorCart.size()); } public void updateSummaryTableSelections() @@ -897,15 +951,13 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI int primaryKeyColIndex = 0; try { - primaryKeyColIndex = getFTSRestClient().getPrimaryKeyColumIndex( - wantedFields, false); + primaryKeyColIndex = getFTSRestClient() + .getPrimaryKeyColumIndex(wantedFields, false); } catch (Exception e) { e.printStackTrace(); } - // System.out.println(">>>>>> got here : 1"); int totalRows = resultTable.getRowCount(); - // resultTable.clearSelection(); for (int row = 0; row < totalRows; row++) { String id = (String) resultTable.getValueAt(row, primaryKeyColIndex); @@ -916,11 +968,9 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI } validateSelection(); } + public void refreshPaginatorState() { - // System.out.println("resultSet count : " + resultSetCount); - // System.out.println("offSet : " + offSet); - // System.out.println("page limit : " + pageLimit); setPrevPageButtonEnabled(false); setNextPageButtonEnabled(false); if (resultSetCount == 0 && pageLimit == 0) @@ -936,6 +986,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI setPrevPageButtonEnabled(true); } } + public void referesh() { mainFrame.setTitle(getFTSFrameTitle());