X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGStructureChooser.java;h=3e6cd2af8405e70972494c356ebbce3424072c55;hb=cef7be0f9008ff15318e3479a5de35e127071ef3;hp=44f659d3b14ee93672f60cc235193cd1e133d24f;hpb=771e6274247689960c5cfa0ea3962aee9451547e;p=jalview.git diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java index 44f659d..3e6cd2a 100644 --- a/src/jalview/jbgui/GStructureChooser.java +++ b/src/jalview/jbgui/GStructureChooser.java @@ -33,6 +33,7 @@ import jalview.util.MessageManager; import java.awt.BorderLayout; import java.awt.CardLayout; +import java.awt.Component; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.GridLayout; @@ -44,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; @@ -52,25 +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(); @@ -127,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); @@ -163,7 +171,7 @@ public abstract class GStructureChooser extends JPanel implements protected JScrollPane scrl_localPDB = new JScrollPane(tbl_local_pdb); - private JTabbedPane pnl_filter = new JTabbedPane(); + protected JTabbedPane pnl_filter = new JTabbedPane(); protected FTSDataColumnPreferences pdbDocFieldPrefs = new FTSDataColumnPreferences( PreferenceSource.STRUCTURE_CHOOSER, @@ -171,6 +179,8 @@ public abstract class GStructureChooser extends JPanel implements protected FTSDataColumnI[] previousWantedFields; + protected static Map tempUserPrefs = new HashMap(); + private JTable tbl_summary = new JTable() { private boolean inLayout; @@ -214,6 +224,8 @@ public abstract class GStructureChooser extends JPanel implements && !inLayout) { resizingColumn.setPreferredWidth(resizingColumn.getWidth()); + String colHeader = resizingColumn.getHeaderValue().toString(); + tempUserPrefs.put(colHeader, resizingColumn.getWidth()); } resizeAndRepaint(); } @@ -238,10 +250,11 @@ 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; } }; @@ -269,6 +282,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() @@ -368,6 +387,7 @@ public abstract class GStructureChooser extends JPanel implements } } evt.consume(); + break; default: return; } @@ -402,7 +422,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() @@ -412,7 +432,7 @@ public abstract class GStructureChooser extends JPanel implements { if (evt.getKeyCode() == KeyEvent.VK_ENTER) { - mainFrame.dispose(); + closeAction(pnl_filter.getHeight()); } } }); @@ -440,11 +460,11 @@ public abstract class GStructureChooser extends JPanel implements } }); - scrl_foundStructures.setPreferredSize(new Dimension(800, 400)); + scrl_foundStructures.setPreferredSize(new Dimension(width, height)); - scrl_localPDB.setPreferredSize(new Dimension(800, 400)); - 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)); @@ -452,8 +472,8 @@ public abstract class GStructureChooser extends JPanel implements chk_rememberSettings.setVisible(false); txt_search.setToolTipText(JvSwingUtils.wrapTooltip(true, MessageManager.getString("label.enter_pdb_id"))); - cmb_filterOption.setToolTipText(MessageManager - .getString("info.select_filter_option")); + cmb_filterOption.setToolTipText( + MessageManager.getString("info.select_filter_option")); txt_search.getDocument().addDocumentListener(new DocumentListener() { @Override @@ -476,6 +496,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); @@ -519,8 +552,8 @@ public abstract class GStructureChooser extends JPanel implements btn_view.setVisible(false); btn_cancel.setVisible(false); previousWantedFields = pdbDocFieldPrefs - .getStructureSummaryFields().toArray( - new FTSDataColumnI[0]); + .getStructureSummaryFields() + .toArray(new FTSDataColumnI[0]); } if (sourceTabbedPane.getTitleAt(index) .equals(foundStructureSummary)) @@ -538,7 +571,7 @@ public abstract class GStructureChooser extends JPanel implements } }; pnl_filter.addChangeListener(changeListener); - pnl_filter.setPreferredSize(new Dimension(800, 400)); + pnl_filter.setPreferredSize(new Dimension(width, height)); pnl_filter.add(foundStructureSummary, scrl_foundStructures); pnl_filter.add(configureCols, pdbDocFieldPrefs); @@ -559,10 +592,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, 900, 500); + 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() @@ -571,10 +633,9 @@ public abstract class GStructureChooser extends JPanel implements { return true; } - + FTSDataColumnI[] currentWantedFields = pdbDocFieldPrefs - .getStructureSummaryFields() - .toArray(new FTSDataColumnI[0]); + .getStructureSummaryFields().toArray(new FTSDataColumnI[0]); return Arrays.equals(currentWantedFields, previousWantedFields) ? false : true; @@ -603,11 +664,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() @@ -645,6 +723,16 @@ public abstract class GStructureChooser extends JPanel implements { return this.name; } + + public boolean isAddSeparatorAfter() + { + return addSeparatorAfter; + } + + public void setAddSeparatorAfter(boolean addSeparatorAfter) + { + this.addSeparatorAfter = addSeparatorAfter; + } } /** @@ -663,8 +751,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) @@ -720,8 +809,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); } @@ -754,16 +843,60 @@ public abstract class GStructureChooser extends JPanel implements { 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; + } + + @Override + public Component getListCellRendererComponent(JList list, Object value, + int index, boolean isSelected, boolean cellHasFocus) + { + + 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 void updateCurrentView(); + protected abstract boolean addSeparatorAfter(JList list, + FilterOption value, int index); + } - protected abstract void populateFilterComboBox(); + protected abstract void stateChanged(ItemEvent e); protected abstract void ok_ActionPerformed(); @@ -772,11 +905,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