git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2515 Id panel in applet updated for NPE on urlProvider
[jalview.git]
/
src
/
jalview
/
appletgui
/
IdPanel.java
diff --git
a/src/jalview/appletgui/IdPanel.java
b/src/jalview/appletgui/IdPanel.java
index
feca846
..
4cc4a3a
100755
(executable)
--- a/
src/jalview/appletgui/IdPanel.java
+++ b/
src/jalview/appletgui/IdPanel.java
@@
-24,8
+24,9
@@
import jalview.datamodel.Sequence;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceGroup;
import jalview.datamodel.SequenceI;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceGroup;
import jalview.datamodel.SequenceI;
-import jalview.urls.UrlProvider;
-import jalview.urls.UrlProviderI;
+import jalview.urls.api.UrlProviderFactoryI;
+import jalview.urls.api.UrlProviderI;
+import jalview.urls.applet.AppletUrlProviderFactory;
import jalview.viewmodel.AlignmentViewport;
import java.awt.BorderLayout;
import jalview.viewmodel.AlignmentViewport;
import java.awt.BorderLayout;
@@
-34,9
+35,9
@@
import java.awt.event.InputEvent;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
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.HashMap;
import java.util.List;
-import java.util.Vector;
public class IdPanel extends Panel implements MouseListener,
MouseMotionListener
public class IdPanel extends Panel implements MouseListener,
MouseMotionListener
@@
-78,14
+79,20
@@
public class IdPanel extends Panel implements MouseListener,
label = av.applet.getParameter("linkLabel_" + i);
url = av.applet.getParameter("linkURL_" + i);
label = av.applet.getParameter("linkLabel_" + i);
url = av.applet.getParameter("linkURL_" + i);
- urlList.put(label, url);
+ // only add non-null parameters
+ if (label != null)
+ {
+ urlList.put(label, url);
+ }
}
if (!urlList.isEmpty())
{
// set default as first entry in list
String defaultUrl = av.applet.getParameter("linkLabel_1");
}
if (!urlList.isEmpty())
{
// set default as first entry in list
String defaultUrl = av.applet.getParameter("linkLabel_1");
- urlProvider = new UrlProvider(defaultUrl, urlList);
+ UrlProviderFactoryI factory = new AppletUrlProviderFactory(
+ defaultUrl, urlList);
+ urlProvider = factory.createUrlProvider();
}
}
}
}
}
}
@@
-219,8
+226,12
@@
public class IdPanel extends Panel implements MouseListener,
String id = sq.getName();
// get the default url with the sequence details filled in
String id = sq.getName();
// get the default url with the sequence details filled in
- String url = urlProvider.getDefaultUrl(id);
- String target = urlProvider.getDefaultTarget(id);
+ if (urlProvider == null)
+ {
+ return;
+ }
+ String url = urlProvider.getPrimaryUrl(id);
+ String target = urlProvider.getPrimaryTarget(id);
try
{
alignPanel.alignFrame.showURL(url, target);
try
{
alignPanel.alignFrame.showURL(url, target);
@@
-247,13
+258,13
@@
public class IdPanel extends Panel implements MouseListener,
return;
}
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
{
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);
}
{
scrollThread = new ScrollThread(false);
}
@@
-281,8
+292,15
@@
public class IdPanel extends Panel implements MouseListener,
// build a new links menu based on the current links + any non-positional
// features
// build a new links menu based on the current links + any non-positional
// features
- Vector<String> nlinks = urlProvider.getLinksForMenu();
-
+ List<String> nlinks;
+ if (urlProvider != null)
+ {
+ nlinks = urlProvider.getLinksForMenu();
+ }
+ else
+ {
+ nlinks = new ArrayList<String>();
+ }
SequenceFeature sf[] = sq == null ? null : sq.getSequenceFeatures();
for (int sl = 0; sf != null && sl < sf.length; sl++)
{
SequenceFeature sf[] = sq == null ? null : sq.getSequenceFeatures();
for (int sl = 0; sf != null && sl < sf.length; sl++)
{
@@
-292,7
+310,7
@@
public class IdPanel extends Panel implements MouseListener,
{
for (int l = 0, lSize = sf[sl].links.size(); l < lSize; l++)
{
{
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));
}
}
}
}
}
}
@@
-392,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?
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);
}
}
}
}
@@
-425,10
+444,10
@@
public class IdPanel extends Panel implements MouseListener,
if (alignPanel.scrollUp(up))
{
// scroll was ok, so add new sequence to selection
if (alignPanel.scrollUp(up))
{
// scroll was ok, so add new sequence to selection
- int seq = av.getStartSeq();
+ int seq = av.getRanges().getStartSeq();
if (!up)
{
if (!up)
{
- seq = av.getEndSeq();
+ seq = av.getRanges().getEndSeq();
}
if (seq < lastid)
}
if (seq < lastid)