X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FIdPanel.java;h=258b8b6b3891f7126f100afd388519b44e9a5aa1;hb=2503f4dfa319a2854d2cc8f7e07e7b979df6bff6;hp=d64c9cc591a0d4f512d2da659ebb4dcf1d3697e9;hpb=e6172518e085efc5703a2e0ce6675fe5f81ea253;p=jalview.git
diff --git a/src/jalview/appletgui/IdPanel.java b/src/jalview/appletgui/IdPanel.java
index d64c9cc..258b8b6 100755
--- a/src/jalview/appletgui/IdPanel.java
+++ b/src/jalview/appletgui/IdPanel.java
@@ -1,29 +1,40 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)
- * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
- * This program 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 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
*
- * This program 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.
+ * 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.
+ *
+ * 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * 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.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;
-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;
public class IdPanel extends Panel implements MouseListener,
MouseMotionListener
@@ -31,16 +42,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,11 +80,21 @@ public class IdPanel extends Panel implements MouseListener,
}
}
+ {
+ // upgrade old SRS link
+ int srsPos = links
+ .indexOf("SRS|http://srs.ebi.ac.uk/srsbin/cgi-bin/wgetz?-newId+(([uniprot-all:$SEQUENCE_ID$]))+-view+SwissEntry");
+ if (srsPos > -1)
+ {
+ links.setElementAt(
+ "EMBL-EBI Search|http://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$SEQUENCE_ID$",
+ 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("EMBL-EBI Search|http://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$SEQUENCE_ID$");
}
}
@@ -88,33 +105,66 @@ public class IdPanel extends Panel implements MouseListener,
int seq = alignPanel.seqPanel.findSeq(e);
SequenceI sequence = av.getAlignment().getSequenceAt(seq);
-
+
// look for non-pos features
StringBuffer tooltiptext = new StringBuffer();
-
-
- if (sequence.getDescription() != null)
+ if (sequence != null)
{
- tooltiptext.append(sequence.getDescription());
- tooltiptext.append("\n");
- }
-
- SequenceFeature sf[] = sequence.getSequenceFeatures();
- for (int sl=0;sf!=null && sl= getSize().height
- && av.alignment.getHeight() > av.getEndSeq())
+ && av.getAlignment().getHeight() > av.getEndSeq())
{
scrollThread = new ScrollThread(false);
}
@@ -252,36 +307,37 @@ 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);
if ((e.getModifiers() & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
{
- Sequence sq = (Sequence) av
- .getAlignment().getSequenceAt(seq);
- // build a new links menu based on the current links + any non-positional features
+ Sequence sq = (Sequence) av.getAlignment().getSequenceAt(seq);
+
+ // build a new links menu based on the current links + any non-positional
+ // features
Vector nlinks = new Vector();
- for (int l=0,lSize=links.size();l0)
+ if (sf[sl].links != null && sf[sl].links.size() > 0)
{
- for (int l=0, lSize=sf[sl].links.size(); l list)
{
- idCanvas.setHighlighted(found);
+ idCanvas.setHighlighted(list);
- if (found == null)
+ if (list == null)
{
return;
}
- int index = av.alignment.findIndex((SequenceI) found.elementAt(0));
+ int index = av.getAlignment().findIndex(list.get(0));
// do we need to scroll the panel?
if (av.getStartSeq() > index || av.getEndSeq() < index)
@@ -412,7 +473,7 @@ public class IdPanel extends Panel implements MouseListener,
{
selectSeqs(lastid - 1, seq);
}
- else if (seq > lastid && seq < av.alignment.getHeight())
+ else if (seq > lastid && seq < av.getAlignment().getHeight())
{
selectSeqs(lastid + 1, seq);
}
@@ -434,5 +495,4 @@ public class IdPanel extends Panel implements MouseListener,
}
}
}
-
}