Changeset 155

Timestamp:

08/12/09 07:56:10 (2 years ago)

Author:

jgao

Message:

IDMapperPicrBiomart, IDMapperFile bug fix for tgtDataSources=null

Location:

trunk/corelib/src/org/bridgedb

Files:

• file/IDMapperFile.java (modified) (2 diffs)
• webservice/IDMapperBiomart.java (modified) (1 diff)

trunk/corelib/src/org/bridgedb/file/IDMapperFile.java

@@ -72 +72 @@
     public Map<Xref, Set<Xref>> mapID(final Set<Xref> srcXrefs,
                 final Set<DataSource> tgtDataSources) throws IDMapperException {
-        if (srcXrefs==null || tgtDataSources==null) {
+        if (srcXrefs==null) {
             throw new IllegalArgumentException("srcXrefs or tgtDataSources cannot be null");
         }
@@ -80 +80 @@
         // remove unsupported target datasources
         Set<DataSource> supportedTgtDatasources = cap.getSupportedTgtDataSources();
-        Set<DataSource> tgtDss = new HashSet(tgtDataSources);
-        tgtDss.retainAll(supportedTgtDatasources);
+        Set<DataSource> tgtDss;
+        if (tgtDataSources==null) {
+            tgtDss = new HashSet(cap.getSupportedTgtDataSources());
+        } else {
+            tgtDss = new HashSet(tgtDataSources);
+            tgtDss.retainAll(supportedTgtDatasources);
+        }
+
         if (tgtDss.isEmpty()) {
             return result;

trunk/corelib/src/org/bridgedb/webservice/IDMapperBiomart.java

@@ -255 +255 @@
     public Map<Xref, Set<Xref>> mapID(Set<Xref> srcXrefs,
                 Set<DataSource> tgtDataSources) throws IDMapperException {
-        if (srcXrefs==null || tgtDataSources==null) {
+        if (srcXrefs==null) {
             throw new java.lang.IllegalArgumentException(
                         "srcXrefs or tgtDataSources cannot be null");