After merge

diff --git a/resources/uniprot_mapping.xml b/resources/uniprot_mapping.xml
new file mode 100755 (executable)
index 0000000..d6961aa
--- /dev/null
+++ b/resources/uniprot_mapping.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>\r
+<mapping>\r
+       <class name="jalview.datamodel.UniprotFile">\r
+                 <map-to xml="uniprot"/>               \r
+                 <field name="UniprotEntries" type="jalview.datamodel.UniprotEntry"  collection="vector">\r
+                     <bind-xml name="entry"/>\r
+                </field>               \r
+        </class>\r
+                \r
+        <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>\r
+               \r
+             \r
+             <field name="UniprotSequence" type="jalview.datamodel.UniprotSequence">\r
+               <bind-xml name="sequence"/> \r
+              </field>\r
+              <field name="feature" type="jalview.datamodel.SequenceFeature" collection="vector"/>\r
+              <field name="dbReference" type="jalview.datamodel.PDBEntry" collection="vector"/>\r
+                      \r
+        </class>\r
+        \r
+        \r
+        <class name="jalview.datamodel.SequenceFeature">\r
+               <field name="type">\r
+                       <bind-xml node="attribute"/>\r
+               </field>\r
+               <field name="description">\r
+                        <bind-xml node="attribute"/>\r
+               </field>\r
+               <field name="status">\r
+                       <bind-xml node="attribute"/>\r
+               </field>\r
+               <field name="position">\r
+                <bind-xml name="position" node="attribute" location="location/position"/>\r
+                </field>\r
+               <field name="begin">\r
+                <bind-xml name="position" node="attribute" location="location/begin"/>\r
+                </field>\r
+               <field name="end">\r
+                <bind-xml name="position" node="attribute" location="location/end"/>\r
+                </field>\r
+        </class>\r
+       \r
+          <class name="jalview.datamodel.UniprotSequence">\r
+                    <field name="content" type="string">\r
+                       <bind-xml name="sequence" node="text"/>\r
+                    </field>\r
+        </class>\r
+        \r
+        <class name="jalview.datamodel.PDBEntry">\r
+               <field name="type"><bind-xml node="attribute"/></field>\r
+               <field name="id"><bind-xml node="attribute"/></field>\r
+               <field name="property" collection="hashtable">\r
+                       <bind-xml name="property">\r
+                          <class name="org.exolab.castor.mapping.MapItem">\r
+                             <field name="key">\r
+                               <bind-xml name="type" node="attribute"/>\r
+                             </field>\r
+                             <field name="value">\r
+                               <bind-xml node="attribute"/>\r
+                               </field>\r
+                          </class>\r
+                       </bind-xml>\r
+               </field>\r
+        </class>\r
+\r
+</mapping>\r