diff --git a/uk/ac/sanger/artemis/Feature.java b/uk/ac/sanger/artemis/Feature.java
index bca8614ca484dc88b1161ba7a871b11ed4d5d669..bbc3e0a5c343deb3e42c32af9b84e05f58086f35 100644
--- a/uk/ac/sanger/artemis/Feature.java
+++ b/uk/ac/sanger/artemis/Feature.java
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/Feature.java,v 1.7 2004-12-22 15:27:30 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/Feature.java,v 1.8 2005-01-06 11:21:06 tjc Exp $
  */
 
 package uk.ac.sanger.artemis;
@@ -59,7 +59,7 @@ import java.util.Date;
  *  embl.Feature and embl.Entry objects.
  *
  *  @author Kim Rutherford
- *  @version $Id: Feature.java,v 1.7 2004-12-22 15:27:30 tjc Exp $
+ *  @version $Id: Feature.java,v 1.8 2005-01-06 11:21:06 tjc Exp $
  **/
 
 public class Feature
@@ -1038,7 +1038,7 @@ public class Feature
 
     for(int i = 0; i  < qual_size; ++i) 
     {
-      final Qualifier this_qualifier = qualifiers.elementAt(i);
+      final Qualifier this_qualifier = (Qualifier)qualifiers.elementAt(i);
 
       if(qualifier_names != null &&
          !qualifier_names.contains(this_qualifier.getName())) 
@@ -3030,7 +3030,7 @@ CHANGED_END:
       for(int qualifier_index = 0; qualifier_index < qualifiers_size;
           ++qualifier_index)
       {
-        final Qualifier this_qualifier = qualifiers.elementAt(qualifier_index);
+        final Qualifier this_qualifier = (Qualifier)qualifiers.elementAt(qualifier_index);
         final String name = this_qualifier.getName();
 
         if(!qualifier_names.contains(name)) 
diff --git a/uk/ac/sanger/artemis/components/EditMenu.java b/uk/ac/sanger/artemis/components/EditMenu.java
index 993b0cf345a9df5f35cc474b90bea3e154964486..abb8843b90542aa1a6c33613f5b8eec25fd9238b 100644
--- a/uk/ac/sanger/artemis/components/EditMenu.java
+++ b/uk/ac/sanger/artemis/components/EditMenu.java
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/EditMenu.java,v 1.3 2004-12-17 15:24:52 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/EditMenu.java,v 1.4 2005-01-06 11:21:06 tjc Exp $
  **/
 
 package uk.ac.sanger.artemis.components;
@@ -53,7 +53,7 @@ import javax.swing.*;
  *  A menu with editing commands.
  *
  *  @author Kim Rutherford
- *  @version $Id: EditMenu.java,v 1.3 2004-12-17 15:24:52 tjc Exp $
+ *  @version $Id: EditMenu.java,v 1.4 2005-01-06 11:21:06 tjc Exp $
  **/
 
 public class EditMenu extends SelectionMenu
@@ -752,7 +752,7 @@ public class EditMenu extends SelectionMenu
 
         for(int j = 0; j < qualifiers.size(); ++j)
         {
-          final Qualifier this_qualifier = qualifiers.elementAt(j);
+          final Qualifier this_qualifier = (Qualifier)qualifiers.elementAt(j);
 
           try 
           {
diff --git a/uk/ac/sanger/artemis/components/FeatureEdit.java b/uk/ac/sanger/artemis/components/FeatureEdit.java
index 2247b87a77cd3f5eb6ea4aa2adf15d12ffd5aa6d..e55d863a9f38f85ff142188b4beec4384ca0dcf3 100644
--- a/uk/ac/sanger/artemis/components/FeatureEdit.java
+++ b/uk/ac/sanger/artemis/components/FeatureEdit.java
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/FeatureEdit.java,v 1.10 2004-12-22 15:27:30 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/FeatureEdit.java,v 1.11 2005-01-06 11:21:06 tjc Exp $
  **/
 
 package uk.ac.sanger.artemis.components;
@@ -59,7 +59,7 @@ import javax.swing.*;
  *  FeatureEdit class
  *
  *  @author Kim Rutherford
- *  @version $Id: FeatureEdit.java,v 1.10 2004-12-22 15:27:30 tjc Exp $
+ *  @version $Id: FeatureEdit.java,v 1.11 2005-01-06 11:21:06 tjc Exp $
  **/
 
 public class FeatureEdit extends JFrame
@@ -863,7 +863,7 @@ public class FeatureEdit extends JFrame
     for(int qualifier_index = 0; qualifier_index < qualifiers.size();
          ++qualifier_index) 
     {
-      final Qualifier this_qualifier = qualifiers.elementAt(qualifier_index);
+      final Qualifier this_qualifier = (Qualifier)qualifiers.elementAt(qualifier_index);
       
       final QualifierInfo qualifier_info =
             getEntryInformation().getQualifierInfo(this_qualifier.getName());
@@ -1271,7 +1271,7 @@ public class FeatureEdit extends JFrame
     for(int qualifier_index = 0; qualifier_index < qualifiers.size();
         ++qualifier_index) 
     {
-      final Qualifier this_qualifier = qualifiers.elementAt(qualifier_index);
+      final Qualifier this_qualifier = (Qualifier)qualifiers.elementAt(qualifier_index);
 
       final QualifierInfo qualifier_info =
                        getEntryInformation().getQualifierInfo(this_qualifier.getName());
diff --git a/uk/ac/sanger/artemis/components/FeatureList.java b/uk/ac/sanger/artemis/components/FeatureList.java
index e1b5186dc7e1b30e662171cae7feff9441556f44..5829bf3bc1bf063c90ab6dfcc7038d356ad8bc29 100644
--- a/uk/ac/sanger/artemis/components/FeatureList.java
+++ b/uk/ac/sanger/artemis/components/FeatureList.java
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/FeatureList.java,v 1.12 2004-12-21 13:46:47 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/FeatureList.java,v 1.13 2005-01-06 11:21:06 tjc Exp $
  */
 
 package uk.ac.sanger.artemis.components;
@@ -48,7 +48,7 @@ import javax.swing.*;
  *  Features.
  *
  *  @author Kim Rutherford
- *  @version $Id: FeatureList.java,v 1.12 2004-12-21 13:46:47 tjc Exp $
+ *  @version $Id: FeatureList.java,v 1.13 2005-01-06 11:21:06 tjc Exp $
  *
  **/
 
@@ -823,7 +823,7 @@ public class FeatureList extends EntryGroupPanel
 
     for(int i = 0 ; i < qualifiers.size() ; ++i) 
     {
-      final Qualifier this_qualifier = qualifiers.elementAt(i);
+      final Qualifier this_qualifier = (Qualifier)qualifiers.elementAt(i);
       final String this_qualifier_name = this_qualifier.getName();
 
       if(!this_qualifier_name.equals("note") &&
diff --git a/uk/ac/sanger/artemis/components/QualifierEditor.java b/uk/ac/sanger/artemis/components/QualifierEditor.java
index 2e87f09534289ddb9775b088fa55c82c73751c5e..8dd259641c489b5ed70aa0ffa3668469136366bd 100644
--- a/uk/ac/sanger/artemis/components/QualifierEditor.java
+++ b/uk/ac/sanger/artemis/components/QualifierEditor.java
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/QualifierEditor.java,v 1.1 2004-06-09 09:47:18 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/QualifierEditor.java,v 1.2 2005-01-06 11:21:06 tjc Exp $
  */
 
 package uk.ac.sanger.artemis.components;
@@ -46,7 +46,7 @@ import javax.swing.*;
  *  features at once.
  *
  *  @author Kim Rutherford <kmr@sanger.ac.uk>
- *  @version $Id: QualifierEditor.java,v 1.1 2004-06-09 09:47:18 tjc Exp $
+ *  @version $Id: QualifierEditor.java,v 1.2 2005-01-06 11:21:06 tjc Exp $
  **/
 
 public class QualifierEditor extends JFrame {
@@ -226,7 +226,7 @@ public class QualifierEditor extends JFrame {
              qualifier_index < qualifier_vector.size () ;
              ++qualifier_index) {
           final Qualifier this_qualifier =
-            qualifier_vector.elementAt (qualifier_index);
+            (Qualifier)qualifier_vector.elementAt (qualifier_index);
 
           if (replace) {
             try {
diff --git a/uk/ac/sanger/artemis/components/SelectionInfoDisplay.java b/uk/ac/sanger/artemis/components/SelectionInfoDisplay.java
index af357961fa0badcb6e721b465a397b4644c3118f..939911dd2346e3e1b58e7d82dcdb9c3d9960db9b 100644
--- a/uk/ac/sanger/artemis/components/SelectionInfoDisplay.java
+++ b/uk/ac/sanger/artemis/components/SelectionInfoDisplay.java
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/SelectionInfoDisplay.java,v 1.6 2004-10-04 15:35:44 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/SelectionInfoDisplay.java,v 1.7 2005-01-06 11:21:06 tjc Exp $
  */
 
 package uk.ac.sanger.artemis.components;
@@ -46,7 +46,7 @@ import javax.swing.*;
  *  This class displays information about the selection in a Label.
  *
  *  @author Kim Rutherford
- *  @version $Id: SelectionInfoDisplay.java,v 1.6 2004-10-04 15:35:44 tjc Exp $
+ *  @version $Id: SelectionInfoDisplay.java,v 1.7 2005-01-06 11:21:06 tjc Exp $
  **/
 public class SelectionInfoDisplay extends CanvasPanel
     implements SelectionChangeListener 
@@ -239,7 +239,7 @@ public class SelectionInfoDisplay extends CanvasPanel
 
     for (int i = 0 ; i < qualifiers.size () ; ++i) 
     {
-      final Qualifier this_qualifier = qualifiers.elementAt (i);
+      final Qualifier this_qualifier = (Qualifier)qualifiers.elementAt (i);
 
       if (this_qualifier.getName ().equals ("note") ||
           this_qualifier.getName ().endsWith ("_file")) 
diff --git a/uk/ac/sanger/artemis/io/BioJavaFeature.java b/uk/ac/sanger/artemis/io/BioJavaFeature.java
index 645d00185b7eeaa5a755cff8dd273e29396ea93b..7c890f09bdbad6d5ca143d8331a5e5ad25bc4f1e 100644
--- a/uk/ac/sanger/artemis/io/BioJavaFeature.java
+++ b/uk/ac/sanger/artemis/io/BioJavaFeature.java
@@ -375,7 +375,7 @@ public class BioJavaFeature extends EMBLObject implements ComparableFeature
     try {
       clearAnnotation ();
       for (int i = 0 ; i < qualifiers.size () ; ++i) {
-        setQualifierInternal (qualifiers.elementAt (i));
+        setQualifierInternal((Qualifier)qualifiers.elementAt (i));
       }
     } catch (ChangeVetoException e) {
       throw new ReadOnlyException ("cannot set qualifiers");
diff --git a/uk/ac/sanger/artemis/io/GFFStreamFeature.java b/uk/ac/sanger/artemis/io/GFFStreamFeature.java
index 5a65ccc2416e1143827ef9d347c74a217c6bc6b5..4ea7bdb5abf927adb979bc4874c5fe42d65d67b7 100644
--- a/uk/ac/sanger/artemis/io/GFFStreamFeature.java
+++ b/uk/ac/sanger/artemis/io/GFFStreamFeature.java
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/io/GFFStreamFeature.java,v 1.2 2004-12-09 15:53:10 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/io/GFFStreamFeature.java,v 1.3 2005-01-06 11:21:06 tjc Exp $
  */
 
 package uk.ac.sanger.artemis.io;
@@ -35,7 +35,7 @@ import java.util.StringTokenizer;
  *  A StreamFeature that thinks it is a GFF feature.
  *
  *  @author Kim Rutherford
- *  @version $Id: GFFStreamFeature.java,v 1.2 2004-12-09 15:53:10 tjc Exp $
+ *  @version $Id: GFFStreamFeature.java,v 1.3 2005-01-06 11:21:06 tjc Exp $
  **/
 
 public class GFFStreamFeature extends SimpleDocumentFeature
@@ -483,7 +483,7 @@ public class GFFStreamFeature extends SimpleDocumentFeature
 
     for(int i = 0 ; i < qualifiers.size() ; ++i) 
     {
-      final Qualifier this_qualifier = qualifiers.elementAt(i);
+      final Qualifier this_qualifier = (Qualifier)qualifiers.elementAt(i);
 
       final String name = this_qualifier.getName();
 
diff --git a/uk/ac/sanger/artemis/io/PublicDBStreamFeature.java b/uk/ac/sanger/artemis/io/PublicDBStreamFeature.java
index 2e3651d5920165b49cb0c0809f446610dace2171..1152a85f9a547be879738c2225f101a9df35721f 100644
--- a/uk/ac/sanger/artemis/io/PublicDBStreamFeature.java
+++ b/uk/ac/sanger/artemis/io/PublicDBStreamFeature.java
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/io/PublicDBStreamFeature.java,v 1.1 2004-06-09 09:50:05 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/io/PublicDBStreamFeature.java,v 1.2 2005-01-06 11:21:06 tjc Exp $
  */
 
 package uk.ac.sanger.artemis.io;
@@ -33,7 +33,7 @@ import java.io.*;
  *  EMBL or GENBANK stream.
  *
  *  @author Kim Rutherford
- *  @version $Id: PublicDBStreamFeature.java,v 1.1 2004-06-09 09:50:05 tjc Exp $
+ *  @version $Id: PublicDBStreamFeature.java,v 1.2 2005-01-06 11:21:06 tjc Exp $
  **/
 
 abstract public class PublicDBStreamFeature
@@ -583,7 +583,7 @@ abstract public class PublicDBStreamFeature
   private void writeQualifiers (final Writer writer)
       throws IOException {
     for (int i = 0 ; i < getQualifiers ().size () ; ++i) {
-      final Qualifier current_qualifier = getQualifiers ().elementAt (i);
+      final Qualifier current_qualifier = (Qualifier)getQualifiers ().elementAt (i);
 
       final String qualifier_name = current_qualifier.getName ();
 
diff --git a/uk/ac/sanger/artemis/io/QualifierVector.java b/uk/ac/sanger/artemis/io/QualifierVector.java
index 52371e073546567f4a86848ff2d31d069a905e85..55e3cdc63f19530de60abeca37cafc06c015eca5 100644
--- a/uk/ac/sanger/artemis/io/QualifierVector.java
+++ b/uk/ac/sanger/artemis/io/QualifierVector.java
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/io/QualifierVector.java,v 1.3 2005-01-04 10:37:48 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/io/QualifierVector.java,v 1.4 2005-01-06 11:21:06 tjc Exp $
  */
 
 package uk.ac.sanger.artemis.io;
@@ -37,11 +37,11 @@ import java.io.IOException;
  *  differently to the Vector class (see addElement() and replaceElement()).
  *
  *  @author Kim Rutherford
- *  @version $Id: QualifierVector.java,v 1.3 2005-01-04 10:37:48 tjc Exp $
+ *  @version $Id: QualifierVector.java,v 1.4 2005-01-06 11:21:06 tjc Exp $
  *
  */
 
-public class QualifierVector 
+public class QualifierVector extends Vector
 {
   /**
    *  Create a new (empty) vector of Qualifier objects.
@@ -68,12 +68,12 @@ public class QualifierVector
 
     if(index_of_qualifier == -1) 
     {
-      vector.addElement(qualifier.copy());
+      addElement(qualifier.copy());
       return null;
     } 
     else
     {
-      final Qualifier current_qualifier = elementAt(index_of_qualifier);
+      final Qualifier current_qualifier = (Qualifier)elementAt(index_of_qualifier);
       current_qualifier.addValues(qualifier.getValues());
       return current_qualifier;
     }
@@ -91,12 +91,12 @@ public class QualifierVector
     if(index == -1) 
     {
       // just add it
-      vector.addElement(qualifier);
+      addElement(qualifier);
     } 
     else 
     {
       removeQualifierByName(qualifier.getName());
-      vector.addElement(qualifier.copy());
+      addElement(qualifier.copy());
     }
   }
 
@@ -110,24 +110,9 @@ public class QualifierVector
     final int index = indexOfQualifierWithName(name);
 
     if(index != -1)
-      vector.removeElementAt(index);
+      removeElementAt(index);
   }
 
-  /**
-   *  Performs the same function as Vector.elementAt()
-   */
-  public Qualifier elementAt(int index) 
-  {
-    return (Qualifier)vector.elementAt(index);
-  }
-
-  /**
-   *  Performs the same function as Vector.size()
-   */
-  public int size()
-  {
-    return vector.size();
-  }
 
   /**
    *  Returns true if and only if this QualifierVector contains a qualifier
@@ -152,7 +137,7 @@ public class QualifierVector
     final int vsize = size();
     for(int i = 0; i < vsize; ++i) 
     {
-      if(elementAt(i).getName().equals(name)) 
+      if(((Qualifier)elementAt(i)).getName().equals(name)) 
         return i;
     }
     return -1;
@@ -169,7 +154,7 @@ public class QualifierVector
     if(index_of_named_qualifier == -1)
       return null; 
     else
-      return elementAt(index_of_named_qualifier);
+      return (Qualifier)elementAt(index_of_named_qualifier);
   }
   
   /**
@@ -178,18 +163,14 @@ public class QualifierVector
    **/
   public QualifierVector copy() 
   {
-    final QualifierVector return_vector = new QualifierVector();
-    final int vsize = size();  
-    for(int i = 0 ; i < vsize; ++i) 
-      return_vector.vector.addElement(elementAt(i).copy());
+    return (QualifierVector)super.clone();
+//  final QualifierVector return_vector = new QualifierVector();
+//  final int vsize = size();  
+//  for(int i = 0 ; i < vsize; ++i) 
+//    return_vector.addElement(((Qualifier)elementAt(i)).copy());
 
-    return return_vector;
+//  return return_vector;
   }
 
-  /**
-   *  Storage for Qualifier objects.
-   */
-  final private Vector vector = new Vector(7);
 }
 
-
diff --git a/uk/ac/sanger/artemis/io/RWCorbaFeature.java b/uk/ac/sanger/artemis/io/RWCorbaFeature.java
index 40529cd4f8c8328ad524c03fe4216061613039b6..a57b33784aa4162e7c8731763dc2e76601a714c7 100644
--- a/uk/ac/sanger/artemis/io/RWCorbaFeature.java
+++ b/uk/ac/sanger/artemis/io/RWCorbaFeature.java
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/io/RWCorbaFeature.java,v 1.1 2004-06-09 09:50:17 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/io/RWCorbaFeature.java,v 1.2 2005-01-06 11:21:06 tjc Exp $
  **/
 
 package uk.ac.sanger.artemis.io;
@@ -40,7 +40,7 @@ import java.util.Date;
  *  CORBA using a nsdb.NucFeatureWriter object.
  *
  *  @author Kim Rutherford
- *  @version $Id: RWCorbaFeature.java,v 1.1 2004-06-09 09:50:17 tjc Exp $
+ *  @version $Id: RWCorbaFeature.java,v 1.2 2005-01-06 11:21:06 tjc Exp $
  **/
 
 public class RWCorbaFeature extends EMBLObject implements DateStampFeature {
@@ -254,7 +254,7 @@ public class RWCorbaFeature extends EMBLObject implements DateStampFeature {
         new nsdb.NucFeaturePackage.Qualifier [qualifiers.size ()];
 
       for (int i = 0 ; i < qualifier_list.length ; ++i) {
-        qualifier_list [i] = getStructFromQualifier (qualifiers.elementAt (i));
+        qualifier_list [i] = getStructFromQualifier((Qualifier)qualifiers.elementAt (i));
       }
 
       feature_handle.setQualifiers (makeServerStamp (datestamp),
diff --git a/uk/ac/sanger/artemis/io/SimpleDocumentEntry.java b/uk/ac/sanger/artemis/io/SimpleDocumentEntry.java
index 641c59b3c88e53646c4d71eb0e7340838702eaaa..2c2c4beae29bab91c2e968b5a3d90366c5ad4a09 100644
--- a/uk/ac/sanger/artemis/io/SimpleDocumentEntry.java
+++ b/uk/ac/sanger/artemis/io/SimpleDocumentEntry.java
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/io/SimpleDocumentEntry.java,v 1.3 2004-12-24 14:00:53 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/io/SimpleDocumentEntry.java,v 1.4 2005-01-06 11:21:06 tjc Exp $
  */
 
 package uk.ac.sanger.artemis.io;
@@ -35,7 +35,7 @@ import java.util.Vector;
  *  This class contains the methods common to all DocumentEntry objects.
  *
  *  @author Kim Rutherford <kmr@sanger.ac.uk>
- *  @version $Id: SimpleDocumentEntry.java,v 1.3 2004-12-24 14:00:53 tjc Exp $
+ *  @version $Id: SimpleDocumentEntry.java,v 1.4 2005-01-06 11:21:06 tjc Exp $
  **/
 
 abstract public class SimpleDocumentEntry
@@ -494,7 +494,7 @@ abstract public class SimpleDocumentEntry
     // check the qualifiers
     for(int i = 0 ; i < new_qualifiers.size() ; ++i) 
     {
-      final Qualifier this_qualifier = new_qualifiers.elementAt(i);
+      final Qualifier this_qualifier = (Qualifier)new_qualifiers.elementAt(i);
       final String this_qualifier_name = this_qualifier.getName();
 
       if(!entry_information.isValidQualifier(new_key, this_qualifier_name)) 
@@ -596,7 +596,7 @@ abstract public class SimpleDocumentEntry
     // check the qualifiers
     for(int i = 0 ; i < feature_qualifiers.size() ; ++i)
     {
-      final Qualifier this_qualifier = feature_qualifiers.elementAt(i);
+      final Qualifier this_qualifier = (Qualifier)feature_qualifiers.elementAt(i);
 
       final String this_qualifier_name = this_qualifier.getName();
 
diff --git a/uk/ac/sanger/artemis/io/SimpleDocumentFeature.java b/uk/ac/sanger/artemis/io/SimpleDocumentFeature.java
index 20fb31f66a67321099b2845faf509bd19eac05eb..335e907cb9fc5f80cd31f63291ecd2bc82212c7b 100644
--- a/uk/ac/sanger/artemis/io/SimpleDocumentFeature.java
+++ b/uk/ac/sanger/artemis/io/SimpleDocumentFeature.java
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/io/SimpleDocumentFeature.java,v 1.1 2004-06-09 09:50:30 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/io/SimpleDocumentFeature.java,v 1.2 2005-01-06 11:21:06 tjc Exp $
  */
 
 package uk.ac.sanger.artemis.io;
@@ -32,7 +32,7 @@ import java.io.*;
  *  SimpleDocumentFeature class
  *
  *  @author Kim Rutherford <kmr@sanger.ac.uk>
- *  @version $Id: SimpleDocumentFeature.java,v 1.1 2004-06-09 09:50:30 tjc Exp $
+ *  @version $Id: SimpleDocumentFeature.java,v 1.2 2005-01-06 11:21:06 tjc Exp $
  **/
 
 abstract class SimpleDocumentFeature extends LineGroup
@@ -221,14 +221,14 @@ abstract class SimpleDocumentFeature extends LineGroup
     }
 
     for (int i = 0 ; i < qualifiers.size () ; ++i) {
-      final String this_name = qualifiers.elementAt (i).getName ();
+      final String this_name = ((Qualifier)qualifiers.elementAt(i)).getName();
 
       if (!getEntryInformation ().isValidQualifier (key, this_name)) {
         final String message =
-          key + " cannot have /" + qualifiers.elementAt (i).getName () +
+          key + " cannot have /" + this_name +
           " as a qualifier";
-        throw new InvalidRelationException (message, key,
-                                            qualifiers.elementAt (i));
+        throw new InvalidRelationException(message, key,
+                                           (Qualifier)qualifiers.elementAt(i));
       }
     }
 
@@ -329,14 +329,13 @@ abstract class SimpleDocumentFeature extends LineGroup
     } else {
       for (int i = 0 ; i < qualifiers.size () ; ++i) {
 
-        final String this_name = qualifiers.elementAt (i).getName ();
+        final String this_name = ((Qualifier)qualifiers.elementAt(i)).getName();
 
         if (!getEntryInformation ().isValidQualifier (getKey (), this_name)) {
           final String message =
-            getKey () + " cannot have /" +
-            qualifiers.elementAt (i).getName () + " as a qualifier";
-          throw new InvalidRelationException (message, getKey (),
-                                              qualifiers.elementAt (i));
+            getKey () + " cannot have /" + this_name + " as a qualifier";
+          throw new InvalidRelationException(message, getKey(),
+                                             (Qualifier)qualifiers.elementAt(i));
         }
       }
       this.qualifiers = qualifiers.copy ();