X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FDBRefUtils.java;h=411a7b9830407aaaf05d94c660669096e4346285;hb=336e0c59bfd53d054da0bb332f858834f57e7bec;hp=0129f6e0e8d91f0e04643407b116999dbabce88a;hpb=2de8acfae59aced665e4c37ad0f7dcc2ed68818e;p=jalview.git diff --git a/src/jalview/util/DBRefUtils.java b/src/jalview/util/DBRefUtils.java index 0129f6e..411a7b9 100755 --- a/src/jalview/util/DBRefUtils.java +++ b/src/jalview/util/DBRefUtils.java @@ -362,6 +362,8 @@ public class DBRefUtils { public boolean matches(DBRefEntry refa, DBRefEntry refb) { +// System.err.println("Comparing A: "+refa.getSrcAccString()+(refa.hasMap()?" has map.":".")); +// System.err.println("Comparing B: "+refb.getSrcAccString()+(refb.hasMap()?" has map.":".")); if (refa.getSource() != null && refb.getSource() != null && refb.getSource().equals(refa.getSource())) { @@ -380,9 +382,9 @@ public class DBRefUtils && (refb.getMap().getMap() == null && refa.getMap() .getMap() == null) || (refb.getMap().getMap() != null - && refa.getMap().getMap() != null && refb - .getMap().getMap().equals(refa.getMap().getMap()))) - { + && refa.getMap().getMap() != null && + (refb + .getMap().getMap().equals(refa.getMap().getMap())))) { // getMap().getMap().containsEither(false,refa.getMap().getMap()) return true; } }