X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FIdPanel.java;h=9bf0128d3ce10a55a5e6055da45b7287e5581bba;hb=a8f483d04205bb8273ee311c12968b7e86d205fa;hp=8a0efc3ddeb0feb8b1f42ae974c16a8ecc09de79;hpb=48b925b3dd950c86b1add0f2a90a2d0f8b6e316e;p=jalview.git diff --git a/src/jalview/appletgui/IdPanel.java b/src/jalview/appletgui/IdPanel.java index 8a0efc3..9bf0128 100755 --- a/src/jalview/appletgui/IdPanel.java +++ b/src/jalview/appletgui/IdPanel.java @@ -1,19 +1,20 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) - * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) + * Copyright (C) 2014 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. - * + * * 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 . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.appletgui; @@ -73,10 +74,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$"); } } @@ -199,7 +211,7 @@ public class IdPanel extends Panel implements MouseListener, // DEFAULT LINK IS FIRST IN THE LINK LIST int seq = alignPanel.seqPanel.findSeq(e); SequenceI sq = av.getAlignment().getSequenceAt(seq); - if (sq==null) + if (sq == null) { return; } @@ -297,7 +309,7 @@ public class IdPanel extends Panel implements MouseListener, 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 Vector nlinks = new Vector(); @@ -305,7 +317,7 @@ public class IdPanel extends Panel implements MouseListener, { nlinks.addElement(links.elementAt(l)); } - SequenceFeature sf[] = sq==null ? null:sq.getSequenceFeatures(); + SequenceFeature sf[] = sq == null ? null : sq.getSequenceFeatures(); for (int sl = 0; sf != null && sl < sf.length; sl++) { if (sf[sl].begin == sf[sl].end && sf[sl].begin == 0) @@ -351,7 +363,7 @@ public class IdPanel extends Panel implements MouseListener, { lastid = seq; SequenceI pickedSeq = av.getAlignment().getSequenceAt(seq); - av.getSelectionGroup().addOrRemove(pickedSeq, false); + av.getSelectionGroup().addOrRemove(pickedSeq, true); } void selectSeqs(int start, int end) @@ -378,7 +390,7 @@ public class IdPanel extends Panel implements MouseListener, for (int i = start; i <= end; i++) { av.getSelectionGroup().addSequence( - av.getAlignment().getSequenceAt(i), i==end); + av.getAlignment().getSequenceAt(i), i == end); } }