From 5adfcdf1845a9da87bde14e871f21385cfbf78b0 Mon Sep 17 00:00:00 2001 From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04> Date: Wed, 23 Mar 2011 11:33:20 +0000 Subject: [PATCH] start to implement generics git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@15795 ee4ac58c-ac51-4696-9907-e4b3aa274f04 --- uk/ac/sanger/artemis/chado/IBatisDAO.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/uk/ac/sanger/artemis/chado/IBatisDAO.java b/uk/ac/sanger/artemis/chado/IBatisDAO.java index c62bb08f6..cebc65db6 100644 --- a/uk/ac/sanger/artemis/chado/IBatisDAO.java +++ b/uk/ac/sanger/artemis/chado/IBatisDAO.java @@ -1375,24 +1375,23 @@ public class IBatisDAO extends GmodDAO * @param list a <code>List</code> of <code>DbXRef</code> objects. * @return a <code>Hashtable</code> of dbxrefs. */ - public static Hashtable mergeDbXRef(final List list) + public static Hashtable<Integer, List<String>> mergeDbXRef(final List<FeatureDbXRef> list) { - Hashtable dbxrefHash = new Hashtable(); - for(int i = 0; i < list.size(); i++) + Hashtable<Integer, List<String>> dbxrefHash = new Hashtable<Integer, List<String>>(); + for(FeatureDbXRef dbxref : list) { - FeatureDbXRef dbxref = (FeatureDbXRef)list.get(i); Integer feature_id = new Integer(dbxref.getFeature().getFeatureId()); String value = dbxref.getDbXRef().getDb().getName() + ":" + dbxref.getDbXRef().getAccession(); if(dbxrefHash.containsKey(feature_id)) { - Vector v = (Vector)dbxrefHash.get(feature_id); + List<String> v = dbxrefHash.get(feature_id); v.add(value); dbxrefHash.put(feature_id, v); } else { - Vector v = new Vector(); + List<String> v = new Vector<String>(); v.add(value); dbxrefHash.put(feature_id, v); } -- GitLab