From: Jim Procter Date: Thu, 12 Jun 2014 10:41:20 +0000 (+0100) Subject: Merge branch 'hotfix/JAL-1524' into Release_2_8_2_Branch X-Git-Tag: Release_2_8_2b1^2~63 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8d0d8f010041eb2089bfe0bf7e5ad481ceae56d5;p=jalview.git Merge branch 'hotfix/JAL-1524' into Release_2_8_2_Branch --- 8d0d8f010041eb2089bfe0bf7e5ad481ceae56d5 diff --cc src/jalview/gui/PopupMenu.java index 83544d7,e2b6536..3cf4fe0 --- a/src/jalview/gui/PopupMenu.java +++ b/src/jalview/gui/PopupMenu.java @@@ -519,9 -478,9 +519,9 @@@ public class PopupMenu extends JPopupMe { Vector pes = (Vector) sq.getDatasetSequence() .getPDBId(); - if (pes != null) + if (pes != null && pes.size()>0) { - reppdb.put(pes.get(0).getId(),pes.get(0)); + reppdb.put(pes.get(0).getId(), pes.get(0)); for (PDBEntry pe : pes) { pdbe.put(pe.getId(), pe);