X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FIdPanel.java;h=2cb30602540526be62ffbed2975363d0c974dfa2;hb=f0d4ca951f4f0f5f88a0e4addcd57c77b8e69db5;hp=3adaa14af2a3813d0985392832ba8b12fe4f550e;hpb=59d682209891099d46b960509907c79e3fb276fe;p=jalview.git
diff --git a/src/jalview/appletgui/IdPanel.java b/src/jalview/appletgui/IdPanel.java
index 3adaa14..2cb3060 100755
--- a/src/jalview/appletgui/IdPanel.java
+++ b/src/jalview/appletgui/IdPanel.java
@@ -1,29 +1,43 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.appletgui;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.List;
-import java.util.Vector;
+import static jalview.util.UrlConstants.EMBLEBI_STRING;
+import static jalview.util.UrlConstants.SRS_STRING;
-import jalview.datamodel.*;
+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.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.util.List;
+import java.util.Vector;
public class IdPanel extends Panel implements MouseListener,
MouseMotionListener
@@ -31,16 +45,12 @@ public class IdPanel extends Panel implements MouseListener,
protected IdCanvas idCanvas;
- protected AlignViewport av;
+ protected AlignmentViewport av;
protected AlignmentPanel alignPanel;
ScrollThread scrollThread = null;
- int offy;
-
- int width;
-
int lastid = -1;
boolean mouseDragging = false;
@@ -73,15 +83,24 @@ public class IdPanel extends Panel implements MouseListener,
}
}
+ {
+ // upgrade old SRS link
+ int srsPos = links.indexOf(SRS_STRING);
+ if (srsPos > -1)
+ {
+ links.setElementAt(EMBLEBI_STRING, srsPos);
+ }
+ }
if (links.size() < 1)
{
links = new java.util.Vector();
- links.addElement("SRS|http://srs.ebi.ac.uk/srsbin/cgi-bin/wgetz?-newId+(([uniprot-all:$SEQUENCE_ID$]))+-view+SwissEntry");
+ links.addElement(EMBLEBI_STRING);
}
}
Tooltip tooltip;
+ @Override
public void mouseMoved(MouseEvent e)
{
int seq = alignPanel.seqPanel.findSeq(e);
@@ -124,7 +143,7 @@ public class IdPanel extends Panel implements MouseListener,
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());
@@ -170,6 +189,7 @@ public class IdPanel extends Panel implements MouseListener,
tooltiptext = null;
}
+ @Override
public void mouseDragged(MouseEvent e)
{
mouseDragging = true;
@@ -189,6 +209,7 @@ public class IdPanel extends Panel implements MouseListener,
alignPanel.paintAlignment(false);
}
+ @Override
public void mouseClicked(MouseEvent e)
{
if (e.getClickCount() < 2)
@@ -252,6 +273,7 @@ public class IdPanel extends Panel implements MouseListener,
}
}
+ @Override
public void mouseEntered(MouseEvent e)
{
if (scrollThread != null)
@@ -260,6 +282,7 @@ public class IdPanel extends Panel implements MouseListener,
}
}
+ @Override
public void mouseExited(MouseEvent e)
{
if (av.getWrapAlignment())
@@ -279,6 +302,7 @@ public class IdPanel extends Panel implements MouseListener,
}
}
+ @Override
public void mousePressed(MouseEvent e)
{
if (e.getClickCount() > 1)
@@ -289,7 +313,7 @@ public class IdPanel extends Panel implements MouseListener,
int y = e.getY();
if (av.getWrapAlignment())
{
- y -= 2 * av.charHeight;
+ y -= 2 * av.getCharHeight();
}
int seq = alignPanel.seqPanel.findSeq(e);
@@ -327,8 +351,8 @@ public class IdPanel extends Panel implements MouseListener,
}
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);
@@ -383,6 +407,7 @@ public class IdPanel extends Panel implements MouseListener,
}
+ @Override
public void mouseReleased(MouseEvent e)
{
if (scrollThread != null)
@@ -437,6 +462,7 @@ public class IdPanel extends Panel implements MouseListener,
running = false;
}
+ @Override
public void run()
{
running = true;
@@ -477,5 +503,4 @@ public class IdPanel extends Panel implements MouseListener,
}
}
}
-
}