Parsing updates

diff --git a/src/MCview/Atom.java b/src/MCview/Atom.java
index 0aaf040..e38d7aa 100755 (executable)
--- a/src/MCview/Atom.java
+++ b/src/MCview/Atom.java
@@ -24,9 +24,9 @@ import java.util.*;
 \r
 \r
 public class Atom {\r
-    double x;\r
-    double y;\r
-    double z;\r
+    float x;\r
+    float y;\r
+    float z;\r
     int number;\r
     String name;\r
     String resName;\r
@@ -35,35 +35,37 @@ public class Atom {
     Color color;\r
     String chain;\r
 \r
-    public Atom(StringTokenizer str) {\r
-        this.number = (new Integer(str.nextToken())).intValue();\r
-        this.name = str.nextToken();\r
+    public boolean isSelected = false;\r
+\r
+    public Atom(StringTokenizer str)\r
+    {\r
+        str.nextToken(); // Number, not used in MCview\r
+        this.name = str.nextToken(); // Name, not used in MCview\r
+\r
         this.resName = str.nextToken();\r
 \r
-        String tmpstr = new String();\r
+        String token1 = str.nextToken();\r
+\r
+        String token2 = str.nextToken();\r
 \r
-        try {\r
-            tmpstr = str.nextToken();\r
+        try{\r
 \r
-            this.resNumber = (new Integer(tmpstr).intValue());\r
-            this.chain = "A";\r
-            this.color = Color.green;\r
-        } catch (NumberFormatException e) {\r
-            this.chain = tmpstr;\r
+          this.chain = token1;\r
+          resNumber = Integer.parseInt(token2);\r
 \r
-            if (tmpstr.equals("A")) {\r
-                this.color = new Color((float) Math.random(),\r
-                        (float) Math.random(), (float) Math.random());\r
-            } else {\r
-                this.color = Color.red;\r
-            }\r
+          this.x = (float) (new Float(str.nextToken()).floatValue());\r
+          this.y = (float) (new Float(str.nextToken()).floatValue());\r
+          this.z = (float) (new Float(str.nextToken()).floatValue());\r
 \r
-            this.resNumber = (new Integer(str.nextToken()).intValue());\r
+        }catch(NumberFormatException ex)\r
+        {\r
+          chain = "A";\r
+          resNumber = Integer.parseInt(token1);\r
+          this.x = (float) (new Float(token2).floatValue());\r
+          this.y = (float) (new Float(str.nextToken()).floatValue());\r
+          this.z = (float) (new Float(str.nextToken()).floatValue());\r
         }\r
 \r
-        this.x = (double) (new Double(str.nextToken()).floatValue());\r
-        this.y = (double) (new Double(str.nextToken()).floatValue());\r
-        this.z = (double) (new Double(str.nextToken()).floatValue());\r
     }\r
 \r
     public void setColor(Color col) {\r