dbxrefs added

git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@4225 ee4ac58c-ac51-4696-9907-e4b3aa274f04

uk/ac/sanger/artemis/chado/JdbcDAO.java

@@ -416,6 +416,7 @@ public class JdbcDAO
       Dbxref dbxref = new Dbxref();
       dbxref.setName( rs.getString("name") );
       dbxref.setAccession( rs.getString("accession") );
+      dbxref.setFeature_id( rs.getInt("feature_id") );
       dbxrefs.add(dbxref);
     }
 

uk/ac/sanger/artemis/util/DatabaseDocument.java

@@ -377,7 +377,7 @@ public class DatabaseDocument extends Document
     }
 
     // get all dbrefs
-    List dbxrefs = dao.getDbxref(schema, null);
+    Hashtable dbxrefs = dao.getDbxref(schema, null);
 
     for(int i = 0; i < feature_size; i++)
     {
@@ -457,19 +457,27 @@ public class DatabaseDocument extends Document
           }
         }
       } 
-      appendDbxref(this_buff, feature_id);
-      this_buff.append("\n");
 
-      progress_listener.progressMade("Read from database: " + name);
+      // append dbxrefs
+      if(dbxrefs != null &&
+         dbxrefs.containsKey(new Integer(feature_id)))
+      {
+        this_buff.append("Dbxref=");
+        Vector dbxref = (Vector)dbxrefs.get(new Integer(feature_id));
+        for(int j=0; j<dbxref.size(); j++)
+        {
+          this_buff.append((String)dbxref.get(j));
+          if(j<dbxref.size()-1)
+            this_buff.append(",");
+        }
       }
       
-    return buffers;
+      this_buff.append("\n");
 
+      progress_listener.progressMade("Read from database: " + name);
     }
 
-  private void appendDbxref(ByteBuffer this_buff, 
-                            String feature_id)
-  {
+    return buffers;
 
   }