X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FPDBEntry.java;h=fdd592074b3079197997a5dc6cf0fc53e70dda64;hb=a8f483d04205bb8273ee311c12968b7e86d205fa;hp=69f0d68e54410f2cf8be31ccafefbe6bdad47393;hpb=33d29753b74b33be28fef39da85fc9fbb256f6c8;p=jalview.git diff --git a/src/jalview/datamodel/PDBEntry.java b/src/jalview/datamodel/PDBEntry.java index 69f0d68..fdd5920 100755 --- a/src/jalview/datamodel/PDBEntry.java +++ b/src/jalview/datamodel/PDBEntry.java @@ -1,20 +1,20 @@ /* - * 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 - * 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. - * - * 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 + * 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. + * + * 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 . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.datamodel; @@ -23,38 +23,53 @@ import java.util.*; public class PDBEntry { String file; + String type; + String id; + Hashtable properties; - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see java.lang.Object#equals(java.lang.Object) */ public boolean equals(Object obj) { - if (obj==null || !(obj instanceof PDBEntry)) + if (obj == null || !(obj instanceof PDBEntry)) { - return false; + return false; } - if (obj==this) + 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))); + 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;