Merge branch 'features/JAL-845splitPaneMergeDevelop' into develop

[jalview.git] / src / MCview / Atom.java

diff --git a/src/MCview/Atom.java b/src/MCview/Atom.java
index b600bc9..9cbcebb 100755 (executable)
--- a/src/MCview/Atom.java
+++ b/src/MCview/Atom.java
@@ -20,7 +20,7 @@
  */
 package MCview;
 
-import java.awt.*;
+import java.awt.Color;
 
 public class Atom
 {
@@ -77,16 +77,16 @@ public class Atom
     chain = str.substring(21, 22);
 
     resNumber = Integer.parseInt(str.substring(22, 26).trim());
-    resNumIns = str.substring(22, 27);
+    resNumIns = str.substring(22, 27).trim();
     insCode = str.substring(26, 27).charAt(0);
-    this.x = (float) (new Float(str.substring(30, 38).trim()).floatValue());
-    this.y = (float) (new Float(str.substring(38, 46).trim()).floatValue());
-    this.z = (float) (new Float(str.substring(47, 55).trim()).floatValue());
+    this.x = (new Float(str.substring(30, 38).trim()).floatValue());
+    this.y = (new Float(str.substring(38, 46).trim()).floatValue());
+    this.z = (new Float(str.substring(47, 55).trim()).floatValue());
     // optional entries - see JAL-730
     String tm = str.substring(54, 60).trim();
     if (tm.length() > 0)
     {
-      occupancy = (float) (new Float(tm)).floatValue();
+      occupancy = (new Float(tm)).floatValue();
     }
     else
     {
@@ -96,7 +96,7 @@ public class Atom
     tm = str.substring(60, 66).trim();
     if (tm.length() > 0)
     {
-      tfactor = (float) (new Float(tm).floatValue());
+      tfactor = (new Float(tm).floatValue());
     }
     else
     {