Added methods that take SCOP Ids rather than SCOPDomains.

dmyersturnbull · dmyersturnbull · commit 32ab23617e5d · 2013-07-11T14:15:33.000-07:00
diff --git a/biojava3-structure/src/main/java/org/biojava/bio/structure/align/util/AtomCache.java b/biojava3-structure/src/main/java/org/biojava/bio/structure/align/util/AtomCache.java
@@ -322,6 +322,32 @@ public void setStrictSCOP(boolean strictSCOP) {
 	public Structure getStructureForDomain(ScopDomain domain) throws IOException, StructureException{
 		return getStructureForDomain(domain, scopInstallation);
 	}
+
+	/** Returns the representation of a ScopDomain as a BioJava Structure object.
+	 * 
+	 * @param domain A SCOP Id
+	 * @return a Structure object.
+	 * @throws IOException
+	 * @throws StructureException
+	 */
+	public Structure getStructureForDomain(String scopId, ScopDatabase scopInstallation) throws IOException, StructureException{
+		if ( scopInstallation == null) {
+			scopInstallation = ScopFactory.getSCOP();
+		}
+		ScopDomain domain = scopInstallation.getDomainByScopID(scopId);
+		return getStructureForDomain(domain, scopInstallation);
+	}
+
+	/** Returns the representation of a ScopDomain as a BioJava Structure object.
+	 * 
+	 * @param domain A Scop Id
+	 * @return a Structure object.
+	 * @throws IOException
+	 * @throws StructureException
+	 */
+	public Structure getStructureForDomain(String scopId) throws IOException, StructureException{
+		return getStructureForDomain(scopId, ScopFactory.getSCOP());
+	}
 	
 	/** Returns the representation of a ScopDomain as a BioJava Structure object
 	 * 
