X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGStructureChooser.java;h=efc3062a6c7f3291ba52fc12bf31a9c5b416334b;hb=3bbaa9775e08ab53f42fc4589935ab63bd05d388;hp=9e4e6f3d1b73fefb4d077905f06487e53ec7f695;hpb=aa301778c8e8d9edc8889de2a6474dbb7575ab19;p=jalview.git diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java index 9e4e6f3..efc3062 100644 --- a/src/jalview/jbgui/GStructureChooser.java +++ b/src/jalview/jbgui/GStructureChooser.java @@ -34,9 +34,12 @@ 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; @@ -67,6 +70,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"); @@ -75,7 +84,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( @@ -136,7 +145,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(); @@ -151,6 +159,7 @@ public abstract class GStructureChooser extends JPanel implements protected JTable tbl_summary = new JTable() { + @Override public String getToolTipText(MouseEvent evt) { String toolTipText = null; @@ -163,16 +172,18 @@ public abstract class GStructureChooser extends JPanel implements toolTipText = getValueAt(rowIndex, colIndex).toString(); } catch (Exception e) { - e.printStackTrace(); + // e.printStackTrace(); } - toolTipText = (toolTipText == null ? null : JvSwingUtils.wrapTooltip( - true, toolTipText)); + 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 JScrollPane scrl_foundStructures = new JScrollPane(tbl_summary); protected JTable tbl_local_pdb = new JTable(); @@ -184,6 +195,7 @@ public abstract class GStructureChooser extends JPanel implements PreferenceSource.STRUCTURE_CHOOSER); protected PDBDocField[] previousWantedFields; + public GStructureChooser() { try @@ -207,50 +219,174 @@ public abstract class GStructureChooser extends JPanel implements { 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 @@ -303,7 +439,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); @@ -313,22 +448,27 @@ 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(); - btn_view.setEnabled(false); int index = sourceTabbedPane.getSelectedIndex(); - if (sourceTabbedPane.getTitleAt(index) -.equals(configureCols)) + 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 = PDBDocFieldPreferences .getStructureSummaryFields().toArray( new PDBRestClient.PDBDocField[0]); @@ -336,6 +476,7 @@ public abstract class GStructureChooser extends JPanel implements if (sourceTabbedPane.getTitleAt(index) .equals(foundStructureSummary)) { + btn_cancel.setEnabled(true); if (wantedFieldsUpdated()) { tabRefresh(); @@ -351,18 +492,23 @@ public abstract class GStructureChooser extends JPanel implements pnl_filter.setPreferredSize(new Dimension(500, 300)); pnl_filter.add(foundStructureSummary, scrl_foundStructures); 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); @@ -382,7 +528,7 @@ public abstract class GStructureChooser extends JPanel implements previousWantedFields) ? false : true; } - + @Override /** * Event listener for the 'filter' combo-box and 'invert' check-box @@ -443,6 +589,7 @@ public abstract class GStructureChooser extends JPanel implements this.view = view; } + @Override public String toString() { return this.name; @@ -459,6 +606,7 @@ public abstract class GStructureChooser extends JPanel implements public class AssociateSeqOptions { private SequenceI sequence; + private String name; public AssociateSeqOptions(SequenceI seq) @@ -474,6 +622,7 @@ public abstract class GStructureChooser extends JPanel implements this.sequence = seq; } + @Override public String toString() { return name;