JAL-3705 JAL-3251 unused attribute repurposed/renamed to mappedFromId

diff --git a/schemas/vamsas.xsd b/schemas/vamsas.xsd
index 20c19dd..b082e78 100755 (executable)
--- a/schemas/vamsas.xsd
+++ b/schemas/vamsas.xsd
@@ -103,10 +103,7 @@
                                                        </xs:element>
                                                </xs:choice>
                                        </xs:sequence>
-                                       <xs:attribute name="mappingType" type="xs:string" use="optional">
-                                               <xs:annotation>
-                                                       <xs:documentation>Biotype of the mapping e.g. CdsToPeptide</xs:documentation>
-                                               </xs:annotation>
+                                       <xs:attribute name="mappedFromId" type="xs:string" use="optional">
                                        </xs:attribute>
                                </xs:extension>
                        </xs:complexContent>    

diff --git a/src/jalview/project/Jalview2XML.java b/src/jalview/project/Jalview2XML.java
index 1851be7..945ddc3 100644 (file)
--- a/src/jalview/project/Jalview2XML.java
+++ b/src/jalview/project/Jalview2XML.java
@@ -2555,7 +2555,7 @@ public class Jalview2XML
 
     if (jmp.getMappedFromId() != null)
     {
-      mp.setMappingType(jmp.getMappedFromId());
+      mp.setMappedFromId(jmp.getMappedFromId());
     }
     
     jalview.util.MapList mlst = jmp.getMap();
@@ -5635,7 +5635,7 @@ public class Jalview2XML
             fto, m.getMapFromUnit().intValue(),
             m.getMapToUnit().intValue());
 
-    jmap.setMappedFromId(m.getMappingType());
+    jmap.setMappedFromId(m.getMappedFromId());
     
     /*
      * (optional) choice of dseqFor or Sequence

diff --git a/src/jalview/xml/binding/jalview/Mapping.java b/src/jalview/xml/binding/jalview/Mapping.java
index 5ebeb7e..39ba1d8 100644 (file)
--- a/src/jalview/xml/binding/jalview/Mapping.java
+++ b/src/jalview/xml/binding/jalview/Mapping.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2019.06.07 at 02:21:15 PM BST 
+// Generated on: 2020.08.11 at 02:44:23 PM BST 
 //
 
 
@@ -42,7 +42,7 @@ import javax.xml.bind.annotation.XmlType;
  *           &lt;/element>
  *         &lt;/choice>
  *       &lt;/sequence>
- *       &lt;attribute name="mappingType" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="mappedFromId" type="{http://www.w3.org/2001/XMLSchema}string" />
  *     &lt;/extension>
  *   &lt;/complexContent>
  * &lt;/complexType>
@@ -63,8 +63,8 @@ public class Mapping
     @XmlElement(name = "Sequence")
     protected Sequence sequence;
     protected String dseqFor;
-    @XmlAttribute(name = "mappingType")
-    protected String mappingType;
+    @XmlAttribute(name = "mappedFromId")
+    protected String mappedFromId;
 
     /**
      * Gets the value of the sequence property.
@@ -115,27 +115,27 @@ public class Mapping
     }
 
     /**
-     * Gets the value of the mappingType property.
+     * Gets the value of the mappedFromId property.
      * 
      * @return
      *     possible object is
      *     {@link String }
      *     
      */
-    public String getMappingType() {
-        return mappingType;
+    public String getMappedFromId() {
+        return mappedFromId;
     }
 
     /**
-     * Sets the value of the mappingType property.
+     * Sets the value of the mappedFromId property.
      * 
      * @param value
      *     allowed object is
      *     {@link String }
      *     
      */
-    public void setMappingType(String value) {
-        this.mappingType = value;
+    public void setMappedFromId(String value) {
+        this.mappedFromId = value;
     }
 
 }