From: jprocter <Jim Procter>
Date: Thu, 8 Jan 2009 16:00:17 +0000 (+0000)
Subject: structure ids are not IDs, but simply references
X-Git-Tag: Release_2_5~356
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=1b1113ce93b37e8371fcc893be4d56118e88c63c;hp=0ae6f43a167ee4219a60e51b1b39672b54860cd0;p=jalview.git

structure ids are not IDs, but simply references
---

diff --git a/src/jalview/schemabinding/version2/descriptors/StructureStateDescriptor.java b/src/jalview/schemabinding/version2/descriptors/StructureStateDescriptor.java
index a52e81d..a904165 100644
--- a/src/jalview/schemabinding/version2/descriptors/StructureStateDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/StructureStateDescriptor.java
@@ -311,7 +311,7 @@ public class StructureStateDescriptor extends org.exolab.castor.xml.util.XMLClas
         desc.setValidator(fieldValidator);
         //-- _viewId
         desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_viewId", "viewId", org.exolab.castor.xml.NodeType.Attribute);
-        super.setIdentity(desc);
+        desc.setImmutable(true);
         handler = new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue( java.lang.Object object ) 
                 throws IllegalStateException
@@ -330,7 +330,7 @@ public class StructureStateDescriptor extends org.exolab.castor.xml.util.XMLClas
                 }
             }
             public java.lang.Object newInstance(java.lang.Object parent) {
-                return new java.lang.String();
+                return null;
             }
         };
         desc.setHandler(handler);
@@ -340,9 +340,10 @@ public class StructureStateDescriptor extends org.exolab.castor.xml.util.XMLClas
         //-- validation code for: _viewId
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
         { //-- local scope
-            org.exolab.castor.xml.validators.IdValidator typeValidator;
-            typeValidator = new org.exolab.castor.xml.validators.IdValidator();
+            org.exolab.castor.xml.validators.StringValidator typeValidator;
+            typeValidator = new org.exolab.castor.xml.validators.StringValidator();
             fieldValidator.setValidator(typeValidator);
+            typeValidator.setWhiteSpace("preserve");
         }
         desc.setValidator(fieldValidator);
         //-- initialize element descriptors