From 9d4025a5350cc2d6e14ca115f4309b070a7d6a0d Mon Sep 17 00:00:00 2001
From: tcarver <tjc>
Date: Mon, 28 Jan 2013 15:44:50 +0000
Subject: [PATCH] add generics
---
uk/ac/sanger/artemis/io/QualifierVector.java | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/uk/ac/sanger/artemis/io/QualifierVector.java b/uk/ac/sanger/artemis/io/QualifierVector.java
index c3766fc73..c8b4a66a7 100644
--- a/uk/ac/sanger/artemis/io/QualifierVector.java
+++ b/uk/ac/sanger/artemis/io/QualifierVector.java
@@ -36,8 +36,10 @@ import java.util.Vector;
*
*/
-public class QualifierVector extends Vector
+public class QualifierVector extends Vector<Qualifier>
{
+ private static final long serialVersionUID = 1L;
+
/**
* Create a new (empty) vector of Qualifier objects.
*/
@@ -54,7 +56,7 @@ public class QualifierVector extends Vector
* @param qualifier This object contians name and values to add.
* @return The Qualifier that was changed or created.
**/
- public Qualifier addQualifierValues(Qualifier qualifier)
+ public Qualifier addQualifierValues(final Qualifier qualifier)
{
if(qualifier.getName() == null)
throw new Error("");
@@ -69,7 +71,7 @@ public class QualifierVector extends Vector
}
else
{
- final Qualifier current_qualifier = (Qualifier)elementAt(index_of_qualifier);
+ final Qualifier current_qualifier = elementAt(index_of_qualifier);
current_qualifier.addValues(qualifier.getValues());
return current_qualifier;
}
@@ -85,10 +87,7 @@ public class QualifierVector extends Vector
final int index = indexOfQualifierWithName(qualifier.getName());
if(index == -1)
- {
- // just add it
addElement(qualifier);
- }
else
{
removeQualifierByName(qualifier.getName());
@@ -129,11 +128,10 @@ public class QualifierVector extends Vector
**/
public int indexOfQualifierWithName(String name)
{
-// return vector.indexOf(name);
final int vsize = size();
for(int i = 0; i < vsize; ++i)
{
- if(((Qualifier)elementAt(i)).getName().equals(name))
+ if(elementAt(i).getName().equals(name))
return i;
}
return -1;
@@ -150,7 +148,7 @@ public class QualifierVector extends Vector
if(index_of_named_qualifier == -1)
return null;
else
- return (Qualifier)elementAt(index_of_named_qualifier);
+ return elementAt(index_of_named_qualifier);
}
/**
@@ -169,4 +167,3 @@ public class QualifierVector extends Vector
}
}
-
--
GitLab