X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FIdPanel.java;h=4cc4a3a5d5e1fa4961532d1a75fb8cb4e47aee4f;hb=5078a67d8357697791d2e71f9df95a46e762aa2e;hp=2cb30602540526be62ffbed2975363d0c974dfa2;hpb=258cf48b8759cd20d44a1c8d170f950e84ccd23f;p=jalview.git diff --git a/src/jalview/appletgui/IdPanel.java b/src/jalview/appletgui/IdPanel.java index 2cb3060..4cc4a3a 100755 --- a/src/jalview/appletgui/IdPanel.java +++ b/src/jalview/appletgui/IdPanel.java @@ -20,14 +20,13 @@ */ package jalview.appletgui; -import static jalview.util.UrlConstants.EMBLEBI_STRING; -import static jalview.util.UrlConstants.SRS_STRING; - import jalview.datamodel.Sequence; import jalview.datamodel.SequenceFeature; import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; -import jalview.util.UrlLink; +import jalview.urls.api.UrlProviderFactoryI; +import jalview.urls.api.UrlProviderI; +import jalview.urls.applet.AppletUrlProviderFactory; import jalview.viewmodel.AlignmentViewport; import java.awt.BorderLayout; @@ -36,8 +35,9 @@ import java.awt.event.InputEvent; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.util.Vector; public class IdPanel extends Panel implements MouseListener, MouseMotionListener @@ -55,7 +55,7 @@ public class IdPanel extends Panel implements MouseListener, boolean mouseDragging = false; - java.util.Vector links = new java.util.Vector(); + UrlProviderI urlProvider = null; public IdPanel(AlignViewport av, AlignmentPanel parent) { @@ -69,6 +69,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++) @@ -76,26 +79,22 @@ public class IdPanel extends Panel implements MouseListener, label = av.applet.getParameter("linkLabel_" + i); url = av.applet.getParameter("linkURL_" + i); - if (label != null && url != null) + // only add non-null parameters + if (label != null) { - links.addElement(label + "|" + url); + urlList.put(label, url); } - } - } - { - // upgrade old SRS link - int srsPos = links.indexOf(SRS_STRING); - if (srsPos > -1) + + if (!urlList.isEmpty()) { - links.setElementAt(EMBLEBI_STRING, srsPos); + // set default as first entry in list + String defaultUrl = av.applet.getParameter("linkLabel_1"); + UrlProviderFactoryI factory = new AppletUrlProviderFactory( + defaultUrl, urlList); + urlProvider = factory.createUrlProvider(); } } - if (links.size() < 1) - { - links = new java.util.Vector(); - links.addElement(EMBLEBI_STRING); - } } Tooltip tooltip; @@ -217,7 +216,7 @@ public class IdPanel extends Panel implements MouseListener, return; } - // DEFAULT LINK IS FIRST IN THE LINK LIST + // get the sequence details int seq = alignPanel.seqPanel.findSeq(e); SequenceI sq = av.getAlignment().getSequenceAt(seq); if (sq == null) @@ -226,46 +225,15 @@ public class IdPanel extends Panel implements MouseListener, } String id = sq.getName(); - String target = null; - String url = null; - int i = 0; - while (url == null && i < links.size()) + // get the default url with the sequence details filled in + if (urlProvider == null) { - // 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 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]; + return; } + String url = urlProvider.getPrimaryUrl(id); + String target = urlProvider.getPrimaryTarget(id); try { - alignPanel.alignFrame.showURL(url, target); } catch (Exception ex) { @@ -290,13 +258,13 @@ public class IdPanel extends Panel implements MouseListener, return; } - if (mouseDragging && e.getY() < 0 && av.getStartSeq() > 0) + if (mouseDragging && e.getY() < 0 && av.getRanges().getStartSeq() > 0) { scrollThread = new ScrollThread(true); } if (mouseDragging && e.getY() >= getSize().height - && av.getAlignment().getHeight() > av.getEndSeq()) + && av.getAlignment().getHeight() > av.getRanges().getEndSeq()) { scrollThread = new ScrollThread(false); } @@ -324,10 +292,14 @@ public class IdPanel extends Panel implements MouseListener, // 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++) + List nlinks; + if (urlProvider != null) + { + nlinks = urlProvider.getLinksForMenu(); + } + else { - nlinks.addElement(links.elementAt(l)); + nlinks = new ArrayList(); } SequenceFeature sf[] = sq == null ? null : sq.getSequenceFeatures(); for (int sl = 0; sf != null && sl < sf.length; sl++) @@ -338,7 +310,7 @@ public class IdPanel extends Panel implements MouseListener, { for (int l = 0, lSize = sf[sl].links.size(); l < lSize; l++) { - nlinks.addElement(sf[sl].links.elementAt(l)); + nlinks.add(sf[sl].links.elementAt(l)); } } } @@ -438,9 +410,10 @@ public class IdPanel extends Panel implements MouseListener, int index = av.getAlignment().findIndex(list.get(0)); // do we need to scroll the panel? - if (av.getStartSeq() > index || av.getEndSeq() < index) + if (av.getRanges().getStartSeq() > index + || av.getRanges().getEndSeq() < index) { - alignPanel.setScrollValues(av.getStartRes(), index); + alignPanel.setScrollValues(av.getRanges().getStartRes(), index); } } @@ -471,10 +444,10 @@ public class IdPanel extends Panel implements MouseListener, if (alignPanel.scrollUp(up)) { // scroll was ok, so add new sequence to selection - int seq = av.getStartSeq(); + int seq = av.getRanges().getStartSeq(); if (!up) { - seq = av.getEndSeq(); + seq = av.getRanges().getEndSeq(); } if (seq < lastid)