Merge branch 'Jalview-JS/develop' into develop

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

diff --git a/src/MCview/Atom.java b/src/mc_view/Atom.java
similarity index 90%
rename from src/MCview/Atom.java
rename to src/mc_view/Atom.java
index a2ce2ae..3b4f409 100755 (executable)
--- a/src/MCview/Atom.java
+++ b/src/mc_view/Atom.java
@@ -18,7 +18,7 @@
  * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
-package MCview;
+package mc_view;
 
 import jalview.schemes.ResidueProperties;
 
@@ -83,14 +83,14 @@ public class Atom
     resNumber = Integer.parseInt(str.substring(22, 26).trim());
     resNumIns = str.substring(22, 27).trim();
     insCode = str.substring(26, 27).charAt(0);
-    this.x = (Float.valueOf(str.substring(30, 38).trim()).floatValue());
-    this.y = (Float.valueOf(str.substring(38, 46).trim()).floatValue());
-    this.z = (Float.valueOf(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.valueOf(tm)).floatValue();
+      occupancy = (new Float(tm)).floatValue();
     }
     else
     {
@@ -100,7 +100,7 @@ public class Atom
     tm = str.substring(60, 66).trim();
     if (tm.length() > 0)
     {
-      tfactor = (Float.valueOf(tm).floatValue());
+      tfactor = (new Float(tm).floatValue());
     }
     else
     {