From 2dce7a14750a1a0484e71ba4c089ecfb44cc55b7 Mon Sep 17 00:00:00 2001 From: tcofoegbu Date: Mon, 2 May 2016 12:46:48 +0100 Subject: [PATCH] JAL-1563 Fixed Uniprot FTS result-set count error, added blank image placeholder to prevent UI from jittering during a search operation, reverted timer for search textfield back to 1.5ses --- resources/images/blank_16x16_placeholder.png | Bin 0 -> 2873 bytes resources/lang/Messages.properties | 4 +++- src/jalview/fts/core/GFTSPanel.java | 22 +++++++++++++++++--- .../fts/service/uniprot/UniProtFTSRestClient.java | 12 +++++++++-- .../fts/service/uniprot/UniprotFTSPanel.java | 7 ++++--- 5 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 resources/images/blank_16x16_placeholder.png diff --git a/resources/images/blank_16x16_placeholder.png b/resources/images/blank_16x16_placeholder.png new file mode 100644 index 0000000000000000000000000000000000000000..885ad87ef7421cccfb2651a73a4b9b484999c5a6 GIT binary patch literal 2873 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 -action.prev_page= << \ No newline at end of file +action.prev_page= << +label.next_page_tooltop=Next Page +label.prev_page_tooltop=Previous Page \ No newline at end of file diff --git a/src/jalview/fts/core/GFTSPanel.java b/src/jalview/fts/core/GFTSPanel.java index 02a313b..ccf33ed 100644 --- a/src/jalview/fts/core/GFTSPanel.java +++ b/src/jalview/fts/core/GFTSPanel.java @@ -91,7 +91,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI protected JButton btn_cancel = new JButton(); - protected JTextField txt_search = new JTextField(35); + protected JTextField txt_search = new JTextField(30); protected SequenceFetcher seqFetcher; @@ -189,10 +189,15 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI protected ImageIcon loadingImage = new ImageIcon(getClass().getResource( "/images/loading.gif")); + protected ImageIcon balnkPlaceholderImage = new ImageIcon(getClass() + .getResource("/images/blank_16x16_placeholder.png")); + protected JLabel lbl_warning = new JLabel(warningImage); protected JLabel lbl_loading = new JLabel(loadingImage); + protected JLabel lbl_blank = new JLabel(balnkPlaceholderImage); + private JTabbedPane tabbedPane = new JTabbedPane(); private JPanel pnl_actions = new JPanel(); @@ -229,6 +234,8 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI lbl_warning.setFont(new java.awt.Font("Verdana", 0, 12)); lbl_loading.setVisible(false); lbl_loading.setFont(new java.awt.Font("Verdana", 0, 12)); + lbl_blank.setVisible(true); + lbl_blank.setFont(new java.awt.Font("Verdana", 0, 12)); tbl_summary.setAutoCreateRowSorter(true); tbl_summary.getTableHeader().setReorderingAllowed(false); @@ -327,6 +334,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.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() @@ -350,6 +359,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.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() @@ -465,7 +476,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI }); final DeferredTextInputListener listener = new DeferredTextInputListener( - 2500, + 1500, new ActionListener() { @Override @@ -490,7 +501,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI @Override public void focusLost(FocusEvent e) { - listener.stop(); +// listener.stop(); } }); @@ -552,6 +563,7 @@ 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(lbl_blank); pnl_inputs.add(btn_prev_page); pnl_inputs.add(btn_next_page); @@ -671,9 +683,11 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI protected void checkForErrors() { lbl_warning.setVisible(false); + lbl_blank.setVisible(true); if (errorWarning.length() > 0) { lbl_loading.setVisible(false); + lbl_blank.setVisible(false); lbl_warning.setToolTipText(JvSwingUtils.wrapTooltip(true, errorWarning.toString())); lbl_warning.setVisible(true); @@ -755,6 +769,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI lbl_loading.setVisible(false); errorWarning.setLength(0); lbl_warning.setVisible(false); + lbl_blank.setVisible(true); btn_ok.setEnabled(false); mainFrame.setTitle(getFTSFrameTitle()); referesh(); @@ -789,6 +804,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI @Override public void setSearchInProgress(Boolean isSearchInProgress) { + lbl_blank.setVisible(!isSearchInProgress); lbl_loading.setVisible(isSearchInProgress); } public void referesh() diff --git a/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java b/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java index 57689f9..0541881 100644 --- a/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java +++ b/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java @@ -58,8 +58,7 @@ public class UniProtFTSRestClient extends FTSRestClient int responseSize = (uniportRestRequest.getResponseSize() == 0) ? getDefaultResponsePageSize() : uniportRestRequest.getResponseSize(); - int offSet = (uniportRestRequest.getOffSet() == 0) ? getDefaultResponsePageSize() - : uniportRestRequest.getOffSet(); + int offSet = uniportRestRequest.getOffSet(); String query = uniportRestRequest.getFieldToSearchBy() .equalsIgnoreCase("Search All") ? uniportRestRequest @@ -71,6 +70,9 @@ public class UniProtFTSRestClient extends FTSRestClient // : " AND status:REL"); // System.out.println(">>>>> Query : " + query); // System.out.println(">>>>> Columns : " + wantedFields); + // System.out.println(">>>>> Response size: " + responseSize + // + " offset : " + // + offSet); WebResource webResource = null; webResource = client.resource(UNIPROT_SEARCH_ENDPOINT) .queryParam("format", "tab") @@ -101,6 +103,12 @@ public class UniProtFTSRestClient extends FTSRestClient { FTSRestResponse searchResult = new FTSRestResponse(); List result = null; + if (uniProtTabDelimittedResponseString == null + || uniProtTabDelimittedResponseString.trim().isEmpty()) + { + searchResult.setNumberOfItemsFound(0); + return searchResult; + } String[] foundDataRow = uniProtTabDelimittedResponseString.split("\n"); if (foundDataRow != null && foundDataRow.length > 0) { diff --git a/src/jalview/fts/service/uniprot/UniprotFTSPanel.java b/src/jalview/fts/service/uniprot/UniprotFTSPanel.java index 3681a23..32f359e 100644 --- a/src/jalview/fts/service/uniprot/UniprotFTSPanel.java +++ b/src/jalview/fts/service/uniprot/UniprotFTSPanel.java @@ -114,13 +114,14 @@ public class UniprotFTSPanel extends GFTSPanel long endTime = System.currentTimeMillis(); resultSetCount = resultList.getNumberOfItemsFound(); - String result = (resultSetCount > 1) ? MessageManager + String result = (resultSetCount > 0) ? MessageManager .getString("label.results") : MessageManager .getString("label.result"); - if (isPaginationEnabled() && resultSetCount > 1) + if (isPaginationEnabled() && resultSetCount > 0) { updateSearchFrameTitle(defaultFTSFrameTitle + " - " + result - + " " + offSet + " to " + (offSet + resultSetCount) + + " " + (offSet + 1) + " to " + + (offSet + resultSetCount) + " " + " (" + (endTime - startTime) + " milli secs)"); } else -- 1.7.10.2