X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=resources%2Funiprot_mapping.xml;h=4c9ad5f3eec1674fee6da61af7519bf065e3232d;hb=refs%2Fheads%2Fbugs%2FJAL-3009_blockingNetworkThreads;hp=ebe8e9ca95821266bd858e6133dd87fcf28a7968;hpb=838e4f91d4a53dd315640dbc9ff6ef7a815ee576;p=jalview.git

diff --git a/resources/uniprot_mapping.xml b/resources/uniprot_mapping.xml
index ebe8e9c..4c9ad5f 100755
--- a/resources/uniprot_mapping.xml
+++ b/resources/uniprot_mapping.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -18,39 +18,39 @@
  * The Jalview Authors are detailed in the 'AUTHORS' file.
 -->
 <mapping>
-	<class name="jalview.datamodel.UniprotFile">
+	<class name="jalview.datamodel.xdb.uniprot.UniprotFile">
                  <map-to xml="uniprot"/>               
-                 <field name="UniprotEntries" type="jalview.datamodel.UniprotEntry" collection="vector">
+                 <field name="UniprotEntries" type="jalview.datamodel.xdb.uniprot.UniprotEntry" collection="vector">
 		      <bind-xml name="entry"/>
 		 </field>		
         </class>
 		 
-	 <class name="jalview.datamodel.UniprotEntry">
+	 <class name="jalview.datamodel.xdb.uniprot.UniprotEntry">
 	        <field name="name" type="string" collection="vector"/>
 	 	<field name="accession" type="string" collection="vector"/>
-	 	<field name="protein" type="jalview.datamodel.UniprotProteinName"/>
-	    <field name="UniprotSequence" type="jalview.datamodel.UniprotSequence">
+	 	<field name="protein" type="jalview.datamodel.xdb.uniprot.UniprotProteinName"/>
+	    <field name="UniprotSequence" type="jalview.datamodel.xdb.uniprot.UniprotSequence">
 	      	<bind-xml name="sequence"/> 
 	    </field>
-	    <field name="feature" type="jalview.datamodel.SequenceFeature" collection="vector"/>
+	    <field name="feature" type="jalview.datamodel.xdb.uniprot.UniprotFeature" collection="vector"/>
 	    <field name="dbReference" type="jalview.datamodel.PDBEntry" collection="vector"/>
 	   	       
 	 </class>
-	<class name="jalview.datamodel.UniprotProteinName">
+	<class name="jalview.datamodel.xdb.uniprot.UniprotProteinName">
 		<field name="name" collection="vector" type="string">
 			<bind-xml name="fullName" location="recommendedName" node="element"/>
 		</field>
 	</class>
 	 <!-- uniprot protein name is now a collection of collections - the INCLUDES and CONTAINS entries of the uniprot
 	 	record. This means this doesn't exist anymore...
-	 <class name="jalview.datamodel.UniprotProteinName">
+	 <class name="jalview.datamodel.xdb.uniprot.UniprotProteinName">
 	 	<field name="name" type="string" collection="vector">
 	 		<bind-xml name="name"/>
 	 	</field>	 	
 	 </class>
 	 -->
 	 
-	 <class name="jalview.datamodel.SequenceFeature">
+	 <class name="jalview.datamodel.xdb.uniprot.UniprotFeature">
 	 	<field name="type">
 	 		<bind-xml node="attribute"/>
 	 	</field>
@@ -62,16 +62,22 @@
 	 	</field>
 	 	<field name="position">
 	 	 <bind-xml name="position" node="attribute" location="location/position"/>
-	 	 </field>
+	 	</field>
 		<field name="begin">
 		 <bind-xml name="position" node="attribute" location="location/begin"/>
-	 	 </field>
-		<field name="end">
-		 <bind-xml name="position" node="attribute" location="location/end"/>
-	 	 </field>
+	 	</field>
+    <field name="end">
+      <bind-xml name="position" node="attribute" location="location/end"/>
+    </field>
+    <field name="variation" collection="vector" type="string">
+     <bind-xml name="variation"/>
+    </field>
+    <field name="original">
+     <bind-xml name="original"/>
+    </field>
 	 </class>
 	
-          <class name="jalview.datamodel.UniprotSequence">
+          <class name="jalview.datamodel.xdb.uniprot.UniprotSequence">
 		     <field name="content" type="string">
 		        <bind-xml name="sequence" node="text"/>
 		     </field>
@@ -80,7 +86,7 @@
 	 <class name="jalview.datamodel.PDBEntry">
 	 	<field name="type"><bind-xml node="attribute"/></field>
 	 	<field name="id"><bind-xml node="attribute"/></field>
-	 	<field name="property" collection="hashtable">
+	 	<field name="props" collection="hashtable">
 			<bind-xml name="property">
 			   <class name="org.exolab.castor.mapping.MapItem">
 			      <field name="key">