X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FIdPanel.java;h=f8ea522eb225e3465b406875c6c3c322ab85d6ee;hb=d3cabbfdd38d554bb8a8b17d3e2c4b113c102545;hp=a3955c0970c0d16d4f0c7fd9b2f4d0333d036a3c;hpb=f60bd625292b277e70cda0125f04756ac7ca05de;p=jalview.git
diff --git a/src/jalview/appletgui/IdPanel.java b/src/jalview/appletgui/IdPanel.java
index a3955c0..f8ea522 100755
--- a/src/jalview/appletgui/IdPanel.java
+++ b/src/jalview/appletgui/IdPanel.java
@@ -1,50 +1,60 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, 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 jalview.datamodel.Sequence;
+import jalview.datamodel.SequenceFeature;
+import jalview.datamodel.SequenceGroup;
+import jalview.datamodel.SequenceI;
+import jalview.util.UrlProvider;
+import jalview.util.UrlProviderI;
+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.HashMap;
+import java.util.List;
import java.util.Vector;
-import jalview.datamodel.*;
-import jalview.util.UrlLink;
-
public class IdPanel extends Panel implements MouseListener,
MouseMotionListener
{
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;
- java.util.Vector links = new java.util.Vector();
+ UrlProviderI urlProvider = null;
public IdPanel(AlignViewport av, AlignmentPanel parent)
{
@@ -58,6 +68,9 @@ public class IdPanel extends Panel implements MouseListener,
String label, url;
// TODO: add in group link parameter
+
+ // make a list of label,url pairs
+ HashMap urlList = new HashMap();
if (av.applet != null)
{
for (int i = 1; i < 10; i++)
@@ -65,22 +78,21 @@ public class IdPanel extends Panel implements MouseListener,
label = av.applet.getParameter("linkLabel_" + i);
url = av.applet.getParameter("linkURL_" + i);
- if (label != null && url != null)
- {
- links.addElement(label + "|" + url);
- }
+ urlList.put(label, url);
+ }
+ if (!urlList.isEmpty())
+ {
+ // set default as first entry in list
+ String defaultUrl = av.applet.getParameter("linkLabel_1");
+ urlProvider = new UrlProvider(defaultUrl, urlList);
}
}
- 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");
- }
}
Tooltip tooltip;
+ @Override
public void mouseMoved(MouseEvent e)
{
int seq = alignPanel.seqPanel.findSeq(e);
@@ -123,7 +135,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());
@@ -169,6 +181,7 @@ public class IdPanel extends Panel implements MouseListener,
tooltiptext = null;
}
+ @Override
public void mouseDragged(MouseEvent e)
{
mouseDragging = true;
@@ -188,6 +201,7 @@ public class IdPanel extends Panel implements MouseListener,
alignPanel.paintAlignment(false);
}
+ @Override
public void mouseClicked(MouseEvent e)
{
if (e.getClickCount() < 2)
@@ -198,52 +212,60 @@ 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;
}
String id = sq.getName();
+ String url = urlProvider.getDefaultUrl(id);
+ String target = urlProvider.getDefaultTarget(id);
- String target = null;
- String url = null;
- int i = 0;
- while (url == null && i < links.size())
- {
- // DEFAULT LINK IS FIRST IN THE LINK LIST
- // BUT IF ITS A REGEX AND DOES NOT MATCH THE NEXT ONE WILL BE TRIED
- url = links.elementAt(i++).toString();
- jalview.util.UrlLink urlLink = null;
- try
- {
- urlLink = new UrlLink(url);
- target = urlLink.getTarget();
- } catch (Exception foo)
- {
- System.err.println("Exception for URLLink '" + url + "'");
- foo.printStackTrace();
- url = null;
- continue;
- }
- ;
- if (!urlLink.isValid())
- {
- System.err.println(urlLink.getInvalidMessage());
- url = null;
- continue;
- }
+ /* String target = null;
+ String url = null;
+ int i = 0;
+ while (url == null && i < links.size())
+ {
+ // DEFAULT LINK IS FIRST IN THE LINK LIST
+ // BUT IF ITS A REGEX AND DOES NOT MATCH THE NEXT ONE WILL BE TRIED
+ url = links.elementAt(i++).toString();
+ jalview.util.UrlLink urlLink = null;
+ try
+ {
+ urlLink = new UrlLink(url);
+ target = urlLink.getTarget();
+ } catch (Exception foo)
+ {
+ System.err.println("Exception for URLLink '" + url + "'");
+ foo.printStackTrace();
+ url = null;
+ continue;
+ }
- String urls[] = urlLink.makeUrls(id, true);
- if (urls == null || urls[0] == null || urls[0].length() < 1)
- {
- url = null;
- continue;
- }
- // just take first URL made from regex
- url = urls[1];
- }
+ if (urlLink.usesDBAccession())
+ {
+ // this URL requires an accession id, not the name of a sequence
+ url = null;
+ continue;
+ }
+
+ if (!urlLink.isValid())
+ {
+ System.err.println(urlLink.getInvalidMessage());
+ url = null;
+ continue;
+ }
+
+ String urls[] = urlLink.makeUrls(id, true);
+ if (urls == null || urls[0] == null || urls[0].length() < 1)
+ {
+ url = null;
+ continue;
+ }
+ // just take first URL made from regex
+ url = urls[1];
+ }*/
try
{
-
alignPanel.alignFrame.showURL(url, target);
} catch (Exception ex)
{
@@ -251,6 +273,7 @@ public class IdPanel extends Panel implements MouseListener,
}
}
+ @Override
public void mouseEntered(MouseEvent e)
{
if (scrollThread != null)
@@ -259,6 +282,7 @@ public class IdPanel extends Panel implements MouseListener,
}
}
+ @Override
public void mouseExited(MouseEvent e)
{
if (av.getWrapAlignment())
@@ -272,12 +296,13 @@ public class IdPanel extends Panel implements MouseListener,
}
if (mouseDragging && e.getY() >= getSize().height
- && av.alignment.getHeight() > av.getEndSeq())
+ && av.getAlignment().getHeight() > av.getEndSeq())
{
scrollThread = new ScrollThread(false);
}
}
+ @Override
public void mousePressed(MouseEvent e)
{
if (e.getClickCount() > 1)
@@ -288,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);
@@ -296,15 +321,12 @@ 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();
- for (int l = 0, lSize = links.size(); l < lSize; l++)
- {
- nlinks.addElement(links.elementAt(l));
- }
- SequenceFeature sf[] = sq==null ? null:sq.getSequenceFeatures();
+ Vector nlinks = urlProvider.getLinksForDisplay();
+
+ 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)
@@ -326,12 +348,12 @@ 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);
- av.getSelectionGroup().setEndRes(av.alignment.getWidth() - 1);
+ av.getSelectionGroup().setEndRes(av.getAlignment().getWidth() - 1);
}
if (e.isShiftDown() && lastid != -1)
@@ -350,7 +372,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)
@@ -377,11 +399,12 @@ public class IdPanel extends Panel implements MouseListener,
for (int i = start; i <= end; i++)
{
av.getSelectionGroup().addSequence(
- av.getAlignment().getSequenceAt(i), false);
+ av.getAlignment().getSequenceAt(i), i == end);
}
}
+ @Override
public void mouseReleased(MouseEvent e)
{
if (scrollThread != null)
@@ -400,16 +423,16 @@ public class IdPanel extends Panel implements MouseListener,
av.sendSelection();
}
- public void highlightSearchResults(java.util.Vector found)
+ public void highlightSearchResults(List 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)
@@ -436,6 +459,7 @@ public class IdPanel extends Panel implements MouseListener,
running = false;
}
+ @Override
public void run()
{
running = true;
@@ -454,7 +478,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);
}
@@ -476,5 +500,4 @@ public class IdPanel extends Panel implements MouseListener,
}
}
}
-
}