X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSeqPanel.java;h=7c6a202577e1ca023a321f00c6a5d40b1994f3f5;hb=b5d61763044c1d72f06ce0e50da2171422a3774b;hp=a13d5f6d694436ca7511c3a5b81dc6c52508ca5a;hpb=72b3f05a1157da32ada5aea139139996dddea219;p=jalview.git diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java index a13d5f6..7c6a202 100644 --- a/src/jalview/gui/SeqPanel.java +++ b/src/jalview/gui/SeqPanel.java @@ -20,21 +20,39 @@ */ package jalview.gui; -import java.util.*; -import java.util.List; - -import java.awt.*; -import java.awt.event.*; - -import javax.swing.*; - -import jalview.commands.*; -import jalview.datamodel.*; +import jalview.commands.EditCommand; +import jalview.commands.EditCommand.Action; +import jalview.datamodel.ColumnSelection; +import jalview.datamodel.SearchResults; +import jalview.datamodel.Sequence; +import jalview.datamodel.SequenceFeature; +import jalview.datamodel.SequenceGroup; +import jalview.datamodel.SequenceI; import jalview.io.SequenceAnnotationReport; -import jalview.schemes.*; -import jalview.structure.*; +import jalview.schemes.ResidueProperties; +import jalview.structure.SelectionListener; +import jalview.structure.SelectionSource; +import jalview.structure.SequenceListener; +import jalview.structure.StructureSelectionManager; import jalview.util.MessageManager; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Font; +import java.awt.FontMetrics; +import java.awt.Point; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.awt.event.MouseMotionListener; +import java.awt.event.MouseWheelEvent; +import java.awt.event.MouseWheelListener; +import java.util.List; +import java.util.Vector; + +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.ToolTipManager; + /** * DOCUMENT ME! * @@ -95,7 +113,7 @@ public class SeqPanel extends JPanel implements MouseListener, private final SequenceAnnotationReport seqARep; - StringBuffer tooltipText = new StringBuffer(""); + StringBuffer tooltipText = new StringBuffer(); String tmpString; @@ -659,7 +677,9 @@ public class SeqPanel extends JPanel implements MouseListener, pos = setStatusMessage(sequence, res, seq); if (ssm != null && pos > -1) + { mouseOverSequence(sequence, res, pos); + } tooltipText.setLength(6); // Cuts the buffer back to @@ -670,11 +690,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")) { @@ -697,7 +712,7 @@ public class SeqPanel extends JPanel implements MouseListener, sequence.getDatasetSequence(), rpos = sequence.findPosition(res)); seqARep.appendFeatures(tooltipText, rpos, features, - this.ap.seqPanel.seqCanvas.fr.getMinMax()); + this.ap.getSeqPanel().seqCanvas.fr.getMinMax()); } if (tooltipText.length() == 6) // { @@ -706,11 +721,13 @@ public class SeqPanel extends JPanel implements MouseListener, } else { - tooltipText.append(""); if (lastTooltip == null || !lastTooltip.equals(tooltipText.toString())) { - setToolTipText(tooltipText.toString()); + String formatedTooltipText = JvSwingUtils.wrapTooltip(true, + tooltipText.toString()); + // String formatedTooltipText = tooltipText.toString(); + setToolTipText(formatedTooltipText); lastTooltip = tooltipText.toString(); } @@ -913,7 +930,7 @@ public class SeqPanel extends JPanel implements MouseListener, message.append("Edit group:"); if (editCommand == null) { - editCommand = new EditCommand("Edit Group"); + editCommand = new EditCommand(MessageManager.getString("action.edit_group")); } } else @@ -926,7 +943,7 @@ public class SeqPanel extends JPanel implements MouseListener, } if (editCommand == null) { - editCommand = new EditCommand("Edit " + label); + editCommand = new EditCommand(MessageManager.formatMessage("label.edit_params", new String[]{label})); } } @@ -1132,7 +1149,7 @@ public class SeqPanel extends JPanel implements MouseListener, } else { - editCommand.appendEdit(EditCommand.INSERT_GAP, groupSeqs, + editCommand.appendEdit(Action.INSERT_GAP, groupSeqs, startres, startres - lastres, av.getAlignment(), true); } } @@ -1148,7 +1165,7 @@ public class SeqPanel extends JPanel implements MouseListener, } else { - editCommand.appendEdit(EditCommand.DELETE_GAP, groupSeqs, + editCommand.appendEdit(Action.DELETE_GAP, groupSeqs, startres, lastres - startres, av.getAlignment(), true); } @@ -1170,7 +1187,7 @@ public class SeqPanel extends JPanel implements MouseListener, } else { - editCommand.appendEdit(EditCommand.INSERT_GAP, new SequenceI[] + editCommand.appendEdit(Action.INSERT_GAP, new SequenceI[] { seq }, lastres, startres - lastres, av.getAlignment(), true); } } @@ -1207,7 +1224,7 @@ public class SeqPanel extends JPanel implements MouseListener, if (max > 0) { - editCommand.appendEdit(EditCommand.DELETE_GAP, + editCommand.appendEdit(Action.DELETE_GAP, new SequenceI[] { seq }, startres, max, av.getAlignment(), true); } @@ -1225,7 +1242,7 @@ public class SeqPanel extends JPanel implements MouseListener, } else { - editCommand.appendEdit(EditCommand.INSERT_NUC, new SequenceI[] + editCommand.appendEdit(Action.INSERT_NUC, new SequenceI[] { seq }, lastres, startres - lastres, av.getAlignment(), true); } } @@ -1261,10 +1278,10 @@ public class SeqPanel extends JPanel implements MouseListener, } } - 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); } @@ -1272,10 +1289,10 @@ public class SeqPanel extends JPanel implements MouseListener, 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); }