From: Charles Ofoegbu Date: Wed, 26 Nov 2014 15:53:57 +0000 (+0000) Subject: Merge branch 'bug/JAL-998_wrap-sequence-tooltip' into develop X-Git-Tag: Jalview_2_9~143 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=53a90a961a55fad88199165bdc4c665ba90c28b3;hp=281154434c63674d9c19577a3737e0e63927ee6b;p=jalview.git Merge branch 'bug/JAL-998_wrap-sequence-tooltip' into develop --- diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java index d546584..e433243 100644 --- a/src/jalview/gui/JvSwingUtils.java +++ b/src/jalview/gui/JvSwingUtils.java @@ -53,14 +53,14 @@ public final class JvSwingUtils */ public static String wrapTooltip(boolean enclose, String ttext) { - if (ttext.length() < 60) { - return enclose ? ""+ttext+"" : ttext; + return enclose ? "" + ttext + "" : ttext; } else { - return (enclose ? "" : "") + "
" + ttext + return (enclose ? "" : "") + + "
" + ttext + "
" + ((enclose ? "" : "")); } } diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java index 4f331ab..5d3df1a 100644 --- a/src/jalview/gui/SeqPanel.java +++ b/src/jalview/gui/SeqPanel.java @@ -113,7 +113,7 @@ public class SeqPanel extends JPanel implements MouseListener, private final SequenceAnnotationReport seqARep; - StringBuffer tooltipText = new StringBuffer(""); + StringBuffer tooltipText = new StringBuffer(); String tmpString; @@ -729,11 +729,6 @@ public class SeqPanel extends JPanel implements MouseListener, { if (groups[g].getStartRes() <= res && groups[g].getEndRes() >= res) { - if (tooltipText.length() > 6) - { - tooltipText.append("
"); - } - if (!groups[g].getName().startsWith("JTreeGroup") && !groups[g].getName().startsWith("JGroup")) { @@ -765,12 +760,13 @@ public class SeqPanel extends JPanel implements MouseListener, } else { - tooltipText.append(""); if (lastTooltip == null || !lastTooltip.equals(tooltipText.toString())) { - setToolTipText(JvSwingUtils.wrapTooltip(true, - tooltipText.toString())); + String formatedTooltipText = JvSwingUtils.wrapTooltip(true, + tooltipText.toString()); + // String formatedTooltipText = tooltipText.toString(); + setToolTipText(formatedTooltipText); lastTooltip = tooltipText.toString(); }