git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1588 restoring saved Chimera session(s)
[jalview.git]
/
src
/
jalview
/
datamodel
/
PDBEntry.java
diff --git
a/src/jalview/datamodel/PDBEntry.java
b/src/jalview/datamodel/PDBEntry.java
index
ee2b549
..
1cf9cd7
100755
(executable)
--- a/
src/jalview/datamodel/PDBEntry.java
+++ b/
src/jalview/datamodel/PDBEntry.java
@@
-20,7
+20,7
@@
*/
package jalview.datamodel;
*/
package jalview.datamodel;
-import java.util.*;
+import java.util.Hashtable;
public class PDBEntry
{
public class PDBEntry
{
@@
-37,6
+37,7
@@
public class PDBEntry
*
* @see java.lang.Object#equals(java.lang.Object)
*/
*
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj)
{
if (obj == null || !(obj instanceof PDBEntry))
public boolean equals(Object obj)
{
if (obj == null || !(obj instanceof PDBEntry))
@@
-44,7
+45,9
@@
public class PDBEntry
return false;
}
if (obj == this)
return false;
}
if (obj == this)
+ {
return true;
return true;
+ }
PDBEntry o = (PDBEntry) obj;
return (file == o.file || (file != null && o.file != null && o.file
.equals(file)))
PDBEntry o = (PDBEntry) obj;
return (file == o.file || (file != null && o.file != null && o.file
.equals(file)))
@@
-57,10
+60,29
@@
public class PDBEntry
.equals(o.properties)));
}
.equals(o.properties)));
}
+ /**
+ * Default constructor
+ */
public PDBEntry()
{
}
public PDBEntry()
{
}
+ /**
+ * Constructor given file path and PDB id.
+ *
+ * @param filePath
+ */
+ public PDBEntry(String filePath, String pdbId)
+ {
+ this.file = filePath;
+ this.id = pdbId;
+ }
+
+ /**
+ * Copy constructor.
+ *
+ * @param entry
+ */
public PDBEntry(PDBEntry entry)
{
file = entry.file;
public PDBEntry(PDBEntry entry)
{
file = entry.file;