X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2FMCview%2FAtom.java;h=9cbcebb004f3b992cd829f2a5594528e7aca2adf;hb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;hp=47c84530ae283c2093d14e35cc4cd179b88caf9b;hpb=b57a02c25e335d033c97f8a6bacd6b54f62bd2b6;p=jalview.git diff --git a/src/MCview/Atom.java b/src/MCview/Atom.java index 47c8453..9cbcebb 100755 --- a/src/MCview/Atom.java +++ b/src/MCview/Atom.java @@ -1,23 +1,26 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) - * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * * Jalview is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - * + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. + * * Jalview is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR * PURPOSE. See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with Jalview. If not, see . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package MCview; -import java.awt.*; +import java.awt.Color; public class Atom { @@ -74,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 { @@ -93,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 {