Merge branch 'develop' into features/JAL-1705_ensembl

[jalview.git] / src / jalview / gui / OptsAndParamsPage.java

diff --git a/src/jalview/gui/OptsAndParamsPage.java b/src/jalview/gui/OptsAndParamsPage.java
index 9b805d1..8a0fe77 100644 (file)
--- a/src/jalview/gui/OptsAndParamsPage.java
+++ b/src/jalview/gui/OptsAndParamsPage.java
@@ -41,7 +41,6 @@ import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 
@@ -111,21 +110,21 @@ public class OptsAndParamsPage
       {
         hasLink = true;
 
-        enabled.setToolTipText(
-             JvSwingUtils
-                        .wrapTooltip(true, ((desc == null || desc.trim().length() == 0) ? MessageManager.getString("label.opt_and_params_further_details ")
+        enabled.setToolTipText(JvSwingUtils
+                .wrapTooltip(
+                        true,
+                        ((desc == null || desc.trim().length() == 0) ? MessageManager
+                                .getString("label.opt_and_params_further_details ")
                                 : desc)
-                                + "<br><img src=\"" + linkImageURL + "\"/>")
-                );
+                                + "<br><img src=\"" + linkImageURL + "\"/>"));
         enabled.addMouseListener(this);
       }
       else
       {
         if (desc != null && desc.trim().length() > 0)
         {
-          enabled.setToolTipText(
-                   JvSwingUtils.wrapTooltip(true, opt.getDescription())
-                 );
+          enabled.setToolTipText(JvSwingUtils.wrapTooltip(true,
+                  opt.getDescription()));
         }
       }
       add(enabled, BorderLayout.NORTH);
@@ -345,10 +344,14 @@ public class OptsAndParamsPage
       {
         // Only create description boxes if there actually is a description.
         ttipText = (JvSwingUtils
-                        .wrapTooltip(true, parm.getDescription()
+                .wrapTooltip(
+                        true,
+                        parm.getDescription()
                                 + (finfo != null ? "<br><img src=\""
                                         + linkImageURL
-                                        + "\"/>"+MessageManager.getString("label.opt_and_params_further_detail")
+                                        + "\"/>"
+                                        + MessageManager
+                                                .getString("label.opt_and_params_further_detail")
                                         : "")));
       }
 
@@ -390,12 +393,21 @@ public class OptsAndParamsPage
         // Only create description boxes if there actually is a description.
         if (finfo != null)
         {
-          showDesc.setToolTipText(JvSwingUtils.wrapTooltip(true, MessageManager.formatMessage("label.opt_and_params_show_brief_desc_image_link", new String[]{linkImageURL.toExternalForm()})));
+          showDesc.setToolTipText(JvSwingUtils.wrapTooltip(
+                  true,
+                  MessageManager
+                          .formatMessage(
+                                  "label.opt_and_params_show_brief_desc_image_link",
+                                  new String[] { linkImageURL
+                                          .toExternalForm() })));
           showDesc.addMouseListener(this);
         }
         else
         {
-          showDesc.setToolTipText(JvSwingUtils.wrapTooltip(true, MessageManager.getString("label.opt_and_params_show_brief_desc")));
+          showDesc.setToolTipText(JvSwingUtils.wrapTooltip(
+                  true,
+                  MessageManager
+                          .getString("label.opt_and_params_show_brief_desc")));
         }
         showDesc.addActionListener(new ActionListener()
         {
@@ -678,8 +690,7 @@ public class OptsAndParamsPage
           {
             slider.setVisible(false);
           }
-          return new int[]
-          { iVal };
+          return new int[] { iVal };
         }
         else
         {
@@ -721,8 +732,7 @@ public class OptsAndParamsPage
           {
             slider.setVisible(false);
           }
-          return new float[]
-          { fVal };
+          return new float[] { fVal };
         }
       }
       else
@@ -730,13 +740,11 @@ public class OptsAndParamsPage
         if (!choice)
         {
           slider.setVisible(false);
-          return new String[]
-          { valueField.getText().trim() };
+          return new String[] { valueField.getText().trim() };
         }
         else
         {
-          return new String[]
-          { (String) choicebox.getSelectedItem() };
+          return new String[] { (String) choicebox.getSelectedItem() };
         }
       }
 
@@ -767,8 +775,7 @@ public class OptsAndParamsPage
 
     JPopupMenu mnu = new JPopupMenu();
     JMenuItem mitem = new JMenuItem(MessageManager.formatMessage(
-            "label.view_params", new String[]
-            { finfo }));
+            "label.view_params", new String[] { finfo }));
     mitem.addActionListener(new ActionListener()
     {
 
@@ -854,7 +861,9 @@ public class OptsAndParamsPage
       }
       else
       {
-        throw new Error(MessageManager.formatMessage("error.invalid_value_for_option", new String[]{string,option.getName()}));
+        throw new Error(MessageManager.formatMessage(
+                "error.invalid_value_for_option", new String[] { string,
+                    option.getName() }));
       }
 
     }