X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationPanel.java;h=35ae2422c0230971d784fe2beefd1a03681794f0;hb=d281dbb95856e0796188c810b819519878235e36;hp=4ead210a6f4b778975db4bf191e190ae0579b62c;hpb=a43bec27a288700b58f4db8ce599b19c6c22c66a;p=jalview.git
diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index 4ead210..35ae242 100755
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -20,22 +20,6 @@
*/
package jalview.gui;
-import jalview.datamodel.AlignmentAnnotation;
-import jalview.datamodel.AlignmentI;
-import jalview.datamodel.Annotation;
-import jalview.datamodel.ColumnSelection;
-import jalview.datamodel.HiddenColumns;
-import jalview.datamodel.SequenceI;
-import jalview.gui.JalviewColourChooser.ColourChooserListener;
-import jalview.renderer.AnnotationRenderer;
-import jalview.renderer.AwtRenderPanelI;
-import jalview.schemes.ResidueProperties;
-import jalview.util.Comparison;
-import jalview.util.MessageManager;
-import jalview.util.Platform;
-import jalview.viewmodel.ViewportListenerI;
-import jalview.viewmodel.ViewportRanges;
-
import java.awt.AlphaComposite;
import java.awt.Color;
import java.awt.Dimension;
@@ -66,6 +50,22 @@ import javax.swing.JPopupMenu;
import javax.swing.Scrollable;
import javax.swing.ToolTipManager;
+import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.Annotation;
+import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.HiddenColumns;
+import jalview.datamodel.SequenceI;
+import jalview.gui.JalviewColourChooser.ColourChooserListener;
+import jalview.renderer.AnnotationRenderer;
+import jalview.renderer.AwtRenderPanelI;
+import jalview.schemes.ResidueProperties;
+import jalview.util.Comparison;
+import jalview.util.MessageManager;
+import jalview.util.Platform;
+import jalview.viewmodel.ViewportListenerI;
+import jalview.viewmodel.ViewportRanges;
+
/**
* AnnotationPanel displays visible portion of annotation rows below unwrapped
* alignment
@@ -786,7 +786,9 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
if (row > -1 && ann.annotations != null
&& column < ann.annotations.length)
{
- setToolTipText(buildToolTip(ann, column, aa));
+ String toolTip = buildToolTip(ann, column, aa);
+ setToolTipText(toolTip == null ? null
+ : JvSwingUtils.wrapTooltip(true, toolTip));
String msg = getStatusMessage(av.getAlignment(), column, ann);
ap.alignFrame.setStatus(msg);
}
@@ -833,7 +835,9 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
}
/**
- * Answers a tooltip for the annotation at the current mouse position
+ * Answers a tooltip for the annotation at the current mouse position, not
+ * wrapped in <html> tags (apply if wanted). Answers null if there is no
+ * tooltip to show.
*
* @param ann
* @param column
@@ -846,45 +850,33 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
if (ann.graphGroup > -1)
{
StringBuilder tip = new StringBuilder(32);
- tip.append("");
+ boolean first = true;
for (int i = 0; i < anns.length; i++)
{
if (anns[i].graphGroup == ann.graphGroup
&& anns[i].annotations[column] != null)
{
+ if (!first)
+ {
+ tip.append("
");
+ }
+ first = false;
tip.append(anns[i].label);
String description = anns[i].annotations[column].description;
if (description != null && description.length() > 0)
{
tip.append(" ").append(description);
}
- tip.append("
");
}
}
- if (tip.length() != 6)
- {
- tip.setLength(tip.length() - 4);
- tooltip = tip.toString() + "";
- }
+ tooltip = first ? null : tip.toString();
}
else if (column < ann.annotations.length
&& ann.annotations[column] != null)
{
- String description = ann.annotations[column].description;
- if (description != null && description.length() > 0)
- {
- tooltip = JvSwingUtils.wrapTooltip(true, description);
- }
- else
- {
- tooltip = null; // no tooltip if null or empty description
- }
- }
- else
- {
- // clear the tooltip.
- tooltip = null;
+ tooltip = ann.annotations[column].description;
}
+
return tooltip;
}