X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Ffts%2Fcore%2FGFTSPanel.java;h=33fa02099b85b90733cdc5eb2a15907d2470b6a5;hb=b07c7cb77f73eecaea77b66b9b5f7f9071e0e1e0;hp=1c799aa1bd63037bfbc5e19cd79b7dbbbc163c7b;hpb=5585b4b0ed1f5dd85887ed6b76352947ce1be133;p=jalview.git diff --git a/src/jalview/fts/core/GFTSPanel.java b/src/jalview/fts/core/GFTSPanel.java index 1c799aa..33fa020 100644 --- a/src/jalview/fts/core/GFTSPanel.java +++ b/src/jalview/fts/core/GFTSPanel.java @@ -41,11 +41,13 @@ import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Comparator; +import java.util.HashSet; import java.util.List; import javax.swing.ImageIcon; @@ -64,6 +66,7 @@ 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; @@ -140,6 +143,10 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI protected int pageLimit; + protected HashSet paginatorCart = new HashSet(); + + protected static final DecimalFormat totalNumberformatter = new DecimalFormat( + "###,###"); private JTable tbl_summary = new JTable() { private boolean inLayout; @@ -183,6 +190,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(); } @@ -237,6 +246,10 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI */ private void jbInit() throws Exception { + 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); @@ -339,10 +352,9 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI } } }); - btn_next_page.setEnabled(false); btn_next_page.setToolTipText(MessageManager - .getString("label.next_page_tooltop")); + .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() @@ -367,7 +379,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI btn_prev_page.setEnabled(false); btn_prev_page.setToolTipText(MessageManager - .getString("label.prev_page_tooltop")); + .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() @@ -422,7 +434,7 @@ 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() @@ -492,6 +504,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI if (!getTypedText().equalsIgnoreCase(lastSearchTerm)) { searchAction(true); + paginatorCart.clear(); lastSearchTerm = getTypedText(); } } @@ -541,7 +554,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)) @@ -554,6 +567,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI if (wantedFieldsUpdated()) { searchAction(true); + paginatorCart.clear(); } else { @@ -563,7 +577,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())); @@ -588,9 +602,40 @@ 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() + { + // System.out.println(">>>>>>>>>> closing internal frame!!!"); + // System.out.println("width : " + this.getWidth()); + // System.out.println("heigh : " + this.getHeight()); + // System.out.println("x : " + mainFrame.getX()); + // System.out.println("y : " + mainFrame.getY()); + 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(); + } public class DeferredTextInputListener implements DocumentListener { private final Timer swingTimer; @@ -640,7 +685,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI } return Arrays.equals(getFTSRestClient() - .getAllDefaulDisplayedDataColumns() + .getAllDefaultDisplayedFTSDataColumns() .toArray(new Object[0]), previousWantedFields) ? false : true; @@ -648,7 +693,8 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI public void validateSelection() { - if (tbl_summary.getSelectedRows().length > 0) + if (tbl_summary.getSelectedRows().length > 0 + || !paginatorCart.isEmpty()) { btn_ok.setEnabled(true); } @@ -710,7 +756,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI protected void btn_back_ActionPerformed() { - mainFrame.dispose(); + closeAction(); new SequenceFetcher(progressIdicator); } @@ -723,7 +769,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI protected void btn_cancel_ActionPerformed() { - mainFrame.dispose(); + closeAction(); } /** @@ -825,6 +871,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI @Override public void prevPageAction() { + updatePaginatorCart(); if (offSet >= pageLimit) { offSet = offSet - pageLimit; @@ -839,11 +886,73 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI @Override public void nextPageAction() { + updatePaginatorCart(); offSet = offSet + pageLimit; searchAction(false); + } + public void updatePaginatorCart() + { + int primaryKeyColIndex = 0; + JTable resultTable = getResultTable(); + int totalRows = resultTable.getRowCount(); + try + { + primaryKeyColIndex = getFTSRestClient().getPrimaryKeyColumIndex( + wantedFields, false); + } catch (Exception e) + { + e.printStackTrace(); + } + + for (int row = 0; row < totalRows; row++) + { + String id = (String) resultTable.getValueAt(row, primaryKeyColIndex); + if (paginatorCart.contains(id)) + { + paginatorCart.remove(id); + } + } + int[] selectedRows = resultTable.getSelectedRows(); + for (int summaryRow : selectedRows) + { + String idStr = resultTable.getValueAt(summaryRow, + primaryKeyColIndex).toString(); + paginatorCart.add(idStr); + } + // System.out.println("Paginator shopping cart size : " + // + paginatorCart.size()); } + public void updateSummaryTableSelections() + { + JTable resultTable = getResultTable(); + if (paginatorCart.isEmpty()) + { + return; + } + int primaryKeyColIndex = 0; + try + { + 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); + if (paginatorCart.contains(id)) + { + resultTable.addRowSelectionInterval(row, row); + } + } + validateSelection(); + } public void refreshPaginatorState() { // System.out.println("resultSet count : " + resultSetCount); @@ -851,6 +960,10 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI // System.out.println("page limit : " + pageLimit); setPrevPageButtonEnabled(false); setNextPageButtonEnabled(false); + if (resultSetCount == 0 && pageLimit == 0) + { + return; + } if (resultSetCount >= pageLimit) { setNextPageButtonEnabled(true);