X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FPDBEntry.java;h=ee2b5493f17bba5ee8923b59568eca490c775b3f;hb=de1a68f7d6f2aeb9c46c8abe2ad8e824bf9d9fc3;hp=7cd6a809dcdf6eaf71bc5ae7935068ac66d3c5db;hpb=3de2a606531d25cfb36e42276c44e75dca32f591;p=jalview.git diff --git a/src/jalview/datamodel/PDBEntry.java b/src/jalview/datamodel/PDBEntry.java index 7cd6a80..ee2b549 100755 --- a/src/jalview/datamodel/PDBEntry.java +++ b/src/jalview/datamodel/PDBEntry.java @@ -1,20 +1,22 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle - * - * This program 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 2 + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) + * Copyright (C) 2014 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. - * - * This program 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. - * + * + * 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 this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.datamodel; @@ -23,21 +25,53 @@ import java.util.*; public class PDBEntry { String file; + String type; + String id; + Hashtable properties; + /* + * (non-Javadoc) + * + * @see java.lang.Object#equals(java.lang.Object) + */ + public boolean equals(Object obj) + { + if (obj == null || !(obj instanceof PDBEntry)) + { + return false; + } + if (obj == this) + return true; + PDBEntry o = (PDBEntry) obj; + return (file == o.file || (file != null && o.file != null && o.file + .equals(file))) + && (type == o.type || (type != null && o.type != null && o.type + .equals(type))) + && (id == o.id || (id != null && o.id != null && o.id + .equalsIgnoreCase(id))) + && (properties == o.properties || (properties != null + && o.properties != null && properties + .equals(o.properties))); + } + public PDBEntry() - {} - public PDBEntry(PDBEntry entry) { + { + } + + public PDBEntry(PDBEntry entry) + { file = entry.file; type = entry.type; id = entry.id; - if (entry.properties!=null) + if (entry.properties != null) { properties = (Hashtable) entry.properties.clone(); } } + public void setFile(String file) { this.file = file;