From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 1 Mar 2019 15:12:06 +0000 (+0000)
Subject: Merge branch 'feature/JAL-3093wrappedModeTooltips' into merge/JAL-3093_JAL-3132
X-Git-Tag: Release_2_11_0~17^2~82
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d34f80c67881e79d7304eb143e9c907bc16d052b;p=jalview.git

Merge branch 'feature/JAL-3093wrappedModeTooltips' into merge/JAL-3093_JAL-3132
---

d34f80c67881e79d7304eb143e9c907bc16d052b
diff --cc test/jalview/gui/SeqPanelTest.java
index f163299,4ce2696..0d49936
--- a/test/jalview/gui/SeqPanelTest.java
+++ b/test/jalview/gui/SeqPanelTest.java
@@@ -27,20 -26,19 +27,23 @@@ import static org.testng.Assert.assertT
  import jalview.api.AlignViewportI;
  import jalview.bin.Cache;
  import jalview.bin.Jalview;
 +import jalview.commands.EditCommand;
 +import jalview.commands.EditCommand.Action;
 +import jalview.commands.EditCommand.Edit;
  import jalview.datamodel.Alignment;
+ import jalview.datamodel.AlignmentAnnotation;
  import jalview.datamodel.AlignmentI;
  import jalview.datamodel.Sequence;
  import jalview.datamodel.SequenceI;
  import jalview.gui.SeqPanel.MousePos;
  import jalview.io.DataSourceType;
  import jalview.io.FileLoader;
 +import jalview.util.MessageManager;
  
  import java.awt.Event;
+ import java.awt.EventQueue;
  import java.awt.event.MouseEvent;
+ import java.lang.reflect.InvocationTargetException;
  
  import javax.swing.JLabel;