X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2FMCview%2FAtom.java;h=904e3070c626cf00a1689be96aad34da9cdfbb0d;hb=refs%2Fheads%2Freleases%2FRelease_2_10_0_Branch;hp=68a7c21e53bf0244449e1096b4a4a33466031ecb;hpb=da3a1b89b39a9b7b328e08f622d8f5aa1f6358e4;p=jalview.git diff --git a/src/MCview/Atom.java b/src/MCview/Atom.java index 68a7c21..904e307 100755 --- a/src/MCview/Atom.java +++ b/src/MCview/Atom.java @@ -81,7 +81,7 @@ 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 = (new Float(str.substring(30, 38).trim()).floatValue()); this.y = (new Float(str.substring(38, 46).trim()).floatValue()); @@ -109,6 +109,24 @@ public class Atom } } + @Override + public boolean equals(Object that) + { + if (this == that || that == null) + { + return true; + } + if (that instanceof Atom) + { + Atom other = (Atom) that; + return other.resName.equals(this.resName) + && other.resNumber == this.resNumber + && other.resNumIns.equals(this.resNumIns) + && other.chain.equals(this.chain); + } + return false; + } + public Atom(float x, float y, float z) { this.x = x;