Fix bug where all chains are called A
authoramwaterhouse <Andrew Waterhouse>
Mon, 14 Nov 2005 18:35:14 +0000 (18:35 +0000)
committeramwaterhouse <Andrew Waterhouse>
Mon, 14 Nov 2005 18:35:14 +0000 (18:35 +0000)
src/MCview/myAtom.java

index 75dec37..5eccbdf 100755 (executable)
@@ -32,7 +32,7 @@ public class myAtom {
     public String resName;\r
     public int resNumber;\r
     public int type;\r
-    public Color color;\r
+    public Color color = Color.lightGray;\r
     public String chain;\r
     public boolean isSelected = false;\r
 \r
@@ -41,24 +41,9 @@ public class myAtom {
         this.name = str.nextToken();\r
         this.resName = str.nextToken();\r
 \r
-        String tmpstr = new String();\r
+        this.chain = str.nextToken();\r
 \r
-        try {\r
-            tmpstr = str.nextToken();\r
-            this.resNumber = (new Integer(tmpstr).intValue());\r
-            this.chain = "A";\r
-            this.color = Color.lightGray;\r
-        } catch (NumberFormatException e) {\r
-            this.chain = tmpstr;\r
-\r
-            if (tmpstr.equals("A")) {\r
-                this.color = Color.lightGray;\r
-            } else {\r
-                this.color = Color.red;\r
-            }\r
-\r
-            this.resNumber = (new Integer(str.nextToken()).intValue());\r
-        }\r
+        this.resNumber = (new Integer(str.nextToken()).intValue());\r
 \r
         this.x = (float) (new Float(str.nextToken()).floatValue());\r
         this.y = (float) (new Float(str.nextToken()).floatValue());\r