X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJvSwingUtils.java;h=e7f992dd37faff03ba188e5f32600d10a4a1a75e;hb=95600b03ceeaf7162219dfa9b0a6bed432228b60;hp=b6f85b3d11173c3394b28c20d717900aebdf9fcd;hpb=872491e84ca43e8ec17ef8c0395d1b7a45e6b5d4;p=jalview.git
diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java
index b6f85b3..e7f992d 100644
--- a/src/jalview/gui/JvSwingUtils.java
+++ b/src/jalview/gui/JvSwingUtils.java
@@ -22,13 +22,20 @@ package jalview.gui;
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;
@@ -36,6 +43,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;
import jalview.util.MessageManager;
@@ -48,27 +57,29 @@ import jalview.util.MessageManager;
public final class JvSwingUtils
{
/**
- * wrap a bare html safe string to around 60 characters per line using a
- *
- *
- * | field
- * @param enclose TODO
- * @param ttext
+ * 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
+ * @param ttext
*
* @return
*/
public static String wrapTooltip(boolean enclose, String ttext)
{
+ Objects.requireNonNull(ttext,
+ "Tootip text to format must not be null!");
ttext = ttext.trim();
- boolean maxLenghtExceeded = false;
+ boolean maxLengthExceeded = false;
if (ttext.contains("
"))
{
String[] htmllines = ttext.split("
");
for (String line : htmllines)
{
- maxLenghtExceeded = line.length() > 60;
- if (maxLenghtExceeded)
+ maxLengthExceeded = line.length() > 60;
+ if (maxLengthExceeded)
{
break;
}
@@ -76,19 +87,23 @@ public final class JvSwingUtils
}
else
{
- maxLenghtExceeded = ttext.length() > 60;
+ maxLengthExceeded = ttext.length() > 60;
}
- if (!maxLenghtExceeded)
+ if (!maxLengthExceeded)
{
return enclose ? "" + ttext + "" : ttext;
}
- else
- {
- return (enclose ? ""
- : "")
- + ttext + ((enclose ? " |
" : ""));
- }
+
+ return (enclose ? "" : "")
+ // BH 2018
+ + ""
+ // + "
"
+ + ttext + "
"
+ // + ""
+ + ((enclose ? "" : ""));
}
public static JButton makeButton(String label, String tooltip,
@@ -118,8 +133,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);
}
@@ -148,12 +163,8 @@ public final class JvSwingUtils
JPanel laypanel = new JPanel(new GridLayout(1, 2));
JPanel labPanel = new JPanel(new BorderLayout());
JPanel valPanel = new JPanel();
- // laypanel.setSize(panel.getPreferredSize());
- // laypanel.setLayout(null);
labPanel.setBounds(new Rectangle(7, 7, 158, 23));
valPanel.setBounds(new Rectangle(172, 7, 270, 23));
- // labPanel.setLayout(new GridLayout(1,1));
- // valPanel.setLayout(new GridLayout(1,1));
labPanel.add(label, BorderLayout.WEST);
valPanel.add(valBox);
laypanel.add(labPanel);
@@ -201,8 +212,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);
}
/**
@@ -278,8 +291,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());
}
@@ -304,4 +317,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