Changeset 506 for trunk

Timestamp:

03/09/11 12:04:34 (15 months ago)

Author:

martijn

Message:

Backwards compatbility fix for changes to GdbProvider?

Location:

trunk

Files:

• org.bridgedb.rdb/src/org/bridgedb/rdb/GdbProvider.java (modified) (2 diffs)
• org.bridgedb.server/src/org/bridgedb/server/IDMapperResource.java (modified) (1 diff)
• org.bridgedb/src/org/bridgedb/IDMapperStack.java (modified) (1 diff)

trunk/org.bridgedb.rdb/src/org/bridgedb/rdb/GdbProvider.java

@@ -74 +74 @@
         }
         
-        public IDMapperStack getGdbs(Organism organism) {
+        /** @deprecated use getStack(organism) instead */
+        public List<IDMapper> getGdbs(Organism organism)
+        {
+                return getStack(organism).getMappers();
+        }
+        
+        public IDMapperStack getStack(Organism organism) {
                 IDMapperStack gdbs = organism2gdb.get(organism);
                 if(gdbs == null) {
@@ -94 +100 @@
         {
                 this.transitive = transitive;
+        }
+        
+        public static GdbProvider fromConfigFile(File f) throws IDMapperException, IOException, ClassNotFoundException
+        {
+                return fromConfigFile(f, false);
         }
         

trunk/org.bridgedb.server/src/org/bridgedb/server/IDMapperResource.java

@@ -77 +77 @@
                         throw new IllegalArgumentException("Unknown organism: " + orgName + "<p><font size='+1'><i>Double check the spelling. We are expecting an entry like: Human</i></font></p>");
                 }
-                mappers = getGdbProvider().getGdbs(org);
+                mappers = getGdbProvider().getStack(org);
                 if (mappers.getSize() == 0)
                 {

trunk/org.bridgedb/src/org/bridgedb/IDMapperStack.java

@@ -558 +558 @@
                 return result;
         }
+
+        /** get all mappers */
+        public List<IDMapper> getMappers()
+        {
+                return gdbs;
+        }
 }