From: amwaterhouse <Andrew Waterhouse>
Date: Wed, 20 Sep 2006 10:15:34 +0000 (+0000)
Subject: proteinNames as vectors
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=7a293d1f0b5bfaaeac5d1f5a7be7113d8ca0c8b5

proteinNames as vectors
---

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