X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOptsAndParamsPage.java;h=eb55994f3d1e9afd1ed8c7483e51135930500bf2;hb=87ea83af3e209a8c3a4b19f9530a9c05b4541148;hp=eab240f25a3d691cf9610e3ad052fcc7817fb723;hpb=59d682209891099d46b960509907c79e3fb276fe;p=jalview.git
diff --git a/src/jalview/gui/OptsAndParamsPage.java b/src/jalview/gui/OptsAndParamsPage.java
index eab240f..eb55994 100644
--- a/src/jalview/gui/OptsAndParamsPage.java
+++ b/src/jalview/gui/OptsAndParamsPage.java
@@ -109,7 +109,7 @@ public class OptsAndParamsPage
enabled.setToolTipText(""
+ JvSwingUtils
- .wrapTooltip(((desc == null) ? "see further details by right-clicking"
+ .wrapTooltip(((desc == null || desc.trim().length()==0) ? "see further details by right-clicking"
: desc)
+ "
![](\"")
")
+ "");
@@ -117,7 +117,7 @@ public class OptsAndParamsPage
}
else
{
- if (desc != null)
+ if (desc != null && desc.trim().length()>0)
{
enabled.setToolTipText(""
+ JvSwingUtils.wrapTooltip(opt.getDescription())
@@ -235,10 +235,11 @@ public class OptsAndParamsPage
}
- public void resetToDefault()
+
+ public void resetToDefault(boolean setDefaultParams)
{
enabled.setSelected(false);
- if (option.isRequired())
+ if (option.isRequired() || (setDefaultParams && option.getValue()!=null))
{
// Apply default value
selectOption(option, option.getValue());
@@ -258,7 +259,7 @@ public class OptsAndParamsPage
initVal = (initEnabled) ? (String) val.getSelectedItem() : null;
}
}
-
+
}
public class ParamBox extends JPanel implements ChangeListener,
@@ -783,9 +784,9 @@ public class OptsAndParamsPage
URL linkImageURL = getClass().getResource("/images/link.gif");
- Map optSet = new Hashtable();
+ Map optSet = new java.util.LinkedHashMap();
- Map paramSet = new Hashtable();
+ Map paramSet = new java.util.LinkedHashMap();
public Map getOptSet()
{