[Jmol-commits] CVS: Jmol/src/org/openscience/jmol/viewer/datamodel Chain.java,1.7,1.8 Model.java,1.1,1.2

[Miguel <mig...@us...>]

Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30699/src/org/openscience/jmol/viewer/datamodel

Modified Files:
	Chain.java Model.java 
Log Message:
canonization of chainIDs and insertionCodes


Index: Chain.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel/Chain.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Chain.java	27 May 2004 17:11:55 -0000	1.7
+++ Chain.java	27 May 2004 21:58:52 -0000	1.8
@@ -43,15 +43,7 @@
 
   public Chain(Model model, char chainID) {
     this.model = model;
-    this.chainID = canonizeChainID(chainID);
-  }
-
-  static char canonizeChainID(char chainID) {
-    if (!((chainID >= 'A' && chainID <= 'Z') ||
-          (chainID >= 'a' && chainID <= 'z') ||
-          (chainID >= '0' && chainID <= '9')))
-      return '\0';
-    return chainID;
+    this.chainID = chainID;
   }
 
   void freeze() {

Index: Model.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel/Model.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Model.java	27 May 2004 17:11:55 -0000	1.1
+++ Model.java	27 May 2004 21:58:52 -0000	1.2
@@ -75,7 +75,6 @@
   }
 
   public Chain getChain(char chainID) {
-    chainID = Chain.canonizeChainID(chainID);
     for (int i = chainCount; --i >= 0; ) {
       Chain chain = chains[i];
       if (chain.chainID == chainID)