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-1645 Version-Rel Version 2.9 Year-Rel 2015 Licensing glob
[jalview.git]
/
src
/
jalview
/
datamodel
/
PDBEntry.java
diff --git
a/src/jalview/datamodel/PDBEntry.java
b/src/jalview/datamodel/PDBEntry.java
index
927550b
..
06790d7
100755
(executable)
--- a/
src/jalview/datamodel/PDBEntry.java
+++ b/
src/jalview/datamodel/PDBEntry.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-24,11
+24,18
@@
import java.util.Hashtable;
public class PDBEntry
{
public class PDBEntry
{
- String file;
+ private String file;
- String type;
+ private String type;
- String id;
+ private String id;
+
+ private String chainCode;
+
+ public enum Type
+ {
+ PDB, FILE
+ }
Hashtable properties;
Hashtable properties;
@@
-49,15
+56,17
@@
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)))
&& (id == o.id || (id != null && o.id != null && o.id
.equalsIgnoreCase(id)))
+ && (chainCode == o.chainCode || (chainCode != null
+ && o.chainCode != null && o.chainCode
+ .equalsIgnoreCase(chainCode)))
&& (properties == o.properties || (properties != null
&& o.properties != null && properties
.equals(o.properties)));
&& (properties == o.properties || (properties != null
&& o.properties != null && properties
.equals(o.properties)));
+
}
/**
}
/**
@@
-72,12
+81,21
@@
public class PDBEntry
*
* @param filePath
*/
*
* @param filePath
*/
- public PDBEntry(String filePath, String pdbId)
+ // public PDBEntry(String filePath, String pdbId)
+ // {
+ // this.file = filePath;
+ // this.id = pdbId;
+ // }
+
+ public PDBEntry(String pdbId, String chain, PDBEntry.Type type,
+ String filePath)
{
{
- this.file = filePath;
this.id = pdbId;
this.id = pdbId;
+ this.chainCode = chain;
+ this.type = type == null ? null : type.toString();
+ this.file = filePath;
}
}
-
+
/**
* Copy constructor.
*
/**
* Copy constructor.
*
@@
-88,6
+106,7
@@
public class PDBEntry
file = entry.file;
type = entry.type;
id = entry.id;
file = entry.file;
type = entry.type;
id = entry.id;
+ chainCode = entry.chainCode;
if (entry.properties != null)
{
properties = (Hashtable) entry.properties.clone();
if (entry.properties != null)
{
properties = (Hashtable) entry.properties.clone();
@@
-104,9
+123,14
@@
public class PDBEntry
return file;
}
return file;
}
- public void setType(String type)
+ public void setType(String t)
+ {
+ this.type = t;
+ }
+
+ public void setType(PDBEntry.Type type)
{
{
- this.type = type;
+ this.type = type == null ? null : type.toString();
}
public String getType()
}
public String getType()
@@
-134,4
+158,18
@@
public class PDBEntry
return properties;
}
return properties;
}
+ public String getChainCode()
+ {
+ return chainCode;
+ }
+
+ public void setChainCode(String chainCode)
+ {
+ this.chainCode = chainCode;
+ }
+
+ public String toString()
+ {
+ return id;
+ }
}
}