git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
JAL-1894 update year/version in copyright
[jalview.git] / src / jalview / gui / OptsAndParamsPage.java
diff --git a/src/jalview/gui/OptsAndParamsPage.java b/src/jalview/gui/OptsAndParamsPage.java
index 06a11d4..6f9e4b1 100644 (file)
--- a/src/jalview/gui/OptsAndParamsPage.java
+++ b/src/jalview/gui/OptsAndParamsPage.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -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("<html>"
-                + JvSwingUtils
-                        .wrapTooltip(((desc == null || desc.trim().length()==0) ? "see further details by right-clicking"
+        enabled.setToolTipText(JvSwingUtils
+                .wrapTooltip(
+                        true,
+                        ((desc == null || desc.trim().length() == 0) ? MessageManager
+                                .getString("label.opt_and_params_further_details ")
                                 : desc)
-                                + "<br><img src=\"" + linkImageURL + "\"/>")
-                + "</html>");
+                                + "<br><img src=\"" + linkImageURL + "\"/>"));
         enabled.addMouseListener(this);
       }
       else
       {
-        if (desc != null && desc.trim().length()>0)
+        if (desc != null && desc.trim().length() > 0)
         {
-          enabled.setToolTipText("<html>"
-                  + JvSwingUtils.wrapTooltip(opt.getDescription())
-                  + "</html>");
+          enabled.setToolTipText(JvSwingUtils.wrapTooltip(true,
+                  opt.getDescription()));
         }
       }
       add(enabled, BorderLayout.NORTH);
@@ -239,11 +238,11 @@ public class OptsAndParamsPage
 
     }
 
-
     public void resetToDefault(boolean setDefaultParams)
     {
       enabled.setSelected(false);
-      if (option.isRequired() || (setDefaultParams && option.getValue()!=null))
+      if (option.isRequired()
+              || (setDefaultParams && option.getValue() != null))
       {
         // Apply default value
         selectOption(option, option.getValue());
@@ -263,7 +262,7 @@ public class OptsAndParamsPage
         initVal = (initEnabled) ? (String) val.getSelectedItem() : null;
       }
     }
-    
+
   }
 
   public class ParamBox extends JPanel implements ChangeListener,
@@ -344,13 +343,16 @@ public class OptsAndParamsPage
               && parm.getDescription().trim().length() > 0)
       {
         // Only create description boxes if there actually is a description.
-        ttipText = ("<html>"
-                + JvSwingUtils
-                        .wrapTooltip(parm.getDescription()
+        ttipText = (JvSwingUtils
+                .wrapTooltip(
+                        true,
+                        parm.getDescription()
                                 + (finfo != null ? "<br><img src=\""
                                         + linkImageURL
-                                        + "\"/> Right click for further information."
-                                        : "")) + "</html>");
+                                        + "\"/>"
+                                        + MessageManager
+                                                .getString("label.opt_and_params_further_detail")
+                                        : "")));
       }
 
       JvSwingUtils.mgAddtoLayout(this, ttipText,
@@ -391,20 +393,21 @@ public class OptsAndParamsPage
         // Only create description boxes if there actually is a description.
         if (finfo != null)
         {
-          showDesc.setToolTipText("<html>"
-                  + JvSwingUtils
-                          .wrapTooltip("Click to show brief description<br><img src=\""
-                                  + linkImageURL
-                                  + "\"/> Right click for further information.")
-                  + "</html>");
+          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("<html>"
-                  + JvSwingUtils
-                          .wrapTooltip("Click to show brief description.")
-                  + "</html>");
+          showDesc.setToolTipText(JvSwingUtils.wrapTooltip(
+                  true,
+                  MessageManager
+                          .getString("label.opt_and_params_show_brief_desc")));
         }
         showDesc.addActionListener(new ActionListener()
         {
@@ -681,14 +684,13 @@ public class OptsAndParamsPage
           {
             slider.getModel().setRangeProperties(iVal, 1,
                     validator.getMin().intValue(),
-                    validator.getMax().intValue()+1, true);
+                    validator.getMax().intValue() + 1, true);
           }
           else
           {
             slider.setVisible(false);
           }
-          return new int[]
-          { iVal };
+          return new int[] { iVal };
         }
         else
         {
@@ -723,14 +725,14 @@ public class OptsAndParamsPage
           {
             slider.getModel().setRangeProperties((int) (fVal * 1000f), 1,
                     (int) (validator.getMin().floatValue() * 1000f),
-                    1+(int) (validator.getMax().floatValue() * 1000f), true);
+                    1 + (int) (validator.getMax().floatValue() * 1000f),
+                    true);
           }
           else
           {
             slider.setVisible(false);
           }
-          return new float[]
-          { fVal };
+          return new float[] { fVal };
         }
       }
       else
@@ -738,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() };
         }
       }
 
@@ -774,7 +774,8 @@ public class OptsAndParamsPage
   {
 
     JPopupMenu mnu = new JPopupMenu();
-    JMenuItem mitem = new JMenuItem(MessageManager.formatMessage("label.view_params", new String[]{finfo}));
+    JMenuItem mitem = new JMenuItem(MessageManager.formatMessage(
+            "label.view_params", new String[] { finfo }));
     mitem.addActionListener(new ActionListener()
     {
 
@@ -860,7 +861,9 @@ public class OptsAndParamsPage
       }
       else
       {
-        throw new Error("Invalid value " + string + " for option " + option);
+        throw new Error(MessageManager.formatMessage(
+                "error.invalid_value_for_option", new String[] { string,
+                    option.getName() }));
       }
 
     }