git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
762dd65
)
JAL-2515 Id panel in applet updated for NPE on urlProvider
bug/JAL-2515
author
kiramt
<k.mourao@dundee.ac.uk>
Mon, 8 May 2017 08:23:31 +0000
(09:23 +0100)
committer
kiramt
<k.mourao@dundee.ac.uk>
Mon, 8 May 2017 08:23:31 +0000
(09:23 +0100)
src/jalview/appletgui/IdPanel.java
patch
|
blob
|
history
diff --git
a/src/jalview/appletgui/IdPanel.java
b/src/jalview/appletgui/IdPanel.java
index
e47c50a
..
4cc4a3a
100755
(executable)
--- a/
src/jalview/appletgui/IdPanel.java
+++ b/
src/jalview/appletgui/IdPanel.java
@@
-35,6
+35,7
@@
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;
@@
-225,6
+226,10
@@
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
+ if (urlProvider == null)
+ {
+ return;
+ }
String url = urlProvider.getPrimaryUrl(id);
String target = urlProvider.getPrimaryTarget(id);
try
String url = urlProvider.getPrimaryUrl(id);
String target = urlProvider.getPrimaryTarget(id);
try
@@
-287,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
- List<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++)
{