structureState element to structure view Id is a many to one relationship - so viewId...

diff --git a/schemas/jalview.xsd b/schemas/jalview.xsd
index 00a589b..06473bc 100755 (executable)
--- a/schemas/jalview.xsd
+++ b/schemas/jalview.xsd
@@ -26,7 +26,15 @@
                                                                                                                                <xs:attribute name="ypos" type="xs:int"/>
                                                                                                                                <xs:attribute name="width" type="xs:int"/>
                                                                                                                                <xs:attribute name="height" type="xs:int"/>
-                                                                                                                               <xs:attribute name="viewId" type="xs:ID" use="optional"/>
+                                                                                                                               <xs:attribute name="viewId" type="xs:string" use="optional">
+                                                                                                                                       <xs:annotation>
+                                                                                                                                               <xs:documentation>additional identifier which properly disambiguates
+                                                                                                                                               the structure view from any other view with the same attributes. This is not an ID,
+                                                                                                                                               because it is possible to have many references to the same physical structure view
+                                                                                                                                               from different sequences in an alignment. A structureState element citing the same
+                                                                                                                                               viewId will appear for each instance.</xs:documentation>
+                                                                                                                                       </xs:annotation>
+                                                                                                                               </xs:attribute>
                                                                                                                                        
                                                                                                                                
                                                                                                                        </xs:extension>

diff --git a/src/jalview/schemabinding/version2/.castor.cdr b/src/jalview/schemabinding/version2/.castor.cdr
index 5b13ce1..7e3a754 100644 (file)
--- a/src/jalview/schemabinding/version2/.castor.cdr
+++ b/src/jalview/schemabinding/version2/.castor.cdr
@@ -1,4 +1,4 @@
-#Mon Nov 10 11:15:07 GMT 2008\r
+#Sun Dec 14 18:51:51 GMT 2008\r
 jalview.schemabinding.version2.ThresholdLine=jalview.schemabinding.version2.descriptors.ThresholdLineDescriptor\r
 jalview.schemabinding.version2.SequenceSetProperties=jalview.schemabinding.version2.descriptors.SequenceSetPropertiesDescriptor\r
 jalview.schemabinding.version2.StructureState=jalview.schemabinding.version2.descriptors.StructureStateDescriptor\r
@@ -33,12 +33,12 @@ jalview.schemabinding.version2.MapListFrom=jalview.schemabinding.version2.descri
 jalview.schemabinding.version2.PdbentryItem=jalview.schemabinding.version2.descriptors.PdbentryItemDescriptor\r
 jalview.schemabinding.version2.FeatureSettings=jalview.schemabinding.version2.descriptors.FeatureSettingsDescriptor\r
 jalview.schemabinding.version2.JGroup=jalview.schemabinding.version2.descriptors.JGroupDescriptor\r
-jalview.schemabinding.version2.VamsasModel=jalview.schemabinding.version2.descriptors.VamsasModelDescriptor\r
-jalview.schemabinding.version2.JalviewUserColours=jalview.schemabinding.version2.descriptors.JalviewUserColoursDescriptor\r
 jalview.schemabinding.version2.MapListTo=jalview.schemabinding.version2.descriptors.MapListToDescriptor\r
+jalview.schemabinding.version2.JalviewUserColours=jalview.schemabinding.version2.descriptors.JalviewUserColoursDescriptor\r
+jalview.schemabinding.version2.VamsasModel=jalview.schemabinding.version2.descriptors.VamsasModelDescriptor\r
 jalview.schemabinding.version2.Pdbentry=jalview.schemabinding.version2.descriptors.PdbentryDescriptor\r
 jalview.schemabinding.version2.HiddenColumns=jalview.schemabinding.version2.descriptors.HiddenColumnsDescriptor\r
-jalview.schemabinding.version2.Features=jalview.schemabinding.version2.descriptors.FeaturesDescriptor\r
 jalview.schemabinding.version2.DseqFor=jalview.schemabinding.version2.descriptors.DseqForDescriptor\r
+jalview.schemabinding.version2.Features=jalview.schemabinding.version2.descriptors.FeaturesDescriptor\r
 jalview.schemabinding.version2.VAMSAS=jalview.schemabinding.version2.descriptors.VAMSASDescriptor\r
 jalview.schemabinding.version2.MappingChoiceItem=jalview.schemabinding.version2.descriptors.MappingChoiceItemDescriptor\r

diff --git a/src/jalview/schemabinding/version2/StructureState.java b/src/jalview/schemabinding/version2/StructureState.java
index 6f43108..24eed77 100644 (file)
--- a/src/jalview/schemabinding/version2/StructureState.java
+++ b/src/jalview/schemabinding/version2/StructureState.java
@@ -82,7 +82,14 @@ public class StructureState implements java.io.Serializable {
     private boolean _has_height;
 
     /**
-     * Field _viewId.
+     * additional identifier which properly disambiguates
+     *  the structure view from any other view with the same
+     * attributes. This is not an ID,
+     *  because it is possible to have many references to the same
+     * physical structure view
+     *  from different sequences in an alignment. A structureState
+     * element citing the same
+     *  viewId will appear for each instance.
      */
     private java.lang.String _viewId;
 
@@ -158,7 +165,16 @@ public class StructureState implements java.io.Serializable {
     }
 
     /**
-     * Returns the value of field 'viewId'.
+     * Returns the value of field 'viewId'. The field 'viewId' has
+     * the following description: additional identifier which
+     * properly disambiguates
+     *  the structure view from any other view with the same
+     * attributes. This is not an ID,
+     *  because it is possible to have many references to the same
+     * physical structure view
+     *  from different sequences in an alignment. A structureState
+     * element citing the same
+     *  viewId will appear for each instance.
      * 
      * @return the value of field 'ViewId'.
      */
@@ -337,7 +353,16 @@ public class StructureState implements java.io.Serializable {
     }
 
     /**
-     * Sets the value of field 'viewId'.
+     * Sets the value of field 'viewId'. The field 'viewId' has the
+     * following description: additional identifier which properly
+     * disambiguates
+     *  the structure view from any other view with the same
+     * attributes. This is not an ID,
+     *  because it is possible to have many references to the same
+     * physical structure view
+     *  from different sequences in an alignment. A structureState
+     * element citing the same
+     *  viewId will appear for each instance.
      * 
      * @param viewId the value of field 'viewId'.
      */