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-2089 patch broken merge to master for Release 2.10.0b1
[jalview.git]
/
src
/
jalview
/
appletgui
/
IdPanel.java
diff --git
a/src/jalview/appletgui/IdPanel.java
b/src/jalview/appletgui/IdPanel.java
index
258b8b6
..
ed96b55
100755
(executable)
--- a/
src/jalview/appletgui/IdPanel.java
+++ b/
src/jalview/appletgui/IdPanel.java
@@
-20,6
+20,13
@@
*/
package jalview.appletgui;
*/
package jalview.appletgui;
+import jalview.datamodel.Sequence;
+import jalview.datamodel.SequenceFeature;
+import jalview.datamodel.SequenceGroup;
+import jalview.datamodel.SequenceI;
+import jalview.util.UrlLink;
+import jalview.viewmodel.AlignmentViewport;
+
import java.awt.BorderLayout;
import java.awt.Panel;
import java.awt.event.InputEvent;
import java.awt.BorderLayout;
import java.awt.Panel;
import java.awt.event.InputEvent;
@@
-29,13
+36,6
@@
import java.awt.event.MouseMotionListener;
import java.util.List;
import java.util.Vector;
import java.util.List;
import java.util.Vector;
-import jalview.datamodel.Sequence;
-import jalview.datamodel.SequenceFeature;
-import jalview.datamodel.SequenceGroup;
-import jalview.datamodel.SequenceI;
-import jalview.util.UrlLink;
-import jalview.viewmodel.AlignmentViewport;
-
public class IdPanel extends Panel implements MouseListener,
MouseMotionListener
{
public class IdPanel extends Panel implements MouseListener,
MouseMotionListener
{
@@
-100,6
+100,7
@@
public class IdPanel extends Panel implements MouseListener,
Tooltip tooltip;
Tooltip tooltip;
+ @Override
public void mouseMoved(MouseEvent e)
{
int seq = alignPanel.seqPanel.findSeq(e);
public void mouseMoved(MouseEvent e)
{
int seq = alignPanel.seqPanel.findSeq(e);
@@
-142,7
+143,7
@@
public class IdPanel extends Panel implements MouseListener,
nl = true;
}
;
nl = true;
}
;
- if (sf[sl].getScore() != Float.NaN && sf[sl].getScore() != 0f)
+ if (!Float.isNaN(sf[sl].getScore()) && sf[sl].getScore() != 0f)
{
tooltiptext.append(" Score = ");
tooltiptext.append(sf[sl].getScore());
{
tooltiptext.append(" Score = ");
tooltiptext.append(sf[sl].getScore());
@@
-188,6
+189,7
@@
public class IdPanel extends Panel implements MouseListener,
tooltiptext = null;
}
tooltiptext = null;
}
+ @Override
public void mouseDragged(MouseEvent e)
{
mouseDragging = true;
public void mouseDragged(MouseEvent e)
{
mouseDragging = true;
@@
-207,6
+209,7
@@
public class IdPanel extends Panel implements MouseListener,
alignPanel.paintAlignment(false);
}
alignPanel.paintAlignment(false);
}
+ @Override
public void mouseClicked(MouseEvent e)
{
if (e.getClickCount() < 2)
public void mouseClicked(MouseEvent e)
{
if (e.getClickCount() < 2)
@@
-270,6
+273,7
@@
public class IdPanel extends Panel implements MouseListener,
}
}
}
}
+ @Override
public void mouseEntered(MouseEvent e)
{
if (scrollThread != null)
public void mouseEntered(MouseEvent e)
{
if (scrollThread != null)
@@
-278,6
+282,7
@@
public class IdPanel extends Panel implements MouseListener,
}
}
}
}
+ @Override
public void mouseExited(MouseEvent e)
{
if (av.getWrapAlignment())
public void mouseExited(MouseEvent e)
{
if (av.getWrapAlignment())
@@
-297,6
+302,7
@@
public class IdPanel extends Panel implements MouseListener,
}
}
}
}
+ @Override
public void mousePressed(MouseEvent e)
{
if (e.getClickCount() > 1)
public void mousePressed(MouseEvent e)
{
if (e.getClickCount() > 1)
@@
-345,8
+351,8
@@
public class IdPanel extends Panel implements MouseListener,
}
if ((av.getSelectionGroup() == null)
}
if ((av.getSelectionGroup() == null)
- || ((!e.isControlDown() && !e.isShiftDown()) && av
- .getSelectionGroup() != null))
+ || ((!jalview.util.Platform.isControlDown(e) && !e
+ .isShiftDown()) && av.getSelectionGroup() != null))
{
av.setSelectionGroup(new SequenceGroup());
av.getSelectionGroup().setStartRes(0);
{
av.setSelectionGroup(new SequenceGroup());
av.getSelectionGroup().setStartRes(0);
@@
-401,6
+407,7
@@
public class IdPanel extends Panel implements MouseListener,
}
}
+ @Override
public void mouseReleased(MouseEvent e)
{
if (scrollThread != null)
public void mouseReleased(MouseEvent e)
{
if (scrollThread != null)
@@
-455,6
+462,7
@@
public class IdPanel extends Panel implements MouseListener,
running = false;
}
running = false;
}
+ @Override
public void run()
{
running = true;
public void run()
{
running = true;