X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGStructureChooser.java;h=c4043c49539d80c6d1b6dd5993b1d47ca759d07e;hb=4d7f98a6dd54d9863ba449ec79dcd95d25ed863d;hp=b79a7f763a285c963835350f6890886aed680f54;hpb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;p=jalview.git diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java index b79a7f7..c4043c4 100644 --- a/src/jalview/jbgui/GStructureChooser.java +++ b/src/jalview/jbgui/GStructureChooser.java @@ -24,8 +24,11 @@ package jalview.jbgui; import jalview.datamodel.SequenceI; import jalview.gui.AlignmentPanel; import jalview.gui.Desktop; +import jalview.gui.JvSwingUtils; import jalview.jbgui.PDBDocFieldPreferences.PreferenceSource; import jalview.util.MessageManager; +import jalview.ws.dbsources.PDBRestClient; +import jalview.ws.dbsources.PDBRestClient.PDBDocField; import java.awt.BorderLayout; import java.awt.CardLayout; @@ -34,6 +37,9 @@ import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.Arrays; import javax.swing.ImageIcon; import javax.swing.JButton; @@ -70,6 +76,8 @@ public abstract class GStructureChooser extends JPanel implements protected AlignmentPanel ap; + protected StringBuilder errorWarning = new StringBuilder(); + protected JLabel lbl_result = new JLabel( MessageManager.getString("label.select")); @@ -83,7 +91,7 @@ public abstract class GStructureChooser extends JPanel implements private JPanel pnl_actions = new JPanel(); - private JPanel pnl_filter = new JPanel(); + private JPanel pnl_main = new JPanel(); private JPanel pnl_idInput = new JPanel(new FlowLayout()); @@ -93,6 +101,8 @@ public abstract class GStructureChooser extends JPanel implements private JPanel pnl_fileChooserBL = new JPanel(new BorderLayout()); + private JPanel pnl_locPDB = new JPanel(new BorderLayout()); + protected JPanel pnl_switchableViews = new JPanel(new CardLayout()); protected CardLayout layout_switchableViews = (CardLayout) (pnl_switchableViews @@ -115,13 +125,17 @@ public abstract class GStructureChooser extends JPanel implements protected ImageIcon errorImage = new ImageIcon(getClass().getResource( "/images/error.png")); + protected ImageIcon warningImage = new ImageIcon(getClass().getResource( + "/images/warning.gif")); + + protected JLabel lbl_warning = new JLabel(warningImage); + protected JLabel lbl_loading = new JLabel(loadingImage); protected JLabel lbl_pdbManualFetchStatus = new JLabel(errorImage); protected JLabel lbl_fromFileStatus = new JLabel(errorImage); - protected AssciateSeqPanel idInputAssSeqPanel = new AssciateSeqPanel(); protected AssciateSeqPanel fileChooserAssSeqPanel = new AssciateSeqPanel(); @@ -132,16 +146,46 @@ public abstract class GStructureChooser extends JPanel implements protected static final String VIEWS_ENTER_ID = "VIEWS_ENTER_ID"; - protected JTable tbl_summary = new JTable(); + protected static final String VIEWS_LOCAL_PDB = "VIEWS_LOCAL_PDB"; + + protected JTable tbl_summary = new JTable() + { + public String getToolTipText(MouseEvent evt) + { + String toolTipText = null; + java.awt.Point pnt = evt.getPoint(); + int rowIndex = rowAtPoint(pnt); + int colIndex = columnAtPoint(pnt); + + try + { + 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(); - protected JScrollPane scrl_foundStructures = new JScrollPane( - tbl_summary); + protected JScrollPane scrl_localPDB = new JScrollPane(tbl_local_pdb); - private JTabbedPane tabbedPane = new JTabbedPane(); + private JTabbedPane pnl_filter = new JTabbedPane(); private PDBDocFieldPreferences pdbDocFieldPrefs = new PDBDocFieldPreferences( PreferenceSource.STRUCTURE_CHOOSER); + protected PDBDocField[] previousWantedFields; + public GStructureChooser() { try @@ -164,6 +208,22 @@ public abstract class GStructureChooser extends JPanel implements private void jbInit() throws Exception { tbl_summary.setAutoCreateRowSorter(true); + tbl_summary.getTableHeader().setReorderingAllowed(false); + tbl_local_pdb.setAutoCreateRowSorter(true); + tbl_local_pdb.getTableHeader().setReorderingAllowed(false); + tbl_local_pdb.addMouseListener(new MouseAdapter() + { + public void mouseClicked(MouseEvent e) + { + updateCurrentView(); + } + + public void mouseReleased(MouseEvent e) + { + updateCurrentView(); + } + }); + 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() @@ -198,10 +258,14 @@ public abstract class GStructureChooser extends JPanel implements scrl_foundStructures .setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + scrl_localPDB.setPreferredSize(new Dimension(500, 300)); + scrl_localPDB + .setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + 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")); @@ -236,26 +300,25 @@ public abstract class GStructureChooser extends JPanel implements pnl_actions.add(btn_cancel); // pnl_filter.add(lbl_result); - pnl_filter.add(cmb_filterOption); - pnl_filter.add(lbl_loading); - pnl_filter.add(chk_invertFilter); + pnl_main.add(cmb_filterOption); + pnl_main.add(lbl_loading); + pnl_main.add(chk_invertFilter); lbl_loading.setVisible(false); - pnl_idInput.add(txt_search); - pnl_idInput.add(lbl_pdbManualFetchStatus); - pnl_fileChooser.add(btn_pdbFromFile); pnl_fileChooser.add(lbl_fromFileStatus); - pnl_fileChooserBL.add(fileChooserAssSeqPanel, BorderLayout.NORTH); pnl_fileChooserBL.add(pnl_fileChooser, BorderLayout.CENTER); + pnl_idInput.add(txt_search); + 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() { public void stateChanged(ChangeEvent changeEvent) @@ -263,27 +326,43 @@ public abstract class GStructureChooser extends JPanel implements JTabbedPane sourceTabbedPane = (JTabbedPane) changeEvent .getSource(); int index = sourceTabbedPane.getSelectedIndex(); + if (sourceTabbedPane.getTitleAt(index).equals(configureCols)) + { + btn_view.setEnabled(false); + btn_cancel.setEnabled(false); + previousWantedFields = PDBDocFieldPreferences + .getStructureSummaryFields().toArray( + new PDBRestClient.PDBDocField[0]); + } if (sourceTabbedPane.getTitleAt(index) .equals(foundStructureSummary)) { - tabRefresh(); + btn_cancel.setEnabled(true); + if (wantedFieldsUpdated()) + { + tabRefresh(); + } + else + { + validateSelections(); + } } } }; - tabbedPane.addChangeListener(changeListener); - tabbedPane.setPreferredSize(new Dimension(500, 300)); - tabbedPane.add(foundStructureSummary, scrl_foundStructures); - tabbedPane.add( - MessageManager.getString("label.configure_displayed_columns"), - pdbDocFieldPrefs); - + pnl_filter.addChangeListener(changeListener); + 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(tabbedPane, VIEWS_FILTER); - + pnl_switchableViews.add(pnl_filter, VIEWS_FILTER); + pnl_switchableViews.add(pnl_locPDB, VIEWS_LOCAL_PDB); + this.setLayout(mainLayout); - this.add(pnl_filter, java.awt.BorderLayout.NORTH); + this.add(pnl_main, java.awt.BorderLayout.NORTH); this.add(pnl_switchableViews, java.awt.BorderLayout.CENTER); this.add(pnl_actions, java.awt.BorderLayout.SOUTH); @@ -293,7 +372,19 @@ public abstract class GStructureChooser extends JPanel implements Desktop.addInternalFrame(mainFrame, frameTitle, 800, 400); } - + public boolean wantedFieldsUpdated() + { + if (previousWantedFields == null) + { + return true; + } + + return Arrays.equals(PDBDocFieldPreferences.getStructureSummaryFields() + .toArray(new PDBRestClient.PDBDocField[0]), + previousWantedFields) ? false : true; + + } + @Override /** * Event listener for the 'filter' combo-box and 'invert' check-box @@ -370,6 +461,7 @@ public abstract class GStructureChooser extends JPanel implements public class AssociateSeqOptions { private SequenceI sequence; + private String name; public AssociateSeqOptions(SequenceI seq) @@ -484,4 +576,6 @@ public abstract class GStructureChooser extends JPanel implements public abstract void cmbAssSeqStateChanged(); public abstract void tabRefresh(); + + public abstract void validateSelections(); }