X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGStructureChooser.java;h=9bcaa5aa1be2ed7a3839e3b25411e26e35d9a37b;hb=6c118f968f6e8f726fdbb6ce6c24d870b22419bb;hp=041fefd8317e1bd6a744778462e561e628911947;hpb=b838581d0bef5793a819a317a827d66421ee48a2;p=jalview.git diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java index 041fefd..9bcaa5a 100644 --- a/src/jalview/jbgui/GStructureChooser.java +++ b/src/jalview/jbgui/GStructureChooser.java @@ -72,12 +72,13 @@ 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(); @@ -90,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; @@ -134,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); @@ -164,6 +165,9 @@ 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_local_pdb = new JTable(); @@ -178,7 +182,7 @@ public abstract class GStructureChooser extends JPanel implements protected FTSDataColumnI[] previousWantedFields; - protected static Map tempUserPrefs = new HashMap(); + protected static Map tempUserPrefs = new HashMap<>(); private JTable tbl_summary = new JTable() { @@ -249,10 +253,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; } }; @@ -280,9 +285,11 @@ public abstract class GStructureChooser extends JPanel implements */ private void jbInit() throws Exception { - Integer width = tempUserPrefs.get("structureChooser.width") == null ? 800 + Integer width = tempUserPrefs.get("structureChooser.width") == null + ? 800 : tempUserPrefs.get("structureChooser.width"); - Integer height = tempUserPrefs.get("structureChooser.height") == null ? 400 + Integer height = tempUserPrefs.get("structureChooser.height") == null + ? 400 : tempUserPrefs.get("structureChooser.height"); tbl_summary.setAutoCreateRowSorter(true); tbl_summary.getTableHeader().setReorderingAllowed(false); @@ -459,17 +466,17 @@ public abstract class GStructureChooser extends JPanel implements scrl_foundStructures.setPreferredSize(new Dimension(width, height)); scrl_localPDB.setPreferredSize(new Dimension(width, height)); - scrl_localPDB - .setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + 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(JvSwingUtils.wrapTooltip(true, - MessageManager.getString("label.enter_pdb_id"))); - cmb_filterOption.setToolTipText(MessageManager - .getString("info.select_filter_option")); + MessageManager.getString("label.enter_pdb_id_tip"))); + cmb_filterOption.setToolTipText( + MessageManager.getString("info.select_filter_option")); txt_search.getDocument().addDocumentListener(new DocumentListener() { @Override @@ -548,8 +555,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)) @@ -588,8 +595,8 @@ 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() + mainFrame.addInternalFrameListener( + new javax.swing.event.InternalFrameAdapter() { @Override public void internalFrameClosing(InternalFrameEvent e) @@ -747,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) @@ -795,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(); @@ -804,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); } @@ -851,8 +859,8 @@ public abstract class GStructureChooser extends JPanel implements * @author tcnofoegbu * */ - public abstract class CustomComboSeparatorsRenderer implements - ListCellRenderer + public abstract class CustomComboSeparatorsRenderer + implements ListCellRenderer { private ListCellRenderer regent; @@ -860,14 +868,14 @@ public abstract class GStructureChooser extends JPanel implements private JSeparator jSeparator = new JSeparator(); - public CustomComboSeparatorsRenderer(ListCellRenderer listCellRenderer) + public CustomComboSeparatorsRenderer( + ListCellRenderer listCellRenderer) { this.regent = listCellRenderer; } @Override - public Component getListCellRendererComponent(JList list, - Object value, + public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { @@ -875,7 +883,7 @@ public abstract class GStructureChooser extends JPanel implements index, isSelected, cellHasFocus); if (index != -1 && addSeparatorAfter(list, (FilterOption) value, index)) - { + { separatorPanel.removeAll(); separatorPanel.add(comp, BorderLayout.CENTER); separatorPanel.add(jSeparator, BorderLayout.SOUTH); @@ -888,8 +896,7 @@ public abstract class GStructureChooser extends JPanel implements } protected abstract boolean addSeparatorAfter(JList list, - FilterOption value, - int index); + FilterOption value, int index); } protected abstract void stateChanged(ItemEvent e); @@ -901,7 +908,8 @@ 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();