- if (refa.getSource()!=null && refb.getSource()!=null
- && refb.getSource().equals(refa.getSource()))
- {
- // We dont care about version
- //if ((refa.getVersion()==null || refb.getVersion()==null)
- // || refb.getVersion().equals(refa.getVersion()))
- //{
- if (refa.getAccessionId()!=null && refb.getAccessionId()!=null
- || refb.getAccessionId().equals(refa.getAccessionId()))
- {
- if (refa.getMap()==null && refb.getMap()==null)
- {
- return true;
- }
- if (refa.getMap()!=null && refb.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()))))
- {
- return true;
- }
- }
- }
- return false;
+ return true;
+ }
+ if (refa.getMap() != null
+ && refb.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()))))
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+ };
+
+ /**
+ * accession ID and DB must be identical. Version is ignored. No map on either
+ * or map but no maplist on either or maplist of map on a is equivalent to the
+ * maplist of map on b.
+ */
+ public static DbRefComp matchDbAndIdAndEitherMapOrEquivalentMapList = new DbRefComp()
+ {
+ 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()))
+ {
+ // We dont care about version
+ // if ((refa.getVersion()==null || refb.getVersion()==null)
+ // || refb.getVersion().equals(refa.getVersion()))
+ // {
+ if (refa.getAccessionId() != null && refb.getAccessionId() != null
+ && refb.getAccessionId().equals(refa.getAccessionId()))
+ {
+ if (refa.getMap() == null || refb.getMap() == null)
+ {
+ return true;
+ }
+ if ((refa.getMap() != null && refb.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()))))
+ { // getMap().getMap().containsEither(false,refa.getMap().getMap())
+ return true;