git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: f30cdeb 40d0dcc)
Merge branch 'bug/JAL-998_wrap-sequence-tooltip' into Release_2_8_2_Branch
authorCharles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 26 Nov 2014 16:06:04 +0000 (16:06 +0000)
committerCharles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 26 Nov 2014 16:06:04 +0000 (16:06 +0000)
1  2 
src/jalview/gui/SeqPanel.java patch | diff1 | diff2 | blob | history

diff --combined src/jalview/gui/SeqPanel.java
index 3b41620,48800c3..c10a4a9
--- 1/src/jalview/gui/SeqPanel.java
--- 2/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@@ -21,7 -21,6 +21,7 @@@
  package jalview.gui;
  
  import jalview.commands.EditCommand;
 +import jalview.commands.EditCommand.Action;
  import jalview.datamodel.ColumnSelection;
  import jalview.datamodel.SearchResults;
  import jalview.datamodel.Sequence;
@@@ -113,7 -112,7 +113,7 @@@ public class SeqPanel extends JPanel im
  
    private final SequenceAnnotationReport seqARep;
  
-   StringBuffer tooltipText = new StringBuffer("<html>");
+   StringBuffer tooltipText = new StringBuffer();
  
    String tmpString;
  
@@@ -728,11 -727,6 +728,6 @@@
        {
          if (groups[g].getStartRes() <= res && groups[g].getEndRes() >= res)
          {
-           if (tooltipText.length() > 6)
-           {
-             tooltipText.append("<br>");
-           }
- 
            if (!groups[g].getName().startsWith("JTreeGroup")
                    && !groups[g].getName().startsWith("JGroup"))
            {
@@@ -764,12 -758,13 +759,13 @@@
      }
      else
      {
        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();
        }
  
@@@ -1191,7 -1186,7 +1187,7 @@@
          }
          else
          {
 -          editCommand.appendEdit(EditCommand.INSERT_GAP, groupSeqs,
 +          editCommand.appendEdit(Action.INSERT_GAP, groupSeqs,
                    startres, startres - lastres, av.getAlignment(), true);
          }
        }
@@@ -1207,7 -1202,7 +1203,7 @@@
          }
          else
          {
 -          editCommand.appendEdit(EditCommand.DELETE_GAP, groupSeqs,
 +          editCommand.appendEdit(Action.DELETE_GAP, groupSeqs,
                    startres, lastres - startres, av.getAlignment(), true);
          }
  
@@@ -1229,7 -1224,7 +1225,7 @@@
          }
          else
          {
 -          editCommand.appendEdit(EditCommand.INSERT_GAP, new SequenceI[]
 +          editCommand.appendEdit(Action.INSERT_GAP, new SequenceI[]
            { seq }, lastres, startres - lastres, av.getAlignment(), true);
          }
        }
@@@ -1266,7 -1261,7 +1262,7 @@@
  
              if (max > 0)
              {
 -              editCommand.appendEdit(EditCommand.DELETE_GAP,
 +              editCommand.appendEdit(Action.DELETE_GAP,
                        new SequenceI[]
                        { seq }, startres, max, av.getAlignment(), true);
              }
@@@ -1284,7 -1279,7 +1280,7 @@@
            }
            else
            {
 -            editCommand.appendEdit(EditCommand.INSERT_NUC, new SequenceI[]
 +            editCommand.appendEdit(Action.INSERT_NUC, new SequenceI[]
              { seq }, lastres, startres - lastres, av.getAlignment(), true);
            }
          }
@@@ -1320,10 -1315,10 +1316,10 @@@
        }
      }
  
 -    editCommand.appendEdit(EditCommand.DELETE_GAP, seq, blankColumn, 1,
 +    editCommand.appendEdit(Action.DELETE_GAP, seq, blankColumn, 1,
              av.getAlignment(), true);
  
 -    editCommand.appendEdit(EditCommand.INSERT_GAP, seq, j, 1,
 +    editCommand.appendEdit(Action.INSERT_GAP, seq, j, 1,
              av.getAlignment(), true);
  
    }
@@@ -1331,10 -1326,10 +1327,10 @@@
    void deleteChar(int j, SequenceI[] seq, int fixedColumn)
    {
  
 -    editCommand.appendEdit(EditCommand.DELETE_GAP, seq, j, 1,
 +    editCommand.appendEdit(Action.DELETE_GAP, seq, j, 1,
              av.getAlignment(), true);
  
 -    editCommand.appendEdit(EditCommand.INSERT_GAP, seq, fixedColumn, 1,
 +    editCommand.appendEdit(Action.INSERT_GAP, seq, fixedColumn, 1,
              av.getAlignment(), true);
    }