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-3633 Help documentation updated
[jalview.git]
/
src
/
jalview
/
appletgui
/
IdPanel.java
diff --git
a/src/jalview/appletgui/IdPanel.java
b/src/jalview/appletgui/IdPanel.java
index
7d9d278
..
1d37d08
100755
(executable)
--- a/
src/jalview/appletgui/IdPanel.java
+++ b/
src/jalview/appletgui/IdPanel.java
@@
-70,7
+70,7
@@
public class IdPanel extends Panel
// TODO: add in group link parameter
// make a list of label,url pairs
// TODO: add in group link parameter
// make a list of label,url pairs
- HashMap<String, String> urlList = new HashMap<String, String>();
+ HashMap<String, String> urlList = new HashMap<>();
if (viewport.applet != null)
{
for (int i = 1; i < 10; i++)
if (viewport.applet != null)
{
for (int i = 1; i < 10; i++)
@@
-198,7
+198,7
@@
public class IdPanel extends Panel
}
lastid = seq;
}
lastid = seq;
- alignPanel.paintAlignment(false);
+ alignPanel.paintAlignment(false, false);
}
@Override
}
@Override
@@
-279,8
+279,8
@@
public class IdPanel extends Panel
int seq = alignPanel.seqPanel.findSeq(e);
int seq = alignPanel.seqPanel.findSeq(e);
- if ((e.getModifiers()
- & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
+ if ((e.getModifiersEx()
+ & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK)
{
SequenceI sq = av.getAlignment().getSequenceAt(seq);
{
SequenceI sq = av.getAlignment().getSequenceAt(seq);
@@
-295,7
+295,7
@@
public class IdPanel extends Panel
}
else
{
}
else
{
- nlinks = new ArrayList<String>();
+ nlinks = new ArrayList<>();
}
for (SequenceFeature sf : sq.getFeatures().getNonPositionalFeatures())
}
for (SequenceFeature sf : sq.getFeatures().getNonPositionalFeatures())
@@
-333,7
+333,7
@@
public class IdPanel extends Panel
selectSeq(seq);
}
selectSeq(seq);
}
- alignPanel.paintAlignment(false);
+ alignPanel.paintAlignment(false, false);
}
void selectSeq(int seq)
}
void selectSeq(int seq)
@@
-395,7
+395,7
@@
public class IdPanel extends Panel
{
idCanvas.setHighlighted(list);
{
idCanvas.setHighlighted(list);
- if (list == null)
+ if (list == null || list.isEmpty())
{
return;
}
{
return;
}
@@
-459,7
+459,7
@@
public class IdPanel extends Panel
running = false;
}
running = false;
}
- alignPanel.paintAlignment(true);
+ alignPanel.paintAlignment(true, false);
try
{
Thread.sleep(100);
try
{
Thread.sleep(100);