git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3878 Create skeleton for alignment service action
[jalview.git]
/
src
/
jalview
/
appletgui
/
SeqPanel.java
diff --git
a/src/jalview/appletgui/SeqPanel.java
b/src/jalview/appletgui/SeqPanel.java
index
32f0abb
..
a1e2340
100644
(file)
--- a/
src/jalview/appletgui/SeqPanel.java
+++ b/
src/jalview/appletgui/SeqPanel.java
@@
-132,8
+132,7
@@
public class SeqPanel extends Panel implements MouseMotionListener,
if (editCommand != null && editCommand.getSize() > 0)
{
ap.alignFrame.addHistoryItem(editCommand);
if (editCommand != null && editCommand.getSize() > 0)
{
ap.alignFrame.addHistoryItem(editCommand);
- av.firePropertyChange("alignment", null,
- av.getAlignment().getSequences());
+ av.notifyAlignment();
}
startseq = -1;
}
startseq = -1;
@@
-500,7
+499,6
@@
public class SeqPanel extends Panel implements MouseMotionListener,
// For now, ignore the mouseWheel font resizing on Macs
// As the Button2_mask always seems to be true
// For now, ignore the mouseWheel font resizing on Macs
// As the Button2_mask always seems to be true
-
if (Platform.isWinMiddleButton(evt))
{
mouseWheelPressed = true;
if (Platform.isWinMiddleButton(evt))
{
mouseWheelPressed = true;
@@
-744,7
+742,7
@@
public class SeqPanel extends Panel implements MouseMotionListener,
}
@Override
}
@Override
- public void highlightSequence(SearchResultsI results)
+ public String highlightSequence(SearchResultsI results)
{
if (av.isFollowHighlight())
{
{
if (av.isFollowHighlight())
{
@@
-761,7
+759,7
@@
public class SeqPanel extends Panel implements MouseMotionListener,
}
setStatusMessage(results);
seqCanvas.highlightSearchResults(results);
}
setStatusMessage(results);
seqCanvas.highlightSearchResults(results);
-
+ return null;
}
@Override
}
@Override
@@
-1432,8
+1430,8
@@
public class SeqPanel extends Panel implements MouseMotionListener,
}
// DETECT RIGHT MOUSE BUTTON IN AWT
}
// DETECT RIGHT MOUSE BUTTON IN AWT
- if ((evt.getModifiers()
- & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
+ if ((evt.getModifiersEx()
+ & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK)
{
List<SequenceFeature> allFeatures = findFeaturesAtColumn(sequence,
sequence.findPosition(column + 1));
{
List<SequenceFeature> allFeatures = findFeaturesAtColumn(sequence,
sequence.findPosition(column + 1));