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 (parent:
02fe165
)
debug comments
author
jprocter
<Jim Procter>
Fri, 19 Jun 2009 09:41:04 +0000
(09:41 +0000)
committer
jprocter
<Jim Procter>
Fri, 19 Jun 2009 09:41:04 +0000
(09:41 +0000)
src/jalview/util/DBRefUtils.java
patch
|
blob
|
history
diff --git
a/src/jalview/util/DBRefUtils.java
b/src/jalview/util/DBRefUtils.java
index
0129f6e
..
411a7b9
100755
(executable)
--- 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)
{
{
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()))
{
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
&& (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;
}
}
return true;
}
}