X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOptsAndParamsPage.java;h=7f1b30516650d88eda92c88223dbae8329222406;hb=81795ab8f5f3401f1102266b947e7cc9798bdc44;hp=4a9b5802d74af5ccb0b3b0da9d66ec2f3eeae48a;hpb=aced09c4feeaf3406269442c14e54abeeb4cad81;p=jalview.git
diff --git a/src/jalview/gui/OptsAndParamsPage.java b/src/jalview/gui/OptsAndParamsPage.java
index 4a9b580..7f1b305 100644
--- 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-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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,29 +110,29 @@ public class OptsAndParamsPage
{
hasLink = true;
- enabled.setToolTipText(""
- + JvSwingUtils
- .wrapTooltip(((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)
- + "
![](\"")
")
- + "");
+ + "
"));
enabled.addMouseListener(this);
}
else
{
if (desc != null && desc.trim().length() > 0)
{
- enabled.setToolTipText(""
- + JvSwingUtils.wrapTooltip(opt.getDescription())
- + "");
+ enabled.setToolTipText(JvSwingUtils.wrapTooltip(true,
+ opt.getDescription()));
}
}
add(enabled, BorderLayout.NORTH);
for (Object str : opt.getPossibleValues())
{
- val.addItem((String) str);
+ val.addItem(str);
}
- val.setSelectedItem((String) opt.getValue());
+ val.setSelectedItem(opt.getValue());
if (opt.getPossibleValues().size() > 1)
{
setLayout(new GridLayout(1, 2));
@@ -146,6 +145,7 @@ public class OptsAndParamsPage
setInitialValue();
}
+ @Override
public void actionPerformed(ActionEvent e)
{
if (e.getSource() != enabled)
@@ -207,32 +207,37 @@ public class OptsAndParamsPage
return opt;
}
+ @Override
public void mouseClicked(MouseEvent e)
{
- if (javax.swing.SwingUtilities.isRightMouseButton(e))
+ if (e.isPopupTrigger())
{
showUrlPopUp(this, finfo.toString(), e.getX(), e.getY());
}
}
+ @Override
public void mouseEntered(MouseEvent e)
{
// TODO Auto-generated method stub
}
+ @Override
public void mouseExited(MouseEvent e)
{
// TODO Auto-generated method stub
}
+ @Override
public void mousePressed(MouseEvent e)
{
// TODO Auto-generated method stub
}
+ @Override
public void mouseReleased(MouseEvent e)
{
// TODO Auto-generated method stub
@@ -344,13 +349,16 @@ public class OptsAndParamsPage
&& parm.getDescription().trim().length() > 0)
{
// Only create description boxes if there actually is a description.
- ttipText = (""
- + JvSwingUtils
- .wrapTooltip(parm.getDescription()
+ ttipText = (JvSwingUtils
+ .wrapTooltip(
+ true,
+ parm.getDescription()
+ (finfo != null ? "
Right click for further information."
- : "")) + "");
+ + "\"/>"
+ + MessageManager
+ .getString("label.opt_and_params_further_details")
+ : "")));
}
JvSwingUtils.mgAddtoLayout(this, ttipText,
@@ -391,16 +399,26 @@ public class OptsAndParamsPage
// Only create description boxes if there actually is a description.
if (finfo != null)
{
- showDesc.setToolTipText(JvSwingUtils.wrapTooltip(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(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()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
descisvisible = !descisvisible;
@@ -440,6 +458,7 @@ public class OptsAndParamsPage
validate();
}
+ @Override
public void actionPerformed(ActionEvent e)
{
if (adjusting)
@@ -515,45 +534,51 @@ public class OptsAndParamsPage
lastVal = null;
}
+ @Override
public void mouseClicked(MouseEvent e)
{
- if (javax.swing.SwingUtilities.isRightMouseButton(e))
+ if (e.isPopupTrigger())
{
showUrlPopUp(this, finfo.toString(), e.getX(), e.getY());
}
}
+ @Override
public void mouseEntered(MouseEvent e)
{
// TODO Auto-generated method stub
}
+ @Override
public void mouseExited(MouseEvent e)
{
// TODO Auto-generated method stub
}
+ @Override
public void mousePressed(MouseEvent e)
{
// TODO Auto-generated method stub
}
+ @Override
public void mouseReleased(MouseEvent e)
{
// TODO Auto-generated method stub
}
+ @Override
public void stateChanged(ChangeEvent e)
{
if (!adjusting)
{
valueField.setText(""
- + ((integ) ? ("" + (int) slider.getValue())
- : ("" + (float) (slider.getValue() / 1000f))));
+ + ((integ) ? ("" + slider.getValue())
+ : ("" + slider.getValue() / 1000f)));
checkIfModified();
}
@@ -679,8 +704,7 @@ public class OptsAndParamsPage
{
slider.setVisible(false);
}
- return new int[]
- { iVal };
+ return new int[] { iVal };
}
else
{
@@ -722,8 +746,7 @@ public class OptsAndParamsPage
{
slider.setVisible(false);
}
- return new float[]
- { fVal };
+ return new float[] { fVal };
}
}
else
@@ -731,13 +754,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() };
}
}
@@ -768,8 +789,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()
{
@@ -855,7 +875,9 @@ public class OptsAndParamsPage
}
else
{
- throw new Error(MessageManager.formatMessage("error.invalid_value_for_option", new String[]{string,option}));
+ throw new Error(MessageManager.formatMessage(
+ "error.invalid_value_for_option", new String[] { string,
+ option.getName() }));
}
}