X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJvSwingUtils.java;h=fc2ecdea44e94b336750a9ac4bc33f41ef3a48c9;hb=ead01b555e8b1d6322cecdf7780222c73143a03a;hp=2cba586795fb658501029e1ab365fdb6ae2b43f3;hpb=95dd7184bda6e9053dfa5c518410b2956feca73b;p=jalview.git
diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java
index 2cba586..fc2ecde 100644
--- a/src/jalview/gui/JvSwingUtils.java
+++ b/src/jalview/gui/JvSwingUtils.java
@@ -24,14 +24,20 @@ import jalview.util.MessageManager;
import java.awt.BorderLayout;
import java.awt.Color;
+import java.awt.Component;
import java.awt.Font;
import java.awt.GridLayout;
import java.awt.Rectangle;
import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.List;
import java.util.Objects;
import javax.swing.AbstractButton;
+import javax.swing.BorderFactory;
import javax.swing.JButton;
+import javax.swing.JComboBox;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JMenu;
@@ -39,6 +45,8 @@ import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.JScrollBar;
import javax.swing.SwingConstants;
+import javax.swing.border.Border;
+import javax.swing.border.TitledBorder;
/**
* useful functions for building Swing GUIs
@@ -48,23 +56,38 @@ import javax.swing.SwingConstants;
*/
public final class JvSwingUtils
{
+ static final String HTML_PREFIX = "
";
+
/**
* wrap a bare html safe string to around 60 characters per line using a CSS
* style class specifying word-wrap and break-word
*
* @param enclose
- * if true, add <html> wrapper tags
+ * if true, add <html> wrapper tags (currently false for only
+ * two references -- both in Jws2Discoverer --
* @param ttext
*
* @return
*/
public static String wrapTooltip(boolean enclose, String ttext)
{
- Objects.requireNonNull(ttext, "Tootip text to format must not be null!");
+ Objects.requireNonNull(ttext,
+ "Tootip text to format must not be null!");
ttext = ttext.trim();
boolean maxLengthExceeded = false;
-
- if (ttext.contains("
"))
+ boolean isHTML = ttext.startsWith("");
+ if (isHTML)
+ {
+ ttext = ttext.substring(6);
+ }
+ if (ttext.endsWith(""))
+ {
+ isHTML = true;
+ ttext = ttext.substring(0, ttext.length() - 7);
+ }
+ boolean hasBR = ttext.contains("
");
+ enclose |= isHTML || hasBR;
+ if (hasBR)
{
String[] htmllines = ttext.split("
");
for (String line : htmllines)
@@ -85,10 +108,8 @@ public final class JvSwingUtils
{
return enclose ? "" + ttext + "" : ttext;
}
-
- return (enclose ? "" : "")
- + "
"
- + ttext + "
" + ((enclose ? "" : ""));
+ // BH 2018,2019
+ return (enclose ? HTML_PREFIX + ttext + "
" : ttext);
}
@@ -119,8 +140,8 @@ public final class JvSwingUtils
for (int i = 0, iSize = menu.getMenuComponentCount(); i < iSize; i++)
{
if (menu.getMenuComponent(i) instanceof JMenu
- && ((JMenu) menu.getMenuComponent(i)).getText().equals(
- submenu))
+ && ((JMenu) menu.getMenuComponent(i)).getText()
+ .equals(submenu))
{
submenuinstance = (JMenu) menu.getMenuComponent(i);
}
@@ -198,8 +219,10 @@ public final class JvSwingUtils
public static Font getLabelFont(boolean bold, boolean italic)
{
- return new java.awt.Font("Verdana", (!bold && !italic) ? Font.PLAIN
- : (bold ? Font.BOLD : 0) + (italic ? Font.ITALIC : 0), 11);
+ return new java.awt.Font("Verdana",
+ (!bold && !italic) ? Font.PLAIN
+ : (bold ? Font.BOLD : 0) + (italic ? Font.ITALIC : 0),
+ 11);
}
/**
@@ -275,8 +298,8 @@ public final class JvSwingUtils
* of possible positions.
*/
float fraction = proportion
- * (scrollbar.getMaximum() - scrollbar.getMinimum() - scrollbar
- .getModel().getExtent())
+ * (scrollbar.getMaximum() - scrollbar.getMinimum()
+ - scrollbar.getModel().getExtent())
+ (scrollbar.getModel().getExtent() / 2f);
return Math.min(Math.round(fraction), scrollbar.getMaximum());
}
@@ -301,4 +324,72 @@ public final class JvSwingUtils
comp.setFont(JvSwingUtils.getLabelFont());
}
+ /**
+ * A helper method to build a drop-down choice of values, with tooltips for
+ * the entries
+ *
+ * @param entries
+ * @param tooltips
+ */
+ public static JComboBox