Merge branch 'develop' into features/JAL-2446NCList

[jalview.git] / src / jalview / jbgui / GStructureChooser.java

diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java
index 041fefd..3e6cd2a 100644 (file)
--- 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();
 
@@ -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);
 
@@ -249,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;
     }
   };
@@ -280,9 +282,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,8 +463,8 @@ 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));
@@ -468,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
@@ -548,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))
@@ -588,8 +592,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 +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)
@@ -804,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);
     }
 
@@ -851,8 +856,8 @@ public abstract class GStructureChooser extends JPanel implements
    * @author tcnofoegbu
    *
    */
-  public abstract class CustomComboSeparatorsRenderer implements
-          ListCellRenderer<Object>
+  public abstract class CustomComboSeparatorsRenderer
+          implements ListCellRenderer<Object>
   {
     private ListCellRenderer<Object> regent;
 
@@ -860,14 +865,14 @@ public abstract class GStructureChooser extends JPanel implements
 
     private JSeparator jSeparator = new JSeparator();
 
-    public CustomComboSeparatorsRenderer(ListCellRenderer<Object> listCellRenderer)
+    public CustomComboSeparatorsRenderer(
+            ListCellRenderer<Object> 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 +880,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 +893,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 +905,8 @@ public abstract class GStructureChooser extends JPanel implements
   protected abstract void txt_search_ActionPerformed();
 
   public abstract void populateCmbAssociateSeqOptions(
-          JComboBox<AssociateSeqOptions> cmb_assSeq, JLabel lbl_associateSeq);
+          JComboBox<AssociateSeqOptions> cmb_assSeq,
+          JLabel lbl_associateSeq);
 
   public abstract void cmbAssSeqStateChanged();