X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGStructureChooser.java;h=9bcaa5aa1be2ed7a3839e3b25411e26e35d9a37b;hb=6c118f968f6e8f726fdbb6ce6c24d870b22419bb;hp=84305572f64dd46bd1e4bcfb3a8d25bbb5ff7ac1;hpb=f8563f9a829936e3cf75f36282e4816a3ea6163b;p=jalview.git diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java index 8430557..9bcaa5a 100644 --- a/src/jalview/jbgui/GStructureChooser.java +++ b/src/jalview/jbgui/GStructureChooser.java @@ -22,16 +22,18 @@ 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.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; +import java.awt.Component; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.GridLayout; @@ -43,6 +45,8 @@ import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; import javax.swing.ImageIcon; import javax.swing.JButton; @@ -51,24 +55,30 @@ import javax.swing.JComboBox; import javax.swing.JFrame; import javax.swing.JInternalFrame; import javax.swing.JLabel; +import javax.swing.JList; import javax.swing.JPanel; import javax.swing.JScrollPane; +import javax.swing.JSeparator; import javax.swing.JTabbedPane; import javax.swing.JTable; import javax.swing.JTextField; +import javax.swing.ListCellRenderer; 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.TableColumn; @SuppressWarnings("serial") /** - * GUI layout for structure chooser + * GUI layout for structure chooser + * * @author tcnofoegbu * */ -public abstract class GStructureChooser extends JPanel implements - ItemListener +public abstract class GStructureChooser extends JPanel + implements ItemListener { protected JPanel statusPanel = new JPanel(); @@ -81,7 +91,7 @@ public abstract class GStructureChooser extends JPanel implements protected JInternalFrame mainFrame = new JInternalFrame(frameTitle); - protected JComboBox cmb_filterOption = new JComboBox(); + protected JComboBox cmb_filterOption = new JComboBox<>(); protected AlignmentPanel ap; @@ -125,17 +135,17 @@ public abstract class GStructureChooser extends JPanel implements protected JCheckBox chk_invertFilter = new JCheckBox( MessageManager.getString("label.invert")); - protected ImageIcon loadingImage = new ImageIcon(getClass().getResource( - "/images/loading.gif")); + protected ImageIcon loadingImage = new ImageIcon( + getClass().getResource("/images/loading.gif")); - protected ImageIcon goodImage = new ImageIcon(getClass().getResource( - "/images/good.png")); + protected ImageIcon goodImage = new ImageIcon( + getClass().getResource("/images/good.png")); - protected ImageIcon errorImage = new ImageIcon(getClass().getResource( - "/images/error.png")); + protected ImageIcon errorImage = new ImageIcon( + getClass().getResource("/images/error.png")); - protected ImageIcon warningImage = new ImageIcon(getClass().getResource( - "/images/warning.gif")); + protected ImageIcon warningImage = new ImageIcon( + getClass().getResource("/images/warning.gif")); protected JLabel lbl_warning = new JLabel(warningImage); @@ -155,10 +165,74 @@ public abstract class GStructureChooser extends JPanel implements protected static final String VIEWS_ENTER_ID = "VIEWS_ENTER_ID"; + /** + * 'cached' structure view + */ protected static final String VIEWS_LOCAL_PDB = "VIEWS_LOCAL_PDB"; - protected JTable tbl_summary = new JTable() + protected JTable tbl_local_pdb = new JTable(); + + protected JScrollPane scrl_localPDB = new JScrollPane(tbl_local_pdb); + + protected JTabbedPane pnl_filter = new JTabbedPane(); + + protected FTSDataColumnPreferences pdbDocFieldPrefs = new FTSDataColumnPreferences( + PreferenceSource.STRUCTURE_CHOOSER, + PDBFTSRestClient.getInstance()); + + protected FTSDataColumnI[] previousWantedFields; + + protected static Map tempUserPrefs = new HashMap<>(); + + private JTable tbl_summary = new JTable() { + private boolean inLayout; + + @Override + public boolean getScrollableTracksViewportWidth() + { + return hasExcessWidth(); + + } + + @Override + public void doLayout() + { + if (hasExcessWidth()) + { + autoResizeMode = AUTO_RESIZE_SUBSEQUENT_COLUMNS; + } + inLayout = true; + super.doLayout(); + inLayout = false; + autoResizeMode = AUTO_RESIZE_OFF; + } + + protected boolean hasExcessWidth() + { + return getPreferredSize().width < getParent().getWidth(); + } + + @Override + public void columnMarginChanged(ChangeEvent e) + { + if (isEditing()) + { + removeEditor(); + } + TableColumn resizingColumn = getTableHeader().getResizingColumn(); + // Need to do this here, before the parent's + // layout manager calls getPreferredSize(). + if (resizingColumn != null && autoResizeMode == AUTO_RESIZE_OFF + && !inLayout) + { + resizingColumn.setPreferredWidth(resizingColumn.getWidth()); + String colHeader = resizingColumn.getHeaderValue().toString(); + tempUserPrefs.put(colHeader, resizingColumn.getWidth()); + } + resizeAndRepaint(); + } + @Override public String getToolTipText(MouseEvent evt) { @@ -179,27 +253,17 @@ public abstract class GStructureChooser extends JPanel implements // e.printStackTrace(); } toolTipText = (toolTipText == null ? null - : (toolTipText.length() > 500 ? JvSwingUtils.wrapTooltip( - true, "\"" + toolTipText.subSequence(0, 500) - + "...\"") : JvSwingUtils.wrapTooltip(true, - toolTipText))); + : (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_localPDB = new JScrollPane(tbl_local_pdb); - - private JTabbedPane pnl_filter = new JTabbedPane(); - - private PDBDocFieldPreferences pdbDocFieldPrefs = new PDBDocFieldPreferences( - PreferenceSource.STRUCTURE_CHOOSER); - - protected PDBDocField[] previousWantedFields; - public GStructureChooser() { try @@ -221,6 +285,12 @@ public abstract class GStructureChooser extends JPanel implements */ private void jbInit() throws Exception { + Integer width = tempUserPrefs.get("structureChooser.width") == null + ? 800 + : tempUserPrefs.get("structureChooser.width"); + Integer height = tempUserPrefs.get("structureChooser.height") == null + ? 400 + : tempUserPrefs.get("structureChooser.height"); tbl_summary.setAutoCreateRowSorter(true); tbl_summary.getTableHeader().setReorderingAllowed(false); tbl_summary.addMouseListener(new MouseAdapter() @@ -320,6 +390,7 @@ public abstract class GStructureChooser extends JPanel implements } } evt.consume(); + break; default: return; } @@ -354,7 +425,7 @@ public abstract class GStructureChooser extends JPanel implements @Override public void actionPerformed(ActionEvent e) { - mainFrame.dispose(); + closeAction(pnl_filter.getHeight()); } }); btn_cancel.addKeyListener(new KeyAdapter() @@ -364,7 +435,7 @@ public abstract class GStructureChooser extends JPanel implements { if (evt.getKeyCode() == KeyEvent.VK_ENTER) { - mainFrame.dispose(); + closeAction(pnl_filter.getHeight()); } } }); @@ -392,23 +463,20 @@ public abstract class GStructureChooser extends JPanel implements } }); - scrl_foundStructures.setPreferredSize(new Dimension(500, 300)); - scrl_foundStructures - .setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + scrl_foundStructures.setPreferredSize(new Dimension(width, height)); - scrl_localPDB.setPreferredSize(new Dimension(500, 300)); - scrl_localPDB - .setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + scrl_localPDB.setPreferredSize(new Dimension(width, height)); + 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")); - cmb_filterOption.setToolTipText(MessageManager - .getString("info.select_filter_option")); + txt_search.setToolTipText(JvSwingUtils.wrapTooltip(true, + MessageManager.getString("label.enter_pdb_id_tip"))); + cmb_filterOption.setToolTipText( + MessageManager.getString("info.select_filter_option")); txt_search.getDocument().addDocumentListener(new DocumentListener() { @Override @@ -431,6 +499,19 @@ public abstract class GStructureChooser extends JPanel implements }); cmb_filterOption.addItemListener(this); + + // add CustomComboSeparatorsRenderer to filter option combo-box + cmb_filterOption.setRenderer(new CustomComboSeparatorsRenderer( + (ListCellRenderer) cmb_filterOption.getRenderer()) + { + @Override + protected boolean addSeparatorAfter(JList list, FilterOption value, + int index) + { + return value.isAddSeparatorAfter(); + } + }); + chk_invertFilter.addItemListener(this); pnl_actions.add(chk_rememberSettings); @@ -473,9 +554,9 @@ public abstract class GStructureChooser extends JPanel implements btn_cancel.setEnabled(false); btn_view.setVisible(false); btn_cancel.setVisible(false); - previousWantedFields = PDBDocFieldPreferences - .getStructureSummaryFields().toArray( - new PDBRestClient.PDBDocField[0]); + previousWantedFields = pdbDocFieldPrefs + .getStructureSummaryFields() + .toArray(new FTSDataColumnI[0]); } if (sourceTabbedPane.getTitleAt(index) .equals(foundStructureSummary)) @@ -493,7 +574,7 @@ public abstract class GStructureChooser extends JPanel implements } }; pnl_filter.addChangeListener(changeListener); - pnl_filter.setPreferredSize(new Dimension(500, 300)); + pnl_filter.setPreferredSize(new Dimension(width, height)); pnl_filter.add(foundStructureSummary, scrl_foundStructures); pnl_filter.add(configureCols, pdbDocFieldPrefs); @@ -514,10 +595,39 @@ public abstract class GStructureChooser extends JPanel implements statusPanel.add(statusBar, null); this.add(pnl_actionsAndStatus, java.awt.BorderLayout.SOUTH); + mainFrame.addInternalFrameListener( + new javax.swing.event.InternalFrameAdapter() + { + @Override + public void internalFrameClosing(InternalFrameEvent e) + { + closeAction(pnl_filter.getHeight()); + } + }); mainFrame.setVisible(true); mainFrame.setContentPane(this); mainFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); - Desktop.addInternalFrame(mainFrame, frameTitle, 800, 400); + Integer x = tempUserPrefs.get("structureChooser.x"); + Integer y = tempUserPrefs.get("structureChooser.y"); + if (x != null && y != null) + { + mainFrame.setLocation(x, y); + } + Desktop.addInternalFrame(mainFrame, frameTitle, width, height); + } + + protected void closeAction(int preferredHeight) + { + // System.out.println(">>>>>>>>>> closing internal frame!!!"); + // System.out.println("width : " + mainFrame.getWidth()); + // System.out.println("heigh : " + mainFrame.getHeight()); + // System.out.println("x : " + mainFrame.getX()); + // System.out.println("y : " + mainFrame.getY()); + tempUserPrefs.put("structureChooser.width", pnl_filter.getWidth()); + tempUserPrefs.put("structureChooser.height", preferredHeight); + tempUserPrefs.put("structureChooser.x", mainFrame.getX()); + tempUserPrefs.put("structureChooser.y", mainFrame.getY()); + mainFrame.dispose(); } public boolean wantedFieldsUpdated() @@ -527,9 +637,10 @@ public abstract class GStructureChooser extends JPanel implements return true; } - return Arrays.equals(PDBDocFieldPreferences.getStructureSummaryFields() - .toArray(new PDBRestClient.PDBDocField[0]), - previousWantedFields) ? false : true; + FTSDataColumnI[] currentWantedFields = pdbDocFieldPrefs + .getStructureSummaryFields().toArray(new FTSDataColumnI[0]); + return Arrays.equals(currentWantedFields, previousWantedFields) ? false + : true; } @@ -556,11 +667,28 @@ public abstract class GStructureChooser extends JPanel implements private String view; - public FilterOption(String name, String value, String view) + private boolean addSeparatorAfter; + + /** + * Model for structure filter option + * + * @param name + * - the name of the Option + * @param value + * - the value of the option + * @param view + * - the category of the filter option + * @param addSeparatorAfter + * - if true, a horizontal separator is rendered immediately after + * this filter option, otherwise + */ + public FilterOption(String name, String value, String view, + boolean addSeparatorAfter) { this.name = name; this.value = value; this.view = view; + this.addSeparatorAfter = addSeparatorAfter; } public String getName() @@ -598,6 +726,16 @@ public abstract class GStructureChooser extends JPanel implements { return this.name; } + + public boolean isAddSeparatorAfter() + { + return addSeparatorAfter; + } + + public void setAddSeparatorAfter(boolean addSeparatorAfter) + { + this.addSeparatorAfter = addSeparatorAfter; + } } /** @@ -616,8 +754,9 @@ public abstract class GStructureChooser extends JPanel implements public AssociateSeqOptions(SequenceI seq) { this.sequence = seq; - this.name = (seq.getName().length() >= 23) ? seq.getName().substring( - 0, 23) : seq.getName(); + this.name = (seq.getName().length() >= 23) + ? seq.getName().substring(0, 23) + : seq.getName(); } public AssociateSeqOptions(String name, SequenceI seq) @@ -664,7 +803,7 @@ public abstract class GStructureChooser extends JPanel implements */ public class AssciateSeqPanel extends JPanel implements ItemListener { - private JComboBox cmb_assSeq = new JComboBox(); + private JComboBox cmb_assSeq = new JComboBox<>(); private JLabel lbl_associateSeq = new JLabel(); @@ -673,8 +812,8 @@ public abstract class GStructureChooser extends JPanel implements this.setLayout(new FlowLayout()); this.add(cmb_assSeq); this.add(lbl_associateSeq); - cmb_assSeq.setToolTipText(MessageManager - .getString("info.associate_wit_sequence")); + cmb_assSeq.setToolTipText( + MessageManager.getString("info.associate_wit_sequence")); cmb_assSeq.addItemListener(this); } @@ -703,16 +842,64 @@ public abstract class GStructureChooser extends JPanel implements } } + public JTable getResultTable() + { + return tbl_summary; + } + public JComboBox getCmbFilterOption() { return cmb_filterOption; } - protected abstract void stateChanged(ItemEvent e); + /** + * Custom ListCellRenderer for adding a separator between different categories + * of structure chooser filter option drop-down. + * + * @author tcnofoegbu + * + */ + public abstract class CustomComboSeparatorsRenderer + implements ListCellRenderer + { + private ListCellRenderer regent; + + private JPanel separatorPanel = new JPanel(new BorderLayout()); + + private JSeparator jSeparator = new JSeparator(); + + public CustomComboSeparatorsRenderer( + ListCellRenderer listCellRenderer) + { + this.regent = listCellRenderer; + } - protected abstract void updateCurrentView(); + @Override + public Component getListCellRendererComponent(JList list, Object value, + int index, boolean isSelected, boolean cellHasFocus) + { - protected abstract void populateFilterComboBox(); + Component comp = regent.getListCellRendererComponent(list, value, + index, isSelected, cellHasFocus); + if (index != -1 + && addSeparatorAfter(list, (FilterOption) value, index)) + { + separatorPanel.removeAll(); + separatorPanel.add(comp, BorderLayout.CENTER); + separatorPanel.add(jSeparator, BorderLayout.SOUTH); + return separatorPanel; + } + else + { + return comp; + } + } + + protected abstract boolean addSeparatorAfter(JList list, + FilterOption value, int index); + } + + protected abstract void stateChanged(ItemEvent e); protected abstract void ok_ActionPerformed(); @@ -721,11 +908,12 @@ public abstract class GStructureChooser extends JPanel implements protected abstract void txt_search_ActionPerformed(); public abstract void populateCmbAssociateSeqOptions( - JComboBox cmb_assSeq, JLabel lbl_associateSeq); + JComboBox cmb_assSeq, + JLabel lbl_associateSeq); public abstract void cmbAssSeqStateChanged(); public abstract void tabRefresh(); public abstract void validateSelections(); -} +} \ No newline at end of file