Changeset 162

Timestamp:

08/19/09 09:44:30 (2 years ago)

Author:

martijn

Message:

Fixes spurious DataSource? entries.
There was a problem where each call go getByFullName / getBySystemCode
with an empty string would lead to creation of a new DataSource? entry

Location:

trunk

Files:

• bio/test/org/bridgedb/bio/Test.java (modified) (1 diff)
• corelib/src/org/bridgedb/DataSource.java (modified) (2 diffs)

trunk/bio/test/org/bridgedb/bio/Test.java

@@ -50 +50 @@
         }
 
+        public void testInit()
+        {
+                for (DataSource ds : DataSource.getDataSources())
+                {
+                        assertNotNull(ds);
+                        assertNotNull(ds.getFullName());
+                        assertNotNull(ds.getSystemCode());
+                }
+        }
+        
         public void testURN()
         {

trunk/corelib/src/org/bridgedb/DataSource.java

@@ -340 +340 @@
         public static DataSource getBySystemCode(String systemCode)
         {
-                if (!bySysCode.containsKey(systemCode))
+                if (!bySysCode.containsKey(systemCode) && isSuitableKey(systemCode))
                 {
                         register (systemCode, null);
@@ -356 +356 @@
         public static DataSource getByFullName(String fullName)
         {
-                if (!byFullName.containsKey(fullName))
+                if (!byFullName.containsKey(fullName) && isSuitableKey(fullName))
                 {
                         register (null, fullName);