proteinNames as vectors

diff --git a/resources/uniprot_mapping.xml b/resources/uniprot_mapping.xml
index d6961aa..d955dd7 100755 (executable)
--- a/resources/uniprot_mapping.xml
+++ b/resources/uniprot_mapping.xml
@@ -2,7 +2,7 @@
 <mapping>\r
        <class name="jalview.datamodel.UniprotFile">\r
                  <map-to xml="uniprot"/>               \r
-                 <field name="UniprotEntries" type="jalview.datamodel.UniprotEntry"  collection="vector">\r
+                 <field name="UniprotEntries" type="jalview.datamodel.UniprotEntry" collection="vector">\r
                      <bind-xml name="entry"/>\r
                 </field>               \r
         </class>\r
@@ -10,10 +10,9 @@
         <class name="jalview.datamodel.UniprotEntry">\r
                <field name="name" type="string" collection="vector"/>\r
                <field name="accession" type="string" collection="vector"/>\r
-               <field name="proteinName" type="string" collection="vector">\r
-                       <bind-xml name="name" location="entry/protein"/>\r
+               <field name="protein" type="jalview.datamodel.UniprotProteinName">\r
+                       <bind-xml name="protein"/>\r
                </field>\r
-               \r
              \r
              <field name="UniprotSequence" type="jalview.datamodel.UniprotSequence">\r
                <bind-xml name="sequence"/> \r
@@ -23,6 +22,12 @@
                       \r
         </class>\r
         \r
+        <class name="jalview.datamodel.UniprotProteinName">\r
+               <field name="name" type="string" collection="vector">\r
+                       <bind-xml name="name"/>\r
+               </field>                \r
+        </class>\r
+        \r
         \r
         <class name="jalview.datamodel.SequenceFeature">\r
                <field name="type">\r