{
return format;
}
+
public String getExtension()
{
return ext;
* CaseInsensitiveString, so we are in effect doing a
* case-insensitive comparison of chain codes
*/
- boolean idMatches = id == o.id
- || (id != null && id.equalsIgnoreCase(o.id));
- boolean fileMatches = file == o.file
- || (file != null && file.equals(o.file));
- boolean typeMatches = type == o.type
- || (type != null && type.equals(o.type));
- if (idMatches && fileMatches && typeMatches)
- {
- return properties == o.properties
- || (properties != null && properties.equals(o.properties));
- }
- return false;
+ return (id == o.id || (id != null && id.equalsIgnoreCase(o.id)))
+ && (file == o.file || (file != null && file.equals(o.file)))
+ && (type == o.type || (type != null && type.equals(o.type)))
+ && (properties == o.properties || (properties != null
+ && properties.equals(o.properties)));
}
/**
{
}
-
public PDBEntry(String pdbId, String chain, PDBEntry.Type type,
String filePath)
{
* @param entryType
* @param filePath
*/
- void init(String pdbId, String chain, PDBEntry.Type entryType, String filePath)
+ void init(String pdbId, String chain, PDBEntry.Type entryType,
+ String filePath)
{
this.id = pdbId;
this.type = entryType == null ? null : entryType.toString();
- this.file = filePath;
+ this.file = (filePath == null ? null : filePath.replace('\\', '/'));
setChainCode(chain);
}
{
if (!DBRefSource.PDB.equals(dbr.getSource()))
{
- throw new IllegalArgumentException("Invalid source: "
- + dbr.getSource());
+ throw new IllegalArgumentException(
+ "Invalid source: " + dbr.getSource());
}
String pdbId = dbr.getAccessionId();
public void setFile(String f)
{
- this.file = f;
+ this.file = f.replace('\\', '/');
}
public String getFile()
{
if (this.properties == null)
{
- this.properties = new Hashtable<String, Object>();
+ this.properties = new Hashtable<>();
}
properties.put(key, value);
}