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-1191 SequenceOntology wrapping/caching SO.OBO via BioJava library
[jalview.git]
/
src
/
jalview
/
datamodel
/
PDBEntry.java
diff --git
a/src/jalview/datamodel/PDBEntry.java
b/src/jalview/datamodel/PDBEntry.java
index
0050666
..
589bc7b
100755
(executable)
--- a/
src/jalview/datamodel/PDBEntry.java
+++ b/
src/jalview/datamodel/PDBEntry.java
@@
-36,6
+36,7
@@
public class PDBEntry
{
PDB, FILE
}
{
PDB, FILE
}
+
Hashtable properties;
/*
Hashtable properties;
/*
@@
-55,12
+56,8
@@
public class PDBEntry
return true;
}
PDBEntry o = (PDBEntry) obj;
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)))
+ return (type == o.type || (type != null && o.type != null && o.type
+ .equals(type)))
&& (id == o.id || (id != null && o.id != null && o.id
.equalsIgnoreCase(id)))
&& (chainCode == o.chainCode || (chainCode != null
&& (id == o.id || (id != null && o.id != null && o.id
.equalsIgnoreCase(id)))
&& (chainCode == o.chainCode || (chainCode != null
@@
-69,6
+66,7
@@
public class PDBEntry
&& (properties == o.properties || (properties != null
&& o.properties != null && properties
.equals(o.properties)));
&& (properties == o.properties || (properties != null
&& o.properties != null && properties
.equals(o.properties)));
+
}
/**
}
/**
@@
-88,13
+86,13
@@
public class PDBEntry
// this.file = filePath;
// this.id = pdbId;
// }
// this.file = filePath;
// this.id = pdbId;
// }
-
+
public PDBEntry(String pdbId, String chain, PDBEntry.Type type,
String filePath)
{
this.id = pdbId;
this.chainCode = chain;
public PDBEntry(String pdbId, String chain, PDBEntry.Type type,
String filePath)
{
this.id = pdbId;
this.chainCode = chain;
- this.type = type.toString();
+ this.type = type == null ? null : type.toString();
this.file = filePath;
}
this.file = filePath;
}
@@
-125,9
+123,14
@@
public class PDBEntry
return file;
}
return file;
}
+ public void setType(String t)
+ {
+ this.type = t;
+ }
+
public void setType(PDBEntry.Type type)
{
public void setType(PDBEntry.Type type)
{
- this.type = type.toString();
+ this.type = type == null ? null : type.toString();
}
public String getType()
}
public String getType()
@@
-165,4
+168,8
@@
public class PDBEntry
this.chainCode = chainCode;
}
this.chainCode = chainCode;
}
+ public String toString()
+ {
+ return id;
+ }
}
}