X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2FMCview%2FAtom.java;h=904e3070c626cf00a1689be96aad34da9cdfbb0d;hb=3730ef528b26ad0fc89a591ead2d44b90af86dfa;hp=927523820ad1fe7418b2eafebf2a30da63608d78;hpb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;p=jalview.git diff --git a/src/MCview/Atom.java b/src/MCview/Atom.java index 9275238..904e307 100755 --- a/src/MCview/Atom.java +++ b/src/MCview/Atom.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) - * Copyright (C) 2015 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -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;