X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGStructureChooser.java;h=a5b03d8e8c412e6510e96272db283cdfc65f4444;hb=41555168f6feea9e3fe407bb2f79f115336e2136;hp=d0f2328dcac255baf5ce587abfb8b03d0dd61f0a;hpb=744872398c812f4db4ad5315f5c489f0e7c150f1;p=jalview.git diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java index d0f2328..a5b03d8 100644 --- a/src/jalview/jbgui/GStructureChooser.java +++ b/src/jalview/jbgui/GStructureChooser.java @@ -22,20 +22,28 @@ package jalview.jbgui; import jalview.datamodel.SequenceI; +import jalview.fts.api.FTSDataColumnI; +import jalview.fts.core.FTSDataColumnPreferences; +import jalview.fts.core.FTSDataColumnPreferences.PreferenceSource; +import jalview.fts.service.pdb.PDBFTSRestClient; import jalview.gui.AlignmentPanel; import jalview.gui.Desktop; -import jalview.jbgui.PDBDocFieldPreferences.PreferenceSource; +import jalview.gui.JvSwingUtils; import jalview.util.MessageManager; import java.awt.BorderLayout; import java.awt.CardLayout; import java.awt.Dimension; import java.awt.FlowLayout; +import java.awt.GridLayout; import java.awt.event.ActionEvent; 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; import java.awt.event.MouseEvent; +import java.util.Arrays; import javax.swing.ImageIcon; import javax.swing.JButton; @@ -63,6 +71,12 @@ import javax.swing.event.DocumentListener; public abstract class GStructureChooser extends JPanel implements ItemListener { + protected JPanel statusPanel = new JPanel(); + + public JLabel statusBar = new JLabel(); + + private JPanel pnl_actionsAndStatus = new JPanel(new BorderLayout()); + protected String frameTitle = MessageManager .getString("label.structure_chooser"); @@ -71,7 +85,7 @@ public abstract class GStructureChooser extends JPanel implements protected JComboBox cmb_filterOption = new JComboBox(); protected AlignmentPanel ap; - + protected StringBuilder errorWarning = new StringBuilder(); protected JLabel lbl_result = new JLabel( @@ -132,7 +146,6 @@ public abstract class GStructureChooser extends JPanel implements protected JLabel lbl_fromFileStatus = new JLabel(errorImage); - protected AssciateSeqPanel idInputAssSeqPanel = new AssciateSeqPanel(); protected AssciateSeqPanel fileChooserAssSeqPanel = new AssciateSeqPanel(); @@ -145,10 +158,37 @@ public abstract class GStructureChooser extends JPanel implements protected static final String VIEWS_LOCAL_PDB = "VIEWS_LOCAL_PDB"; - protected JTable tbl_summary = new JTable(); + protected JTable tbl_summary = new JTable() + { + @Override + public String getToolTipText(MouseEvent evt) + { + String toolTipText = null; + java.awt.Point pnt = evt.getPoint(); + int rowIndex = rowAtPoint(pnt); + int colIndex = columnAtPoint(pnt); - protected JScrollPane scrl_foundStructures = new JScrollPane( - tbl_summary); + try + { + if (getValueAt(rowIndex, colIndex) == null) + { + return null; + } + 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 JScrollPane scrl_foundStructures = new JScrollPane(tbl_summary); protected JTable tbl_local_pdb = new JTable(); @@ -156,8 +196,10 @@ public abstract class GStructureChooser extends JPanel implements private JTabbedPane pnl_filter = new JTabbedPane(); - private PDBDocFieldPreferences pdbDocFieldPrefs = new PDBDocFieldPreferences( - PreferenceSource.STRUCTURE_CHOOSER); + private FTSDataColumnPreferences pdbDocFieldPrefs = new FTSDataColumnPreferences( + PreferenceSource.STRUCTURE_CHOOSER, PDBFTSRestClient.getInstance()); + + protected FTSDataColumnI[] previousWantedFields; public GStructureChooser() { @@ -181,49 +223,175 @@ public abstract class GStructureChooser extends JPanel implements private void jbInit() throws Exception { tbl_summary.setAutoCreateRowSorter(true); + tbl_summary.getTableHeader().setReorderingAllowed(false); + tbl_summary.addMouseListener(new MouseAdapter() + { + @Override + public void mouseClicked(MouseEvent e) + { + validateSelections(); + } + + @Override + public void mouseReleased(MouseEvent e) + { + validateSelections(); + } + }); + tbl_summary.addKeyListener(new KeyAdapter() + { + @Override + public void keyPressed(KeyEvent evt) + { + validateSelections(); + switch (evt.getKeyCode()) + { + case KeyEvent.VK_ESCAPE: // escape key + mainFrame.dispose(); + break; + case KeyEvent.VK_ENTER: // enter key + if (btn_view.isEnabled()) + { + ok_ActionPerformed(); + } + break; + case KeyEvent.VK_TAB: // tab key + if (evt.isShiftDown()) + { + pnl_filter.requestFocus(); + } + else + { + btn_view.requestFocus(); + } + evt.consume(); + break; + default: + return; + } + } + }); tbl_local_pdb.setAutoCreateRowSorter(true); + tbl_local_pdb.getTableHeader().setReorderingAllowed(false); tbl_local_pdb.addMouseListener(new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { - updateCurrentView(); + validateSelections(); } + @Override public void mouseReleased(MouseEvent e) { - updateCurrentView(); + validateSelections(); + } + }); + tbl_local_pdb.addKeyListener(new KeyAdapter() + { + @Override + public void keyPressed(KeyEvent evt) + { + validateSelections(); + switch (evt.getKeyCode()) + { + case KeyEvent.VK_ESCAPE: // escape key + mainFrame.dispose(); + break; + case KeyEvent.VK_ENTER: // enter key + if (btn_view.isEnabled()) + { + ok_ActionPerformed(); + } + break; + case KeyEvent.VK_TAB: // tab key + if (evt.isShiftDown()) + { + cmb_filterOption.requestFocus(); + } + else + { + if (btn_view.isEnabled()) + { + btn_view.requestFocus(); + } + else + { + btn_cancel.requestFocus(); + } + } + evt.consume(); + default: + return; + } } }); - btn_view.setFont(new java.awt.Font("Verdana", 0, 12)); btn_view.setText(MessageManager.getString("action.view")); btn_view.addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(ActionEvent e) { ok_ActionPerformed(); } }); + btn_view.addKeyListener(new KeyAdapter() + { + @Override + public void keyPressed(KeyEvent evt) + { + if (evt.getKeyCode() == KeyEvent.VK_ENTER) + { + 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() { + @Override public void actionPerformed(ActionEvent e) { mainFrame.dispose(); } }); + btn_cancel.addKeyListener(new KeyAdapter() + { + @Override + public void keyPressed(KeyEvent evt) + { + if (evt.getKeyCode() == KeyEvent.VK_ENTER) + { + mainFrame.dispose(); + } + } + }); btn_pdbFromFile.setFont(new java.awt.Font("Verdana", 0, 12)); String btn_title = MessageManager.getString("label.select_pdb_file"); btn_pdbFromFile.setText(btn_title + " "); btn_pdbFromFile.addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(ActionEvent e) { pdbFromFile_actionPerformed(); } }); + btn_pdbFromFile.addKeyListener(new KeyAdapter() + { + @Override + public void keyPressed(KeyEvent evt) + { + if (evt.getKeyCode() == KeyEvent.VK_ENTER) + { + pdbFromFile_actionPerformed(); + } + } + }); scrl_foundStructures.setPreferredSize(new Dimension(500, 300)); scrl_foundStructures @@ -236,7 +404,7 @@ public abstract class GStructureChooser extends JPanel implements cmb_filterOption.setFont(new java.awt.Font("Verdana", 0, 12)); chk_invertFilter.setFont(new java.awt.Font("Verdana", 0, 12)); chk_rememberSettings.setFont(new java.awt.Font("Verdana", 0, 12)); - + chk_rememberSettings.setVisible(false); txt_search.setToolTipText(MessageManager .getString("label.enter_pdb_id")); @@ -276,7 +444,6 @@ public abstract class GStructureChooser extends JPanel implements pnl_main.add(chk_invertFilter); lbl_loading.setVisible(false); - pnl_fileChooser.add(btn_pdbFromFile); pnl_fileChooser.add(lbl_fromFileStatus); pnl_fileChooserBL.add(fileChooserAssSeqPanel, BorderLayout.NORTH); @@ -286,42 +453,67 @@ public abstract class GStructureChooser extends JPanel implements pnl_idInput.add(lbl_pdbManualFetchStatus); pnl_idInputBL.add(idInputAssSeqPanel, BorderLayout.NORTH); pnl_idInputBL.add(pnl_idInput, BorderLayout.CENTER); - + final String foundStructureSummary = MessageManager .getString("label.found_structures_summary"); - + final String configureCols = MessageManager + .getString("label.configure_displayed_columns"); ChangeListener changeListener = new ChangeListener() { + @Override public void stateChanged(ChangeEvent changeEvent) { JTabbedPane sourceTabbedPane = (JTabbedPane) changeEvent .getSource(); int index = sourceTabbedPane.getSelectedIndex(); + btn_view.setVisible(true); + btn_cancel.setVisible(true); + if (sourceTabbedPane.getTitleAt(index).equals(configureCols)) + { + btn_view.setEnabled(false); + btn_cancel.setEnabled(false); + btn_view.setVisible(false); + btn_cancel.setVisible(false); + previousWantedFields = PDBFTSRestClient.getInstance() + .getAllDefaulDisplayedDataColumns() + .toArray(new FTSDataColumnI[0]); + } if (sourceTabbedPane.getTitleAt(index) .equals(foundStructureSummary)) { - tabRefresh(); + btn_cancel.setEnabled(true); + if (wantedFieldsUpdated()) + { + tabRefresh(); + } + else + { + validateSelections(); + } } } }; pnl_filter.addChangeListener(changeListener); pnl_filter.setPreferredSize(new Dimension(500, 300)); pnl_filter.add(foundStructureSummary, scrl_foundStructures); - pnl_filter.add( - MessageManager.getString("label.configure_displayed_columns"), - pdbDocFieldPrefs); - + pnl_filter.add(configureCols, pdbDocFieldPrefs); + pnl_locPDB.add(scrl_localPDB); pnl_switchableViews.add(pnl_fileChooserBL, VIEWS_FROM_FILE); pnl_switchableViews.add(pnl_idInputBL, VIEWS_ENTER_ID); pnl_switchableViews.add(pnl_filter, VIEWS_FILTER); pnl_switchableViews.add(pnl_locPDB, VIEWS_LOCAL_PDB); - + this.setLayout(mainLayout); this.add(pnl_main, java.awt.BorderLayout.NORTH); this.add(pnl_switchableViews, java.awt.BorderLayout.CENTER); - this.add(pnl_actions, java.awt.BorderLayout.SOUTH); + // this.add(pnl_actions, java.awt.BorderLayout.SOUTH); + statusPanel.setLayout(new GridLayout()); + pnl_actionsAndStatus.add(pnl_actions, BorderLayout.CENTER); + pnl_actionsAndStatus.add(statusPanel, BorderLayout.SOUTH); + statusPanel.add(statusBar, null); + this.add(pnl_actionsAndStatus, java.awt.BorderLayout.SOUTH); mainFrame.setVisible(true); mainFrame.setContentPane(this); @@ -329,7 +521,21 @@ public abstract class GStructureChooser extends JPanel implements Desktop.addInternalFrame(mainFrame, frameTitle, 800, 400); } - + public boolean wantedFieldsUpdated() + { + if (previousWantedFields == null) + { + return true; + } + + return Arrays.equals( + PDBFTSRestClient.getInstance() + .getAllDefaulDisplayedDataColumns() + .toArray(new FTSDataColumnI[0]), + previousWantedFields) ? false : true; + + } + @Override /** * Event listener for the 'filter' combo-box and 'invert' check-box @@ -390,6 +596,7 @@ public abstract class GStructureChooser extends JPanel implements this.view = view; } + @Override public String toString() { return this.name; @@ -406,6 +613,7 @@ public abstract class GStructureChooser extends JPanel implements public class AssociateSeqOptions { private SequenceI sequence; + private String name; public AssociateSeqOptions(SequenceI seq) @@ -421,6 +629,7 @@ public abstract class GStructureChooser extends JPanel implements this.sequence = seq; } + @Override public String toString() { return name; @@ -520,4 +729,6 @@ public abstract class GStructureChooser extends JPanel implements public abstract void cmbAssSeqStateChanged(); public abstract void tabRefresh(); + + public abstract void validateSelections(); }